public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-02 06:59:15 +00:00
Code Issues Releases Wiki Activity

remove $link

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-17 16:23:15 +04:00
parent aca75cb5cb
commit 6322ac79a0
80 changed files with 1624 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
include/ccache.php
View File

@@ -1,19 +1,19 @@
<?php
/* function ccache_zero($link, $feed_id, $owner_uid) {
db_query($link, "UPDATE ttrss_counters_cache SET
/* function ccache_zero( $feed_id, $owner_uid) {
db_query( "UPDATE ttrss_counters_cache SET
value = 0, updated = NOW() WHERE
feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
} */
function ccache_zero_all($link, $owner_uid) {
db_query($link, "UPDATE ttrss_counters_cache SET
function ccache_zero_all( $owner_uid) {
db_query( "UPDATE ttrss_counters_cache SET
value = 0 WHERE owner_uid = '$owner_uid'");
db_query($link, "UPDATE ttrss_cat_counters_cache SET
db_query( "UPDATE ttrss_cat_counters_cache SET
value = 0 WHERE owner_uid = '$owner_uid'");
}
function ccache_remove($link, $feed_id, $owner_uid, $is_cat = false) {
function ccache_remove( $feed_id, $owner_uid, $is_cat = false) {
if (!$is_cat) {
$table = "ttrss_counters_cache";
@@ -21,39 +21,39 @@
$table = "ttrss_cat_counters_cache";
}
db_query($link, "DELETE FROM $table WHERE
db_query( "DELETE FROM $table WHERE
feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
}
function ccache_update_all($link, $owner_uid) {
function ccache_update_all( $owner_uid) {
if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid)) {
if (get_pref( 'ENABLE_FEED_CATS', $owner_uid)) {
$result = db_query($link, "SELECT feed_id FROM ttrss_cat_counters_cache
$result = db_query( "SELECT feed_id FROM ttrss_cat_counters_cache
WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
while ($line = db_fetch_assoc($result)) {
ccache_update($link, $line["feed_id"], $owner_uid, true);
ccache_update( $line["feed_id"], $owner_uid, true);
}
/* We have to manually include category 0 */
ccache_update($link, 0, $owner_uid, true);
ccache_update( 0, $owner_uid, true);
} else {
$result = db_query($link, "SELECT feed_id FROM ttrss_counters_cache
$result = db_query( "SELECT feed_id FROM ttrss_counters_cache
WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
while ($line = db_fetch_assoc($result)) {
print ccache_update($link, $line["feed_id"], $owner_uid);
print ccache_update( $line["feed_id"], $owner_uid);
}
}
}
function ccache_find($link, $feed_id, $owner_uid, $is_cat = false,
function ccache_find( $feed_id, $owner_uid, $is_cat = false,
$no_update = false) {
if (!is_numeric($feed_id)) return;
@@ -61,7 +61,7 @@
if (!$is_cat) {
$table = "ttrss_counters_cache";
/* if ($feed_id > 0) {
$tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
$tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds
WHERE id = '$feed_id'");
$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
} */
@@ -75,7 +75,7 @@
$date_qpart = "updated > DATE_SUB(NOW(), INTERVAL 15 MINUTE)";
}
$result = db_query($link, "SELECT value FROM $table
$result = db_query( "SELECT value FROM $table
WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id'
LIMIT 1");
@@ -85,30 +85,30 @@
if ($no_update) {
return -1;
} else {
return ccache_update($link, $feed_id, $owner_uid, $is_cat);
return ccache_update( $feed_id, $owner_uid, $is_cat);
}
}
}
function ccache_update($link, $feed_id, $owner_uid, $is_cat = false,
function ccache_update( $feed_id, $owner_uid, $is_cat = false,
$update_pcat = true) {
if (!is_numeric($feed_id)) return;
/* if (!$is_cat && $feed_id > 0) {
$tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
$tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds
WHERE id = '$feed_id'");
$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
} */
$prev_unread = ccache_find($link, $feed_id, $owner_uid, $is_cat, true);
$prev_unread = ccache_find( $feed_id, $owner_uid, $is_cat, true);
/* When updating a label, all we need to do is recalculate feed counters
* because labels are not cached */
if ($feed_id < 0) {
ccache_update_all($link, $owner_uid);
ccache_update_all( $owner_uid);
return;
}
@@ -127,14 +127,14 @@
/* Recalculate counters for child feeds */
$result = db_query($link, "SELECT id FROM ttrss_feeds
$result = db_query( "SELECT id FROM ttrss_feeds
WHERE owner_uid = '$owner_uid' AND $cat_qpart");
while ($line = db_fetch_assoc($result)) {
ccache_update($link, $line["id"], $owner_uid, false, false);
ccache_update( $line["id"], $owner_uid, false, false);
}
$result = db_query($link, "SELECT SUM(value) AS sv
$result = db_query( "SELECT SUM(value) AS sv
FROM ttrss_counters_cache, ttrss_feeds
WHERE id = feed_id AND $cat_qpart AND
ttrss_feeds.owner_uid = '$owner_uid'");
@@ -142,27 +142,27 @@
$unread = (int) db_fetch_result($result, 0, "sv");
} else {
$unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid);
$unread = (int) getFeedArticles( $feed_id, $is_cat, true, $owner_uid);
}
db_query($link, "BEGIN");
db_query( "BEGIN");
$result = db_query($link, "SELECT feed_id FROM $table
$result = db_query( "SELECT feed_id FROM $table
WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1");
if (db_num_rows($result) == 1) {
db_query($link, "UPDATE $table SET
db_query( "UPDATE $table SET
value = '$unread', updated = NOW() WHERE
feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
} else {
db_query($link, "INSERT INTO $table
db_query( "INSERT INTO $table
(feed_id, value, owner_uid, updated)
VALUES
($feed_id, $unread, $owner_uid, NOW())");
}
db_query($link, "COMMIT");
db_query( "COMMIT");
if ($feed_id > 0 && $prev_unread != $unread) {
@@ -172,36 +172,36 @@
if ($update_pcat) {
$result = db_query($link, "SELECT cat_id FROM ttrss_feeds
$result = db_query( "SELECT cat_id FROM ttrss_feeds
WHERE owner_uid = '$owner_uid' AND id = '$feed_id'");
$cat_id = (int) db_fetch_result($result, 0, "cat_id");
ccache_update($link, $cat_id, $owner_uid, true);
ccache_update( $cat_id, $owner_uid, true);
}
}
} else if ($feed_id < 0) {
ccache_update_all($link, $owner_uid);
ccache_update_all( $owner_uid);
}
return $unread;
}
/* function ccache_cleanup($link, $owner_uid) {
/* function ccache_cleanup( $owner_uid) {
if (DB_TYPE == "pgsql") {
db_query($link, "DELETE FROM ttrss_counters_cache AS c1 WHERE
db_query( "DELETE FROM ttrss_counters_cache AS c1 WHERE
(SELECT count(*) FROM ttrss_counters_cache AS c2
WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
AND owner_uid = '$owner_uid'");
db_query($link, "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
db_query( "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
(SELECT count(*) FROM ttrss_cat_counters_cache AS c2
WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
AND owner_uid = '$owner_uid'");
} else {
db_query($link, "DELETE c1 FROM
db_query( "DELETE c1 FROM
ttrss_counters_cache AS c1,
ttrss_counters_cache AS c2
WHERE
@@ -209,7 +209,7 @@
c1.owner_uid = c2.owner_uid AND
c1.feed_id = c2.feed_id");
db_query($link, "DELETE c1 FROM
db_query( "DELETE c1 FROM
ttrss_cat_counters_cache AS c1,
ttrss_cat_counters_cache AS c2
WHERE

26
include/db-prefs.php
View File

@@ -7,7 +7,7 @@
$_SESSION["prefs_cache"] = array();
}
function cache_prefs($link) {
function cache_prefs() {
$profile = false;
$user_id = $_SESSION["uid"];
@@ -19,9 +19,9 @@
$profile_qpart = "profile IS NULL AND";
}
if (get_schema_version($link) < 63) $profile_qpart = "";
if (get_schema_version() < 63) $profile_qpart = "";
$result = db_query($link, "SELECT
$result = db_query( "SELECT
value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name
FROM
ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -42,9 +42,9 @@
}
}
function get_pref($link, $pref_name, $user_id = false, $die_on_error = false) {
function get_pref( $pref_name, $user_id = false, $die_on_error = false) {
$pref_name = db_escape_string($link, $pref_name);
$pref_name = db_escape_string( $pref_name);
$prefs_cache = true;
$profile = false;
@@ -69,9 +69,9 @@
$profile_qpart = "profile IS NULL AND";
}
if (get_schema_version($link) < 63) $profile_qpart = "";
if (get_schema_version() < 63) $profile_qpart = "";
$result = db_query($link, "SELECT
$result = db_query( "SELECT
value,ttrss_prefs_types.type_name as type_name
FROM
ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -114,9 +114,9 @@
}
}
function set_pref($link, $pref_name, $value, $user_id = false, $strip_tags = true) {
$pref_name = db_escape_string($link, $pref_name);
$value = db_escape_string($link, $value, $strip_tags);
function set_pref( $pref_name, $value, $user_id = false, $strip_tags = true) {
$pref_name = db_escape_string( $pref_name);
$value = db_escape_string( $value, $strip_tags);
if (!$user_id) {
$user_id = $_SESSION["uid"];
@@ -132,7 +132,7 @@
$profile_qpart = "AND profile IS NULL";
}
if (get_schema_version($link) < 63) $profile_qpart = "";
if (get_schema_version() < 63) $profile_qpart = "";
$type_name = "";
$current_value = "";
@@ -145,7 +145,7 @@
}
if (!$type_name) {
$result = db_query($link, "SELECT type_name
$result = db_query( "SELECT type_name
FROM ttrss_prefs,ttrss_prefs_types
WHERE pref_name = '$pref_name' AND type_id = ttrss_prefs_types.id");
@@ -170,7 +170,7 @@
$value = 'UTC';
}
db_query($link, "UPDATE ttrss_user_prefs SET
db_query( "UPDATE ttrss_user_prefs SET
value = '$value' WHERE pref_name = '$pref_name'
$profile_qpart
AND owner_uid = " . $_SESSION["uid"]);

10
include/db.php
View File

@@ -4,11 +4,11 @@ function db_connect($host, $user, $pass, $db) {
return Db::get()->connect($host, $user, $pass, $db, 0);
}
function db_escape_string($link, $s, $strip_tags = true) {
function db_escape_string( $s, $strip_tags = true) {
return Db::get()->escape_string($s, $strip_tags);
}
function db_query($link, $query, $die_on_error = true) {
function db_query( $query, $die_on_error = true) {
return Db::get()->query($query, $die_on_error);
}
@@ -25,15 +25,15 @@ function db_fetch_result($result, $row, $param) {
return Db::get()->fetch_result($result, $row, $param);
}
function db_close($link) {
function db_close() {
return Db::get()->close();
}
function db_affected_rows($link, $result) {
function db_affected_rows( $result) {
return Db::get()->affected_rows($result);
}
function db_last_error($link) {
function db_last_error() {
return Db::get()->last_error();
}

26
include/digest.php
View File

@@ -6,7 +6,7 @@
* @param integer $limit The maximum number of articles by digest.
* @return boolean Return false if digests are not enabled.
*/
function send_headlines_digests($link, $debug = false) {
function send_headlines_digests( $debug = false) {
require_once 'classes/ttrssmailer.php';
@@ -21,13 +21,13 @@
$interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
}
$result = db_query($link, "SELECT id,email FROM ttrss_users
$result = db_query( "SELECT id,email FROM ttrss_users
WHERE email != '' AND (last_digest_sent IS NULL OR $interval_query)");
while ($line = db_fetch_assoc($result)) {
if (get_pref($link, 'DIGEST_ENABLE', $line['id'], false)) {
$preferred_ts = strtotime(get_pref($link, 'DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
if (get_pref( 'DIGEST_ENABLE', $line['id'], false)) {
$preferred_ts = strtotime(get_pref( 'DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
// try to send digests within 2 hours of preferred time
if ($preferred_ts && time() >= $preferred_ts &&
@@ -35,14 +35,14 @@
if ($debug) _debug("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
$do_catchup = get_pref($link, 'DIGEST_CATCHUP', $line['id'], false);
$do_catchup = get_pref( 'DIGEST_CATCHUP', $line['id'], false);
global $tz_offset;
// reset tz_offset global to prevent tz cache clash between users
$tz_offset = -1;
$tuple = prepare_headlines_digest($link, $line["id"], 1, $limit);
$tuple = prepare_headlines_digest( $line["id"], 1, $limit);
$digest = $tuple[0];
$headlines_count = $tuple[1];
$affected_ids = $tuple[2];
@@ -60,13 +60,13 @@
if ($rc && $do_catchup) {
if ($debug) _debug("Marking affected articles as read...");
catchupArticlesById($link, $affected_ids, 0, $line["id"]);
catchupArticlesById( $affected_ids, 0, $line["id"]);
}
} else {
if ($debug) _debug("No headlines");
}
db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
db_query( "UPDATE ttrss_users SET last_digest_sent = NOW()
WHERE id = " . $line["id"]);
}
@@ -77,7 +77,7 @@
}
function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 1000) {
function prepare_headlines_digest( $user_id, $days = 1, $limit = 1000) {
require_once "lib/MiniTemplator.class.php";
@@ -87,7 +87,7 @@
$tpl->readTemplateFromFile("templates/digest_template_html.txt");
$tpl_t->readTemplateFromFile("templates/digest_template.txt");
$user_tz_string = get_pref($link, 'USER_TIMEZONE', $user_id);
$user_tz_string = get_pref( 'USER_TIMEZONE', $user_id);
$local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
@@ -104,7 +104,7 @@
$interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
}
$result = db_query($link, "SELECT ttrss_entries.title,
$result = db_query( "SELECT ttrss_entries.title,
ttrss_feeds.title AS feed_title,
COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS cat_title,
date_updated,
@@ -143,7 +143,7 @@
array_push($affected_ids, $line["ref_id"]);
$updated = make_local_datetime($link, $line['last_updated'], false,
$updated = make_local_datetime( $line['last_updated'], false,
$user_id);
/* if ($line["score"] != 0) {
@@ -152,7 +152,7 @@
$line["title"] .= " (".$line['score'].")";
} */
if (get_pref($link, 'ENABLE_FEED_CATS', $user_id)) {
if (get_pref( 'ENABLE_FEED_CATS', $user_id)) {
$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
}

8
include/feedbrowser.php
View File

@@ -1,5 +1,5 @@
<?php
function make_feed_browser($link, $search, $limit, $mode = 1) {
function make_feed_browser( $search, $limit, $mode = 1) {
$owner_uid = $_SESSION["uid"];
$rv = '';
@@ -12,13 +12,13 @@
}
if ($mode == 1) {
/* $result = db_query($link, "SELECT feed_url, subscribers FROM
/* $result = db_query( "SELECT feed_url, subscribers FROM
ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
AND owner_uid = '$owner_uid') $search_qpart
ORDER BY subscribers DESC LIMIT $limit"); */
$result = db_query($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
$result = db_query( "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
(SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
WHERE
@@ -28,7 +28,7 @@
GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
} else if ($mode == 2) {
$result = db_query($link, "SELECT *,
$result = db_query( "SELECT *,
(SELECT COUNT(*) FROM ttrss_user_entries WHERE
orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
FROM

550
include/functions.php
View File

File diff suppressed because it is too large Load Diff

82
include/labels.php
View File

@@ -1,6 +1,6 @@
<?php
function label_find_id($link, $label, $owner_uid) {
$result = db_query($link,
function label_find_id( $label, $owner_uid) {
$result = db_query(
"SELECT id FROM ttrss_labels2 WHERE caption = '$label'
AND owner_uid = '$owner_uid' LIMIT 1");
@@ -11,12 +11,12 @@
}
}
function get_article_labels($link, $id, $owner_uid = false) {
function get_article_labels( $id, $owner_uid = false) {
$rv = array();
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
$result = db_query($link, "SELECT label_cache FROM
$result = db_query( "SELECT label_cache FROM
ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " .
$owner_uid);
@@ -33,7 +33,7 @@
}
}
$result = db_query($link,
$result = db_query(
"SELECT DISTINCT label_id,caption,fg_color,bg_color
FROM ttrss_labels2, ttrss_user_labels2
WHERE id = label_id
@@ -48,16 +48,16 @@
}
if (count($rv) > 0)
label_update_cache($link, $owner_uid, $id, $rv);
label_update_cache( $owner_uid, $id, $rv);
else
label_update_cache($link, $owner_uid, $id, array("no-labels" => 1));
label_update_cache( $owner_uid, $id, array("no-labels" => 1));
return $rv;
}
function label_find_caption($link, $label, $owner_uid) {
$result = db_query($link,
function label_find_caption( $label, $owner_uid) {
$result = db_query(
"SELECT caption FROM ttrss_labels2 WHERE id = '$label'
AND owner_uid = '$owner_uid' LIMIT 1");
@@ -68,10 +68,10 @@
}
}
function get_all_labels($link, $owner_uid) {
function get_all_labels( $owner_uid) {
$rv = array();
$result = db_query($link, "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
$result = db_query( "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
while ($line = db_fetch_assoc($result)) {
array_push($rv, $line);
@@ -80,50 +80,50 @@
return $rv;
}
function label_update_cache($link, $owner_uid, $id, $labels = false, $force = false) {
function label_update_cache( $owner_uid, $id, $labels = false, $force = false) {
if ($force)
label_clear_cache($link, $id);
label_clear_cache( $id);
if (!$labels)
$labels = get_article_labels($link, $id);
$labels = get_article_labels( $id);
$labels = db_escape_string($link, json_encode($labels));
$labels = db_escape_string( json_encode($labels));
db_query($link, "UPDATE ttrss_user_entries SET
db_query( "UPDATE ttrss_user_entries SET
label_cache = '$labels' WHERE ref_id = '$id' AND owner_uid = '$owner_uid'");
}
function label_clear_cache($link, $id) {
function label_clear_cache( $id) {
db_query($link, "UPDATE ttrss_user_entries SET
db_query( "UPDATE ttrss_user_entries SET
label_cache = '' WHERE ref_id = '$id'");
}
function label_remove_article($link, $id, $label, $owner_uid) {
function label_remove_article( $id, $label, $owner_uid) {
$label_id = label_find_id($link, $label, $owner_uid);
$label_id = label_find_id( $label, $owner_uid);
if (!$label_id) return;
$result = db_query($link,
$result = db_query(
"DELETE FROM ttrss_user_labels2
WHERE
label_id = '$label_id' AND
article_id = '$id'");
label_clear_cache($link, $id);
label_clear_cache( $id);
}
function label_add_article($link, $id, $label, $owner_uid) {
function label_add_article( $id, $label, $owner_uid) {
$label_id = label_find_id($link, $label, $owner_uid);
$label_id = label_find_id( $label, $owner_uid);
if (!$label_id) return;
$result = db_query($link,
$result = db_query(
"SELECT
article_id FROM ttrss_labels2, ttrss_user_labels2
WHERE
@@ -133,66 +133,66 @@
LIMIT 1");
if (db_num_rows($result) == 0) {
db_query($link, "INSERT INTO ttrss_user_labels2
db_query( "INSERT INTO ttrss_user_labels2
(label_id, article_id) VALUES ('$label_id', '$id')");
}
label_clear_cache($link, $id);
label_clear_cache( $id);
}
function label_remove($link, $id, $owner_uid) {
function label_remove( $id, $owner_uid) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
db_query($link, "BEGIN");
db_query( "BEGIN");
$result = db_query($link, "SELECT caption FROM ttrss_labels2
$result = db_query( "SELECT caption FROM ttrss_labels2
WHERE id = '$id'");
$caption = db_fetch_result($result, 0, "caption");
$result = db_query($link, "DELETE FROM ttrss_labels2 WHERE id = '$id'
$result = db_query( "DELETE FROM ttrss_labels2 WHERE id = '$id'
AND owner_uid = " . $owner_uid);
if (db_affected_rows($link, $result) != 0 && $caption) {
if (db_affected_rows( $result) != 0 && $caption) {
/* Remove access key for the label */
$ext_id = LABEL_BASE_INDEX - 1 - $id;
db_query($link, "DELETE FROM ttrss_access_keys WHERE
db_query( "DELETE FROM ttrss_access_keys WHERE
feed_id = '$ext_id' AND owner_uid = $owner_uid");
/* Remove cached data */
db_query($link, "UPDATE ttrss_user_entries SET label_cache = ''
db_query( "UPDATE ttrss_user_entries SET label_cache = ''
WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $owner_uid);
}
db_query($link, "COMMIT");
db_query( "COMMIT");
}
function label_create($link, $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
function label_create( $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION['uid'];
db_query($link, "BEGIN");
db_query( "BEGIN");
$result = false;
$result = db_query($link, "SELECT id FROM ttrss_labels2
$result = db_query( "SELECT id FROM ttrss_labels2
WHERE caption = '$caption' AND owner_uid = $owner_uid");
if (db_num_rows($result) == 0) {
$result = db_query($link,
$result = db_query(
"INSERT INTO ttrss_labels2 (caption,owner_uid,fg_color,bg_color)
VALUES ('$caption', '$owner_uid', '$fg_color', '$bg_color')");
$result = db_affected_rows($link, $result) != 0;
$result = db_affected_rows( $result) != 0;
}
db_query($link, "COMMIT");
db_query( "COMMIT");
return $result;
}

212
include/rssfuncs.php
View File

@@ -3,32 +3,32 @@
define('DAEMON_FEED_LIMIT', 100);
define('DAEMON_SLEEP_INTERVAL', 60);
function update_feedbrowser_cache($link) {
function update_feedbrowser_cache() {
$result = db_query($link, "SELECT feed_url, site_url, title, COUNT(id) AS subscribers
$result = db_query( "SELECT feed_url, site_url, title, COUNT(id) AS subscribers
FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
WHERE tf.feed_url = ttrss_feeds.feed_url
AND (private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%'))
GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000");
db_query($link, "BEGIN");
db_query( "BEGIN");
db_query($link, "DELETE FROM ttrss_feedbrowser_cache");
db_query( "DELETE FROM ttrss_feedbrowser_cache");
$count = 0;
while ($line = db_fetch_assoc($result)) {
$subscribers = db_escape_string($link, $line["subscribers"]);
$feed_url = db_escape_string($link, $line["feed_url"]);
$title = db_escape_string($link, $line["title"]);
$site_url = db_escape_string($link, $line["site_url"]);
$subscribers = db_escape_string( $line["subscribers"]);
$feed_url = db_escape_string( $line["feed_url"]);
$title = db_escape_string( $line["title"]);
$site_url = db_escape_string( $line["site_url"]);
$tmp_result = db_query($link, "SELECT subscribers FROM
$tmp_result = db_query( "SELECT subscribers FROM
ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'");
if (db_num_rows($tmp_result) == 0) {
db_query($link, "INSERT INTO ttrss_feedbrowser_cache
db_query( "INSERT INTO ttrss_feedbrowser_cache
(feed_url, site_url, title, subscribers) VALUES ('$feed_url',
'$site_url', '$title', '$subscribers')");
@@ -38,7 +38,7 @@
}
db_query($link, "COMMIT");
db_query( "COMMIT");
return $count;
@@ -57,10 +57,10 @@
* @param boolean $debug Set to false to disable debug output. Default to true.
* @return void
*/
function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
function update_daemon_common( $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
// Process all other feeds using last_updated and interval parameters
$schema_version = get_schema_version($link);
$schema_version = get_schema_version();
if ($schema_version != SCHEMA_VERSION) {
die("Schema version is wrong, please upgrade the database.\n");
@@ -116,7 +116,7 @@
$random_qpart = sql_random_function();
// We search for feed needing update.
$result = db_query($link, "SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
$result = db_query( "SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs
WHERE
@@ -134,7 +134,7 @@
// Here is a little cache magic in order to minimize risk of double feed updates.
$feeds_to_update = array();
while ($line = db_fetch_assoc($result)) {
array_push($feeds_to_update, db_escape_string($link, $line['feed_url']));
array_push($feeds_to_update, db_escape_string( $line['feed_url']));
}
// We update the feed last update started date before anything else.
@@ -145,16 +145,16 @@
$feeds_quoted = array();
foreach ($feeds_to_update as $feed) {
array_push($feeds_quoted, "'" . db_escape_string($link, $feed) . "'");
array_push($feeds_quoted, "'" . db_escape_string( $feed) . "'");
}
db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
db_query( sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
WHERE feed_url IN (%s)", implode(',', $feeds_quoted)));
}
expire_cached_files($debug);
expire_lock_files($debug);
expire_error_log($link, $debug);
expire_error_log( $debug);
$nf = 0;
@@ -162,16 +162,16 @@
foreach ($feeds_to_update as $feed) {
if($debug) _debug("Base feed: $feed");
//update_rss_feed($link, $line["id"], true);
//update_rss_feed( $line["id"], true);
// since we have the data cached, we can deal with other feeds with the same url
$tmp_result = db_query($link, "SELECT DISTINCT ttrss_feeds.id,last_updated
$tmp_result = db_query( "SELECT DISTINCT ttrss_feeds.id,last_updated
FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
ttrss_users.id = ttrss_user_prefs.owner_uid AND
ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
feed_url = '".db_escape_string($link, $feed)."' AND
feed_url = '".db_escape_string( $feed)."' AND
(ttrss_feeds.update_interval > 0 OR
ttrss_user_prefs.value != '-1')
$login_thresh_qpart
@@ -180,7 +180,7 @@
if (db_num_rows($tmp_result) > 0) {
while ($tline = db_fetch_assoc($tmp_result)) {
if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]);
update_rss_feed($link, $tline["id"], true);
update_rss_feed( $tline["id"], true);
++$nf;
}
}
@@ -189,14 +189,14 @@
require_once "digest.php";
// Send feed digests by email if needed.
send_headlines_digests($link, $debug);
send_headlines_digests( $debug);
return $nf;
} // function update_daemon_common
// ignore_daemon is not used
function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false,
function update_rss_feed( $feed, $ignore_daemon = false, $no_cache = false,
$override_url = false) {
require_once "lib/simplepie/simplepie.inc";
@@ -207,7 +207,7 @@
_debug("update_rss_feed: start");
}
$result = db_query($link, "SELECT id,update_interval,auth_login,
$result = db_query( "SELECT id,update_interval,auth_login,
feed_url,auth_pass,cache_images,last_updated,
mark_unread_on_update, owner_uid,
pubsub_state, auth_pass_encrypted
@@ -228,7 +228,7 @@
$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
0, "auth_pass_encrypted"));
db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
db_query( "UPDATE ttrss_feeds SET last_update_started = NOW()
WHERE id = '$feed'");
$auth_login = db_fetch_result($result, 0, "auth_login");
@@ -242,7 +242,7 @@
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
$fetch_url = db_fetch_result($result, 0, "feed_url");
$feed = db_escape_string($link, $feed);
$feed = db_escape_string( $feed);
if ($override_url) $fetch_url = $override_url;
@@ -252,7 +252,7 @@
// Ignore cache if new feed or manual update.
$cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
30 : get_feed_update_interval($link, $feed) * 60;
30 : get_feed_update_interval( $feed) * 60;
if ($debug_enabled) {
_debug("update_rss_feed: cache filename: $cache_filename exists: " . file_exists($cache_filename));
@@ -322,14 +322,14 @@
// If-Modified-Since
if ($fetch_last_error_code != 304) {
$error_escaped = db_escape_string($link, $fetch_last_error);
$error_escaped = db_escape_string( $fetch_last_error);
} else {
if ($debug_enabled) {
_debug("update_rss_feed: source claims data not modified, nothing to do.");
}
}
db_query($link,
db_query(
"UPDATE ttrss_feeds SET last_error = '$error_escaped',
last_updated = NOW() WHERE id = '$feed'");
@@ -337,9 +337,9 @@
}
}
$pluginhost = new PluginHost($link);
$pluginhost = new PluginHost();
$pluginhost->set_debug($debug_enabled);
$user_plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
$user_plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid);
$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
$pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid);
@@ -364,7 +364,7 @@
// print_r($rss);
$feed = db_escape_string($link, $feed);
$feed = db_escape_string( $feed);
if (!$rss->error()) {
@@ -388,7 +388,7 @@
_debug("update_rss_feed: processing feed data...");
}
// db_query($link, "BEGIN");
// db_query( "BEGIN");
if (DB_TYPE == "pgsql") {
$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
@@ -396,7 +396,7 @@
$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
}
$result = db_query($link, "SELECT title,site_url,owner_uid,
$result = db_query( "SELECT title,site_url,owner_uid,
(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
favicon_needs_check
FROM ttrss_feeds WHERE id = '$feed'");
@@ -408,7 +408,7 @@
$owner_uid = db_fetch_result($result, 0, "owner_uid");
$site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
$site_url = db_escape_string( mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
if ($favicon_needs_check || $force_refetch) {
if ($debug_enabled) {
@@ -421,31 +421,31 @@
if (file_exists($favicon_file)) {
require_once "colors.php";
$favicon_color = db_escape_string($link,
$favicon_color = db_escape_string(
calculate_avg_color($favicon_file));
$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
}
db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
db_query( "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
$favicon_colorstring
WHERE id = '$feed'");
}
if (!$registered_title || $registered_title == "[Unknown]") {
$feed_title = db_escape_string($link, $rss->get_title());
$feed_title = db_escape_string( $rss->get_title());
if ($debug_enabled) {
_debug("update_rss_feed: registering title: $feed_title");
}
db_query($link, "UPDATE ttrss_feeds SET
db_query( "UPDATE ttrss_feeds SET
title = '$feed_title' WHERE id = '$feed'");
}
if ($site_url && $orig_site_url != $site_url) {
db_query($link, "UPDATE ttrss_feeds SET
db_query( "UPDATE ttrss_feeds SET
site_url = '$site_url' WHERE id = '$feed'");
}
@@ -453,8 +453,8 @@
_debug("update_rss_feed: loading filters & labels...");
}
$filters = load_filters($link, $feed, $owner_uid);
$labels = get_all_labels($link, $owner_uid);
$filters = load_filters( $feed, $owner_uid);
$labels = get_all_labels( $owner_uid);
if ($debug_enabled) {
//print_r($filters);
@@ -468,7 +468,7 @@
_debug("update_rss_feed: no articles found.");
}
db_query($link, "UPDATE ttrss_feeds
db_query( "UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
return; // no articles
@@ -506,7 +506,7 @@
if ($debug_enabled)
_debug("update_rss_feed: feed hub url found, subscribe request sent.");
db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 1
db_query( "UPDATE ttrss_feeds SET pubsub_state = 1
WHERE id = '$feed'");
}
}
@@ -528,7 +528,7 @@
$entry_guid = "$owner_uid,$entry_guid";
$entry_guid_hashed = db_escape_string($link, 'SHA1:' . sha1($entry_guid));
$entry_guid_hashed = db_escape_string( 'SHA1:' . sha1($entry_guid));
if ($debug_enabled) {
_debug("update_rss_feed: guid $entry_guid / $entry_guid_hashed");
@@ -578,13 +578,13 @@
$entry_author = $entry_author_item->get_name();
if (!$entry_author) $entry_author = $entry_author_item->get_email();
$entry_author = db_escape_string($link, $entry_author);
$entry_author = db_escape_string( $entry_author);
}
$entry_guid = db_escape_string($link, mb_substr($entry_guid, 0, 245));
$entry_guid = db_escape_string( mb_substr($entry_guid, 0, 245));
$entry_comments = db_escape_string($link, mb_substr($entry_comments, 0, 245));
$entry_author = db_escape_string($link, mb_substr($entry_author, 0, 245));
$entry_comments = db_escape_string( mb_substr($entry_comments, 0, 245));
$entry_author = db_escape_string( mb_substr($entry_author, 0, 245));
$num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
@@ -641,8 +641,8 @@
}
// FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?)
$result = db_query($link, "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
WHERE ref_id = id AND (guid = '".db_escape_string($link, $entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid");
$result = db_query( "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries
WHERE ref_id = id AND (guid = '".db_escape_string( $entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid");
if (db_num_rows($result) != 0) {
$entry_plugin_data = db_fetch_result($result, 0, "plugin_data");
@@ -671,11 +671,11 @@
}
$entry_tags = $article["tags"];
$entry_guid = db_escape_string($link, $entry_guid);
$entry_title = db_escape_string($link, $article["title"]);
$entry_author = db_escape_string($link, $article["author"]);
$entry_link = db_escape_string($link, $article["link"]);
$entry_plugin_data = db_escape_string($link, $article["plugin_data"]);
$entry_guid = db_escape_string( $entry_guid);
$entry_title = db_escape_string( $article["title"]);
$entry_author = db_escape_string( $article["author"]);
$entry_link = db_escape_string( $article["link"]);
$entry_plugin_data = db_escape_string( $article["plugin_data"]);
$entry_content = $article["content"]; // escaped below
@@ -686,13 +686,13 @@
if ($cache_images && is_writable(CACHE_DIR . '/images'))
cache_images($entry_content, $site_url, $debug_enabled);
$entry_content = db_escape_string($link, $entry_content, false);
$entry_content = db_escape_string( $entry_content, false);
$content_hash = "SHA1:" . sha1($entry_content);
db_query($link, "BEGIN");
db_query( "BEGIN");
$result = db_query($link, "SELECT id FROM ttrss_entries
$result = db_query( "SELECT id FROM ttrss_entries
WHERE (guid = '$entry_guid' OR guid = '$entry_guid_hashed')");
if (db_num_rows($result) == 0) {
@@ -703,7 +703,7 @@
// base post entry does not exist, create it
$result = db_query($link,
$result = db_query(
"INSERT INTO ttrss_entries
(title,
guid,
@@ -745,15 +745,15 @@
$base_entry_id = db_fetch_result($result, 0, "id");
db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
db_query( "UPDATE ttrss_entries SET date_updated = NOW()
WHERE id = '$base_entry_id'");
$article_labels = get_article_labels($link, $base_entry_id, $owner_uid);
$article_labels = get_article_labels( $base_entry_id, $owner_uid);
}
// now it should exist, if not - bad luck then
$result = db_query($link, "SELECT
$result = db_query( "SELECT
id,content_hash,no_orig_date,title,plugin_data,guid,
".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
@@ -786,14 +786,14 @@
if ($stored_guid != $entry_guid_hashed) {
if ($debug_enabled) _debug("upgrading compat guid to hashed one");
db_query($link, "UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
db_query( "UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE
id = '$ref_id'");
} */
// check for user post link to main table
// do we allow duplicate posts with same GUID in different feeds?
if (get_pref($link, "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
if (get_pref( "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
$dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)";
} else {
$dupcheck_qpart = "";
@@ -813,7 +813,7 @@
}
if (find_article_filter($article_filters, "filter")) {
db_query($link, "COMMIT"); // close transaction in progress
db_query( "COMMIT"); // close transaction in progress
continue;
}
@@ -829,7 +829,7 @@
// if ($_REQUEST["xdebug"]) print "$query\n";
$result = db_query($link, $query);
$result = db_query( $query);
// okay it doesn't exist - create user entry
if (db_num_rows($result) == 0) {
@@ -862,7 +862,7 @@
if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) {
$result = db_query($link, "SELECT COUNT(*) AS similar FROM
$result = db_query( "SELECT COUNT(*) AS similar FROM
ttrss_entries,ttrss_user_entries
WHERE ref_id = id AND updated >= NOW() - INTERVAL '7 day'
AND similarity(title, '$entry_title') >= "._NGRAM_TITLE_DUPLICATE_THRESHOLD."
@@ -882,7 +882,7 @@
$last_marked = ($marked == 'true') ? 'NOW()' : 'NULL';
$last_published = ($published == 'true') ? 'NOW()' : 'NULL';
$result = db_query($link,
$result = db_query(
"INSERT INTO ttrss_user_entries
(ref_id, owner_uid, feed_id, unread, last_read, marked,
published, score, tag_cache, label_cache, uuid,
@@ -894,14 +894,14 @@
if (PUBSUBHUBBUB_HUB && $published == 'true') {
$rss_link = get_self_url_prefix() .
"/public.php?op=rss&id=-2&key=" .
get_feed_access_key($link, -2, false, $owner_uid);
get_feed_access_key( -2, false, $owner_uid);
$p = new Publisher(PUBSUBHUBBUB_HUB);
$pubsub_result = $p->publish_update($rss_link);
}
$result = db_query($link,
$result = db_query(
"SELECT int_id FROM ttrss_user_entries WHERE
ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND
feed_id = '$feed' LIMIT 1");
@@ -940,7 +940,7 @@
$update_insignificant = false;
}
if (db_escape_string($link, $orig_title) != $entry_title) {
if (db_escape_string( $orig_title) != $entry_title) {
$post_needs_update = true;
$update_insignificant = false;
}
@@ -955,7 +955,7 @@
// print "<!-- post $orig_title needs update : $post_needs_update -->";
db_query($link, "UPDATE ttrss_entries
db_query( "UPDATE ttrss_entries
SET title = '$entry_title', content = '$entry_content',
content_hash = '$content_hash',
updated = '$entry_timestamp_fmt',
@@ -965,20 +965,20 @@
if (!$update_insignificant) {
if ($mark_unread_on_update) {
db_query($link, "UPDATE ttrss_user_entries
db_query( "UPDATE ttrss_user_entries
SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
}
}
}
}
db_query($link, "COMMIT");
db_query( "COMMIT");
if ($debug_enabled) {
_debug("update_rss_feed: assigning labels...");
}
assign_article_to_label_filters($link, $entry_ref_id, $article_filters,
assign_article_to_label_filters( $entry_ref_id, $article_filters,
$owner_uid, $article_labels);
if ($debug_enabled) {
@@ -1004,24 +1004,24 @@
print_r($enclosures);
}
db_query($link, "BEGIN");
db_query( "BEGIN");
foreach ($enclosures as $enc) {
$enc_url = db_escape_string($link, $enc[0]);
$enc_type = db_escape_string($link, $enc[1]);
$enc_dur = db_escape_string($link, $enc[2]);
$enc_url = db_escape_string( $enc[0]);
$enc_type = db_escape_string( $enc[1]);
$enc_dur = db_escape_string( $enc[2]);
$result = db_query($link, "SELECT id FROM ttrss_enclosures
$result = db_query( "SELECT id FROM ttrss_enclosures
WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'");
if (db_num_rows($result) == 0) {
db_query($link, "INSERT INTO ttrss_enclosures
db_query( "INSERT INTO ttrss_enclosures
(content_url, content_type, title, duration, post_id) VALUES
('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')");
}
}
db_query($link, "COMMIT");
db_query( "COMMIT");
// check for manual tags (we have to do it here since they're loaded from filters)
@@ -1040,7 +1040,7 @@
// Skip boring tags
$boring_tags = trim_array(explode(",", mb_strtolower(get_pref($link,
$boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
$filtered_tags = array();
@@ -1065,22 +1065,22 @@
if (count($filtered_tags) > 0) {
db_query($link, "BEGIN");
db_query( "BEGIN");
foreach ($filtered_tags as $tag) {
$tag = sanitize_tag($tag);
$tag = db_escape_string($link, $tag);
$tag = db_escape_string( $tag);
if (!tag_is_valid($tag)) continue;
$result = db_query($link, "SELECT id FROM ttrss_tags
$result = db_query( "SELECT id FROM ttrss_tags
WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND
owner_uid = '$owner_uid' LIMIT 1");
if ($result && db_num_rows($result) == 0) {
db_query($link, "INSERT INTO ttrss_tags
db_query( "INSERT INTO ttrss_tags
(owner_uid,tag_name,post_int_id)
VALUES ('$owner_uid','$tag', '$entry_int_id')");
}
@@ -1092,16 +1092,16 @@
$tags_to_cache = array_unique($tags_to_cache);
$tags_str = db_escape_string($link, join(",", $tags_to_cache));
$tags_str = db_escape_string( join(",", $tags_to_cache));
db_query($link, "UPDATE ttrss_user_entries
db_query( "UPDATE ttrss_user_entries
SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
AND owner_uid = $owner_uid");
db_query($link, "COMMIT");
db_query( "COMMIT");
}
if (get_pref($link, "AUTO_ASSIGN_LABELS", $owner_uid, false)) {
if (get_pref( "AUTO_ASSIGN_LABELS", $owner_uid, false)) {
if ($debug_enabled) {
_debug("update_rss_feed: auto-assigning labels...");
}
@@ -1111,7 +1111,7 @@
if ($caption && preg_match("/\b$caption\b/i", "$tags_str " . strip_tags($entry_content) . " $entry_title")) {
if (!labels_contains_caption($article_labels, $caption)) {
label_add_article($link, $entry_ref_id, $caption, $owner_uid);
label_add_article( $entry_ref_id, $caption, $owner_uid);
}
}
}
@@ -1126,29 +1126,29 @@
if ($debug_enabled) {
_debug("update_rss_feed: new feed, catching it up...");
}
catchup_feed($link, $feed, false, $owner_uid);
catchup_feed( $feed, false, $owner_uid);
}
if ($debug_enabled) {
_debug("purging feed...");
}
purge_feed($link, $feed, 0, $debug_enabled);
purge_feed( $feed, 0, $debug_enabled);
db_query($link, "UPDATE ttrss_feeds
db_query( "UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
// db_query($link, "COMMIT");
// db_query( "COMMIT");
} else {
$error_msg = db_escape_string($link, mb_substr($rss->error(), 0, 245));
$error_msg = db_escape_string( mb_substr($rss->error(), 0, 245));
if ($debug_enabled) {
_debug("update_rss_feed: error fetching feed: $error_msg");
}
db_query($link,
db_query(
"UPDATE ttrss_feeds SET last_error = '$error_msg',
last_updated = NOW() WHERE id = '$feed'");
}
@@ -1204,14 +1204,14 @@
return $doc->saveXML($node);
}
function expire_error_log($link, $debug) {
function expire_error_log( $debug) {
if ($debug) _debug("Removing old error log entries...");
if (DB_TYPE == "pgsql") {
db_query($link, "DELETE FROM ttrss_error_log
db_query( "DELETE FROM ttrss_error_log
WHERE created_at < NOW() - INTERVAL '7 days'");
} else {
db_query($link, "DELETE FROM ttrss_error_log
db_query( "DELETE FROM ttrss_error_log
WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
}
@@ -1284,7 +1284,7 @@
return $params;
}
function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
function get_article_filters($filters, $title, $content, $timestamp, $author, $tags) {
$matches = array();
foreach ($filters as $filter) {
@@ -1399,11 +1399,11 @@
return false;
}
function assign_article_to_label_filters($link, $id, $filters, $owner_uid, $article_labels) {
function assign_article_to_label_filters( $id, $filters, $owner_uid, $article_labels) {
foreach ($filters as $f) {
if ($f["type"] == "label") {
if (!labels_contains_caption($article_labels, $f["param"])) {
label_add_article($link, $id, $f["param"], $owner_uid);
label_add_article( $id, $f["param"], $owner_uid);
}
}
}

14
include/sanity_check.php
View File

@@ -21,7 +21,7 @@
return $url_path;
}
function initial_sanity_check($link) {
function initial_sanity_check() {
$errors = array();
@@ -88,14 +88,10 @@
}
if (SINGLE_USER_MODE) {
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
$result = db_query( "SELECT id FROM ttrss_users WHERE id = 1");
if ($link) {
$result = db_query($link, "SELECT id FROM ttrss_users WHERE id = 1");
if (db_num_rows($result) != 1) {
array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
}
if (db_num_rows($result) != 1) {
array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
}
}
@@ -202,6 +198,6 @@
}
}
initial_sanity_check($link);
initial_sanity_check();
?>

2
include/sessions.php
View File

@@ -36,7 +36,7 @@
}
}
function validate_session($link) {
function validate_session() {
if (SINGLE_USER_MODE) return true;
if (VERSION != $_SESSION["version"]) return false;