diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-17 18:34:18 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-17 18:34:18 +0400 |
| commit | a42c55f02b7e313ab61bf826794d0888f2dceae1 (patch) | |
| tree | 7946572f0e45015a0b54830bd1296be548584ed8 /include | |
| parent | 72ff0137298f60970c664f0be24327b120bf4ac7 (diff) | |
fix blank character after opening bracket in function calls
Diffstat (limited to 'include')
| -rw-r--r-- | include/ccache.php | 78 | ||||
| -rw-r--r-- | include/colors.php | 18 | ||||
| -rw-r--r-- | include/db-prefs.php | 18 | ||||
| -rw-r--r-- | include/db.php | 6 | ||||
| -rw-r--r-- | include/digest.php | 26 | ||||
| -rw-r--r-- | include/feedbrowser.php | 8 | ||||
| -rw-r--r-- | include/functions.php | 468 | ||||
| -rw-r--r-- | include/labels.php | 70 | ||||
| -rw-r--r-- | include/rssfuncs.php | 190 | ||||
| -rw-r--r-- | include/sanity_check.php | 2 | ||||
| -rw-r--r-- | include/sanity_config.php | 2 |
11 files changed, 443 insertions, 443 deletions
diff --git a/include/ccache.php b/include/ccache.php index 10e70ffe3..d89b9efe0 100644 --- a/include/ccache.php +++ b/include/ccache.php @@ -1,19 +1,19 @@ <?php - /* function ccache_zero( $feed_id, $owner_uid) { - db_query( "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( $owner_uid) { - db_query( "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( "UPDATE ttrss_cat_counters_cache SET + db_query("UPDATE ttrss_cat_counters_cache SET value = 0 WHERE owner_uid = '$owner_uid'"); } - function ccache_remove( $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( "DELETE FROM $table WHERE + db_query("DELETE FROM $table WHERE feed_id = '$feed_id' AND owner_uid = '$owner_uid'"); } - function ccache_update_all( $owner_uid) { + function ccache_update_all($owner_uid) { - if (get_pref( 'ENABLE_FEED_CATS', $owner_uid)) { + if (get_pref('ENABLE_FEED_CATS', $owner_uid)) { - $result = db_query( "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( $line["feed_id"], $owner_uid, true); + ccache_update($line["feed_id"], $owner_uid, true); } /* We have to manually include category 0 */ - ccache_update( 0, $owner_uid, true); + ccache_update(0, $owner_uid, true); } else { - $result = db_query( "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( $line["feed_id"], $owner_uid); + print ccache_update($line["feed_id"], $owner_uid); } } } - function ccache_find( $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( "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( "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( $feed_id, $owner_uid, $is_cat); + return ccache_update($feed_id, $owner_uid, $is_cat); } } } - function ccache_update( $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( "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( $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( $owner_uid); + ccache_update_all($owner_uid); return; } @@ -127,14 +127,14 @@ /* Recalculate counters for child feeds */ - $result = db_query( "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( $line["id"], $owner_uid, false, false); + ccache_update($line["id"], $owner_uid, false, false); } - $result = db_query( "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( $feed_id, $is_cat, true, $owner_uid); + $unread = (int) getFeedArticles($feed_id, $is_cat, true, $owner_uid); } - db_query( "BEGIN"); + db_query("BEGIN"); - $result = db_query( "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( "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( "INSERT INTO $table + db_query("INSERT INTO $table (feed_id, value, owner_uid, updated) VALUES ($feed_id, $unread, $owner_uid, NOW())"); } - db_query( "COMMIT"); + db_query("COMMIT"); if ($feed_id > 0 && $prev_unread != $unread) { @@ -172,36 +172,36 @@ if ($update_pcat) { - $result = db_query( "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( $cat_id, $owner_uid, true); + ccache_update($cat_id, $owner_uid, true); } } } else if ($feed_id < 0) { - ccache_update_all( $owner_uid); + ccache_update_all($owner_uid); } return $unread; } - /* function ccache_cleanup( $owner_uid) { + /* function ccache_cleanup($owner_uid) { if (DB_TYPE == "pgsql") { - db_query( "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( "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( "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( "DELETE c1 FROM + db_query("DELETE c1 FROM ttrss_cat_counters_cache AS c1, ttrss_cat_counters_cache AS c2 WHERE diff --git a/include/colors.php b/include/colors.php index 1359b9e2d..b20c34c41 100644 --- a/include/colors.php +++ b/include/colors.php @@ -237,13 +237,13 @@ function rgb2hsl($arr) { } else { $s = $del_Max / $var_Max; - $del_R = ( ( ( $max - $var_R ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max; - $del_G = ( ( ( $max - $var_G ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max; - $del_B = ( ( ( $max - $var_B ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max; + $del_R = ((($max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; + $del_G = ((($max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; + $del_B = ((($max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max; if ($var_R == $var_Max) $h = $del_B - $del_G; - else if ($var_G == $var_Max) $h = ( 1 / 3 ) + $del_R - $del_B; - else if ($var_B == $var_Max) $h = ( 2 / 3 ) + $del_G - $del_R; + else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B; + else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R; if ($H < 0) $h++; if ($H > 1) $h--; @@ -261,10 +261,10 @@ function hsl2rgb($arr) { $r = $g = $B = $v * 255; } else { $var_H = $h * 6; - $var_i = floor( $var_H ); - $var_1 = $v * ( 1 - $s ); - $var_2 = $v * ( 1 - $s * ( $var_H - $var_i ) ); - $var_3 = $v * ( 1 - $s * (1 - ( $var_H - $var_i ) ) ); + $var_i = floor($var_H ); + $var_1 = $v * (1 - $s ); + $var_2 = $v * (1 - $s * ($var_H - $var_i ) ); + $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) ); if ($var_i == 0) { $var_R = $v ; $var_G = $var_3 ; $var_B = $var_1 ; } else if ($var_i == 1) { $var_R = $var_2 ; $var_G = $v ; $var_B = $var_1 ; } diff --git a/include/db-prefs.php b/include/db-prefs.php index d786e5349..125f1caaa 100644 --- a/include/db-prefs.php +++ b/include/db-prefs.php @@ -21,7 +21,7 @@ if (get_schema_version() < 63) $profile_qpart = ""; - $result = db_query( "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( $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( $pref_name); + $pref_name = db_escape_string($pref_name); $prefs_cache = true; $profile = false; @@ -71,7 +71,7 @@ if (get_schema_version() < 63) $profile_qpart = ""; - $result = db_query( "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( $pref_name, $value, $user_id = false, $strip_tags = true) { - $pref_name = db_escape_string( $pref_name); - $value = db_escape_string( $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"]; @@ -145,7 +145,7 @@ } if (!$type_name) { - $result = db_query( "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( "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"]); diff --git a/include/db.php b/include/db.php index 72c78474a..55d1d654e 100644 --- a/include/db.php +++ b/include/db.php @@ -1,10 +1,10 @@ <?php -function db_escape_string( $s, $strip_tags = true) { +function db_escape_string($s, $strip_tags = true) { return Db::get()->escape_string($s, $strip_tags); } -function db_query( $query, $die_on_error = true) { +function db_query($query, $die_on_error = true) { return Db::get()->query($query, $die_on_error); } @@ -21,7 +21,7 @@ function db_fetch_result($result, $row, $param) { return Db::get()->fetch_result($result, $row, $param); } -function db_affected_rows( $result) { +function db_affected_rows($result) { return Db::get()->affected_rows($result); } diff --git a/include/digest.php b/include/digest.php index a3f414271..965fd1a79 100644 --- a/include/digest.php +++ b/include/digest.php @@ -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( $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( "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( 'DIGEST_ENABLE', $line['id'], false)) { - $preferred_ts = strtotime(get_pref( '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( '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( $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( $affected_ids, 0, $line["id"]); + catchupArticlesById($affected_ids, 0, $line["id"]); } } else { if ($debug) _debug("No headlines"); } - db_query( "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( $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( '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( "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( $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( 'ENABLE_FEED_CATS', $user_id)) { + if (get_pref('ENABLE_FEED_CATS', $user_id)) { $line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title']; } diff --git a/include/feedbrowser.php b/include/feedbrowser.php index 7bafe68ac..6c245121f 100644 --- a/include/feedbrowser.php +++ b/include/feedbrowser.php @@ -1,5 +1,5 @@ <?php - function make_feed_browser( $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( "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( "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( "SELECT *, + $result = db_query("SELECT *, (SELECT COUNT(*) FROM ttrss_user_entries WHERE orig_feed_id = ttrss_archived_feeds.id) AS articles_archived FROM diff --git a/include/functions.php b/include/functions.php index 971c61e2f..66d5896d1 100644 --- a/include/functions.php +++ b/include/functions.php @@ -166,9 +166,9 @@ * @access public * @return void */ - function purge_feed( $feed_id, $purge_interval, $debug = false) { + function purge_feed($feed_id, $purge_interval, $debug = false) { - if (!$purge_interval) $purge_interval = feed_purge_interval( $feed_id); + if (!$purge_interval) $purge_interval = feed_purge_interval($feed_id); $rows = -1; @@ -183,7 +183,7 @@ if ($purge_interval == -1 || !$purge_interval) { if ($owner_uid) { - ccache_update( $feed_id, $owner_uid); + ccache_update($feed_id, $owner_uid); } return; } @@ -191,7 +191,7 @@ if (!$owner_uid) return; if (FORCE_ARTICLE_PURGE == 0) { - $purge_unread = get_pref( "PURGE_UNREAD_ARTICLES", + $purge_unread = get_pref("PURGE_UNREAD_ARTICLES", $owner_uid, false); } else { $purge_unread = true; @@ -205,7 +205,7 @@ if (preg_match("/^7\./", $pg_version) || preg_match("/^8\.0/", $pg_version)) { - $result = db_query( "DELETE FROM ttrss_user_entries WHERE + $result = db_query("DELETE FROM ttrss_user_entries WHERE ttrss_entries.id = ref_id AND marked = false AND feed_id = '$feed_id' AND @@ -214,7 +214,7 @@ } else { - $result = db_query( "DELETE FROM ttrss_user_entries + $result = db_query("DELETE FROM ttrss_user_entries USING ttrss_entries WHERE ttrss_entries.id = ref_id AND marked = false AND @@ -227,12 +227,12 @@ } else { -/* $result = db_query( "DELETE FROM ttrss_user_entries WHERE +/* $result = db_query("DELETE FROM ttrss_user_entries WHERE marked = false AND feed_id = '$feed_id' AND (SELECT date_updated FROM ttrss_entries WHERE id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */ - $result = db_query( "DELETE FROM ttrss_user_entries + $result = db_query("DELETE FROM ttrss_user_entries USING ttrss_user_entries, ttrss_entries WHERE ttrss_entries.id = ref_id AND marked = false AND @@ -244,7 +244,7 @@ } - ccache_update( $feed_id, $owner_uid); + ccache_update($feed_id, $owner_uid); if ($debug) { _debug("Purged feed $feed_id ($purge_interval): deleted $rows articles"); @@ -253,9 +253,9 @@ return $rows; } // function purge_feed - function feed_purge_interval( $feed_id) { + function feed_purge_interval($feed_id) { - $result = db_query( "SELECT purge_interval, owner_uid FROM ttrss_feeds + $result = db_query("SELECT purge_interval, owner_uid FROM ttrss_feeds WHERE id = '$feed_id'"); if (db_num_rows($result) == 1) { @@ -272,20 +272,20 @@ } } - function purge_orphans( $do_output = false) { + function purge_orphans($do_output = false) { // purge orphaned posts in main content table - $result = db_query( "DELETE FROM ttrss_entries WHERE + $result = db_query("DELETE FROM ttrss_entries WHERE (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0"); if ($do_output) { - $rows = db_affected_rows( $result); + $rows = db_affected_rows($result); _debug("Purged $rows orphaned posts."); } } - function get_feed_update_interval( $feed_id) { - $result = db_query( "SELECT owner_uid, update_interval FROM + function get_feed_update_interval($feed_id) { + $result = db_query("SELECT owner_uid, update_interval FROM ttrss_feeds WHERE id = '$feed_id'"); if (db_num_rows($result) == 1) { @@ -295,7 +295,7 @@ if ($update_interval != 0) { return $update_interval; } else { - return get_pref( 'DEFAULT_UPDATE_INTERVAL', $owner_uid, false); + return get_pref('DEFAULT_UPDATE_INTERVAL', $owner_uid, false); } } else { @@ -552,9 +552,9 @@ } } - function initialize_user_prefs( $uid, $profile = false) { + function initialize_user_prefs($uid, $profile = false) { - $uid = db_escape_string( $uid); + $uid = db_escape_string($uid); if (!$profile) { $profile = "NULL"; @@ -565,11 +565,11 @@ if (get_schema_version() < 63) $profile_qpart = ""; - db_query( "BEGIN"); + db_query("BEGIN"); - $result = db_query( "SELECT pref_name,def_value FROM ttrss_prefs"); + $result = db_query("SELECT pref_name,def_value FROM ttrss_prefs"); - $u_result = db_query( "SELECT pref_name + $u_result = db_query("SELECT pref_name FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart"); $active_prefs = array(); @@ -582,16 +582,16 @@ if (array_search($line["pref_name"], $active_prefs) === FALSE) { // print "adding " . $line["pref_name"] . "<br>"; - $line["def_value"] = db_escape_string( $line["def_value"]); - $line["pref_name"] = db_escape_string( $line["pref_name"]); + $line["def_value"] = db_escape_string($line["def_value"]); + $line["pref_name"] = db_escape_string($line["pref_name"]); if (get_schema_version() < 63) { - db_query( "INSERT INTO ttrss_user_prefs + db_query("INSERT INTO ttrss_user_prefs (owner_uid,pref_name,value) VALUES ('$uid', '".$line["pref_name"]."','".$line["def_value"]."')"); } else { - db_query( "INSERT INTO ttrss_user_prefs + db_query("INSERT INTO ttrss_user_prefs (owner_uid,pref_name,value, profile) VALUES ('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)"); } @@ -599,7 +599,7 @@ } } - db_query( "COMMIT"); + db_query("COMMIT"); } @@ -613,7 +613,7 @@ return ""; } - function authenticate_user( $login, $password, $check_only = false) { + function authenticate_user($login, $password, $check_only = false) { if (!SINGLE_USER_MODE) { $user_id = false; @@ -635,14 +635,14 @@ $_SESSION["uid"] = $user_id; $_SESSION["version"] = VERSION; - $result = db_query( "SELECT login,access_level,pwd_hash FROM ttrss_users + $result = db_query("SELECT login,access_level,pwd_hash FROM ttrss_users WHERE id = '$user_id'"); $_SESSION["name"] = db_fetch_result($result, 0, "login"); $_SESSION["access_level"] = db_fetch_result($result, 0, "access_level"); $_SESSION["csrf_token"] = sha1(uniqid(rand(), true)); - db_query( "UPDATE ttrss_users SET last_login = NOW() WHERE id = " . + db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " . $_SESSION["uid"]); $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"]; @@ -651,7 +651,7 @@ $_SESSION["last_version_check"] = time(); - initialize_user_prefs( $_SESSION["uid"]); + initialize_user_prefs($_SESSION["uid"]); return true; } @@ -675,7 +675,7 @@ $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"]; - initialize_user_prefs( $_SESSION["uid"]); + initialize_user_prefs($_SESSION["uid"]); return true; } @@ -704,13 +704,13 @@ // user preferences are checked on every login, not here - function initialize_user( $uid) { + function initialize_user($uid) { - db_query( "insert into ttrss_feeds (owner_uid,title,feed_url) + db_query("insert into ttrss_feeds (owner_uid,title,feed_url) values ('$uid', 'Tiny Tiny RSS: New Releases', 'http://tt-rss.org/releases.rss')"); - db_query( "insert into ttrss_feeds (owner_uid,title,feed_url) + db_query("insert into ttrss_feeds (owner_uid,title,feed_url) values ('$uid', 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php')"); } @@ -726,9 +726,9 @@ return $csrf_token == $_SESSION['csrf_token']; } - function load_user_plugins( $owner_uid) { + function load_user_plugins($owner_uid) { if ($owner_uid) { - $plugins = get_pref( "_ENABLED_PLUGINS", $owner_uid); + $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); global $pluginhost; $pluginhost->load($plugins, $pluginhost::KIND_USER, $owner_uid); @@ -744,18 +744,18 @@ if (SINGLE_USER_MODE) { @session_start(); - authenticate_user( "admin", null); + authenticate_user("admin", null); cache_prefs(); - load_user_plugins( $_SESSION["uid"]); + load_user_plugins($_SESSION["uid"]); } else { if (!validate_session()) $_SESSION["uid"] = false; if (!$_SESSION["uid"]) { - if (AUTH_AUTO_LOGIN && authenticate_user( null, null)) { - $_SESSION["ref_schema_version"] = get_schema_version( true); + if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) { + $_SESSION["ref_schema_version"] = get_schema_version(true); } else { - authenticate_user( null, null, true); + authenticate_user(null, null, true); } if (!$_SESSION["uid"]) { @@ -768,7 +768,7 @@ } else { /* bump login timestamp */ - db_query( "UPDATE ttrss_users SET last_login = NOW() WHERE id = " . + db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " . $_SESSION["uid"]); $_SESSION["last_login_update"] = time(); } @@ -780,16 +780,16 @@ if ($_SESSION["uid"]) { cache_prefs(); - load_user_plugins( $_SESSION["uid"]); + load_user_plugins($_SESSION["uid"]); /* cleanup ccache */ - db_query( "DELETE FROM ttrss_counters_cache WHERE owner_uid = ". + db_query("DELETE FROM ttrss_counters_cache WHERE owner_uid = ". $_SESSION["uid"] . " AND (SELECT COUNT(id) FROM ttrss_feeds WHERE ttrss_feeds.id = feed_id) = 0"); - db_query( "DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ". + db_query("DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ". $_SESSION["uid"] . " AND (SELECT COUNT(id) FROM ttrss_feed_categories WHERE ttrss_feed_categories.id = feed_id) = 0"); @@ -825,7 +825,7 @@ return $dt->format('U') + $dest_tz->getOffset($dt); } - function make_local_datetime( $timestamp, $long, $owner_uid = false, + function make_local_datetime($timestamp, $long, $owner_uid = false, $no_smart_dt = false) { if (!$owner_uid) $owner_uid = $_SESSION['uid']; @@ -839,7 +839,7 @@ if ($tz_offset == -1) { - $user_tz_string = get_pref( 'USER_TIMEZONE', $owner_uid); + $user_tz_string = get_pref('USER_TIMEZONE', $owner_uid); try { $user_tz = new DateTimeZone($user_tz_string); @@ -853,28 +853,28 @@ $user_timestamp = $dt->format('U') + $tz_offset; if (!$no_smart_dt) { - return smart_date_time( $user_timestamp, + return smart_date_time($user_timestamp, $tz_offset, $owner_uid); } else { if ($long) - $format = get_pref( 'LONG_DATE_FORMAT', $owner_uid); + $format = get_pref('LONG_DATE_FORMAT', $owner_uid); else - $format = get_pref( 'SHORT_DATE_FORMAT', $owner_uid); + $format = get_pref('SHORT_DATE_FORMAT', $owner_uid); return date($format, $user_timestamp); } } - function smart_date_time( $timestamp, $tz_offset = 0, $owner_uid = false) { + function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION['uid']; if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) { return date("G:i", $timestamp); } else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) { - $format = get_pref( 'SHORT_DATE_FORMAT', $owner_uid); + $format = get_pref('SHORT_DATE_FORMAT', $owner_uid); return date($format, $timestamp); } else { - $format = get_pref( 'LONG_DATE_FORMAT', $owner_uid); + $format = get_pref('LONG_DATE_FORMAT', $owner_uid); return date($format, $timestamp); } } @@ -898,11 +898,11 @@ // Session caching removed due to causing wrong redirects to upgrade // script when get_schema_version() is called on an obsolete session // created on a previous schema version. - function get_schema_version( $nocache = false) { + function get_schema_version($nocache = false) { global $schema_version; if (!$schema_version) { - $result = db_query( "SELECT schema_version FROM ttrss_version"); + $result = db_query("SELECT schema_version FROM ttrss_version"); $version = db_fetch_result($result, 0, "schema_version"); $schema_version = $version; return $version; @@ -915,20 +915,20 @@ require_once 'errors.php'; $error_code = 0; - $schema_version = get_schema_version( true); + $schema_version = get_schema_version(true); if ($schema_version != SCHEMA_VERSION) { $error_code = 5; } if (DB_TYPE == "mysql") { - $result = db_query( "SELECT true", false); + $result = db_query("SELECT true", false); if (db_num_rows($result) != 1) { $error_code = 10; } } - if (db_escape_string( "testTEST") != "testTEST") { + if (db_escape_string("testTEST") != "testTEST") { $error_code = 12; } @@ -987,7 +987,7 @@ } } - function catchup_feed( $feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') { + function catchup_feed($feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all') { if (!$owner_uid) $owner_uid = $_SESSION['uid']; @@ -1029,7 +1029,7 @@ if ($feed >= 0) { if ($feed > 0) { - $children = getChildCategories( $feed, $owner_uid); + $children = getChildCategories($feed, $owner_uid); array_push($children, $feed); $children = join(",", $children); @@ -1039,7 +1039,7 @@ $cat_qpart = "cat_id IS NULL"; } - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id @@ -1048,7 +1048,7 @@ } else if ($feed == -2) { - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*) FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0 AND unread = true AND $date_qpart AND owner_uid = $owner_uid"); @@ -1056,7 +1056,7 @@ } else if ($feed > 0) { - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id @@ -1065,7 +1065,7 @@ } else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred if ($feed == -1) { - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id @@ -1073,7 +1073,7 @@ } if ($feed == -2) { - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id @@ -1082,7 +1082,7 @@ if ($feed == -3) { - $intl = get_pref( "FRESH_ARTICLE_MAX_AGE"); + $intl = get_pref("FRESH_ARTICLE_MAX_AGE"); if (DB_TYPE == "pgsql") { $match_part = "date_entered > NOW() - INTERVAL '$intl hour' "; @@ -1091,7 +1091,7 @@ INTERVAL $intl HOUR) "; } - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id @@ -1099,7 +1099,7 @@ } if ($feed == -4) { - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id @@ -1110,7 +1110,7 @@ $label_id = feed_to_label_id($feed); - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id @@ -1119,10 +1119,10 @@ } - ccache_update( $feed, $owner_uid, $cat_view); + ccache_update($feed, $owner_uid, $cat_view); } else { // tag - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET unread = false, last_read = NOW() WHERE ref_id IN (SELECT id FROM (SELECT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id @@ -1137,13 +1137,13 @@ $data = array_merge($data, getVirtCounters()); $data = array_merge($data, getLabelCounters()); - $data = array_merge($data, getFeedCounters( $active_feed)); + $data = array_merge($data, getFeedCounters($active_feed)); $data = array_merge($data, getCategoryCounters()); return $data; } - function getCategoryTitle( $cat_id) { + function getCategoryTitle($cat_id) { if ($cat_id == -1) { return __("Special"); @@ -1151,7 +1151,7 @@ return __("Labels"); } else { - $result = db_query( "SELECT title FROM ttrss_feed_categories WHERE + $result = db_query("SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'"); if (db_num_rows($result) == 1) { @@ -1169,11 +1169,11 @@ /* Labels category */ $cv = array("id" => -2, "kind" => "cat", - "counter" => getCategoryUnread( -2)); + "counter" => getCategoryUnread(-2)); array_push($ret_arr, $cv); - $result = db_query( "SELECT id AS cat_id, value AS unread, + $result = db_query("SELECT id AS cat_id, value AS unread, (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children FROM ttrss_feed_categories, ttrss_cat_counters_cache @@ -1185,7 +1185,7 @@ $line["cat_id"] = (int) $line["cat_id"]; if ($line["num_children"] > 0) { - $child_counter = getCategoryChildrenUnread( $line["cat_id"], $_SESSION["uid"]); + $child_counter = getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]); } else { $child_counter = 0; } @@ -1199,7 +1199,7 @@ /* Special case: NULL category doesn't actually exist in the DB */ $cv = array("id" => 0, "kind" => "cat", - "counter" => (int) ccache_find( 0, $_SESSION["uid"], true)); + "counter" => (int) ccache_find(0, $_SESSION["uid"], true)); array_push($ret_arr, $cv); @@ -1207,23 +1207,23 @@ } // only accepts real cats (>= 0) - function getCategoryChildrenUnread( $cat, $owner_uid = false) { + function getCategoryChildrenUnread($cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; - $result = db_query( "SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat' + $result = db_query("SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat' AND owner_uid = $owner_uid"); $unread = 0; while ($line = db_fetch_assoc($result)) { - $unread += getCategoryUnread( $line["id"], $owner_uid); - $unread += getCategoryChildrenUnread( $line["id"], $owner_uid); + $unread += getCategoryUnread($line["id"], $owner_uid); + $unread += getCategoryChildrenUnread($line["id"], $owner_uid); } return $unread; } - function getCategoryUnread( $cat, $owner_uid = false) { + function getCategoryUnread($cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -1235,7 +1235,7 @@ $cat_query = "cat_id IS NULL"; } - $result = db_query( "SELECT id FROM ttrss_feeds WHERE $cat_query + $result = db_query("SELECT id FROM ttrss_feeds WHERE $cat_query AND owner_uid = " . $owner_uid); $cat_feeds = array(); @@ -1247,7 +1247,7 @@ $match_part = implode(" OR ", $cat_feeds); - $result = db_query( "SELECT COUNT(int_id) AS unread + $result = db_query("SELECT COUNT(int_id) AS unread FROM ttrss_user_entries WHERE unread = true AND ($match_part) AND owner_uid = " . $owner_uid); @@ -1261,10 +1261,10 @@ return $unread; } else if ($cat == -1) { - return getFeedUnread( -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0); + return getFeedUnread(-1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0); } else if ($cat == -2) { - $result = db_query( " + $result = db_query(" SELECT COUNT(unread) AS unread FROM ttrss_user_entries, ttrss_user_labels2 WHERE article_id = ref_id AND unread = true @@ -1277,14 +1277,14 @@ } } - function getFeedUnread( $feed, $is_cat = false) { - return getFeedArticles( $feed, $is_cat, true, $_SESSION["uid"]); + function getFeedUnread($feed, $is_cat = false) { + return getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]); } - function getLabelUnread( $label_id, $owner_uid = false) { + function getLabelUnread($label_id, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; - $result = db_query( "SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2 + $result = db_query("SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2 WHERE owner_uid = '$owner_uid' AND unread = true AND label_id = '$label_id' AND article_id = ref_id"); if (db_num_rows($result) != 0) { @@ -1294,7 +1294,7 @@ } } - function getFeedArticles( $feed, $is_cat = false, $unread_only = false, + function getFeedArticles($feed, $is_cat = false, $unread_only = false, $owner_uid = false) { $n_feed = (int) $feed; @@ -1309,14 +1309,14 @@ } if ($is_cat) { - return getCategoryUnread( $n_feed, $owner_uid); + return getCategoryUnread($n_feed, $owner_uid); } else if ($n_feed == -6) { return 0; } else if ($feed != "0" && $n_feed == 0) { - $feed = db_escape_string( $feed); + $feed = db_escape_string($feed); - $result = db_query( "SELECT SUM((SELECT COUNT(int_id) + $result = db_query("SELECT SUM((SELECT COUNT(int_id) FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id AND ref_id = id AND $unread_qpart)) AS count FROM ttrss_tags WHERE owner_uid = $owner_uid AND tag_name = '$feed'"); @@ -1329,7 +1329,7 @@ } else if ($n_feed == -3) { $match_part = "unread = true AND score >= 0"; - $intl = get_pref( "FRESH_ARTICLE_MAX_AGE", $owner_uid); + $intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid); if (DB_TYPE == "pgsql") { $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' "; @@ -1353,7 +1353,7 @@ $label_id = feed_to_label_id($feed); - return getLabelUnread( $label_id, $owner_uid); + return getLabelUnread($label_id, $owner_uid); } @@ -1372,11 +1372,11 @@ //echo "[$feed/$query]\n"; - $result = db_query( $query); + $result = db_query($query); } else { - $result = db_query( "SELECT COUNT(post_int_id) AS unread + $result = db_query("SELECT COUNT(post_int_id) AS unread FROM ttrss_tags,ttrss_user_entries,ttrss_entries WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id AND $unread_qpart AND ttrss_tags.owner_uid = " . $owner_uid); @@ -1387,13 +1387,13 @@ return $unread; } - function getGlobalUnread( $user_id = false) { + function getGlobalUnread($user_id = false) { if (!$user_id) { $user_id = $_SESSION["uid"]; } - $result = db_query( "SELECT SUM(value) AS c_id FROM ttrss_counters_cache + $result = db_query("SELECT SUM(value) AS c_id FROM ttrss_counters_cache WHERE owner_uid = '$user_id' AND feed_id > 0"); $c_id = db_fetch_result($result, 0, "c_id"); @@ -1401,7 +1401,7 @@ return $c_id; } - function getGlobalCounters( $global_unread = -1) { + function getGlobalCounters($global_unread = -1) { $ret_arr = array(); if ($global_unread == -1) { @@ -1413,7 +1413,7 @@ array_push($ret_arr, $cv); - $result = db_query( "SELECT COUNT(id) AS fn FROM + $result = db_query("SELECT COUNT(id) AS fn FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); $subscribed_feeds = db_fetch_result($result, 0, "fn"); @@ -1432,13 +1432,13 @@ for ($i = 0; $i >= -4; $i--) { - $count = getFeedUnread( $i); + $count = getFeedUnread($i); $cv = array("id" => $i, "counter" => (int) $count); -// if (get_pref( 'EXTENDED_FEEDLIST')) -// $cv["xmsg"] = getFeedArticles( $i)." ".__("total"); +// if (get_pref('EXTENDED_FEEDLIST')) +// $cv["xmsg"] = getFeedArticles($i)." ".__("total"); array_push($ret_arr, $cv); } @@ -1461,13 +1461,13 @@ return $ret_arr; } - function getLabelCounters( $descriptions = false) { + function getLabelCounters($descriptions = false) { $ret_arr = array(); $owner_uid = $_SESSION["uid"]; - $result = db_query( "SELECT id,caption,COUNT(unread) AS unread + $result = db_query("SELECT id,caption,COUNT(unread) AS unread FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON (ttrss_labels2.id = label_id) LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND unread = true @@ -1488,8 +1488,8 @@ if ($descriptions) $cv["description"] = $label_name; -// if (get_pref( 'EXTENDED_FEEDLIST')) -// $cv["xmsg"] = getFeedArticles( $id)." ".__("total"); +// if (get_pref('EXTENDED_FEEDLIST')) +// $cv["xmsg"] = getFeedArticles($id)." ".__("total"); array_push($ret_arr, $cv); } @@ -1497,7 +1497,7 @@ return $ret_arr; } - function getFeedCounters( $active_feed = false) { + function getFeedCounters($active_feed = false) { $ret_arr = array(); @@ -1510,7 +1510,7 @@ AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid AND ttrss_counters_cache.feed_id = id"; - $result = db_query( $query); + $result = db_query($query); $fctrs_modified = false; while ($line = db_fetch_assoc($result)) { @@ -1519,7 +1519,7 @@ $count = $line["count"]; $last_error = htmlspecialchars($line["last_error"]); - $last_updated = make_local_datetime( $line['last_updated'], false); + $last_updated = make_local_datetime($line['last_updated'], false); $has_img = feed_has_icon($id); @@ -1534,8 +1534,8 @@ if ($last_error) $cv["error"] = $last_error; -// if (get_pref( 'EXTENDED_FEEDLIST')) -// $cv["xmsg"] = getFeedArticles( $id)." ".__("total"); +// if (get_pref('EXTENDED_FEEDLIST')) +// $cv["xmsg"] = getFeedArticles($id)." ".__("total"); if ($active_feed && $id == $active_feed) $cv["title"] = truncate_string($line["title"], 30); @@ -1548,7 +1548,7 @@ } function get_pgsql_version() { - $result = db_query( "SELECT version() AS version"); + $result = db_query("SELECT version() AS version"); $version = explode(" ", db_fetch_result($result, 0, "version")); return $version[1]; } @@ -1565,7 +1565,7 @@ * to get all possible feeds. * 5 - Couldn't download the URL content. */ - function subscribe_to_feed( $url, $cat_id = 0, + function subscribe_to_feed($url, $cat_id = 0, $auth_login = '', $auth_pass = '') { global $fetch_last_error; @@ -1612,7 +1612,7 @@ $auth_pass_encrypted = 'false'; } - $auth_pass = db_escape_string( $auth_pass); + $auth_pass = db_escape_string($auth_pass); if (db_num_rows($result) == 0) { $result = db_query( @@ -1628,7 +1628,7 @@ $feed_id = db_fetch_result($result, 0, "id"); if ($feed_id) { - update_rss_feed( $feed_id, true); + update_rss_feed($feed_id, true); } return array("code" => 1); @@ -1637,7 +1637,7 @@ } } - function print_feed_select( $id, $default_id = "", + function print_feed_select($id, $default_id = "", $attributes = "", $include_all_feeds = true, $root_id = false, $nest_level = 0) { @@ -1649,14 +1649,14 @@ } } - if (get_pref( 'ENABLE_FEED_CATS')) { + if (get_pref('ENABLE_FEED_CATS')) { if ($root_id) $parent_qpart = "parent_cat = '$root_id'"; else $parent_qpart = "parent_cat IS NULL"; - $result = db_query( "SELECT id,title, + $result = db_query("SELECT id,title, (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children FROM ttrss_feed_categories @@ -1673,10 +1673,10 @@ $line["id"], htmlspecialchars($line["title"])); if ($line["num_children"] > 0) - print_feed_select( $id, $default_id, $attributes, + print_feed_select($id, $default_id, $attributes, $include_all_feeds, $line["id"], $nest_level+1); - $feed_result = db_query( "SELECT id,title FROM ttrss_feeds + $feed_result = db_query("SELECT id,title FROM ttrss_feeds WHERE cat_id = '".$line["id"]."' AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title"); while ($fline = db_fetch_assoc($feed_result)) { @@ -1698,7 +1698,7 @@ printf("<option $is_selected value='CAT:0'>%s</option>", __("Uncategorized")); - $feed_result = db_query( "SELECT id,title FROM ttrss_feeds + $feed_result = db_query("SELECT id,title FROM ttrss_feeds WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"] . " ORDER BY title"); while ($fline = db_fetch_assoc($feed_result)) { @@ -1715,7 +1715,7 @@ } } else { - $result = db_query( "SELECT id,title FROM ttrss_feeds + $result = db_query("SELECT id,title FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title"); while ($line = db_fetch_assoc($result)) { @@ -1732,7 +1732,7 @@ } } - function print_feed_cat_select( $id, $default_id, + function print_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true, $root_id = false, $nest_level = 0) { if (!$root_id) { @@ -1744,7 +1744,7 @@ else $parent_qpart = "parent_cat IS NULL"; - $result = db_query( "SELECT id,title, + $result = db_query("SELECT id,title, (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children FROM ttrss_feed_categories @@ -1765,7 +1765,7 @@ $line["id"], htmlspecialchars($line["title"])); if ($line["num_children"] > 0) - print_feed_cat_select( $id, $default_id, $attributes, + print_feed_cat_select($id, $default_id, $attributes, $include_all_cats, $line["id"], $nest_level+1); } @@ -1791,13 +1791,13 @@ return ($val == "on") ? "true" : "false"; } - function getFeedCatTitle( $id) { + function getFeedCatTitle($id) { if ($id == -1) { return __("Special"); } else if ($id < LABEL_BASE_INDEX) { return __("Labels"); } else if ($id > 0) { - $result = db_query( "SELECT ttrss_feed_categories.title + $result = db_query("SELECT ttrss_feed_categories.title FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND cat_id = ttrss_feed_categories.id"); if (db_num_rows($result) == 1) { @@ -1844,9 +1844,9 @@ return false; } - function getFeedTitle( $id, $cat = false) { + function getFeedTitle($id, $cat = false) { if ($cat) { - return getCategoryTitle( $id); + return getCategoryTitle($id); } else if ($id == -1) { return __("Starred articles"); } else if ($id == -2) { @@ -1861,7 +1861,7 @@ return __("Recently read"); } else if ($id < LABEL_BASE_INDEX) { $label_id = feed_to_label_id($id); - $result = db_query( "SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'"); + $result = db_query("SELECT caption FROM ttrss_labels2 WHERE id = '$label_id'"); if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "caption"); } else { @@ -1869,7 +1869,7 @@ } } else if (is_numeric($id) && $id > 0) { - $result = db_query( "SELECT title FROM ttrss_feeds WHERE id = '$id'"); + $result = db_query("SELECT title FROM ttrss_feeds WHERE id = '$id'"); if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "title"); } else { @@ -1888,18 +1888,18 @@ "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) { - $params[strtolower($param)] = (int) get_pref( $param); + $params[strtolower($param)] = (int) get_pref($param); } $params["icons_url"] = ICONS_URL; $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME; - $params["default_view_mode"] = get_pref( "_DEFAULT_VIEW_MODE"); - $params["default_view_limit"] = (int) get_pref( "_DEFAULT_VIEW_LIMIT"); - $params["default_view_order_by"] = get_pref( "_DEFAULT_VIEW_ORDER_BY"); + $params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE"); + $params["default_view_limit"] = (int) get_pref("_DEFAULT_VIEW_LIMIT"); + $params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY"); $params["bw_limit"] = (int) $_SESSION["bw_limit"]; $params["label_base_index"] = (int) LABEL_BASE_INDEX; - $result = db_query( "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM + $result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); $max_feed_id = db_fetch_result($result, 0, "mid"); @@ -1908,7 +1908,7 @@ $params["max_feed_id"] = (int) $max_feed_id; $params["num_feeds"] = (int) $num_feeds; - $params["collapsed_feedlist"] = (int) get_pref( "_COLLAPSED_FEEDLIST"); + $params["collapsed_feedlist"] = (int) get_pref("_COLLAPSED_FEEDLIST"); $params["hotkeys"] = get_hotkeys_map(); $params["csrf_token"] = $_SESSION["csrf_token"]; @@ -2054,7 +2054,7 @@ "^(191)|Ctrl+/" => "help_dialog", ); - if (get_pref( 'COMBINED_DISPLAY_MODE')) { + if (get_pref('COMBINED_DISPLAY_MODE')) { $hotkeys["^(38)|Ctrl-up"] = "prev_article_noscroll"; $hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll"; } @@ -2080,7 +2080,7 @@ function make_runtime_info() { $data = array(); - $result = db_query( "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM + $result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); $max_feed_id = db_fetch_result($result, 0, "mid"); @@ -2090,7 +2090,7 @@ $data["num_feeds"] = (int) $num_feeds; $data['last_article_id'] = getLastArticleId(); - $data['cdm_expanded'] = get_pref( 'CDM_EXPANDED'); + $data['cdm_expanded'] = get_pref('CDM_EXPANDED'); $data['dep_ts'] = calculate_dep_timestamp(); $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE'); @@ -2134,7 +2134,7 @@ return $data; } - function search_to_sql( $search) { + function search_to_sql($search) { $search_query_part = ""; @@ -2155,7 +2155,7 @@ case "title": if ($commandpair[1]) { array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE '%". - db_escape_string( mb_strtolower($commandpair[1]))."%'))"); + db_escape_string(mb_strtolower($commandpair[1]))."%'))"); } else { array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); @@ -2164,7 +2164,7 @@ case "author": if ($commandpair[1]) { array_push($query_keywords, "($not (LOWER(author) LIKE '%". - db_escape_string( mb_strtolower($commandpair[1]))."%'))"); + db_escape_string(mb_strtolower($commandpair[1]))."%'))"); } else { array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); @@ -2178,7 +2178,7 @@ array_push($query_keywords, "($not (note IS NULL OR note = ''))"); else array_push($query_keywords, "($not (LOWER(note) LIKE '%". - db_escape_string( mb_strtolower($commandpair[1]))."%'))"); + db_escape_string(mb_strtolower($commandpair[1]))."%'))"); } else { array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); @@ -2211,7 +2211,7 @@ default: if (strpos($k, "@") === 0) { - $user_tz_string = get_pref( 'USER_TIMEZONE', $_SESSION['uid']); + $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']); $orig_ts = strtotime(substr($k, 1)); $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC')); @@ -2230,35 +2230,35 @@ return $search_query_part; } - function getParentCategories( $cat, $owner_uid) { + function getParentCategories($cat, $owner_uid) { $rv = array(); - $result = db_query( "SELECT parent_cat FROM ttrss_feed_categories + $result = db_query("SELECT parent_cat FROM ttrss_feed_categories WHERE id = '$cat' AND parent_cat IS NOT NULL AND owner_uid = $owner_uid"); while ($line = db_fetch_assoc($result)) { array_push($rv, $line["parent_cat"]); - $rv = array_merge($rv, getParentCategories( $line["parent_cat"], $owner_uid)); + $rv = array_merge($rv, getParentCategories($line["parent_cat"], $owner_uid)); } return $rv; } - function getChildCategories( $cat, $owner_uid) { + function getChildCategories($cat, $owner_uid) { $rv = array(); - $result = db_query( "SELECT id FROM ttrss_feed_categories + $result = db_query("SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat' AND owner_uid = $owner_uid"); while ($line = db_fetch_assoc($result)) { array_push($rv, $line["id"]); - $rv = array_merge($rv, getChildCategories( $line["id"], $owner_uid)); + $rv = array_merge($rv, getChildCategories($line["id"], $owner_uid)); } return $rv; } - function queryFeedHeadlines( $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) { + function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -2275,7 +2275,7 @@ $search_query_part = "ref_id = -1 AND "; } else { - $search_query_part = search_to_sql( $search); + $search_query_part = search_to_sql($search); $search_query_part .= " AND "; } @@ -2293,10 +2293,10 @@ $override_order = "updated DESC"; - $filter_query_part = filter_to_sql( $filter, $owner_uid); + $filter_query_part = filter_to_sql($filter, $owner_uid); // Try to check if SQL regexp implementation chokes on a valid regexp - $result = db_query( "SELECT true AS true_val FROM ttrss_entries, + $result = db_query("SELECT true AS true_val FROM ttrss_entries, ttrss_user_entries, ttrss_feeds, ttrss_feed_categories WHERE $filter_query_part LIMIT 1", false); @@ -2329,10 +2329,10 @@ $view_query_part = " "; } else if ($feed != -1) { - $unread = getFeedUnread( $feed, $cat_view); + $unread = getFeedUnread($feed, $cat_view); if ($cat_view && $feed > 0 && $include_children) - $unread += getCategoryChildrenUnread( $feed); + $unread += getCategoryChildrenUnread($feed); if ($unread > 0) $view_query_part = " unread = true AND "; @@ -2378,7 +2378,7 @@ if ($feed > 0) { if ($include_children) { - $subcats = getChildCategories( $feed, $owner_uid); + $subcats = getChildCategories($feed, $owner_uid); array_push($subcats, $feed); $cats_qpart = join(",", $subcats); } else { @@ -2398,7 +2398,7 @@ if ($feed > 0) { if ($include_children) { # sub-cats - $subcats = getChildCategories( $feed, $owner_uid); + $subcats = getChildCategories($feed, $owner_uid); array_push($subcats, $feed); $query_strategy_part = "cat_id IN (". @@ -2461,7 +2461,7 @@ } else if ($feed == -3) { // fresh virtual feed $query_strategy_part = "unread = true AND score >= 0"; - $intl = get_pref( "FRESH_ARTICLE_MAX_AGE", $owner_uid); + $intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid); if (DB_TYPE == "pgsql") { $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' "; @@ -2505,17 +2505,17 @@ $feed_title = T_sprintf("Search results: %s", $search); } else { if ($cat_view) { - $feed_title = getCategoryTitle( $feed); + $feed_title = getCategoryTitle($feed); } else { if (is_numeric($feed) && $feed > 0) { - $result = db_query( "SELECT title,site_url,last_error + $result = db_query("SELECT title,site_url,last_error FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = $owner_uid"); $feed_title = db_fetch_result($result, 0, "title"); $feed_site_url = db_fetch_result($result, 0, "site_url"); $last_error = db_fetch_result($result, 0, "last_error"); } else { - $feed_title = getFeedTitle( $feed); + $feed_title = getFeedTitle($feed); } } } @@ -2535,7 +2535,7 @@ } // proper override_order applied above - if ($vfeed_query_part && !$ignore_vfeed_group && get_pref( 'VFEED_GROUP_BY_FEED', $owner_uid)) { + if ($vfeed_query_part && !$ignore_vfeed_group && get_pref('VFEED_GROUP_BY_FEED', $owner_uid)) { if (!$override_order) { $order_by = "ttrss_feeds.title, $order_by"; } else { @@ -2589,7 +2589,7 @@ if ($_REQUEST["debug"]) print $query; - $result = db_query( $query); + $result = db_query($query); } else { // browsing by tag @@ -2658,14 +2658,14 @@ // $tag_sql = "tag_name = '$feed'"; DEFAULT way // error_log("[". $select_qpart . "][" . $from_qpart . "][" .$where_qpart . "]"); - $result = db_query( $select_qpart . $from_qpart . $where_qpart); + $result = db_query($select_qpart . $from_qpart . $where_qpart); } return array($result, $feed_title, $feed_site_url, $last_error); } - function sanitize( $str, $force_remove_images = false, $owner = false, $site_url = false) { + function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false) { if (!$owner) $owner = $_SESSION["uid"]; $res = trim($str); if (!$res) return ''; @@ -2708,7 +2708,7 @@ } if ($entry->nodeName == 'img') { - if (($owner && get_pref( "STRIP_IMAGES", $owner)) || + if (($owner && get_pref("STRIP_IMAGES", $owner)) || $force_remove_images || $_SESSION["bw_limit"]) { $p = $doc->createElement('p'); @@ -2825,7 +2825,7 @@ return false; } - function catchupArticlesById( $ids, $cmode, $owner_uid = false) { + function catchupArticlesById($ids, $cmode, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; if (count($ids) == 0) return; @@ -2839,32 +2839,32 @@ $ids_qpart = join(" OR ", $tmp_ids); if ($cmode == 0) { - db_query( "UPDATE ttrss_user_entries SET + db_query("UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE ($ids_qpart) AND owner_uid = $owner_uid"); } else if ($cmode == 1) { - db_query( "UPDATE ttrss_user_entries SET + db_query("UPDATE ttrss_user_entries SET unread = true WHERE ($ids_qpart) AND owner_uid = $owner_uid"); } else { - db_query( "UPDATE ttrss_user_entries SET + db_query("UPDATE ttrss_user_entries SET unread = NOT unread,last_read = NOW() WHERE ($ids_qpart) AND owner_uid = $owner_uid"); } /* update ccache */ - $result = db_query( "SELECT DISTINCT feed_id FROM ttrss_user_entries + $result = db_query("SELECT DISTINCT feed_id FROM ttrss_user_entries WHERE ($ids_qpart) AND owner_uid = $owner_uid"); while ($line = db_fetch_assoc($result)) { - ccache_update( $line["feed_id"], $owner_uid); + ccache_update($line["feed_id"], $owner_uid); } } - function get_article_tags( $id, $owner_uid = 0, $tag_cache = false) { + function get_article_tags($id, $owner_uid = 0, $tag_cache = false) { - $a_id = db_escape_string( $id); + $a_id = db_escape_string($id); if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -2879,7 +2879,7 @@ /* check cache first */ if ($tag_cache === false) { - $result = db_query( "SELECT tag_cache FROM ttrss_user_entries + $result = db_query("SELECT tag_cache FROM ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = $owner_uid"); $tag_cache = db_fetch_result($result, 0, "tag_cache"); @@ -2891,7 +2891,7 @@ /* do it the hard way */ - $tmp_result = db_query( $query); + $tmp_result = db_query($query); while ($tmp_line = db_fetch_assoc($tmp_result)) { array_push($tags, $tmp_line["tag_name"]); @@ -2899,9 +2899,9 @@ /* update the cache */ - $tags_str = db_escape_string( join(",", $tags)); + $tags_str = db_escape_string(join(",", $tags)); - db_query( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET tag_cache = '$tags_str' WHERE ref_id = '$id' AND owner_uid = $owner_uid"); } @@ -2972,7 +2972,7 @@ return vsprintf(__(array_shift($args)), $args); } - function format_inline_player( $url, $ctype) { + function format_inline_player($url, $ctype) { $entry = ""; @@ -3013,7 +3013,7 @@ } - function format_article( $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) { + function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; $rv = array(); @@ -3021,9 +3021,9 @@ $rv['id'] = $id; /* we can figure out feed_id from article id anyway, why do we - * pass feed_id here? let's ignore the argument :( */ + * pass feed_id here? let's ignore the argument :(*/ - $result = db_query( "SELECT feed_id FROM ttrss_user_entries + $result = db_query("SELECT feed_id FROM ttrss_user_entries WHERE ref_id = '$id'"); $feed_id = (int) db_fetch_result($result, 0, "feed_id"); @@ -3033,14 +3033,14 @@ //if (!$zoom_mode) { print "<article id='$id'><![CDATA["; }; if ($mark_as_read) { - $result = db_query( "UPDATE ttrss_user_entries + $result = db_query("UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE ref_id = '$id' AND owner_uid = $owner_uid"); - ccache_update( $feed_id, $owner_uid); + ccache_update($feed_id, $owner_uid); } - $result = db_query( "SELECT id,title,link,content,feed_id,comments,int_id, + $result = db_query("SELECT id,title,link,content,feed_id,comments,int_id, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url, (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images, @@ -3060,10 +3060,10 @@ $tag_cache = $line["tag_cache"]; - $line["tags"] = get_article_tags( $id, $owner_uid, $line["tag_cache"]); + $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]); unset($line["tag_cache"]); - $line["content"] = sanitize( $line["content"], false, $owner_uid, $line["site_url"]); + $line["content"] = sanitize($line["content"], false, $owner_uid, $line["site_url"]); global $pluginhost; @@ -3106,7 +3106,7 @@ $entry_author = __(" - ") . $entry_author; } - $parsed_updated = make_local_datetime( $line["updated"], true, + $parsed_updated = make_local_datetime($line["updated"], true, $owner_uid, true); $rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>"; @@ -3163,7 +3163,7 @@ if ($line["orig_feed_id"]) { - $tmp_result = db_query( "SELECT * FROM ttrss_archived_feeds + $tmp_result = db_query("SELECT * FROM ttrss_archived_feeds WHERE id = ".$line["orig_feed_id"]); if (db_num_rows($tmp_result) != 0) { @@ -3199,7 +3199,7 @@ $rv['content'] .= "<div class=\"postContent\">"; $rv['content'] .= $line["content"]; - $rv['content'] .= format_article_enclosures( $id, + $rv['content'] .= format_article_enclosures($id, sql_bool_to_bool($line["always_display_enclosures"]), $line["content"], sql_bool_to_bool($line["hide_images"])); @@ -3273,22 +3273,22 @@ } } // function encrypt_password - function load_filters( $feed_id, $owner_uid, $action_id = false) { + function load_filters($feed_id, $owner_uid, $action_id = false) { $filters = array(); - $cat_id = (int)getFeedCategory( $feed_id); + $cat_id = (int)getFeedCategory($feed_id); - $result = db_query( "SELECT * FROM ttrss_filters2 WHERE + $result = db_query("SELECT * FROM ttrss_filters2 WHERE owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title"); $check_cats = join(",", array_merge( - getParentCategories( $cat_id, $owner_uid), + getParentCategories($cat_id, $owner_uid), array($cat_id))); while ($line = db_fetch_assoc($result)) { $filter_id = $line["id"]; - $result2 = db_query( "SELECT + $result2 = db_query("SELECT r.reg_exp, r.inverse, r.feed_id, r.cat_id, r.cat_filter, t.name AS type_name FROM ttrss_filters2_rules AS r, ttrss_filter_types AS t @@ -3311,7 +3311,7 @@ array_push($rules, $rule); } - $result2 = db_query( "SELECT a.action_param,t.name AS type_name + $result2 = db_query("SELECT a.action_param,t.name AS type_name FROM ttrss_filters2_actions AS a, ttrss_filter_actions AS t WHERE @@ -3439,7 +3439,7 @@ } - function get_feed_category( $feed_cat, $parent_cat_id = false) { + function get_feed_category($feed_cat, $parent_cat_id = false) { if ($parent_cat_id) { $parent_qpart = "parent_cat = '$parent_cat_id'"; $parent_insert = "'$parent_cat_id'"; @@ -3459,11 +3459,11 @@ } } - function add_feed_category( $feed_cat, $parent_cat_id = false) { + function add_feed_category($feed_cat, $parent_cat_id = false) { if (!$feed_cat) return false; - db_query( "BEGIN"); + db_query("BEGIN"); if ($parent_cat_id) { $parent_qpart = "parent_cat = '$parent_cat_id'"; @@ -3485,7 +3485,7 @@ "INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat) VALUES ('".$_SESSION["uid"]."', '$feed_cat', $parent_insert)"); - db_query( "COMMIT"); + db_query("COMMIT"); return true; } @@ -3493,8 +3493,8 @@ return false; } - function getArticleFeed( $id) { - $result = db_query( "SELECT feed_id FROM ttrss_user_entries + function getArticleFeed($id) { + $result = db_query("SELECT feed_id FROM ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); if (db_num_rows($result) != 0) { @@ -3539,14 +3539,14 @@ } - function get_article_enclosures( $id) { + function get_article_enclosures($id) { $query = "SELECT * FROM ttrss_enclosures WHERE post_id = '$id' AND content_url != ''"; $rv = array(); - $result = db_query( $query); + $result = db_query($query); if (db_num_rows($result) > 0) { while ($line = db_fetch_assoc($result)) { @@ -3557,7 +3557,7 @@ return $rv; } - function save_email_address( $email) { + function save_email_address($email) { // FIXME: implement persistent storage of emails if (!$_SESSION['stored_emails']) @@ -3568,22 +3568,22 @@ } - function get_feed_access_key( $feed_id, $is_cat, $owner_uid = false) { + function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; $sql_is_cat = bool_to_sql_bool($is_cat); - $result = db_query( "SELECT access_key FROM ttrss_access_keys + $result = db_query("SELECT access_key FROM ttrss_access_keys WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat AND owner_uid = " . $owner_uid); if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "access_key"); } else { - $key = db_escape_string( sha1(uniqid(rand(), true))); + $key = db_escape_string(sha1(uniqid(rand(), true))); - $result = db_query( "INSERT INTO ttrss_access_keys + $result = db_query("INSERT INTO ttrss_access_keys (access_key, feed_id, is_cat, owner_uid) VALUES ('$key', '$feed_id', $sql_is_cat, '$owner_uid')"); @@ -3627,9 +3627,9 @@ return is_html(fetch_file_contents($url, false, $login, $pass)); } - function print_label_select( $name, $value, $attributes = "") { + function print_label_select($name, $value, $attributes = "") { - $result = db_query( "SELECT caption FROM ttrss_labels2 + $result = db_query("SELECT caption FROM ttrss_labels2 WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption"); print "<select default=\"$value\" name=\"" . htmlspecialchars($name) . @@ -3651,10 +3651,10 @@ } - function format_article_enclosures( $id, $always_display_enclosures, + function format_article_enclosures($id, $always_display_enclosures, $article_content, $hide_images = false) { - $result = get_article_enclosures( $id); + $result = get_article_enclosures($id); $rv = ''; if (count($result) > 0) { @@ -3672,7 +3672,7 @@ $filename = substr($url, strrpos($url, "/")+1); - $player = format_inline_player( $url, $ctype); + $player = format_inline_player($url, $ctype); if ($player) array_push($entries_inline, $player); @@ -3693,7 +3693,7 @@ array_push($entries, $entry); } - if ($_SESSION['uid'] && !get_pref( "STRIP_IMAGES") && !$_SESSION["bw_limit"]) { + if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) { if ($always_display_enclosures || !preg_match("/<img/i", $article_content)) { @@ -3738,7 +3738,7 @@ } function getLastArticleId() { - $result = db_query( "SELECT MAX(ref_id) AS id FROM ttrss_user_entries + $result = db_query("SELECT MAX(ref_id) AS id FROM ttrss_user_entries WHERE owner_uid = " . $_SESSION["uid"]); if (db_num_rows($result) == 1) { @@ -3824,7 +3824,7 @@ return $ids; } - function cleanup_tags( $days = 14, $limit = 1000) { + function cleanup_tags($days = 14, $limit = 1000) { if (DB_TYPE == "pgsql") { $interval_query = "date_updated < NOW() - INTERVAL '$days days'"; @@ -3842,7 +3842,7 @@ WHERE post_int_id = int_id AND $interval_query AND ref_id = ttrss_entries.id AND tag_cache != '' LIMIT $limit_part"; - $result = db_query( $query); + $result = db_query($query); $ids = array(); @@ -3853,8 +3853,8 @@ if (count($ids) > 0) { $ids = join(",", $ids); - $tmp_result = db_query( "DELETE FROM ttrss_tags WHERE id IN ($ids)"); - $tags_deleted += db_affected_rows( $tmp_result); + $tmp_result = db_query("DELETE FROM ttrss_tags WHERE id IN ($ids)"); + $tags_deleted += db_affected_rows($tmp_result); } else { break; } @@ -3866,7 +3866,7 @@ } function print_user_stylesheet() { - $value = get_pref( 'USER_STYLESHEET'); + $value = get_pref('USER_STYLESHEET'); if ($value) { print "<style type=\"text/css\">"; @@ -3922,7 +3922,7 @@ return $html; } - function filter_to_sql( $filter, $owner_uid) { + function filter_to_sql($filter, $owner_uid) { $query = array(); if (DB_TYPE == "pgsql") @@ -3936,7 +3936,7 @@ if ($regexp_valid) { - $rule['reg_exp'] = db_escape_string( $rule['reg_exp']); + $rule['reg_exp'] = db_escape_string($rule['reg_exp']); switch ($rule["type"]) { case "title": @@ -3969,13 +3969,13 @@ if (isset($rule['inverse'])) $qpart = "NOT ($qpart)"; if (isset($rule["feed_id"]) && $rule["feed_id"] > 0) { - $qpart .= " AND feed_id = " . db_escape_string( $rule["feed_id"]); + $qpart .= " AND feed_id = " . db_escape_string($rule["feed_id"]); } if (isset($rule["cat_id"])) { if ($rule["cat_id"] > 0) { - $children = getChildCategories( $rule["cat_id"], $owner_uid); + $children = getChildCategories($rule["cat_id"], $owner_uid); array_push($children, $rule["cat_id"]); $children = join(",", $children); @@ -4049,8 +4049,8 @@ return $tempname; } - function getFeedCategory( $feed) { - $result = db_query( "SELECT cat_id FROM ttrss_feeds + function getFeedCategory($feed) { + $result = db_query("SELECT cat_id FROM ttrss_feeds WHERE id = '$feed'"); if (db_num_rows($result) > 0) { diff --git a/include/labels.php b/include/labels.php index fc23fca93..c2a48a338 100644 --- a/include/labels.php +++ b/include/labels.php @@ -1,5 +1,5 @@ <?php - function label_find_id( $label, $owner_uid) { + 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( $id, $owner_uid = false) { + function get_article_labels($id, $owner_uid = false) { $rv = array(); if (!$owner_uid) $owner_uid = $_SESSION["uid"]; - $result = db_query( "SELECT label_cache FROM + $result = db_query("SELECT label_cache FROM ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " . $owner_uid); @@ -48,15 +48,15 @@ } if (count($rv) > 0) - label_update_cache( $owner_uid, $id, $rv); + label_update_cache($owner_uid, $id, $rv); else - label_update_cache( $owner_uid, $id, array("no-labels" => 1)); + label_update_cache($owner_uid, $id, array("no-labels" => 1)); return $rv; } - function label_find_caption( $label, $owner_uid) { + 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( $owner_uid) { + function get_all_labels($owner_uid) { $rv = array(); - $result = db_query( "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,31 +80,31 @@ return $rv; } - function label_update_cache( $owner_uid, $id, $labels = false, $force = false) { + function label_update_cache($owner_uid, $id, $labels = false, $force = false) { if ($force) - label_clear_cache( $id); + label_clear_cache($id); if (!$labels) - $labels = get_article_labels( $id); + $labels = get_article_labels($id); - $labels = db_escape_string( json_encode($labels)); + $labels = db_escape_string(json_encode($labels)); - db_query( "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( $id) { + function label_clear_cache($id) { - db_query( "UPDATE ttrss_user_entries SET + db_query("UPDATE ttrss_user_entries SET label_cache = '' WHERE ref_id = '$id'"); } - function label_remove_article( $id, $label, $owner_uid) { + function label_remove_article($id, $label, $owner_uid) { - $label_id = label_find_id( $label, $owner_uid); + $label_id = label_find_id($label, $owner_uid); if (!$label_id) return; @@ -114,12 +114,12 @@ label_id = '$label_id' AND article_id = '$id'"); - label_clear_cache( $id); + label_clear_cache($id); } - function label_add_article( $id, $label, $owner_uid) { + function label_add_article($id, $label, $owner_uid) { - $label_id = label_find_id( $label, $owner_uid); + $label_id = label_find_id($label, $owner_uid); if (!$label_id) return; @@ -133,55 +133,55 @@ LIMIT 1"); if (db_num_rows($result) == 0) { - db_query( "INSERT INTO ttrss_user_labels2 + db_query("INSERT INTO ttrss_user_labels2 (label_id, article_id) VALUES ('$label_id', '$id')"); } - label_clear_cache( $id); + label_clear_cache($id); } - function label_remove( $id, $owner_uid) { + function label_remove($id, $owner_uid) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; - db_query( "BEGIN"); + db_query("BEGIN"); - $result = db_query( "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( "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( $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( "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( "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( "COMMIT"); + db_query("COMMIT"); } - function label_create( $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( "BEGIN"); + db_query("BEGIN"); $result = false; - $result = db_query( "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) { @@ -189,10 +189,10 @@ "INSERT INTO ttrss_labels2 (caption,owner_uid,fg_color,bg_color) VALUES ('$caption', '$owner_uid', '$fg_color', '$bg_color')"); - $result = db_affected_rows( $result) != 0; + $result = db_affected_rows($result) != 0; } - db_query( "COMMIT"); + db_query("COMMIT"); return $result; } diff --git a/include/rssfuncs.php b/include/rssfuncs.php index ba2890669..bebc1c1f9 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -5,30 +5,30 @@ function update_feedbrowser_cache() { - $result = db_query( "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( "BEGIN"); + db_query("BEGIN"); - db_query( "DELETE FROM ttrss_feedbrowser_cache"); + db_query("DELETE FROM ttrss_feedbrowser_cache"); $count = 0; while ($line = db_fetch_assoc($result)) { - $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"]); + $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( "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( "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( "COMMIT"); + db_query("COMMIT"); return $count; @@ -57,7 +57,7 @@ * @param boolean $debug Set to false to disable debug output. Default to true. * @return void */ - function update_daemon_common( $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(); @@ -116,7 +116,7 @@ $random_qpart = sql_random_function(); // We search for feed needing update. - $result = db_query( "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( $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( $feed) . "'"); + array_push($feeds_quoted, "'" . db_escape_string($feed) . "'"); } - db_query( 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( $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( $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( "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( $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( $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( $debug); + send_headlines_digests($debug); return $nf; } // function update_daemon_common // ignore_daemon is not used - function update_rss_feed( $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( "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( "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( $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( $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,7 +322,7 @@ // If-Modified-Since if ($fetch_last_error_code != 304) { - $error_escaped = db_escape_string( $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."); @@ -339,7 +339,7 @@ $pluginhost = new PluginHost(Db::get()); $pluginhost->set_debug($debug_enabled); - $user_plugins = get_pref( "_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( $feed); + $feed = db_escape_string($feed); if (!$rss->error()) { @@ -388,7 +388,7 @@ _debug("update_rss_feed: processing feed data..."); } -// db_query( "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( "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( 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) { @@ -427,25 +427,25 @@ $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'"; } - db_query( "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( $rss->get_title()); + $feed_title = db_escape_string($rss->get_title()); if ($debug_enabled) { _debug("update_rss_feed: registering title: $feed_title"); } - db_query( "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( "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( $feed, $owner_uid); - $labels = get_all_labels( $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( "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( "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( '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( $entry_author); + $entry_author = db_escape_string($entry_author); } - $entry_guid = db_escape_string( mb_substr($entry_guid, 0, 245)); + $entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245)); - $entry_comments = db_escape_string( mb_substr($entry_comments, 0, 245)); - $entry_author = db_escape_string( 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( "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"); + $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( $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_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( $entry_content, false); + $entry_content = db_escape_string($entry_content, false); $content_hash = "SHA1:" . sha1($entry_content); - db_query( "BEGIN"); + db_query("BEGIN"); - $result = db_query( "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) { @@ -745,15 +745,15 @@ $base_entry_id = db_fetch_result($result, 0, "id"); - db_query( "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( $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( "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( "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( "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( "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( $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( "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." @@ -894,7 +894,7 @@ if (PUBSUBHUBBUB_HUB && $published == 'true') { $rss_link = get_self_url_prefix() . "/public.php?op=rss&id=-2&key=" . - get_feed_access_key( -2, false, $owner_uid); + get_feed_access_key(-2, false, $owner_uid); $p = new Publisher(PUBSUBHUBBUB_HUB); @@ -940,7 +940,7 @@ $update_insignificant = false; } - if (db_escape_string( $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( "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( "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET last_read = null, unread = true WHERE ref_id = '$ref_id'"); } } } } - db_query( "COMMIT"); + db_query("COMMIT"); if ($debug_enabled) { _debug("update_rss_feed: assigning labels..."); } - assign_article_to_label_filters( $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( "BEGIN"); + db_query("BEGIN"); foreach ($enclosures as $enc) { - $enc_url = db_escape_string( $enc[0]); - $enc_type = db_escape_string( $enc[1]); - $enc_dur = db_escape_string( $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( "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( "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( "COMMIT"); + db_query("COMMIT"); // check for manual tags (we have to do it here since they're loaded from filters) @@ -1065,22 +1065,22 @@ if (count($filtered_tags) > 0) { - db_query( "BEGIN"); + db_query("BEGIN"); foreach ($filtered_tags as $tag) { $tag = sanitize_tag($tag); - $tag = db_escape_string( $tag); + $tag = db_escape_string($tag); if (!tag_is_valid($tag)) continue; - $result = db_query( "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( "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( join(",", $tags_to_cache)); + $tags_str = db_escape_string(join(",", $tags_to_cache)); - db_query( "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( "COMMIT"); + db_query("COMMIT"); } - if (get_pref( "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( $entry_ref_id, $caption, $owner_uid); + label_add_article($entry_ref_id, $caption, $owner_uid); } } } @@ -1126,23 +1126,23 @@ if ($debug_enabled) { _debug("update_rss_feed: new feed, catching it up..."); } - catchup_feed( $feed, false, $owner_uid); + catchup_feed($feed, false, $owner_uid); } if ($debug_enabled) { _debug("purging feed..."); } - purge_feed( $feed, 0, $debug_enabled); + purge_feed($feed, 0, $debug_enabled); - db_query( "UPDATE ttrss_feeds + db_query("UPDATE ttrss_feeds SET last_updated = NOW(), last_error = '' WHERE id = '$feed'"); -// db_query( "COMMIT"); +// db_query("COMMIT"); } else { - $error_msg = db_escape_string( 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"); @@ -1204,14 +1204,14 @@ return $doc->saveXML($node); } - function expire_error_log( $debug) { + function expire_error_log($debug) { if ($debug) _debug("Removing old error log entries..."); if (DB_TYPE == "pgsql") { - db_query( "DELETE FROM ttrss_error_log + db_query("DELETE FROM ttrss_error_log WHERE created_at < NOW() - INTERVAL '7 days'"); } else { - db_query( "DELETE FROM ttrss_error_log + db_query("DELETE FROM ttrss_error_log WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)"); } @@ -1399,11 +1399,11 @@ return false; } - function assign_article_to_label_filters( $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( $id, $f["param"], $owner_uid); + label_add_article($id, $f["param"], $owner_uid); } } } diff --git a/include/sanity_check.php b/include/sanity_check.php index 0477efd50..a5c682be8 100644 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -88,7 +88,7 @@ } if (SINGLE_USER_MODE) { - $result = db_query( "SELECT id FROM ttrss_users WHERE id = 1"); + $result = db_query("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."); diff --git a/include/sanity_config.php b/include/sanity_config.php index 398c979fe..d5cfd2d78 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ <?php # This file has been generated at: Tue Apr 16 16:41:13 MSK 2013 define('GENERATED_CONFIG_CHECK', 26); -$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?> +$requred_defines = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?> |