diff options
author | Craig Meyer <[email protected]> | 2011-07-30 22:31:40 -0400 |
---|---|---|
committer | Craig Meyer <[email protected]> | 2011-07-30 22:31:40 -0400 |
commit | 9949bd154e9d01b50132e387059ef987c6887c8b (patch) | |
tree | 76ae2f40905d2f706ec0461374831b6b8457922d /functions.php | |
parent | 9d9faf6dc2e9387a7bfe3040c36bc8bf9b87294e (diff) |
functions.php: Fixed some mild errors.
fetch_file_contents()
using $updated when it was not defined - commented it out
update_rss_feed_real()
was also using $updated, undefined
and had a inconsistent return, added return false;
lookup_user_id($link, $user)
was using $login for the SELECT not $user
format_headline_subtoolbar()
used $search_q before it was assigned to, re-ordered the code
format_article()
The 3rd arg "$feed_id" was never used in the function, it was set in the function
Verified (and modified as needed) function calls in backend.php (5 Usages) and in modules/backend-rpc,php (1 usage)
printTagCloud()
Before ksort($tags) add a check for count($tags) == 0 return
replace depreciated split() calls with explode()
backend.php
replace depreciated split() calls with explode()
modules/backed-rpc.php
replace depreciated split() calls with explode()
in handle_rpc_request(), separate asort() from join(), asort() does not return an array.
This fixes a problem where a new tag is added to an entry, but doesn't show up after clicking on save. User must do a screen refresh.
A PHP error msg was being returned in the JSON response.
.gitignore
Make sure Mac OS X .DS_Store & PHPStorm project files (.idea/) are not included
Diffstat (limited to 'functions.php')
-rw-r--r-- | functions.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/functions.php b/functions.php index 6deeef461..0707960da 100644 --- a/functions.php +++ b/functions.php @@ -399,7 +399,7 @@ return $contents; } else { - if ($login && $pass && $updated != 3) { + if ($login && $pass ){ $url_parts = array(); preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts); @@ -579,11 +579,11 @@ $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); $fetch_url = db_fetch_result($result, 0, "feed_url"); - if ($update_interval < 0) { return; } + if ($update_interval < 0) { return false; } $feed = db_escape_string($feed); - if ($auth_login && $auth_pass && $updated != 3) { + if ($auth_login && $auth_pass ){ $url_parts = array(); preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts); @@ -1445,7 +1445,7 @@ foreach ($article_filters as $f) { if ($f[0] == "tag") { - $manual_tags = trim_array(split(",", $f[1])); + $manual_tags = trim_array(explode(",", $f[1])); foreach ($manual_tags as $tag) { if (tag_is_valid($tag)) { @@ -1457,7 +1457,7 @@ // Skip boring tags - $boring_tags = trim_array(split(",", mb_strtolower(get_pref($link, + $boring_tags = trim_array(explode(",", mb_strtolower(get_pref($link, 'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8'))); $filtered_tags = array(); @@ -1817,8 +1817,7 @@ function lookup_user_id($link, $user) { - $result = db_query($link, "SELECT id FROM ttrss_users WHERE - login = '$login'"); + $result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$user'"); if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "id"); @@ -3000,7 +2999,7 @@ function get_pgsql_version($link) { $result = db_query($link, "SELECT version() AS version"); - $version = split(" ", db_fetch_result($result, 0, "version")); + $version = explode(" ", db_fetch_result($result, 0, "version")); return $version[1]; } @@ -3345,7 +3344,7 @@ $search_query_part = ""; - $keywords = split(" ", $search); + $keywords = explode(" ", $search); $query_keywords = array(); foreach ($keywords as $k) { @@ -3356,7 +3355,7 @@ $not = ""; } - $commandpair = split(":", mb_strtolower($k), 2); + $commandpair = explode(":", mb_strtolower($k), 2); if ($commandpair[0] == "note" && $commandpair[1]) { @@ -4317,7 +4316,7 @@ $fg_color = db_fetch_result($result, 0, "fg_color"); $bg_color = db_fetch_result($result, 0, "bg_color"); - $reply .= "<span style='background : $bg_color; color : $fg_color'>"; + $reply .= "<span style=\"background : $bg_color; color : $fg_color\" >"; $reply .= $feed_title; $reply .= "</span>"; } else { @@ -4678,8 +4677,7 @@ return $entry; } - function format_article($link, $id, $feed_id, $mark_as_read = true, - $zoom_mode = false) { + function format_article($link, $id, $mark_as_read = true, $zoom_mode = false) { $rv = array(); @@ -4947,10 +4945,10 @@ if ($subop == "undefined") $subop = ""; - $subop_split = split(":", $subop); + $subop_split = explode(":", $subop); if ($subop == "CatchupSelected") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); $cmode = sprintf("%d", $_REQUEST["cmode"]); catchupArticlesById($link, $ids, $cmode); @@ -5556,6 +5554,8 @@ $tags[$line["tag_name"]] = $line["count"]; } + if( count($tags) == 0 ){ return; } + ksort($tags); $max_size = 32; // max font size in pixels |