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 /modules/backend-rpc.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 'modules/backend-rpc.php')
-rw-r--r-- | modules/backend-rpc.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 4f2465e73..a89c5ee81 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -15,7 +15,7 @@ // Silent if ($subop == "remprofiles") { - $ids = split(",", db_escape_string(trim($_REQUEST["ids"]))); + $ids = explode(",", db_escape_string(trim($_REQUEST["ids"]))); foreach ($ids as $id) { if ($_SESSION["profile"] != $id) { @@ -91,7 +91,7 @@ // Silent if ($subop == "remarchive") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); foreach ($ids as $id) { $result = db_query($link, "DELETE FROM ttrss_archived_feeds WHERE @@ -186,7 +186,7 @@ } if ($subop == "archive") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); foreach ($ids as $id) { archive_article($link, $id, $_SESSION["uid"]); @@ -260,7 +260,7 @@ /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */ 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); @@ -270,7 +270,7 @@ } if ($subop == "markSelected") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); $cmode = sprintf("%d", $_REQUEST["cmode"]); markArticlesById($link, $ids, $cmode); @@ -280,7 +280,7 @@ } if ($subop == "publishSelected") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); $cmode = sprintf("%d", $_REQUEST["cmode"]); publishArticlesById($link, $ids, $cmode); @@ -320,7 +320,7 @@ $id = db_escape_string($_REQUEST["id"]); $tags_str = db_escape_string($_REQUEST["tags_str"]); - $tags = array_unique(trim_array(split(",", $tags_str))); + $tags = array_unique(trim_array(explode(",", $tags_str))); db_query($link, "BEGIN"); @@ -359,7 +359,8 @@ /* update tag cache */ - $tags_str = asort(join(",", $tags_to_cache)); + sort($tags_to_cache); + $tags_str = join(",", $tags_to_cache); db_query($link, "UPDATE ttrss_user_entries SET tag_cache = '$tags_str' WHERE ref_id = '$id' @@ -413,7 +414,7 @@ } if ($subop == "purge") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); $days = sprintf("%d", $_REQUEST["days"]); foreach ($ids as $id) { @@ -443,7 +444,7 @@ } */ if ($subop == "getArticles") { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); $articles = array(); foreach ($ids as $id) { @@ -468,7 +469,7 @@ if ($subop == "assignToLabel" || $subop == "removeFromLabel") { $reply = array(); - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($_REQUEST["ids"])); $label_id = db_escape_string($_REQUEST["lid"]); $label = db_escape_string(label_find_caption($link, $label_id, @@ -559,7 +560,7 @@ } } -/* $ids = split(",", db_escape_string($_REQUEST["ids"])); +/* $ids = explode(",", db_escape_string($_REQUEST["ids"])); $subscribed = array(); |