}
function setprofile() {
- $id = db_escape_string($this->link, $_REQUEST["id"]);
+ $id = db_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(",", db_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
+ db_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 = db_escape_string( trim($_REQUEST["title"]));
if ($title) {
- db_query($this->link, "BEGIN");
+ db_query( "BEGIN");
- $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+ $result = db_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, "INSERT INTO ttrss_settings_profiles (title, owner_uid)
+ db_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 = db_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 ($profile_id) {
- initialize_user_prefs($this->link, $_SESSION["uid"], $profile_id);
+ initialize_user_prefs( $_SESSION["uid"], $profile_id);
}
}
}
- db_query($this->link, "COMMIT");
+ db_query( "COMMIT");
}
}
// Silent
function saveprofile() {
- $id = db_escape_string($this->link, $_REQUEST["id"]);
- $title = db_escape_string($this->link, trim($_REQUEST["value"]));
+ $id = db_escape_string( $_REQUEST["id"]);
+ $title = db_escape_string( trim($_REQUEST["value"]));
if ($id == 0) {
print __("Default profile");
}
if ($title) {
- db_query($this->link, "BEGIN");
+ db_query( "BEGIN");
- $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+ $result = db_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
+ db_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 = db_query( "SELECT title FROM ttrss_settings_profiles
WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
print db_fetch_result($result, 0, "title");
}
- db_query($this->link, "COMMIT");
+ db_query( "COMMIT");
}
}
// Silent
function remarchive() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
foreach ($ids as $id) {
- $result = db_query($this->link, "DELETE FROM ttrss_archived_feeds WHERE
+ $result = db_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);
+ $rc = db_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']);
+ $feed = db_escape_string( $_REQUEST['feed']);
+ $cat = db_escape_string( $_REQUEST['cat']);
+ $login = db_escape_string( $_REQUEST['login']);
$pass = trim($_REQUEST['pass']); // escaped later
- $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
+ $rc = 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 = db_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, $_SESSION['uid'], $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 = db_escape_string( $_REQUEST["id"]);
if ($mark == "1") {
$mark = "true";
$mark = "false";
}
- $result = db_query($this->link, "UPDATE ttrss_user_entries SET marked = $mark,
+ $result = db_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 = db_escape_string( $_REQUEST["ids"]);
- $result = db_query($this->link, "DELETE FROM ttrss_user_entries
+ $result = db_query( "DELETE FROM ttrss_user_entries
WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
- purge_orphans($this->link);
+ 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 = db_escape_string( trim($id));
+ db_query( "BEGIN");
- $result = db_query($this->link, "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+ $result = db_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"].")");
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"));
+ $feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
+ $site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
+ $title = db_escape_string( db_fetch_result($result, 0, "title"));
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+ $result = db_query( "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
AND owner_uid = " .$_SESSION["uid"]);
if (db_num_rows($result) == 0) {
if (!$title) $title = '[Unknown]';
- $result = db_query($this->link,
+ $result = db_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 = db_query(
"SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
AND owner_uid = ".$_SESSION["uid"]);
}
if ($feed_id) {
- $result = db_query($this->link, "UPDATE ttrss_user_entries
+ $result = db_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");
+ db_query( "COMMIT");
}
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function archive() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", db_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) {
+ db_query( "BEGIN");
- $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+ $result = db_query( "SELECT feed_id FROM ttrss_user_entries
WHERE ref_id = '$id' AND owner_uid = $owner_uid");
if (db_num_rows($result) != 0) {
$feed_id = (int) db_fetch_result($result, 0, "feed_id");
if ($feed_id) {
- $result = db_query($link, "SELECT id FROM ttrss_archived_feeds
+ $result = db_query( "SELECT id FROM ttrss_archived_feeds
WHERE id = '$feed_id'");
if (db_num_rows($result) == 0) {
- db_query($link, "INSERT INTO ttrss_archived_feeds
+ db_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
WHERE id = '$feed_id'");
}
- db_query($link, "UPDATE ttrss_user_entries
+ db_query( "UPDATE ttrss_user_entries
SET orig_feed_id = feed_id, feed_id = NULL
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
}
}
- db_query($link, "COMMIT");
+ db_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 = db_escape_string( $_REQUEST["id"]);
+ $note = trim(strip_tags(db_escape_string( $_REQUEST["note"])));
if ($pub == "1") {
$pub = "true";
$pub = "false";
}
- $result = db_query($this->link, "UPDATE ttrss_user_entries SET
+ $result = db_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);
if ($seq) $reply['seq'] = $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(",", db_escape_string( $_REQUEST["ids"]));
$cmode = sprintf("%d", $_REQUEST["cmode"]);
- catchupArticlesById($this->link, $ids, $cmode);
+ catchupArticlesById( $ids, $cmode);
print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
}
function markSelected() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", db_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(",", db_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"));
}
$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();
}
print json_encode($reply);
}
function completeLabels() {
- $search = db_escape_string($this->link, $_REQUEST["search"]);
+ $search = db_escape_string( $_REQUEST["search"]);
- $result = db_query($this->link, "SELECT DISTINCT caption FROM
+ $result = db_query( "SELECT DISTINCT caption FROM
ttrss_labels2
WHERE owner_uid = '".$_SESSION["uid"]."' AND
LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
}
function purge() {
- $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", db_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 = db_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);
+ purge_feed( $id, $days);
}
}
}
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"]);
+ $search = db_escape_string( $_REQUEST["search"]);
+ $limit = db_escape_string( $_REQUEST["limit"]);
+ $mode = (int) db_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 = db_escape_string( $feed[0]);
+ $feed_url = db_escape_string( $feed[1]);
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+ $result = db_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
+ $result = db_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 = db_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"));
+ $site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
+ $feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
+ $title = db_escape_string( db_fetch_result($result, 0, "title"));
- $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+ $result = db_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
+ $result = db_query( "INSERT INTO ttrss_feeds
(owner_uid,feed_url,title,cat_id,site_url)
VALUES ('$id','".$_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 = db_escape_string( $_REQUEST['feed_id']);
+ $is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
+ $mode = db_escape_string( $_REQUEST['mode']);
- catchup_feed($this->link, $feed_id, $is_cat, false, false, $mode);
+ catchup_feed( $feed_id, $is_cat, false, false, $mode);
print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function quickAddCat() {
- $cat = db_escape_string($this->link, $_REQUEST["cat"]);
+ $cat = db_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 = db_query( "SELECT id FROM ttrss_feed_categories WHERE
title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
if (db_num_rows($result) == 1) {
$id = 0;
}
- print_feed_cat_select($this->link, "cat_id", $id);
+ print_feed_cat_select( "cat_id", $id);
}
// Silent
function clearArticleKeys() {
- db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
+ db_query( "UPDATE ttrss_user_entries SET uuid = '' WHERE
owner_uid = " . $_SESSION["uid"]);
return;
$random_qpart = sql_random_function();
// We search for feed needing update.
- $result = db_query($this->link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+ $result = db_query( "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs
WHERE
$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);
+ purge_orphans();
+ cleanup_tags( 14, 50000);
if ($num_updated > 0) {
print json_encode(array("message" => "UPDATE_COUNTERS",
}
- private function markArticlesById($link, $ids, $cmode) {
+ 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
+ db_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
+ db_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
+ db_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
+ db_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
+ db_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
+ db_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);
}
function getlinktitlebyid() {
- $id = db_escape_string($this->link, $_REQUEST['id']);
+ $id = db_escape_string( $_REQUEST['id']);
- $result = db_query($this->link, "SELECT link, title FROM ttrss_entries, ttrss_user_entries
+ $result = db_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) {
git.wh0rd.org / tt-rss.git / blobdiff