}
function setprofile() {
- $id = db_escape_string($this->link, $_REQUEST["id"]);
+ $id = $this->dbh->escape_string($_REQUEST["id"]);
$_SESSION["profile"] = $id;
- $_SESSION["prefs_cache"] = array();
}
function remprofiles() {
- $ids = explode(",", db_escape_string($this->link, trim($_REQUEST["ids"])));
+ $ids = explode(",", $this->dbh->escape_string(trim($_REQUEST["ids"])));
foreach ($ids as $id) {
if ($_SESSION["profile"] != $id) {
- db_query($this->link, "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
+ $this->dbh->query("DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
owner_uid = " . $_SESSION["uid"]);
}
}
// Silent
function addprofile() {
- $title = db_escape_string($this->link, trim($_REQUEST["title"]));
+ $title = $this->dbh->escape_string(trim($_REQUEST["title"]));
if ($title) {
- db_query($this->link, "BEGIN");
+ $this->dbh->query("BEGIN");
- $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+ $result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles
WHERE title = '$title' AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) == 0) {
+ if ($this->dbh->num_rows($result) == 0) {
- db_query($this->link, "INSERT INTO ttrss_settings_profiles (title, owner_uid)
+ $this->dbh->query("INSERT INTO ttrss_settings_profiles (title, owner_uid)
VALUES ('$title', ".$_SESSION["uid"] .")");
- $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles WHERE
+ $result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles WHERE
title = '$title'");
- if (db_num_rows($result) != 0) {
- $profile_id = db_fetch_result($result, 0, "id");
+ if ($this->dbh->num_rows($result) != 0) {
+ $profile_id = $this->dbh->fetch_result($result, 0, "id");
if ($profile_id) {
- initialize_user_prefs($this->link, $_SESSION["uid"], $profile_id);
+ initialize_user_prefs($_SESSION["uid"], $profile_id);
}
}
}
- db_query($this->link, "COMMIT");
+ $this->dbh->query("COMMIT");
}
}
// Silent
function saveprofile() {
- $id = db_escape_string($this->link, $_REQUEST["id"]);
- $title = db_escape_string($this->link, trim($_REQUEST["value"]));
+ $id = $this->dbh->escape_string($_REQUEST["id"]);
+ $title = $this->dbh->escape_string(trim($_REQUEST["value"]));
if ($id == 0) {
print __("Default profile");
}
if ($title) {
- db_query($this->link, "BEGIN");
+ $this->dbh->query("BEGIN");
- $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+ $result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles
WHERE title = '$title' AND owner_uid =" . $_SESSION["uid"]);
- if (db_num_rows($result) == 0) {
- db_query($this->link, "UPDATE ttrss_settings_profiles
+ if ($this->dbh->num_rows($result) == 0) {
+ $this->dbh->query("UPDATE ttrss_settings_profiles
SET title = '$title' WHERE id = '$id' AND
owner_uid = " . $_SESSION["uid"]);
print $title;
} else {
- $result = db_query($this->link, "SELECT title FROM ttrss_settings_profiles
+ $result = $this->dbh->query("SELECT title FROM ttrss_settings_profiles
WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
- print db_fetch_result($result, 0, "title");
+ print $this->dbh->fetch_result($result, 0, "title");
}
- db_query($this->link, "COMMIT");
+ $this->dbh->query("COMMIT");
}
}
// Silent
function remarchive() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
foreach ($ids as $id) {
- $result = db_query($this->link, "DELETE FROM ttrss_archived_feeds WHERE
+ $result = $this->dbh->query("DELETE FROM ttrss_archived_feeds WHERE
(SELECT COUNT(*) FROM ttrss_user_entries
WHERE orig_feed_id = '$id') = 0 AND
id = '$id' AND owner_uid = ".$_SESSION["uid"]);
- $rc = db_affected_rows($this->link, $result);
+ $this->dbh->affected_rows($result);
}
}
function addfeed() {
- $feed = db_escape_string($this->link, $_REQUEST['feed']);
- $cat = db_escape_string($this->link, $_REQUEST['cat']);
- $login = db_escape_string($this->link, $_REQUEST['login']);
- $pass = db_escape_string($this->link, $_REQUEST['pass']);
+ $feed = $this->dbh->escape_string($_REQUEST['feed']);
+ $cat = $this->dbh->escape_string($_REQUEST['cat']);
+ $login = $this->dbh->escape_string($_REQUEST['login']);
+ $pass = trim($_REQUEST['pass']); // escaped later
- $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
+ $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
print json_encode(array("result" => $rc));
}
function togglepref() {
- $key = db_escape_string($this->link, $_REQUEST["key"]);
- set_pref($this->link, $key, !get_pref($this->link, $key));
- $value = get_pref($this->link, $key);
+ $key = $this->dbh->escape_string($_REQUEST["key"]);
+ set_pref($key, !get_pref($key));
+ $value = get_pref($key);
print json_encode(array("param" =>$key, "value" => $value));
}
$key = $_REQUEST['key'];
$value = str_replace("\n", "<br/>", $_REQUEST['value']);
- set_pref($this->link, $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
+ set_pref($key, $value, false, $key != 'USER_STYLESHEET');
print json_encode(array("param" =>$key, "value" => $value));
}
function mark() {
$mark = $_REQUEST["mark"];
- $id = db_escape_string($this->link, $_REQUEST["id"]);
+ $id = $this->dbh->escape_string($_REQUEST["id"]);
if ($mark == "1") {
$mark = "true";
$mark = "false";
}
- $result = db_query($this->link, "UPDATE ttrss_user_entries SET marked = $mark,
+ $this->dbh->query("UPDATE ttrss_user_entries SET marked = $mark,
last_marked = NOW()
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
}
function delete() {
- $ids = db_escape_string($this->link, $_REQUEST["ids"]);
+ $ids = $this->dbh->escape_string($_REQUEST["ids"]);
- $result = db_query($this->link, "DELETE FROM ttrss_user_entries
- WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+ $this->dbh->query("DELETE FROM ttrss_user_entries
+ WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
- purge_orphans($this->link);
+ Article::purge_orphans();
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
$ids = explode(",", $_REQUEST["ids"]);
foreach ($ids as $id) {
- $id = db_escape_string($this->link, trim($id));
- db_query($this->link, "BEGIN");
+ $id = $this->dbh->escape_string(trim($id));
+ $this->dbh->query("BEGIN");
- $result = db_query($this->link, "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+ $result = $this->dbh->query("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
- AND owner_uid = ".$_SESSION["uid"].")");
+ AND owner_uid = ".$_SESSION["uid"].") AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) != 0) {
- $feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
- $site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
- $title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
+ if ($this->dbh->num_rows($result) != 0) {
+ $feed_url = $this->dbh->escape_string(db_fetch_result($result, 0, "feed_url"));
+ $site_url = $this->dbh->escape_string(db_fetch_result($result, 0, "site_url"));
+ $title = $this->dbh->escape_string(db_fetch_result($result, 0, "title"));
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+ $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
AND owner_uid = " .$_SESSION["uid"]);
- if (db_num_rows($result) == 0) {
+ if ($this->dbh->num_rows($result) == 0) {
if (!$title) $title = '[Unknown]';
- $result = db_query($this->link,
+ $result = $this->dbh->query(
"INSERT INTO ttrss_feeds
(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
VALUES (".$_SESSION["uid"].",
'$title',
NULL, '', '', 0)");
- $result = db_query($this->link,
+ $result = $this->dbh->query(
"SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
AND owner_uid = ".$_SESSION["uid"]);
- if (db_num_rows($result) != 0) {
- $feed_id = db_fetch_result($result, 0, "id");
+ if ($this->dbh->num_rows($result) != 0) {
+ $feed_id = $this->dbh->fetch_result($result, 0, "id");
}
} else {
- $feed_id = db_fetch_result($result, 0, "id");
+ $feed_id = $this->dbh->fetch_result($result, 0, "id");
}
if ($feed_id) {
- $result = db_query($this->link, "UPDATE ttrss_user_entries
+ $result = $this->dbh->query("UPDATE ttrss_user_entries
SET feed_id = '$feed_id', orig_feed_id = NULL
WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
}
}
- db_query($this->link, "COMMIT");
+ $this->dbh->query("COMMIT");
}
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function archive() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
foreach ($ids as $id) {
- $this->archive_article($this->link, $id, $_SESSION["uid"]);
+ $this->archive_article($id, $_SESSION["uid"]);
}
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
- private function archive_article($link, $id, $owner_uid) {
- db_query($link, "BEGIN");
+ private function archive_article($id, $owner_uid) {
+ $this->dbh->query("BEGIN");
- $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+ $result = $this->dbh->query("SELECT feed_id FROM ttrss_user_entries
WHERE ref_id = '$id' AND owner_uid = $owner_uid");
- if (db_num_rows($result) != 0) {
+ if ($this->dbh->num_rows($result) != 0) {
/* prepare the archived table */
- $feed_id = (int) db_fetch_result($result, 0, "feed_id");
+ $feed_id = (int) $this->dbh->fetch_result($result, 0, "feed_id");
if ($feed_id) {
- $result = db_query($link, "SELECT id FROM ttrss_archived_feeds
- WHERE id = '$feed_id'");
+ $result = $this->dbh->query("SELECT id FROM ttrss_archived_feeds
+ WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) == 0) {
- db_query($link, "INSERT INTO ttrss_archived_feeds
+ if ($this->dbh->num_rows($result) == 0) {
+ $result = db_query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+ $new_feed_id = (int)db_fetch_result($result, 0, "id") + 1;
+
+ $this->dbh->query("INSERT INTO ttrss_archived_feeds
(id, owner_uid, title, feed_url, site_url)
- SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
+ SELECT $new_feed_id, owner_uid, title, feed_url, site_url from ttrss_feeds
WHERE id = '$feed_id'");
+ } else {
+ $new_feed_id = $this->dbh->fetch_result($result, 0, "id");
}
- db_query($link, "UPDATE ttrss_user_entries
- SET orig_feed_id = feed_id, feed_id = NULL
+ $this->dbh->query("UPDATE ttrss_user_entries
+ SET orig_feed_id = $new_feed_id, feed_id = NULL
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
}
}
- db_query($link, "COMMIT");
+ $this->dbh->query("COMMIT");
}
function publ() {
$pub = $_REQUEST["pub"];
- $id = db_escape_string($this->link, $_REQUEST["id"]);
- $note = trim(strip_tags(db_escape_string($this->link, $_REQUEST["note"])));
+ $id = $this->dbh->escape_string($_REQUEST["id"]);
if ($pub == "1") {
$pub = "true";
$pub = "false";
}
- $result = db_query($this->link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
published = $pub, last_published = NOW()
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
if (PUBSUBHUBBUB_HUB) {
$rss_link = get_self_url_prefix() .
"/public.php?op=rss&id=-2&key=" .
- get_feed_access_key($this->link, -2, false);
+ get_feed_access_key(-2, false);
- $p = new Publisher(PUBSUBHUBBUB_HUB);
+ $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
$pubsub_result = $p->publish_update($rss_link);
}
$reply = array();
- if ($seq) $reply['seq'] = $seq;
+ if (!empty($_REQUEST['seq'])) $reply['seq'] = (int) $_REQUEST['seq'];
- if ($last_article_id != getLastArticleId($this->link)) {
- $reply['counters'] = getAllCounters($this->link);
+ if ($last_article_id != getLastArticleId()) {
+ $reply['counters'] = getAllCounters();
}
- $reply['runtime-info'] = make_runtime_info($this->link);
+ $reply['runtime-info'] = make_runtime_info();
print json_encode($reply);
}
/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
function catchupSelected() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
$cmode = sprintf("%d", $_REQUEST["cmode"]);
- catchupArticlesById($this->link, $ids, $cmode);
+ catchupArticlesById($ids, $cmode);
- print json_encode(array("message" => "UPDATE_COUNTERS"));
+ print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
}
function markSelected() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
$cmode = sprintf("%d", $_REQUEST["cmode"]);
- $this->markArticlesById($this->link, $ids, $cmode);
+ $this->markArticlesById($ids, $cmode);
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function publishSelected() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
$cmode = sprintf("%d", $_REQUEST["cmode"]);
- $this->publishArticlesById($this->link, $ids, $cmode);
+ $this->publishArticlesById($ids, $cmode);
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function sanityCheck() {
$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
+ $_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
+ $_SESSION["clientTzOffset"] = $_REQUEST["clientTzOffset"];
$reply = array();
- $reply['error'] = sanity_check($this->link);
+ $reply['error'] = sanity_check();
if ($reply['error']['code'] == 0) {
- $reply['init-params'] = make_init_params($this->link);
- $reply['runtime-info'] = make_runtime_info($this->link);
+ $reply['init-params'] = make_init_params();
+ $reply['runtime-info'] = make_runtime_info(true);
}
print json_encode($reply);
}
- function setArticleTags() {
-
- $id = db_escape_string($this->link, $_REQUEST["id"]);
-
- $tags_str = db_escape_string($this->link, $_REQUEST["tags_str"]);
- $tags = array_unique(trim_array(explode(",", $tags_str)));
-
- db_query($this->link, "BEGIN");
-
- $result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries WHERE
- ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
-
- if (db_num_rows($result) == 1) {
-
- $tags_to_cache = array();
-
- $int_id = db_fetch_result($result, 0, "int_id");
-
- db_query($this->link, "DELETE FROM ttrss_tags WHERE
- post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
-
- foreach ($tags as $tag) {
- $tag = sanitize_tag($tag);
-
- if (!tag_is_valid($tag)) {
- continue;
- }
-
- if (preg_match("/^[0-9]*$/", $tag)) {
- continue;
- }
-
- // print "<!-- $id : $int_id : $tag -->";
-
- if ($tag != '') {
- db_query($this->link, "INSERT INTO ttrss_tags
- (post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
- }
-
- array_push($tags_to_cache, $tag);
- }
-
- /* update tag cache */
-
- sort($tags_to_cache);
- $tags_str = join(",", $tags_to_cache);
-
- db_query($this->link, "UPDATE ttrss_user_entries
- SET tag_cache = '$tags_str' WHERE ref_id = '$id'
- AND owner_uid = " . $_SESSION["uid"]);
- }
-
- db_query($this->link, "COMMIT");
-
- $tags = get_article_tags($this->link, $id);
- $tags_str = format_tags_string($tags, $id);
- $tags_str_full = join(", ", $tags);
-
- if (!$tags_str_full) $tags_str_full = __("no tags");
-
- print json_encode(array("id" => (int)$id,
- "content" => $tags_str, "content_full" => $tags_str_full));
- }
-
function completeLabels() {
- $search = db_escape_string($this->link, $_REQUEST["search"]);
+ $search = $this->dbh->escape_string($_REQUEST["search"]);
- $result = db_query($this->link, "SELECT DISTINCT caption FROM
+ $result = $this->dbh->query("SELECT DISTINCT caption FROM
ttrss_labels2
WHERE owner_uid = '".$_SESSION["uid"]."' AND
LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
LIMIT 5");
print "<ul>";
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $this->dbh->fetch_assoc($result)) {
print "<li>" . $line["caption"] . "</li>";
}
print "</ul>";
}
-
- function completeTags() {
- $search = db_escape_string($this->link, $_REQUEST["search"]);
-
- $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
- WHERE owner_uid = '".$_SESSION["uid"]."' AND
- tag_name LIKE '$search%' ORDER BY tag_name
- LIMIT 10");
-
- print "<ul>";
- while ($line = db_fetch_assoc($result)) {
- print "<li>" . $line["tag_name"] . "</li>";
- }
- print "</ul>";
- }
-
function purge() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
$days = sprintf("%d", $_REQUEST["days"]);
foreach ($ids as $id) {
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+ $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
id = '$id' AND owner_uid = ".$_SESSION["uid"]);
- if (db_num_rows($result) == 1) {
- purge_feed($this->link, $id, $days);
+ if ($this->dbh->num_rows($result) == 1) {
+ purge_feed($id, $days);
}
}
}
- function getArticles() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
- $articles = array();
-
- foreach ($ids as $id) {
- if ($id) {
- array_push($articles, format_article($this->link, $id, 0, false));
- }
- }
-
- print json_encode($articles);
- }
-
- function assigntolabel() {
- return $this->labelops(true);
- }
-
- function removefromlabel() {
- return $this->labelops(false);
- }
-
- function labelops($assign) {
- $reply = array();
-
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
- $label_id = db_escape_string($this->link, $_REQUEST["lid"]);
-
- $label = db_escape_string($this->link, label_find_caption($this->link, $label_id,
- $_SESSION["uid"]));
-
- $reply["info-for-headlines"] = array();
-
- if ($label) {
-
- foreach ($ids as $id) {
-
- if ($assign)
- label_add_article($this->link, $id, $label, $_SESSION["uid"]);
- else
- label_remove_article($this->link, $id, $label, $_SESSION["uid"]);
-
- $labels = get_article_labels($this->link, $id, $_SESSION["uid"]);
-
- array_push($reply["info-for-headlines"],
- array("id" => $id, "labels" => format_article_labels($labels, $id)));
-
- }
- }
-
- $reply["message"] = "UPDATE_COUNTERS";
-
- print json_encode($reply);
- }
-
function updateFeedBrowser() {
- $search = db_escape_string($this->link, $_REQUEST["search"]);
- $limit = db_escape_string($this->link, $_REQUEST["limit"]);
- $mode = (int) db_escape_string($this->link, $_REQUEST["mode"]);
+ if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
+
+ $search = $this->dbh->escape_string($_REQUEST["search"]);
+ $limit = $this->dbh->escape_string($_REQUEST["limit"]);
+ $mode = (int) $this->dbh->escape_string($_REQUEST["mode"]);
require_once "feedbrowser.php";
print json_encode(array("content" =>
- make_feed_browser($this->link, $search, $limit, $mode),
+ make_feed_browser($search, $limit, $mode),
"mode" => $mode));
}
if ($mode == 1) {
foreach ($payload as $feed) {
- $title = db_escape_string($this->link, $feed[0]);
- $feed_url = db_escape_string($this->link, $feed[1]);
+ $title = $this->dbh->escape_string($feed[0]);
+ $feed_url = $this->dbh->escape_string($feed[1]);
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+ $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) == 0) {
- $result = db_query($this->link, "INSERT INTO ttrss_feeds
+ if ($this->dbh->num_rows($result) == 0) {
+ $result = $this->dbh->query("INSERT INTO ttrss_feeds
(owner_uid,feed_url,title,cat_id,site_url)
VALUES ('".$_SESSION["uid"]."',
'$feed_url', '$title', NULL, '')");
} else if ($mode == 2) {
// feed archive
foreach ($payload as $id) {
- $result = db_query($this->link, "SELECT * FROM ttrss_archived_feeds
+ $result = $this->dbh->query("SELECT * FROM ttrss_archived_feeds
WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) != 0) {
- $site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
- $feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
- $title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
+ if ($this->dbh->num_rows($result) != 0) {
+ $site_url = $this->dbh->escape_string(db_fetch_result($result, 0, "site_url"));
+ $feed_url = $this->dbh->escape_string(db_fetch_result($result, 0, "feed_url"));
+ $title = $this->dbh->escape_string(db_fetch_result($result, 0, "title"));
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+ $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) == 0) {
- $result = db_query($this->link, "INSERT INTO ttrss_feeds
+ if ($this->dbh->num_rows($result) == 0) {
+ $result = $this->dbh->query("INSERT INTO ttrss_feeds
(owner_uid,feed_url,title,cat_id,site_url)
- VALUES ('$id','".$_SESSION["uid"]."',
+ VALUES ('".$_SESSION["uid"]."',
'$feed_url', '$title', NULL, '$site_url')");
}
}
}
function catchupFeed() {
- $feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
- $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
- $mode = db_escape_string($this->link, $_REQUEST['mode']);
+ $feed_id = $this->dbh->escape_string($_REQUEST['feed_id']);
+ $is_cat = $this->dbh->escape_string($_REQUEST['is_cat']) == "true";
+ $mode = $this->dbh->escape_string($_REQUEST['mode']);
+ $search_query = $this->dbh->escape_string($_REQUEST['search_query']);
+ $search_lang = $this->dbh->escape_string($_REQUEST['search_lang']);
- catchup_feed($this->link, $feed_id, $is_cat, false, false, $mode);
+ Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function quickAddCat() {
- $cat = db_escape_string($this->link, $_REQUEST["cat"]);
+ $cat = $this->dbh->escape_string($_REQUEST["cat"]);
- add_feed_category($this->link, $cat);
+ add_feed_category($cat);
- $result = db_query($this->link, "SELECT id FROM ttrss_feed_categories WHERE
+ $result = $this->dbh->query("SELECT id FROM ttrss_feed_categories WHERE
title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
- if (db_num_rows($result) == 1) {
- $id = db_fetch_result($result, 0, "id");
+ if ($this->dbh->num_rows($result) == 1) {
+ $id = $this->dbh->fetch_result($result, 0, "id");
} else {
$id = 0;
}
- print_feed_cat_select($this->link, "cat_id", $id);
- }
-
- // Silent
- function clearArticleKeys() {
- db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
- owner_uid = " . $_SESSION["uid"]);
-
- return;
+ print_feed_cat_select("cat_id", $id, '');
}
function setpanelmode() {
$wide = (int) $_REQUEST["wide"];
setcookie("ttrss_widescreen", $wide,
- time() + SESSION_COOKIE_LIFETIME);
+ time() + COOKIE_LIFETIME_LONG);
print json_encode(array("wide" => $wide));
}
- function updaterandomfeed() {
+ static function updaterandomfeed_real($dbh) {
+
// Test if the feed need a update (update interval exceded).
if (DB_TYPE == "pgsql") {
$update_limit_qpart = "AND ((
$random_qpart = sql_random_function();
+ // we could be invoked from public.php with no active session
+ if ($_SESSION["uid"]) {
+ $owner_check_qpart = "AND ttrss_feeds.owner_uid = '".$_SESSION["uid"]."'";
+ } else {
+ $owner_check_qpart = "";
+ }
+
// We search for feed needing update.
- $result = db_query($this->link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+ $result = $dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs
WHERE
ttrss_feeds.owner_uid = ttrss_users.id
AND ttrss_users.id = ttrss_user_prefs.owner_uid
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
- AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]."
- $update_limit_qpart $updstart_thresh_qpart
+ $owner_check_qpart
+ $update_limit_qpart
+ $updstart_thresh_qpart
ORDER BY $random_qpart LIMIT 30");
$feed_id = -1;
$tstart = time();
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $dbh->fetch_assoc($result)) {
$feed_id = $line["id"];
if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
- update_rss_feed($this->link, $feed_id, true);
+ update_rss_feed($feed_id, true);
++$num_updated;
} else {
break;
}
// Purge orphans and cleanup tags
- purge_orphans($this->link);
- cleanup_tags($this->link, 14, 50000);
+ Article::purge_orphans();
+ //cleanup_tags(14, 50000);
if ($num_updated > 0) {
print json_encode(array("message" => "UPDATE_COUNTERS",
}
- private function markArticlesById($link, $ids, $cmode) {
+ function updaterandomfeed() {
+ RPC::updaterandomfeed_real($this->dbh);
+ }
+
+ private function markArticlesById($ids, $cmode) {
$tmp_ids = array();
$ids_qpart = join(" OR ", $tmp_ids);
if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
marked = false, last_marked = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
marked = true, last_marked = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else {
- db_query($link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
marked = NOT marked,last_marked = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
}
}
- private function publishArticlesById($link, $ids, $cmode) {
+ private function publishArticlesById($ids, $cmode) {
$tmp_ids = array();
$ids_qpart = join(" OR ", $tmp_ids);
if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
published = false,last_published = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
published = true,last_published = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else {
- db_query($link, "UPDATE ttrss_user_entries SET
+ $this->dbh->query("UPDATE ttrss_user_entries SET
published = NOT published,last_published = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
}
if (PUBSUBHUBBUB_HUB) {
$rss_link = get_self_url_prefix() .
"/public.php?op=rss&id=-2&key=" .
- get_feed_access_key($link, -2, false);
+ get_feed_access_key(-2, false);
- $p = new Publisher(PUBSUBHUBBUB_HUB);
+ $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
- $pubsub_result = $p->publish_update($rss_link);
+ /* $pubsub_result = */ $p->publish_update($rss_link);
}
}
function getlinktitlebyid() {
- $id = db_escape_string($this->link, $_REQUEST['id']);
+ $id = $this->dbh->escape_string($_REQUEST['id']);
- $result = db_query($this->link, "SELECT link, title FROM ttrss_entries, ttrss_user_entries
+ $result = $this->dbh->query("SELECT link, title FROM ttrss_entries, ttrss_user_entries
WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]);
- if (db_num_rows($result) != 0) {
- $link = db_fetch_result($result, 0, "link");
- $title = db_fetch_result($result, 0, "title");
+ if ($this->dbh->num_rows($result) != 0) {
+ $link = $this->dbh->fetch_result($result, 0, "link");
+ $title = $this->dbh->fetch_result($result, 0, "title");
echo json_encode(array("link" => $link, "title" => $title));
} else {
}
}
-}
-?>
+ function log() {
+ $msg = $this->dbh->escape_string($_REQUEST['msg']);
+ $file = $this->dbh->escape_string(basename($_REQUEST['file']));
+ $line = (int) $_REQUEST['line'];
+ $context = $this->dbh->escape_string($_REQUEST['context']);
+
+ if ($msg) {
+ Logger::get()->log_error(E_USER_WARNING,
+ $msg, 'client-js:' . $file, $line, $context);
+
+ echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+ } else {
+ echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
+ }
+
+ }
+}
\ No newline at end of file
git.wh0rd.org / tt-rss.git / blobdiff