"padding : 5px; border-style : dashed; border-color : #e7d796;".
"margin-bottom : 1em; color : #9a8c59;";
- if (!$limit) $limit = 100;
+ if (!$limit) $limit = 60;
- if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
- $date_sort_field = "updated";
- } else {
- $date_sort_field = "date_entered";
- }
+ $date_sort_field = "date_entered DESC, updated DESC";
if ($feed == -2)
- $date_sort_field = "last_published";
+ $date_sort_field = "last_published DESC";
else if ($feed == -1)
- $date_sort_field = "last_marked";
+ $date_sort_field = "last_marked DESC";
+
+ $qfh_ret = queryFeedHeadlines( $feed,
+ 1, $view_mode, $is_cat, $search, $search_mode,
+ $date_sort_field, $offset, $owner_uid,
+ false, 0, false, true);
+
+ $result = $qfh_ret[0];
+
+ if (db_num_rows($result) != 0) {
+ $ts = strtotime(db_fetch_result($result, 0, "date_entered"));
+
+ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
+ strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) {
+ header('HTTP/1.0 304 Not Modified');
+ return;
+ }
+
+ $last_modified = gmdate("D, d M Y H:i:s", $ts) . " GMT";
+ header("Last-Modified: $last_modified", true);
+ }
- $qfh_ret = queryFeedHeadlines($this->link, $feed,
+ $qfh_ret = queryFeedHeadlines( $feed,
$limit, $view_mode, $is_cat, $search, $search_mode,
- "$date_sort_field DESC", $offset, $owner_uid,
+ $date_sort_field, $offset, $owner_uid,
false, 0, false, true);
+
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
$feed_site_url = $qfh_ret[2];
$feed_self_url = get_self_url_prefix() .
"/public.php?op=rss&id=-2&key=" .
- get_feed_access_key($this->link, -2, false, $owner_uid);
+ get_feed_access_key( -2, false, $owner_uid);
if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
- while ($line = db_fetch_assoc($result)) {
+ while ($line = db_fetch_assoc($result)) {
+
$tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true);
$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
$tpl->setVariable('ARTICLE_EXCERPT',
truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
- $content = sanitize($this->link, $line["content_preview"], false, $owner_uid);
+ $content = sanitize( $line["content_preview"], false, $owner_uid);
if ($line['note']) {
$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
$content;
-}
+ $tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
+ }
$tpl->setVariable('ARTICLE_CONTENT', $content, true);
$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
- $tags = get_article_tags($this->link, $line["id"], $owner_uid);
+ $tags = get_article_tags( $line["id"], $owner_uid);
foreach ($tags as $tag) {
$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
$tpl->addBlock('category');
}
- $enclosures = get_article_enclosures($this->link, $line["id"]);
+ $enclosures = get_article_enclosures( $line["id"]);
foreach ($enclosures as $e) {
$type = htmlspecialchars($e['content_type']);
$article['link'] = $line['link'];
$article['title'] = $line['title'];
$article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
- $article['content'] = sanitize($this->link, $line["content_preview"], false, $owner_uid);
+ $article['content'] = sanitize( $line["content_preview"], false, $owner_uid);
$article['updated'] = date('c', strtotime($line["updated"]));
if ($line['note']) $article['note'] = $line['note'];
if ($article['author']) $article['author'] = $line['author'];
- $tags = get_article_tags($this->link, $line["id"], $owner_uid);
+ $tags = get_article_tags( $line["id"], $owner_uid);
if (count($tags) > 0) {
$article['tags'] = array();
}
}
- $enclosures = get_article_enclosures($this->link, $line["id"]);
+ $enclosures = get_article_enclosures( $line["id"]);
if (count($enclosures) > 0) {
$article['enclosures'] = array();
}
function getUnread() {
- $login = db_escape_string($this->link, $_REQUEST["login"]);
+ $login = db_escape_string( $_REQUEST["login"]);
$fresh = $_REQUEST["fresh"] == "1";
- $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'");
+ $result = db_query( "SELECT id FROM ttrss_users WHERE login = '$login'");
if (db_num_rows($result) == 1) {
$uid = db_fetch_result($result, 0, "id");
- print getGlobalUnread($this->link, $uid);
+ print getGlobalUnread( $uid);
if ($fresh) {
print ";";
- print getFeedArticles($this->link, -3, false, true, $uid);
+ print getFeedArticles( -3, false, true, $uid);
}
} else {
}
function getProfiles() {
- $login = db_escape_string($this->link, $_REQUEST["login"]);
+ $login = db_escape_string( $_REQUEST["login"]);
- $result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles,ttrss_users
+ $result = db_query( "SELECT * FROM ttrss_settings_profiles,ttrss_users
WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
}
function pubsub() {
- $mode = db_escape_string($this->link, $_REQUEST['hub_mode']);
- $feed_id = (int) db_escape_string($this->link, $_REQUEST['id']);
- $feed_url = db_escape_string($this->link, $_REQUEST['hub_topic']);
+ $mode = db_escape_string( $_REQUEST['hub_mode']);
+ $feed_id = (int) db_escape_string( $_REQUEST['id']);
+ $feed_url = db_escape_string( $_REQUEST['hub_topic']);
if (!PUBSUBHUBBUB_ENABLED) {
header('HTTP/1.0 404 Not Found');
// TODO: implement hub_verifytoken checking
- $result = db_query($this->link, "SELECT feed_url FROM ttrss_feeds
+ $result = db_query( "SELECT feed_url FROM ttrss_feeds
WHERE id = '$feed_id'");
if (db_num_rows($result) != 0) {
if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
if ($mode == "subscribe") {
- db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 2
+ db_query( "UPDATE ttrss_feeds SET pubsub_state = 2
WHERE id = '$feed_id'");
print $_REQUEST['hub_challenge'];
} else if ($mode == "unsubscribe") {
- db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 0
+ db_query( "UPDATE ttrss_feeds SET pubsub_state = 0
WHERE id = '$feed_id'");
print $_REQUEST['hub_challenge'];
} else if (!$mode) {
// Received update ping, schedule feed update.
- //update_rss_feed($this->link, $feed_id, true, true);
+ //update_rss_feed( $feed_id, true, true);
- db_query($this->link, "UPDATE ttrss_feeds SET
+ db_query( "UPDATE ttrss_feeds SET
last_update_started = '1970-01-01',
last_updated = '1970-01-01' WHERE id = '$feed_id'");
}
function share() {
- $uuid = db_escape_string($this->link, $_REQUEST["key"]);
+ $uuid = db_escape_string( $_REQUEST["key"]);
- $result = db_query($this->link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
+ $result = db_query( "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
uuid = '$uuid'");
if (db_num_rows($result) != 0) {
$id = db_fetch_result($result, 0, "ref_id");
$owner_uid = db_fetch_result($result, 0, "owner_uid");
- $article = format_article($this->link, $id, false, true, $owner_uid);
+ $article = format_article( $id, false, true, $owner_uid);
print_r($article['content']);
}
function rss() {
- $feed = db_escape_string($this->link, $_REQUEST["id"]);
- $key = db_escape_string($this->link, $_REQUEST["key"]);
+ $feed = db_escape_string( $_REQUEST["id"]);
+ $key = db_escape_string( $_REQUEST["key"]);
$is_cat = $_REQUEST["is_cat"] != false;
- $limit = (int)db_escape_string($this->link, $_REQUEST["limit"]);
- $offset = (int)db_escape_string($this->link, $_REQUEST["offset"]);
+ $limit = (int)db_escape_string( $_REQUEST["limit"]);
+ $offset = (int)db_escape_string( $_REQUEST["offset"]);
- $search = db_escape_string($this->link, $_REQUEST["q"]);
- $search_mode = db_escape_string($this->link, $_REQUEST["smode"]);
- $view_mode = db_escape_string($this->link, $_REQUEST["view-mode"]);
+ $search = db_escape_string( $_REQUEST["q"]);
+ $search_mode = db_escape_string( $_REQUEST["smode"]);
+ $view_mode = db_escape_string( $_REQUEST["view-mode"]);
- $format = db_escape_string($this->link, $_REQUEST['format']);
+ $format = db_escape_string( $_REQUEST['format']);
if (!$format) $format = 'atom';
if (SINGLE_USER_MODE) {
- authenticate_user($this->link, "admin", null);
+ authenticate_user( "admin", null);
}
$owner_id = false;
if ($key) {
- $result = db_query($this->link, "SELECT owner_uid FROM
+ $result = db_query( "SELECT owner_uid FROM
ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
if (db_num_rows($result) == 1)
function globalUpdateFeeds() {
include "rssfuncs.php";
// Update all feeds needing a update.
- update_daemon_common($this->link, 0, true, false);
+ update_daemon_common( 0, true, false);
+
+ // Update feedbrowser
+ update_feedbrowser_cache();
+
+ // Purge orphans and cleanup tags
+ purge_orphans();
+
+ cleanup_tags( 14, 50000);
+
+ global $pluginhost;
+ $pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+
}
function sharepopup() {
if (SINGLE_USER_MODE) {
- login_sequence($this->link);
+ login_sequence();
}
header('Content-Type: text/html; charset=utf-8');
- print "<html>
- <head>
- <title>Tiny Tiny RSS</title>
- <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
- <script type=\"text/javascript\" src=\"lib/prototype.js\"></script>
- <script type=\"text/javascript\" src=\"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls\"></script>
- <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
- </head>
- <body id='sharepopup'>";
+ print "<html><head><title>Tiny Tiny RSS</title>";
+
+ print stylesheet_tag("utility.css");
+ print javascript_tag("lib/prototype.js");
+ print javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+ print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
+ </head><body id='sharepopup'>";
$action = $_REQUEST["action"];
if ($action == 'share') {
- $title = db_escape_string($this->link, strip_tags($_REQUEST["title"]));
- $url = db_escape_string($this->link, strip_tags($_REQUEST["url"]));
- $content = db_escape_string($this->link, strip_tags($_REQUEST["content"]));
- $labels = db_escape_string($this->link, strip_tags($_REQUEST["labels"]));
+ $title = db_escape_string( strip_tags($_REQUEST["title"]));
+ $url = db_escape_string( strip_tags($_REQUEST["url"]));
+ $content = db_escape_string( strip_tags($_REQUEST["content"]));
+ $labels = db_escape_string( strip_tags($_REQUEST["labels"]));
- Article::create_published_article($this->link, $title, $url, $content, $labels,
+ Article::create_published_article( $title, $url, $content, $labels,
$_SESSION["uid"]);
print "<script type='text/javascript'>";
}
function login() {
-
- @session_start();
-
$_SESSION["prefs_cache"] = array();
if (!SINGLE_USER_MODE) {
- $login = db_escape_string($this->link, $_POST["login"]);
+ $login = db_escape_string( $_POST["login"]);
$password = $_POST["password"];
$remember_me = $_POST["remember_me"];
- if (authenticate_user($this->link, $login, $password)) {
+ if ($remember_me) {
+ session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+ } else {
+ session_set_cookie_params(0);
+ }
+
+ @session_start();
+
+ if (authenticate_user( $login, $password)) {
$_POST["password"] = "";
$_SESSION["language"] = $_POST["language"];
- $_SESSION["ref_schema_version"] = get_schema_version($this->link, true);
+ $_SESSION["ref_schema_version"] = get_schema_version( true);
$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
if ($_POST["profile"]) {
- $profile = db_escape_string($this->link, $_POST["profile"]);
+ $profile = db_escape_string( $_POST["profile"]);
- $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+ $result = db_query( "SELECT id FROM ttrss_settings_profiles
WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
if (db_num_rows($result) != 0) {
function subscribe() {
if (SINGLE_USER_MODE) {
- login_sequence($this->link);
+ login_sequence();
}
if ($_SESSION["uid"]) {
- $feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"]));
+ $feed_url = db_escape_string( trim($_REQUEST["feed_url"]));
header('Content-Type: text/html; charset=utf-8');
print "<html>
alt=\"Tiny Tiny RSS\"/>
<h1>".__("Subscribe to feed...")."</h1><div class='content'>";
- $rc = subscribe_to_feed($this->link, $feed_url);
+ $rc = subscribe_to_feed( $feed_url);
switch ($rc['code']) {
case 0:
$tt_uri = get_self_url_prefix();
if ($rc['code'] <= 2){
- $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"]);
$feed_id = db_fetch_result($result, 0, "id");
print "</div></body></html>";
} else {
- render_login_form($this->link);
+ render_login_form();
}
}
function subscribe2() {
- $feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"]));
- $cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
- $from = db_escape_string($this->link, $_REQUEST["from"]);
+ $feed_url = db_escape_string( trim($_REQUEST["feed_url"]));
+ $cat_id = db_escape_string( $_REQUEST["cat_id"]);
+ $from = db_escape_string( $_REQUEST["from"]);
/* only read authentication information from POST */
- $auth_login = db_escape_string($this->link, trim($_POST["auth_login"]));
- $auth_pass = db_escape_string($this->link, trim($_POST["auth_pass"]));
+ $auth_login = db_escape_string( trim($_POST["auth_login"]));
+ $auth_pass = db_escape_string( trim($_POST["auth_pass"]));
- $rc = subscribe_to_feed($this->link, $feed_url, $cat_id, $auth_login, $auth_pass);
+ $rc = subscribe_to_feed( $feed_url, $cat_id, $auth_login, $auth_pass);
switch ($rc) {
case 1:
$tt_uri = get_self_url_prefix();
if ($rc <= 2){
- $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"]);
$feed_id = db_fetch_result($result, 0, "id");
function forgotpass() {
header('Content-Type: text/html; charset=utf-8');
- print "<html>
- <head>
- <title>Tiny Tiny RSS</title>
- <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
- <script type=\"text/javascript\" src=\"lib/prototype.js\"></script>
- <script type=\"text/javascript\" src=\"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls\"></script>
- <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
- </head>
- <body id='forgotpass'>";
+ print "<html><head><title>Tiny Tiny RSS</title>";
+
+ print stylesheet_tag("utility.css");
+ print javascript_tag("lib/prototype.js");
+
+ print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
+ </head><body id='forgotpass'>";
print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
- print "<h1>".__("Reset password")."</h1>";
+ print "<h1>".__("Password recovery")."</h1>";
print "<div class='content'>";
- print "<p>".__("You will need to provide valid account name and email. New password will be sent on your email address.")."</p>";
-
@$method = $_POST['method'];
if (!$method) {
- $secretkey = uniqid();
- $_SESSION["secretkey"] = $secretkey;
+ print_notice(__("You will need to provide valid account name and email. New password will be sent on your email address."));
print "<form method='POST' action='public.php'>";
- print "<input type='hidden' name='secretkey' value='$secretkey'>";
print "<input type='hidden' name='method' value='do'>";
print "<input type='hidden' name='op' value='forgotpass'>";
print "</form>";
} else if ($method == 'do') {
- $secretkey = $_POST["secretkey"];
- $login = db_escape_string($this->link, $_POST["login"]);
- $email = db_escape_string($this->link, $_POST["email"]);
- $test = db_escape_string($this->link, $_POST["test"]);
+ $login = db_escape_string( $_POST["login"]);
+ $email = db_escape_string( $_POST["email"]);
+ $test = db_escape_string( $_POST["test"]);
if (($test != 4 && $test != 'four') || !$email || !$login) {
print_error(__('Some of the required form parameters are missing or incorrect.'));
- print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
+ print "<form method=\"GET\" action=\"public.php\">
+ <input type=\"hidden\" name=\"op\" value=\"forgotpass\">
+ <input type=\"submit\" value=\"".__("Go back")."\">
+ </form>";
- } else if ($_SESSION["secretkey"] == $secretkey) {
+ } else {
- $result = db_query($this->link, "SELECT id FROM ttrss_users
+ $result = db_query( "SELECT id FROM ttrss_users
WHERE login = '$login' AND email = '$email'");
if (db_num_rows($result) != 0) {
$id = db_fetch_result($result, 0, "id");
- Pref_Users::resetUserPassword($this->link, $id, false);
+ Pref_Users::resetUserPassword( $id, false);
- print "<p>".__("Completed.")."</p>";
+ print "<p>";
+
+ print "<p>"."Completed."."</p>";
+
+ print "<form method=\"GET\" action=\"index.php\">
+ <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+ </form>";
} else {
print_error(__("Sorry, login and email combination not found."));
- print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
- }
- } else {
- print_error(__("Form secret key incorrect. Please enable cookies and try again."));
- print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
+ print "<form method=\"GET\" action=\"public.php\">
+ <input type=\"hidden\" name=\"op\" value=\"forgotpass\">
+ <input type=\"submit\" value=\"".__("Go back")."\">
+ </form>";
+ }
}
}
}
+ function dbupdate() {
+ if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+ $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
+ render_login_form();
+ exit;
+ }
+
+ ?><html>
+ <head>
+ <title>Database Updater</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <link rel="stylesheet" type="text/css" href="utility.css"/>
+ </head>
+ <style type="text/css">
+ span.ok { color : #009000; font-weight : bold; }
+ span.err { color : #ff0000; font-weight : bold; }
+ </style>
+ <body>
+ <script type='text/javascript'>
+ function confirmOP() {
+ return confirm("Update the database?");
+ }
+ </script>
+
+ <div class="floatingLogo"><img src="images/logo_small.png"></div>
+
+ <h1><?php echo __("Database Updater") ?></h1>
+
+ <div class="content">
+
+ <?php
+ @$op = $_REQUEST["subop"];
+ $updater = new DbUpdater( DB_TYPE, SCHEMA_VERSION);
+
+ if ($op == "performupdate") {
+ if ($updater->isUpdateRequired()) {
+
+ print "<h2>Performing updates</h2>";
+
+ print "<h3>Updating to schema version " . SCHEMA_VERSION . "</h3>";
+
+ print "<ul>";
+
+ for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+ print "<li>Performing update up to version $i...";
+
+ $result = $updater->performUpdateTo($i);
+
+ if (!$result) {
+ print "<span class='err'>FAILED!</span></li></ul>";
+
+ print_warning("One of the updates failed. Either retry the process or perform updates manually.");
+ print "<p><form method=\"GET\" action=\"index.php\">
+ <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+ </form>";
+
+ break;
+ } else {
+ print "<span class='ok'>OK!</span></li>";
+ }
+ }
+
+ print "</ul>";
+
+ print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
+
+ print "<p><form method=\"GET\" action=\"index.php\">
+ <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+ </form>";
+
+ } else {
+ print "<h2>Your database is up to date.</h2>";
+
+ print "<p><form method=\"GET\" action=\"index.php\">
+ <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+ </form>";
+ }
+ } else {
+ if ($updater->isUpdateRequired()) {
+
+ print "<h2>Database update required</h2>";
+
+ print "<h3>";
+ printf("Your Tiny Tiny RSS database needs update to the latest version: %d to %d.",
+ $updater->getSchemaVersion(), SCHEMA_VERSION);
+ print "</h3>";
+
+ print_warning("Please backup your database before proceeding.");
+
+ print "<form method='POST'>
+ <input type='hidden' name='subop' value='performupdate'>
+ <input type='submit' onclick='return confirmOP()' value='".__("Perform updates")."'>
+ </form>";
+
+ } else {
+
+ print "<h2>" . "Tiny Tiny RSS database is up to date." . "</h2>";
+
+ print "<p><form method=\"GET\" action=\"index.php\">
+ <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+ </form>";
+
+ }
+ }
+ ?>
+
+ </div>
+ </body>
+ </html>
+ <?php
+ }
+
}
?>
git.wh0rd.org / tt-rss.git / blobdiff