<?
require_once "sessions.php";
+ require_once "backend-rpc.php";
header("Cache-Control: no-cache, must-revalidate");
header("Pragma: no-cache");
$op = $_REQUEST["op"];
+ define('SCHEMA_VERSION', 8);
+
+ require_once "sanity_check.php";
+ require_once "config.php";
+
+ require_once "db.php";
+ require_once "db-prefs.php";
+ require_once "functions.php";
+ require_once "magpierss/rss_fetch.inc";
+
+ $err_msg = check_configuration_variables();
+
+ if ($err_msg) {
+ header("Content-Type: application/xml");
+ print_error_xml(9, $err_msg); die;
+ }
+
if ((!$op || $op == "rpc" || $op == "globalUpdateFeeds") && !$_REQUEST["noxml"]) {
header("Content-Type: application/xml");
}
if (!$_SESSION["uid"] && $op != "globalUpdateFeeds") {
if ($op == "rpc") {
- print "<error error-code=\"6\"/>";
+ print_error_xml(6); die;
} else {
print "
<html><body>
}
if (!$op) {
- print "<error error-code=\"7\"/>";
- exit;
+ print_error_xml(7); exit;
}
- define('SCHEMA_VERSION', 7);
-
- require_once "sanity_check.php";
- require_once "config.php";
- require_once "db.php";
- require_once "db-prefs.php";
- require_once "functions.php";
- require_once "magpierss/rss_fetch.inc";
-
$purge_intervals = array(
- 0 => "Default",
+ 0 => "Use default",
-1 => "Never purge",
- 5 => "1 week",
- 14 => "2 weeks",
- 31 => "1 month",
- 60 => "2 months",
- 90 => "3 months");
+ 5 => "1 week old",
+ 14 => "2 weeks old",
+ 31 => "1 month old",
+ 60 => "2 months old",
+ 90 => "3 months old");
$update_intervals = array(
- 0 => "Default",
+ 0 => "Use default",
-1 => "Disable updates",
- 30 => "30 minutes",
- 60 => "1 hour",
- 240 => "4 hours",
- 720 => "12 hours",
+ 30 => "Each 30 minutes",
+ 60 => "Hourly",
+ 240 => "Each 4 hours",
+ 720 => "Each 12 hours",
1440 => "Daily",
10080 => "Weekly");
setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON);
+
+ if (get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED")) {
+ setcookie('ttrss_vf_catchupnext', 1);
+ } else {
+ setcookie('ttrss_vf_catchupnext', 0);
+ }
}
$fetch = $_GET["fetch"];
if (!sanity_check($link)) { return; }
- function getAllCounters($link) {
- getLabelCounters($link);
- getFeedCounters($link);
- getTagCounters($link);
- getGlobalCounters($link);
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- getCategoryCounters($link);
- }
- }
-
- function getCategoryCounters($link) {
- $result = db_query($link, "SELECT cat_id,SUM((SELECT COUNT(int_id)
- FROM ttrss_user_entries WHERE feed_id = ttrss_feeds.id
- AND unread = true)) AS unread FROM ttrss_feeds
- WHERE
- owner_uid = ".$_SESSION["uid"]." GROUP BY cat_id");
-
- while ($line = db_fetch_assoc($result)) {
- $line["cat_id"] = sprintf("%d", $line["cat_id"]);
- print "<counter type=\"category\" id=\"".$line["cat_id"]."\" counter=\"".
- $line["unread"]."\"/>";
- }
- }
-
- function getFeedUnread($link, $feed) {
- $n_feed = sprintf("%d", $feed);
-
- if ($n_feed == -1) {
- $match_part = "marked = true";
- } else if ($feed > 0) {
- $match_part = "feed_id = '$n_feed'";
- } else if ($feed < -10) {
- $label_id = -$feed - 11;
-
- $result = db_query($link, "SELECT sql_exp FROM ttrss_labels WHERE
- id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
-
- $match_part = db_fetch_result($result, 0, "sql_exp");
- }
-
- if ($match_part) {
-
- $result = db_query($link, "SELECT count(int_id) AS unread
- FROM ttrss_user_entries
- WHERE unread = true AND $match_part AND owner_uid = " . $_SESSION["uid"]);
-
- } else {
-
- $result = db_query($link, "SELECT COUNT(post_int_id) AS unread
- FROM ttrss_tags,ttrss_user_entries
- WHERE tag_name = '$feed' AND post_int_id = int_id AND unread = true AND
- ttrss_tags.owner_uid = " . $_SESSION["uid"]);
- }
-
- $unread = db_fetch_result($result, 0, "unread");
- return $unread;
- }
-
- /* FIXME this needs reworking */
-
- function getGlobalUnread($link) {
- $result = db_query($link, "SELECT count(id) as c_id FROM ttrss_entries,ttrss_user_entries
- WHERE unread = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- owner_uid = " . $_SESSION["uid"]);
- $c_id = db_fetch_result($result, 0, "c_id");
- return $c_id;
- }
-
- function getGlobalCounters($link, $global_unread = -1) {
- if ($global_unread == -1) {
- $global_unread = getGlobalUnread($link);
- }
- print "<counter type=\"global\" id='global-unread' counter='$global_unread'/>";
- }
-
- function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
-
- if ($smart_mode) {
- if (!$_SESSION["tctr_last_value"]) {
- $_SESSION["tctr_last_value"] = array();
- }
- }
-
- $old_counters = $_SESSION["tctr_last_value"];
-
- $tctrs_modified = false;
-
-/* $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
- FROM ttrss_tags,ttrss_entries,ttrss_user_entries WHERE
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- ttrss_tags.owner_uid = ".$_SESSION["uid"]." AND
- post_int_id = ttrss_user_entries.int_id AND unread = true GROUP BY tag_name
- UNION
- select tag_name,0 as count FROM ttrss_tags
- WHERE ttrss_tags.owner_uid = ".$_SESSION["uid"]); */
-
- $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
- FROM ttrss_user_entries WHERE int_id = post_int_id
- AND unread = true)) AS count FROM ttrss_tags
- WHERE owner_uid = 2 GROUP BY tag_name ORDER BY tag_name");
-
- $tags = array();
-
- while ($line = db_fetch_assoc($result)) {
- $tags[$line["tag_name"]] += $line["count"];
- }
-
- foreach (array_keys($tags) as $tag) {
- $unread = $tags[$tag];
-
- $tag = htmlspecialchars($tag);
-
- if (!$smart_mode || $old_counters[$tag] != $unread) {
- $old_counters[$tag] = $unread;
- $tctrs_modified = true;
- print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
- }
-
- }
-
- if ($smart_mode && $tctrs_modified) {
- $_SESSION["tctr_last_value"] = $old_counters;
- }
-
- }
-
- function getLabelCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
-
- if ($smart_mode) {
- if (!$_SESSION["lctr_last_value"]) {
- $_SESSION["lctr_last_value"] = array();
- }
- }
-
- $old_counters = $_SESSION["lctr_last_value"];
- $lctrs_modified = false;
-
- $result = db_query($link, "SELECT count(id) as count FROM ttrss_entries,ttrss_user_entries
- WHERE marked = true AND ttrss_user_entries.ref_id = ttrss_entries.id AND
- unread = true AND owner_uid = ".$_SESSION["uid"]);
-
- $count = db_fetch_result($result, 0, "count");
-
- print "<counter type=\"label\" id=\"-1\" counter=\"$count\"/>";
-
- $result = db_query($link, "SELECT owner_uid,id,sql_exp,description FROM
- ttrss_labels WHERE owner_uid = ".$_SESSION["uid"]." ORDER by description");
-
- while ($line = db_fetch_assoc($result)) {
-
- $id = -$line["id"] - 11;
-
- error_reporting (0);
-
- $tmp_result = db_query($link, "SELECT count(id) as count FROM ttrss_user_entries,ttrss_entries
- WHERE (" . $line["sql_exp"] . ") AND unread = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- owner_uid = ".$_SESSION["uid"]);
-
- $count = db_fetch_result($tmp_result, 0, "count");
-
- if (!$smart_mode || $old_counters[$id] != $count) {
- $old_counters[$id] = $count;
- $lctrs_modified = true;
- print "<counter type=\"label\" id=\"$id\" counter=\"$count\"/>";
- }
-
- error_reporting (DEFAULT_ERROR_LEVEL);
- }
-
- if ($smart_mode && $lctrs_modified) {
- $_SESSION["lctr_last_value"] = $old_counters;
- }
- }
-
-/* function getFeedCounter($link, $id) {
-
- $result = db_query($link, "SELECT
- count(id) as count,last_error
- FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
- WHERE feed_id = '$id' AND unread = true
- AND ttrss_user_entries.feed_id = ttrss_feeds.id
- AND ttrss_user_entries.ref_id = ttrss_entries.id");
-
- $count = db_fetch_result($result, 0, "count");
- $last_error = htmlspecialchars(db_fetch_result($result, 0, "last_error"));
-
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";
- } */
-
- function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
-
- if ($smart_mode) {
- if (!$_SESSION["fctr_last_value"]) {
- $_SESSION["fctr_last_value"] = array();
- }
- }
-
- $old_counters = $_SESSION["fctr_last_value"];
-
- $result = db_query($link, "SELECT id,last_error,parent_feed,
- (SELECT count(id)
- FROM ttrss_entries,ttrss_user_entries
- WHERE feed_id = ttrss_feeds.id AND
- ttrss_user_entries.ref_id = ttrss_entries.id
- AND unread = true AND owner_uid = ".$_SESSION["uid"].") as count
- FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"] . "
- AND parent_feed IS NULL");
-
- $fctrs_modified = false;
-
- while ($line = db_fetch_assoc($result)) {
-
- $id = $line["id"];
- $count = $line["count"];
- $last_error = htmlspecialchars($line["last_error"]);
-
- $has_img = is_file(ICONS_DIR . "/$id.ico");
-
- $tmp_result = db_query($link,
- "SELECT id,COUNT(unread) AS unread
- FROM ttrss_feeds LEFT JOIN ttrss_user_entries
- ON (ttrss_feeds.id = ttrss_user_entries.feed_id)
- WHERE parent_feed = '$id' AND unread = true GROUP BY ttrss_feeds.id");
-
- if (db_num_rows($tmp_result) > 0) {
- while ($l = db_fetch_assoc($tmp_result)) {
- $count += $l["unread"];
- }
- }
-
- if (!$smart_mode || $old_counters[$id] != $count) {
- $old_counters[$id] = $count;
- $fctrs_modified = true;
-
- if ($last_error) {
- $error_part = "error=\"$last_error\"";
- } else {
- $error_part = "";
- }
-
- if ($has_img) {
- $has_img_part = "hi=\"$has_img\"";
- } else {
- $has_img_part = "";
- }
-
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part/>";
- }
- }
-
- if ($smart_mode && $fctrs_modified) {
- $_SESSION["fctr_last_value"] = $old_counters;
- }
- }
-
function outputFeedList($link, $tags = false) {
print "<html><head>
type=\"text/css\" href=\"tt-rss_compact.css\"/>";
}
- print "<script type=\"text/javascript\" src=\"functions.js\"></script>
- <script type=\"text/javascript\" src=\"feedlist.js\"></script>
+ $script_dt_add = get_script_dt_add();
+
+ print "<script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
+ <script type=\"text/javascript\" src=\"feedlist.js?$script_dt_add\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
<!--[if gte IE 5.5000]>
<script type=\"text/javascript\" src=\"pngfix.js\"></script>
}
$result = db_query($link, "SELECT ttrss_feeds.*,
+ SUBSTRING(last_updated,1,19) AS last_updated_noms,
(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
$total_unread = 0;
$category = "";
+
+ $short_date = get_pref($link, 'SHORT_DATE_FORMAT');
while ($line = db_fetch_assoc($result)) {
$total = $line["total"];
$unread = $line["unread"];
+ if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+ $last_updated = smart_date_time(strtotime($line["last_updated_noms"]));
+ } else {
+ $last_updated = date($short_date, strtotime($line["last_updated_noms"]));
+ }
+
$rtl_content = sql_bool_to_bool($line["rtl_content"]);
if ($rtl_content) {
<a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
<a href=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
<span id=\"FCATCTR-$cat_id\"
- class=\"$catctr_class\">($cat_unread unread)$ellipsis</span></a></li>";
+ class=\"$catctr_class\">($cat_unread unread)$ellipsis</span>
+ </a></li>";
// !!! NO SPACE before <ul...feedCatList - breaks firstChild DOM function
// -> keyboard navigation, etc.
}
printFeedEntry($feed_id, $class, $feed, $unread,
- "icons/$feed_id.ico", $link, $rtl_content);
+ "icons/$feed_id.ico", $link, $rtl_content,
+ $last_updated, $line["last_error"]);
++$lnum;
}
if ($op == "rpc") {
-
- $subop = $_GET["subop"];
-
- if ($subop == "setpref") {
- if (WEB_DEMO_MODE) {
- return;
- }
-
- print "<rpc-reply>";
-
- $key = db_escape_string($_GET["key"]);
- $value = db_escape_string($_GET["value"]);
-
- set_pref($link, $key, $value);
-
- print "<param-set key=\"$key\" value=\"$value\"/>";
-
- print "</rpc-reply>";
-
- }
-
- if ($subop == "getLabelCounters") {
- $aid = $_GET["aid"];
- print "<rpc-reply>";
- getLabelCounters($link);
- if ($aid) {
- getFeedCounter($link, $aid);
- }
- print "</rpc-reply>";
- }
-
- if ($subop == "getFeedCounters") {
- print "<rpc-reply>";
- getFeedCounters($link);
- print "</rpc-reply>";
- }
-
- if ($subop == "getAllCounters") {
- print "<rpc-reply>";
- getAllCounters($link);
- print "</rpc-reply>";
- }
-
- if ($subop == "mark") {
- $mark = $_GET["mark"];
- $id = db_escape_string($_GET["id"]);
-
- if ($mark == "1") {
- $mark = "true";
- } else {
- $mark = "false";
- }
-
- // FIXME this needs collision testing
-
- $result = db_query($link, "UPDATE ttrss_user_entries SET marked = $mark
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- }
-
- if ($subop == "updateFeed") {
- $feed_id = db_escape_string($_GET["feed"]);
-
- $result = db_query($link,
- "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'
- AND owner_uid = " . $_SESSION["uid"]);
-
- if (db_num_rows($result) > 0) {
- $feed_url = db_fetch_result($result, 0, "feed_url");
- update_rss_feed($link, $feed_url, $feed_id);
- }
-
- print "<rpc-reply>";
- getFeedCounter($link, $feed_id);
- print "</rpc-reply>";
-
- return;
- }
-
- if ($subop == "forceUpdateAllFeeds" || $subop == "updateAllFeeds") {
-
- if (ENABLE_UPDATE_DAEMON) {
-
- if ($subop == "forceUpdateAllFeeds") {
-
- $result = db_query($link, "SELECT count(id) AS cid FROM
- ttrss_scheduled_updates WHERE feed_id IS NULL AND
- owner_uid = " . $_SESSION["uid"]);
-
- $cid = db_fetch_result($result, 0, "cid");
-
-# print "<rpc-reply>";
-
- if ($cid == 0) {
-
- db_query($link, "INSERT INTO ttrss_scheduled_updates
- (owner_uid, feed_id, entered) VALUES
- (".$_SESSION["uid"].", NULL, NOW())");
-
-// print "<!-- ScheduledOK -->";
-
- } else {
-// print "<!-- RequestAlreadyInQueue -->";
- }
-
-# print "</rpc-reply>";
- }
-
- } else {
- update_all_feeds($link, $subop == "forceUpdateAllFeeds");
- }
-
- $global_unread_caller = sprintf("%d", $_GET["uctr"]);
- $global_unread = getGlobalUnread($link);
-
- print "<rpc-reply>";
-
- if ($global_unread_caller != $global_unread) {
-
- $omode = $_GET["omode"];
-
- if (!$omode) $omode = "tflc";
-
- if (strchr($omode, "l")) getLabelCounters($link);
- if (strchr($omode, "f")) getFeedCounters($link);
- if (strchr($omode, "t")) getTagCounters($link);
- if (strchr($omode, "c")) {
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- getCategoryCounters($link);
- }
- }
- }
-
- getGlobalCounters($link, $global_unread);
-
- print "</rpc-reply>";
-
- }
-
- /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
- if ($subop == "catchupSelected") {
-
- $ids = split(",", db_escape_string($_GET["ids"]));
-
- $cmode = sprintf("%d", $_GET["cmode"]);
-
- foreach ($ids as $id) {
-
- if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
- unread = false,last_read = NOW()
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- } else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
- unread = true
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- } else {
- db_query($link, "UPDATE ttrss_user_entries SET
- unread = NOT unread,last_read = NOW()
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- }
- }
- print "<rpc-reply>";
- getAllCounters($link);
- print "</rpc-reply>";
- }
-
- if ($subop == "markSelected") {
-
- $ids = split(",", db_escape_string($_GET["ids"]));
-
- $cmode = sprintf("%d", $_GET["cmode"]);
-
- foreach ($ids as $id) {
-
- if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
- marked = false
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- } else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
- marked = true
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- } else {
- db_query($link, "UPDATE ttrss_user_entries SET
- marked = NOT marked
- WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- }
- }
- print "<rpc-reply>";
- getAllCounters($link);
- print "</rpc-reply>";
- }
-
- if ($subop == "sanityCheck") {
- if (sanity_check($link)) {
- print "<error error-code=\"0\"/>";
- }
- }
-
- if ($subop == "globalPurge") {
-
- print "<rpc-reply>";
- global_purge_old_posts($link, true);
- print "</rpc-reply>";
-
- }
-
+ handle_rpc_request($link);
}
if ($op == "feeds") {
if ($rtl_content) {
$rtl_tag = "dir=\"RTL\"";
+ $rtl_class = "RTL";
} else {
$rtl_tag = "";
+ $rtl_class = "";
}
$result = db_query($link, "UPDATE ttrss_user_entries
num_comments,
author
FROM ttrss_entries,ttrss_user_entries
- WHERE id = '$id' AND ref_id = id");
+ WHERE id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"]);
print "<html><head>
<title>Tiny Tiny RSS : Article $id</title>
type=\"text/css\" href=\"tt-rss_compact.css\"/>";
}
- print "<script type=\"text/javascript\" src=\"functions.js\"></script>
+ $script_dt_add = get_script_dt_add();
+
+ print "<script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
</head><body $rtl_tag>";
$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
strtotime($line["updated"]));
- print "<td class=\"postDate\">$parsed_updated</td>";
+ print "<td class=\"postDate$rtl_class\">$parsed_updated</td>";
print "</tr>";
if ($op == "viewfeed") {
- $feed = $_GET["feed"];
- $skip = $_GET["skip"];
- $subop = $_GET["subop"];
- $view_mode = $_GET["view"];
- $limit = $_GET["limit"];
- $cat_view = $_GET["cat"];
+ $feed = db_escape_string($_GET["feed"]);
+ $skip = db_escape_string($_GET["skip"]);
+ $subop = db_escape_string($_GET["subop"]);
+ $view_mode = db_escape_string($_GET["view"]);
+ $limit = db_escape_string($_GET["limit"]);
+ $cat_view = db_escape_string($_GET["cat"]);
+ $next_unread_feed = db_escape_string($_GET["nuf"]);
if (!$skip) $skip = 0;
type=\"text/css\" href=\"tt-rss_compact.css\"/>";
}
- $result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
- WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+ if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+ update_generic_feed($link, $feed, $cat_view);
+ }
- if (db_num_rows($result) == 1) {
- $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
- } else {
- $rtl_content = false;
+ if ($subop == "MarkAllRead") {
+ catchup_feed($link, $feed, $cat_view);
+
+ if (get_pref($link, 'ON_CATCHUP_SHOW_NEXT_FEED')) {
+ if ($next_unread_feed) {
+ $feed = $next_unread_feed;
+ }
+ }
}
- if ($rtl_content) {
- $rtl_tag = "dir=\"RTL\"";
+ if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
+
+ $result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
+ WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($result) == 1) {
+ $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
+ } else {
+ $rtl_content = false;
+ }
+
+ if ($rtl_content) {
+ $rtl_tag = "dir=\"RTL\"";
+ } else {
+ $rtl_tag = "";
+ }
} else {
$rtl_tag = "";
+ $rtl_content = false;
}
+ $script_dt_add = get_script_dt_add();
+
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
- <script type=\"text/javascript\" src=\"functions.js\"></script>
- <script type=\"text/javascript\" src=\"viewfeed.js\"></script>
+ <script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
+ <script type=\"text/javascript\" src=\"viewfeed.js?$script_dt_add\"></script>
<!--[if gte IE 5.5000]>
<script type=\"text/javascript\" src=\"pngfix.js\"></script>
<link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss-ie.css\">
window.onload = init;
</script>";
- if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
-
-/* if (ENABLE_UPDATE_DAEMON) {
-
- if ($cid == 0) {
-
- db_query($link, "INSERT INTO ttrss_scheduled_updates
- (owner_uid, feed_id, entered) VALUES
- (".$_SESSION["uid"].", '$feed', NOW())");
- }
-
- } else {
- // fixme update_rss_feed...
- } */
-
- if ($cat_view) {
-
- if ($feed > 0) {
- $cat_qpart = "cat_id = '$feed'";
- } else {
- $cat_qpart = "cat_id IS NULL";
- }
-
- $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
- WHERE $cat_qpart AND owner_uid = " . $_SESSION["uid"]);
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- $feed_url = $tmp_line["feed_url"];
- update_rss_feed($link, $feed_url, $feed, ENABLE_UPDATE_DAEMON);
- }
-
- } else {
- $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
- WHERE id = '$feed'");
- $feed_url = db_fetch_result($tmp_result, 0, "feed_url");
- update_rss_feed($link, $feed_url, $feed, ENABLE_UPDATE_DAEMON);
- }
- }
-
- if ($subop == "MarkAllRead") {
-
- if (preg_match("/^[0-9][0-9]*$/", $feed) != false && $feed >= 0) {
-
- if ($cat_view) {
-
- if ($feed > 0) {
- $cat_qpart = "cat_id = '$feed'";
- } else {
- $cat_qpart = "cat_id IS NULL";
- }
-
- $tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = " .
- $_SESSION["uid"]);
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
-
- $tmp_feed = $tmp_line["id"];
-
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE feed_id = '$tmp_feed' AND owner_uid = " . $_SESSION["uid"]);
- }
-
- } else if ($feed > 0) {
-
- $tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE parent_feed = '$feed'
- ORDER BY cat_id,title");
-
- $parent_ids = array();
-
- if (db_num_rows($tmp_result) > 0) {
- while ($p = db_fetch_assoc($tmp_result)) {
- array_push($parent_ids, "feed_id = " . $p["id"]);
- }
-
- $children_qpart = implode(" OR ", $parent_ids);
-
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE (feed_id = '$feed' OR $children_qpart)
- AND owner_uid = " . $_SESSION["uid"]);
-
- } else {
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE feed_id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
- }
-
- } else if ($feed < 0 && $feed > -10) { // special, like starred
-
- if ($feed == -1) {
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE marked = true AND owner_uid = ".$_SESSION["uid"]);
- }
-
- } else if ($feed < -10) { // label
-
- // TODO make this more efficient
-
- $label_id = -$feed - 11;
-
- $tmp_result = db_query($link, "SELECT sql_exp FROM ttrss_labels
- WHERE id = '$label_id'");
-
- if ($tmp_result) {
- $sql_exp = db_fetch_result($tmp_result, 0, "sql_exp");
-
- db_query($link, "BEGIN");
-
- $tmp2_result = db_query($link,
- "SELECT
- int_id
- FROM
- ttrss_user_entries,ttrss_entries
- WHERE
- ref_id = id AND
- $sql_exp AND
- owner_uid = " . $_SESSION["uid"]);
-
- while ($tmp_line = db_fetch_assoc($tmp2_result)) {
- db_query($link, "UPDATE
- ttrss_user_entries
- SET
- unread = false, last_read = NOW()
- WHERE
- int_id = " . $tmp_line["int_id"]);
- }
-
- db_query($link, "COMMIT");
-
-/* db_query($link, "UPDATE ttrss_user_entries,ttrss_entries
- SET unread = false,last_read = NOW()
- WHERE $sql_exp
- AND ref_id = id
- AND owner_uid = ".$_SESSION["uid"]); */
- }
- }
- } else { // tag
- db_query($link, "BEGIN");
-
- $tag_name = db_escape_string($feed);
-
- $result = db_query($link, "SELECT post_int_id FROM ttrss_tags
- WHERE tag_name = '$tag_name' AND owner_uid = " . $_SESSION["uid"]);
-
- while ($line = db_fetch_assoc($result)) {
- db_query($link, "UPDATE ttrss_user_entries SET
- unread = false, last_read = NOW()
- WHERE int_id = " . $line["post_int_id"]);
- }
- db_query($link, "COMMIT");
- }
-
- }
-
$search = db_escape_string($_GET["search"]);
$search_mode = db_escape_string($_GET["smode"]);
$feed_title = "?";
}
+ $feed_title = db_unescape_string($feed_title);
+
if ($feed < -10) error_reporting (0);
print "<div id=\"headlinesContainer\">";
print "<div class=\"cdmHeader\">";
- print "<div style=\"float : right\">$updated_fmt</div>";
+ print "<div style=\"float : right\">$updated_fmt,
+ <a class=\"cdmToggleLink\"
+ href=\"javascript:toggleUnread($id)\">Toggle unread</a>
+ </div>";
- print "<a target=\"new\" href=\"".$line["link"]."\">".$line["title"]."</a>";
+ print "<a class=\"title\"
+ onclick=\"javascript:toggleUnread($id, 0)\"
+ target=\"new\" href=\"".$line["link"]."\">".$line["title"]."</a>";
if ($line["feed_title"]) {
print " (<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
print "</div>";
print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div>";
-
+
print "<div style=\"float : right\">$marked_pic</div>
- <div class=\"cdmFooter\">
+ <div lass=\"cdmFooter\">
<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"></div>";
+# print "<div align=\"center\"><a class=\"cdmToggleLink\"
+# href=\"javascript:toggleUnread($id)\">
+# Toggle unread</a></div>";
+
print "</div>";
}
print "Feed browser is administratively disabled.";
return;
}
+
+ print "<div id=\"infoBoxTitle\">Other feeds: Top 25</div>";
print "<div class=\"infoBoxContents\">";
- print "<h1>Feed browser</h1>";
-
- print "<p>Showing top 50 registered feeds, sorted by popularity:</p>";
+ print "<p>Showing top 25 registered feeds, sorted by popularity:</p>";
$result = db_query($link, "SELECT feed_url,count(id) AS subscribers
FROM ttrss_feeds
WHERE auth_login = '' AND auth_pass = '' AND private = false
- GROUP BY feed_url ORDER BY subscribers DESC LIMIT 50");
+ GROUP BY feed_url ORDER BY subscribers DESC LIMIT 25");
print "<ul class='browseFeedList' id='browseFeedList'>";
$title = htmlspecialchars(db_unescape_string(db_fetch_result($result,
0, "title")));
- print "<div class=\"infoBoxContents\">";
-
$icon_file = ICONS_DIR . "/$feed_id.ico";
if (file_exists($icon_file) && filesize($icon_file) > 0) {
} else {
$feed_icon = "";
}
-
- print "<h1>$feed_icon $title</h1>";
- print "<table width='100%'>";
+ print "<div id=\"infoBoxTitle\">Feed editor</div>";
+
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"edit_feed_form\">";
- $row_class = "odd";
+ print "<input type=\"hidden\" name=\"id\" value=\"$feed_id\">";
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
- print "<tr class='$row_class'><td>Title:</td>";
- print "<td><input id=\"iedit_title\" value=\"$title\"></td></tr>";
+ print "<table width='100%'>";
+
+ print "<tr><td>Title:</td>";
+ print "<td><input class=\"iedit\" name=\"title\" value=\"$title\"></td></tr>";
$feed_url = db_fetch_result($result, 0, "feed_url");
$feed_url = htmlspecialchars(db_unescape_string(db_fetch_result($result,
0, "feed_url")));
- $row_class = toggleEvenOdd($row_class);
-
- print "<tr class='$row_class'><td>Feed URL:</td>";
- print "<td><input id=\"iedit_link\" value=\"$feed_url\"></td></tr>";
+
+ print "<tr><td>Feed URL:</td>";
+ print "<td><input class=\"iedit\" name=\"feed_url\" value=\"$feed_url\"></td></tr>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
$cat_id = db_fetch_result($result, 0, "cat_id");
- $row_class = toggleEvenOdd($row_class);
-
- print "<tr class='$row_class'><td>Category:</td>";
+ print "<tr><td>Category:</td>";
print "<td>";
- print "<select id=\"iedit_fcat\">";
- print "<option id=\"0\">Uncategorized</option>";
-
- $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
- if (db_num_rows($tmp_result) > 0) {
- print "<option disabled>--------</option>";
- }
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["id"] == $cat_id) {
- $is_selected = "selected";
- } else {
- $is_selected = "";
- }
- printf("<option $is_selected id='%d'>%s</option>",
- $tmp_line["id"], $tmp_line["title"]);
- }
+ print_feed_cat_select($link, "cat_id", $cat_id);
- print "</select></td>";
+ print "</td>";
print "</td></tr>";
}
$update_interval = db_fetch_result($result, 0, "update_interval");
- $row_class = toggleEvenOdd($row_class);
- print "<tr class='$row_class'><td>Update Interval:</td>";
-// print "<td><input id=\"iedit_updintl\"
-// value=\"$update_interval\"></td></tr>";
+ print "<tr><td>Update Interval:</td>";
print "<td>";
- print "<select id=\"iedit_updintl\">";
+ print "<select name=\"update_interval\">";
foreach (array_keys($update_intervals) as $i) {
} else {
$selected = "";
}
- print "<option $selected id=\"$i\">" . $update_intervals[$i] . "</option>";
+ print "<option $selected value=\"$i\">" . $update_intervals[$i] . "</option>";
}
print "</select>";
print "</td>";
- $row_class = toggleEvenOdd($row_class);
- print "<tr class='$row_class'><td>Link to:</td>";
+ print "<tr><td>Link to:</td><td>";
$tmp_result = db_query($link, "SELECT COUNT(id) AS count
FROM ttrss_feeds WHERE parent_feed = '$feed_id'");
$disabled = "disabled";
}
- print "<select $disabled id=\"iedit_parent_feed\">";
+ print "<select $disabled name=\"parent_feed\">";
- print "<option id=\"0\">Not linked</option>";
+ print "<option value=\"0\">Not linked</option>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
if ($cat_id) {
} else {
$is_selected = "";
}
- printf("<option $is_selected id='%d'>%s</option>",
+ printf("<option $is_selected value='%d'>%s</option>",
$tmp_line["id"], $tmp_line["title"]);
}
- print "</select></td>";
- print "</td></tr>";
+ print "</select>";
+ print "</td></tr>";
$purge_interval = db_fetch_result($result, 0, "purge_interval");
- $row_class = toggleEvenOdd($row_class);
- print "<tr class='$row_class'><td>Purge Days:</td>";
-// print "<td><input id=\"iedit_purgintl\"
-// value=\"$purge_interval\"></td></tr>";
+ print "<tr><td>Article purging:</td>";
print "<td>";
- print "<select id=\"iedit_purgintl\">";
+ print "<select name=\"purge_interval\">";
foreach (array_keys($purge_intervals) as $i) {
} else {
$selected = "";
}
- print "<option $selected id=\"$i\">" . $purge_intervals[$i] . "</option>";
+ print "<option $selected value=\"$i\">" . $purge_intervals[$i] . "</option>";
}
print "</select>";
print "</td>";
-// print "<tr><td colspan=\"2\"><b>Authentication</b></td></tr>";
-
- $row_class = toggleEvenOdd($row_class);
$auth_login = db_fetch_result($result, 0, "auth_login");
- print "<tr class='$row_class'><td>Login:</td>";
- print "<td><input id=\"iedit_login\"
- value=\"$auth_login\"></td></tr>";
+ print "<tr><td>Login:</td>";
+ print "<td><input class=\"iedit\" name=\"auth_login\" value=\"$auth_login\"></td></tr>";
- $row_class = toggleEvenOdd($row_class);
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- print "<tr class='$row_class'><td>Password:</td>";
- print "<td><input type=\"password\" id=\"iedit_pass\"
+ print "<tr><td>Password:</td>";
+ print "<td><input class=\"iedit\" type=\"password\" name=\"auth_pass\"
value=\"$auth_pass\"></td></tr>";
- $row_class = toggleEvenOdd($row_class);
$private = sql_bool_to_bool(db_fetch_result($result, 0, "private"));
if ($private) {
$checked = "";
}
- print "<tr class='$row_class'><td valign='top'>Options:</td>";
- print "<td><input type=\"checkbox\" id=\"iedit_private\"
- $checked><label for=\"iedit_private\">Hide from feed browser</label>";
+ print "<tr><td valign='top'>Options:</td>";
+ print "<td><input type=\"checkbox\" name=\"private\" id=\"private\"
+ $checked><label for=\"private\">Hide from feed browser</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
$checked = "";
}
- print "<br><input type=\"checkbox\" id=\"iedit_rtl\"
- $checked><label for=\"iedit_rtl\">Right-to-left content</label>";
+ print "<br><input type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
+ $checked><label for=\"rtl_content\">Right-to-left content</label>";
print "</td></tr>";
print "</table>";
+
+ print "</form>";
+
print "</div>";
print "<div align='center'>
}
if ($subop == "editSave") {
- $feed_title = db_escape_string($_POST["t"]);
- $feed_link = db_escape_string($_POST["l"]);
- $upd_intl = db_escape_string($_POST["ui"]);
- $purge_intl = db_escape_string($_POST["pi"]);
- $feed_id = db_escape_string($_POST["id"]);
- $cat_id = db_escape_string($_POST["catid"]);
- $auth_login = db_escape_string($_POST["login"]);
- $auth_pass = db_escape_string($_POST["pass"]);
- $parent_feed = db_escape_string($_POST["pfeed"]);
- $private = db_escape_string($_POST["is_pvt"]);
- $rtl_content = db_escape_string($_POST["is_rtl"]);
-
- if (strtoupper($upd_intl) == "DEFAULT")
- $upd_intl = 0;
-
- if (strtoupper($upd_intl) == "DISABLED")
- $upd_intl = -1;
-
- if (strtoupper($purge_intl) == "DEFAULT")
- $purge_intl = 0;
- if (strtoupper($purge_intl) == "DISABLED")
- $purge_intl = -1;
-
- if ($cat_id != 0) {
+ $feed_title = db_escape_string(trim($_POST["title"]));
+ $feed_link = db_escape_string(trim($_POST["feed_url"]));
+ $upd_intl = db_escape_string($_POST["update_interval"]);
+ $purge_intl = db_escape_string($_POST["purge_interval"]);
+ $feed_id = db_escape_string($_POST["id"]);
+ $cat_id = db_escape_string($_POST["cat_id"]);
+ $auth_login = db_escape_string(trim($_POST["auth_login"]));
+ $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
+ $parent_feed = db_escape_string($_POST["parent_feed"]);
+ $private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
+ $rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
+
+ if ($cat_id && $cat_id != 0) {
$category_qpart = "cat_id = '$cat_id'";
} else {
$category_qpart = 'cat_id = NULL';
}
- if ($parent_feed != 0) {
+ if ($parent_feed && $parent_feed != 0) {
$parent_qpart = "parent_feed = '$parent_feed'";
} else {
$parent_qpart = 'parent_feed = NULL';
}
if ($subop == "saveCat") {
- $cat_title = db_escape_string($_GET["title"]);
+ $cat_title = db_escape_string(trim($_GET["title"]));
$cat_id = db_escape_string($_GET["id"]);
$result = db_query($link, "UPDATE ttrss_feed_categories SET
$feed_link = db_escape_string(trim($_GET["link"]));
$cat_id = db_escape_string($_GET["cid"]);
- if ($cat_id == "0" || !$cat_id) {
- $cat_qpart = "NULL";
- } else {
- $cat_qpart = "'$cat_id'";
- }
-
- $result = db_query($link,
- "SELECT id FROM ttrss_feeds
- WHERE feed_url = '$feed_link' AND owner_uid = ".$_SESSION["uid"]);
-
- if (db_num_rows($result) == 0) {
-
- $result = db_query($link,
- "INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id)
- VALUES ('".$_SESSION["uid"]."', '$feed_link',
- '[Unknown]', $cat_qpart)");
-
- $result = db_query($link,
- "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'
- AND owner_uid = " . $_SESSION["uid"]);
-
- $feed_id = db_fetch_result($result, 0, "id");
-
- if ($feed_id) {
- update_rss_feed($link, $feed_link, $feed_id, true);
- }
+ if (subscribe_to_feed($link, $feed_link, $cat_id)) {
+ print "Added feed.";
} else {
-
print "<div class=\"warning\">
Feed <b>$feed_link</b> already exists in the database.
</div>";
// onclick=\"javascript:hideParentElement(this);\" src=\"images/close.png\">";
print "<a href=\"javascript:showBlockElement('feedUpdateErrors')\">
- <b>Feeds with update errors</b> (click to expand)</a>";
+ <b>Some feeds have update errors (click for details)</b></a>";
print "<ul id=\"feedUpdateErrors\" class=\"nomarks\">";
cellspacing='0' cellpadding='0'><tr>
<td>
<input id=\"fadd_link\"
- onchange=\"javascript:addFeed()\"
- size=\"40\">
+ onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
+ size=\"40\">
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:addFeed()\" value=\"Add feed\">";
+ disabled=\"true\" id=\"fadd_submit_btn\"
+ onclick=\"addFeed()\" value=\"Subscribe\">";
- if (ENABLE_FEED_BROWSER) {
- print " (<a href='javascript:browseFeeds()'>Top 50</a>)";
+ if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
+ print " <input type=\"submit\" class=\"button\"
+ onclick=\"javascript:browseFeeds()\" value=\"Top 25\">";
}
print "</td><td align='right'>
<input id=\"feed_search\" size=\"20\"
- onchange=\"javascript:updateFeedList()\"
- value=\"$feed_search\">
+ onchange=\"javascript:updateFeedList()\" value=\"$feed_search\">
<input type=\"submit\" class=\"button\"
onclick=\"javascript:updateFeedList()\" value=\"Search\">
</td>
class=\"prefFeedList\" id=\"prefFeedList\">";
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
- <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedList',
- 'FEEDR-', 'FRCHK-', true)\">All</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedList',
- 'FEEDR-', 'FRCHK-', false)\">None</a>
+ <a href=\"javascript:selectPrefRows('feed', true)\">All</a>,
+ <a href=\"javascript:selectPrefRows('feed', false)\">None</a>
</td</tr>";
if (!get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr class=\"title\">
<td width='5%' align='center'> </td>
- <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
- <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
- <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Interval</a></td></tr>";
+ <td width='40%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+ <td width='45%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+ <td width='15%' align='right'><a href=\"javascript:updateFeedList('last_updated')\">Updated</a></td>";
}
$lnum = 0;
$edit_title = htmlspecialchars(db_unescape_string($line["title"]));
$edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
$edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
-
-// if ($line["update_interval"] == "0") $line["update_interval"] = "Default";
-// if ($line["update_interval"] == "-1") $line["update_interval"] = "Disabled";
-// if ($line["purge_interval"] == "0") $line["purge_interval"] = "Default";
-// if ($line["purge_interval"] < 0) $line["purge_interval"] = "Disabled";
if (!$edit_cat) $edit_cat = "Uncategorized";
+ $last_updated = $line["last_updated"];
+
+ if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+ $last_updated = smart_date_time(strtotime($last_updated));
+ } else {
+ $short_date = get_pref($link, 'SHORT_DATE_FORMAT');
+ $last_updated = date($short_date, strtotime($last_updated));
+ }
+
if (get_pref($link, 'ENABLE_FEED_CATS') && $cur_cat_id != $cat_id) {
$lnum = 0;
print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
print "<tr class=\"title\">
- <td width='5%' align='center'> </td>
- <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
- <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
- <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Interval</a></td></tr>";
+ <td width='5%'> </td>";
+
+ if (get_pref($link, 'ENABLE_FEED_ICONS')) {
+ print "<td width='3%'> </td>";
+ }
+
+ print "<td width='40%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+ <td width='45%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+ <td width='15%' align='right'><a href=\"javascript:updateFeedList('last_updated')\">Updated</a></td>";
$cur_cat_id = $cat_id;
}
} else {
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
-// print "<td class='feedIcon'>$feed_icon</td>";
-
- print "<td class='feedSelect'><input onclick='toggleSelectRow(this);'
+
+ print "<td class='feedSelect'><input onclick='toggleSelectPrefRow(this, \"feed\");'
type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
+ if (get_pref($link, 'ENABLE_FEED_ICONS')) {
+ print "<td class='feedIcon'>$feed_icon</td>";
+ }
+
$edit_title = truncate_string($edit_title, 40);
$edit_link = truncate_string($edit_link, 60);
}
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- "$feed_icon $edit_title $parent_title" . "</a></td>";
+ "$edit_title $parent_title" . "</a></td>";
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
$edit_link . "</a></td>";
-/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_cat . "</a></td>";
- } */
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $update_intervals[$line["update_interval"]] . "</a></td>";
+ print "<td align='right'><a href=\"javascript:editFeed($feed_id);\">" .
+ "$last_updated</a></td>";
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $purge_intervals[$line["purge_interval"]] . "</a></td>";
-
print "</tr>";
++$lnum;
print "</table>";
- print "<p>";
+ print "<p><span id=\"feedOpToolbar\">";
if ($subop == "edit") {
print "Edit feed:
print "
Selection:
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:selectedFeedDetails()\" value=\"Details\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
+ onclick=\"javascript:removeSelectedFeeds()\" value=\"Unsubscribe\">";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print " ";
-
- $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
- WHERE owner_uid = ".$_SESSION["uid"]."
- ORDER BY title");
-
- print "<select id=\"sfeed_set_fcat\">";
- print "<option id=\"0\">Uncategorized</option>";
-
- if (db_num_rows($result) != 0) {
-
- print "<option disabled>--------</option>";
-
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>",
- $line["id"], $line["title"]);
- }
- }
-
- print "</select>";
+ print " | ";
- print " <input type=\"submit\" class=\"button\"
- onclick=\"javascript:categorizeSelectedFeeds()\" value=\"Set category\">";
+ print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
- }
+ print " <input type=\"submit\" class=\"button\" disabled=\"true\"
+ onclick=\"javascript:categorizeSelectedFeeds()\" value=\"Recategorize\">";
- if (get_pref($link, 'ENABLE_PREFS_CATCHUP_UNCATCHUP')) {
- print "
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:readSelectedFeeds(true)\" value=\"Mark as read\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:readSelectedFeeds(false)\"
- value=\"Mark as unread\"> ";
}
- print "
+ print "</span>
All feeds: <input type=\"submit\"
class=\"button\" onclick=\"gotoExportOpml()\"
value=\"Export OPML\">";
print "<h3>Edit Categories</h3>";
- // print "<h3>Categories</h3>";
-
print "<div class=\"prefGenericAddBox\">
<input id=\"fadd_cat\"
- onchange=\"javascript:addFeedCat()\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
size=\"40\">
<input
- type=\"submit\" class=\"button\"
- onclick=\"javascript:addFeedCat()\" value=\"Add category\"></div>";
+ type=\"submit\" class=\"button\" disabled=\"true\" id=\"catadd_submit_btn\"
+ onclick=\"javascript:addFeedCat()\" value=\"Create category\"></div>";
$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
WHERE owner_uid = ".$_SESSION["uid"]."
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
- <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedCatList',
- 'FCATR-', 'FCCHK-', true)\">All</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('prefFeedCatList',
- 'FCATR-', 'FCCHK-', false)\">None</a>
+ <a href=\"javascript:selectPrefRows('fcat', true)\">All</a>,
+ <a href=\"javascript:selectPrefRows('fcat', false)\">None</a>
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\"></td><td width=\"80%\">Title</td>
+ <td width=\"5%\"> </td><td width=\"80%\">Title</td>
</tr>";
$lnum = 0;
if (!$edit_cat_id || $subop != "editCat") {
- print "<td align='center'><input onclick='toggleSelectRow(this);'
- type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"fcat\");'
+ type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFeedCat($cat_id);\">" .
$edit_title . "</a></td>";
print "</table>";
- print "<p>";
+ print "<p id=\"catOpToolbar\">";
if ($subop == "editCat") {
print "Edit category:
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\"
onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\"
onclick=\"javascript:feedCatEditSave()\" value=\"Save\">";
} else {
print "
Selection:
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedFeedCat()\" value=\"Edit\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:removeSelectedFeedCats()\" value=\"Remove\">";
}
if ($subop == "editSave") {
- $regexp = db_escape_string($_GET["r"]);
- $descr = db_escape_string($_GET["d"]);
- $match = db_escape_string($_GET["m"]);
+ $regexp = db_escape_string(trim($_GET["r"]));
+ $match = db_escape_string(trim($_GET["m"]));
$filter_id = db_escape_string($_GET["id"]);
$feed_id = db_escape_string($_GET["fid"]);
$action_id = db_escape_string($_GET["aid"]);
$result = db_query($link, "UPDATE ttrss_filters SET
reg_exp = '$regexp',
- description = '$descr',
feed_id = $feed_id,
action_id = '$action_id',
filter_type = (SELECT id FROM ttrss_filter_types WHERE
if ($quiet) return;
+ print "<div id=\"infoBoxShadow\">
+ <div id=\"infoBox\">PLACEHOLDER</div></div>";
+
$result = db_query($link, "SELECT description
FROM ttrss_filter_types ORDER BY description");
array_push($filter_types, $line["description"]);
}
- print "<div class=\"prefGenericAddBox\">
- <input id=\"fadd_regexp\" size=\"40\"> ";
-
- print_select("fadd_match", "Title", $filter_types);
-
- print " <select id=\"fadd_feed\">";
-
- print "<option selected id=\"0\">All feeds</option>";
-
- $result = db_query($link, "SELECT id,title FROM ttrss_feeds
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($result) > 0) {
- print "<option disabled>--------</option>";
- }
-
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>", $line["id"], $line["title"]);
- }
-
- print "</select> ";
-
- print " Action: ";
-
- print "<select id=\"fadd_action\">";
-
- $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
- ORDER BY name");
-
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>", $line["id"], $line["description"]);
- }
-
- print "</select> ";
-
-/* print "<input type=\"submit\"
- class=\"button\" onclick=\"javascript:testFilter()\"
- value=\"Test filter\"> "; */
-
print "<input type=\"submit\"
- class=\"button\" onclick=\"javascript:addFilter()\"
- value=\"Add filter\">";
-
- print "</div>";
+ class=\"button\"
+ onclick=\"javascript:displayDlg('quickAddFilter', false)\"
+ value=\"Create filter\">";
$result = db_query($link, "SELECT
ttrss_filters.id AS id,reg_exp,
- ttrss_filters.description AS description,
ttrss_filter_types.name AS filter_type_name,
ttrss_filter_types.description AS filter_type_descr,
feed_id,
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
- <a href=\"javascript:selectTableRowsByIdPrefix('prefFilterList',
- 'FILRR-', 'FICHK-', true)\">All</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('prefFilterList',
- 'FILRR-', 'FICHK-', false)\">None</a>
+ <a href=\"javascript:selectPrefRows('filter', true)\">All</a>,
+ <a href=\"javascript:selectPrefRows('filter', false)\">None</a>
</td</tr>";
print "<tr class=\"title\">
<td width=\"20%\">Filter expression</td>
<td width=\"20%\">Feed</td>
<td width=\"15%\">Match</td>
- <td width=\"15%\">Action</td>
- <td width=\"30%\">Description</td></tr>";
-
+ <td width=\"15%\">Action</td>";
+
$lnum = 0;
while ($line = db_fetch_assoc($result)) {
print "<tr class=\"$class\" $this_row_id>";
$line["regexp"] = htmlspecialchars($line["reg_exp"]);
- $line["description"] = htmlspecialchars($line["description"]);
if (!$line["feed_title"]) $line["feed_title"] = "All feeds";
if (!$edit_filter_id || $subop != "edit") {
- if (!$line["description"]) $line["description"] = "[No description]";
-
- print "<td align='center'><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");'
type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["action_description"] . "</td>";
-
- print "<td><a href=\"javascript:editFilter($filter_id);\">" .
- $line["description"] . "</td>";
} else if ($filter_id != $edit_filter_id) {
if (!$line["description"]) $line["description"] = "[No description]";
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"FICHK-".$line["id"]."\"></td>";
print "<td>".$line["reg_exp"]."</td>";
print "<td>".$line["feed_title"]."</td>";
print "<td>".$line["filter_type_descr"]."</td>";
print "<td>".$line["action_description"]."</td>";
- print "<td>".$line["description"]."</td>";
} else {
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked></td>";
print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
"\"></td>";
- print "<td>";
- print "<select id=\"iedit_feed\">";
- print "<option id=\"0\">All feeds</option>";
-
- $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feeds
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($tmp_result) > 0) {
- print "<option disabled>--------</option>";
- }
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["id"] == $line["feed_id"]) {
- $is_selected = "selected";
- } else {
- $is_selected = "";
- }
- printf("<option $is_selected id='%d'>%s</option>",
- $tmp_line["id"], $tmp_line["title"]);
- }
-
- print "</select></td>";
-
+ print "<td>";
+ print_feed_select($link, "iedit_feed", $line["feed_id"]);
+ print "</td>";
+
print "<td>";
print_select("iedit_match", $line["filter_type_descr"], $filter_types);
print "</td>";
print "</select></td>";
-
- print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
- "\"></td>";
-
print "</td>";
}
print "</table>";
- print "<p>";
+ print "<p id=\"filterOpToolbar\">";
if ($subop == "edit") {
print "Edit filter:
print "
Selection:
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedFilter()\" value=\"Edit\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:removeSelectedFilters()\" value=\"Remove\">";
}
if ($subop == "test") {
- $expr = $_GET["expr"];
- $descr = $_GET["descr"];
+ $expr = trim($_GET["expr"]);
+ $descr = trim($_GET["descr"]);
+
+ print "<div id=\"infoBoxTitle\">Test label: $descr</div>";
print "<div class='infoBoxContents'>";
- print "<h1>Label «$descr»</h1>";
+# print "<h1>Label «$descr»</h1>";
// print "<p><b>Expression</b>: $expr</p>";
if ($num_matches > 0) {
- print "<p>Query returned <b>$num_matches</b> matches, first 5 follow:</p>";
+ print "<p>Query returned <b>$num_matches</b> matches, showing first 15:</p>";
$result = db_query($link,
"SELECT title,
WHERE ($expr) AND
ttrss_user_entries.ref_id = ttrss_entries.id
AND owner_uid = " . $_SESSION["uid"] . "
- ORDER BY date_entered DESC LIMIT 5");
+ ORDER BY date_entered DESC LIMIT 15");
- print "<ul class=\"nomarks\">";
+ print "<ul class=\"filterTestResults\">";
+
+ $row_class = "even";
+
while ($line = db_fetch_assoc($result)) {
- print "<li>".$line["title"].
+ $row_class = toggleEvenOdd($row_class);
+
+ print "<li class=\"$row_class\">".$line["title"].
" <span class=\"insensitive\">(".$line["feed_title"].")</span></li>";
}
print "</ul>";
if ($subop == "editSave") {
- $sql_exp = $_GET["s"];
- $descr = $_GET["d"];
+ $sql_exp = trim($_GET["s"]);
+ $descr = trim($_GET["d"]);
$label_id = db_escape_string($_GET["id"]);
// print "$sql_exp : $descr : $label_id";
}
print "<div class=\"prefGenericAddBox\">
- <input size=\"40\" id=\"ladd_expr\"> ";
+ <input size=\"40\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'label_create_btn')\"
+ id=\"ladd_expr\"> ";
print"<input type=\"submit\" class=\"button\"
- onclick=\"javascript:addLabel()\" value=\"Add label\"></div>";
+ disabled=\"true\" id=\"label_create_btn\"
+ onclick=\"javascript:addLabel()\" value=\"Create label\"></div>";
$result = db_query($link, "SELECT
id,sql_exp,description
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
- <a href=\"javascript:selectTableRowsByIdPrefix('prefLabelList',
- 'LILRR-', 'LICHK-', true)\">All</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('prefLabelList',
- 'LILRR-', 'LICHK-', false)\">None</a>
+ <a href=\"javascript:selectPrefRows('label', true)\">All</a>,
+ <a href=\"javascript:selectPrefRows('label', false)\">None</a>
</td</tr>";
print "<tr class=\"title\">
- <td align='center' width=\"5%\"> </td>
+ <td width=\"5%\"> </td>
<td width=\"40%\">SQL expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
if (!$line["description"]) $line["description"] = "[No caption]";
- print "<td align='center'><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"label\");'
type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editLabel($label_id);\">" .
if (!$line["description"]) $line["description"] = "[No description]";
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"LICHK-".$line["id"]."\"></td>";
print "<td>".$line["sql_exp"]."</td>";
} else {
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked></td>";
print "<td><input id=\"iedit_expr\" value=\"".$line["sql_exp"].
"\"></td>";
print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
- "\"></td>";
-
+ "\"></td>";
}
print "</table>";
- print "<p>";
+ print "<p id=\"labelOpToolbar\">";
if ($subop == "edit") {
print "Edit label:
<input type=\"submit\" class=\"button\"
onclick=\"javascript:labelEditCancel()\" value=\"Cancel\">";
- } else {
-
+ } else {
print "
Selection:
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedLabel()\" value=\"Edit\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
}
} else {
print "<html><head>
<title>Tiny Tiny RSS : Help</title>
<link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
- <script type=\"text/javascript\" src=\"functions.js\"></script>
+ <script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
</head><body>";
}
$tid = sprintf("%d", $_GET["tid"]);
+ print "<div id=\"infoBoxTitle\">Help</div>";
+
print "<div class='infoBoxContents'>";
if (file_exists("help/$tid.php")) {
$param = $_GET["param"];
if ($id == "quickAddFeed") {
- print "
- Feed URL: <input
- onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
- id=\"qafInput\">";
+
+ print "<div id=\"infoBoxTitle\">Subscribe to feed</div>";
+ print "<div class=\"infoBoxContents\">";
+
+ print "<table width='100%'>
+ <tr><td>Feed URL:</td><td>
+ <input onblur=\"javascript:enableHotkeys()\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
+ onfocus=\"javascript:disableHotkeys()\" id=\"qafInput\"></td></tr>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<tr><td>Category:</td><td>";
+
$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
WHERE owner_uid = ".$_SESSION["uid"]."
ORDER BY title");
- print " <select id=\"qafCat\">";
+ print "<select id=\"qafCat\">";
print "<option id=\"0\">Uncategorized</option>";
if (db_num_rows($result) != 0) {
}
print "</select>";
+ print "</td></tr>";
}
- print " <input class=\"button\"
- type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Add feed\">
- <input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeDlg()\"
- value=\"Cancel\">";
+ print "<tr><td colspan='2' align='right'>
+ <input class=\"button\"
+ id=\"fadd_submit_btn\" disabled=\"true\"
+ type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Subscribe\">
+ <input class=\"button\"
+ type=\"submit\" onclick=\"javascript:closeInfoBox()\"
+ value=\"Cancel\"></td></tr></table>";
}
if ($id == "quickDelFeed") {
<input class=\"button\"
type=\"submit\" onclick=\"javascript:qfdDelete($param)\" value=\"Remove\">
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeDlg()\"
+ type=\"submit\" onclick=\"javascript:closeInfoBox()\"
value=\"Cancel\">";
} else {
print "Error: Feed $param not found.
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeDlg()\"
+ type=\"submit\" onclick=\"javascript:closeInfoBox()\"
value=\"Cancel\">";
}
}
if ($id == "search") {
+ print "<div id=\"infoBoxTitle\">Search</div>";
+ print "<div class=\"infoBoxContents\">";
+
$active_feed_id = db_escape_string($_GET["param"]);
+ print "<table width='100%'><tr><td>Search:</td><td>";
+
print "<input id=\"searchbox\" class=\"extSearch\"
- onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
- onchange=\"javascript:search()\">
+ onblur=\"javascript:enableHotkeys()\"
+ onfocus=\"javascript:disableHotkeys()\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
+ onchange=\"javascript:search()\">
+ </td></tr><tr><td>Where:</td><td>
<select id=\"searchmodebox\">
<option selected>All feeds</option>";
print "<option>This category</option>";
}
- print "</select>
+ print "</select></td></tr>
+
+ <tr><td colspan='2' align='right'>
<input type=\"submit\"
- class=\"button\" onclick=\"javascript:search()\" value=\"Search\">
+ class=\"button\" onclick=\"javascript:search()\"
+ id=\"search_submit_btn\" disabled=\"true\"
+ value=\"Search\">
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeDlg()\"
- value=\"Close\">";
+ type=\"submit\" onclick=\"javascript:closeInfoBox()\"
+ value=\"Cancel\"></td></tr></table>";
}
if ($id == "quickAddFilter") {
+ print "<div id=\"infoBoxTitle\">Create filter</div>";
+ print "<div class=\"infoBoxContents\">";
+
+// print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
+
$result = db_query($link, "SELECT description
FROM ttrss_filter_types ORDER BY description");
array_push($filter_types, $line["description"]);
}
- print "<table>";
+ print "<table width='100%'>";
- print "<tr><td>Match:</td><td><input id=\"fadd_regexp\" size=\"40\"> ";
+ print "<tr><td>Match:</td>
+ <td><input onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ id=\"fadd_regexp\" size=\"30\"> ";
print_select("fadd_match", "Title", $filter_types);
print "</td></tr>";
- print "<tr><td>Feed:</td><td><select id=\"fadd_feed\">";
-
- print "<option selected id=\"0\">All feeds</option>";
-
- $result = db_query($link, "SELECT id,title FROM ttrss_feeds
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($result) > 0) {
- print "<option disabled>--------</option>";
- }
-
- while ($line = db_fetch_assoc($result)) {
- if ($param == $line["id"]) {
- $selected = "selected";
- } else {
- $selected = "";
- }
- printf("<option id='%d' %s>%s</option>", $line["id"], $selected, $line["title"]);
- }
-
- print "</select></td></tr>";
+ print "<tr><td>Feed:</td><td>";
+
+ print_feed_select($link, "fadd_feed");
+
+ print "</td></tr>";
print "<tr><td>Action:</td>";
print "</td></tr><tr><td colspan=\"2\" align=\"right\">";
print "<input type=\"submit\"
+ id=\"infobox_submit\"
class=\"button\" onclick=\"javascript:qaddFilter()\"
- value=\"Add filter\"> ";
+ disabled=\"true\" value=\"Create\"> ";
print "<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeDlg()\"
- value=\"Close\">";
+ type=\"submit\" onclick=\"javascript:closeInfoBox()\"
+ value=\"Cancel\">";
print "</td></tr></table>";
+
}
+
+ print "</div>";
+
}
// update feeds of all users, may be used anonymously
print "</form>";
- print "<form action=\"backend.php\" method=\"POST\">";
+ print "<form action=\"backend.php\" method=\"POST\" name=\"changePassForm\">";
print "<table width=\"100%\" class=\"prefPrefsList\">";
print "<tr><td colspan='3'><h3>Authentication</h3></tr></td>";
print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
print "<p><input class=\"button\" type=\"submit\"
+ onclick=\"return validateNewPassword(this.form)\"
value=\"Change password\" name=\"subop\">";
print "</form>";
$tmp_user_pwd = make_password(8);
$pwd_hash = 'SHA1:' . sha1($tmp_user_pwd);
- db_query($link, "INSERT INTO ttrss_users
- (login,pwd_hash,access_level,last_login)
- VALUES ('$login', '$pwd_hash', 0, NOW())");
-
-
$result = db_query($link, "SELECT id FROM ttrss_users WHERE
- login = '$login' AND pwd_hash = '$pwd_hash'");
-
- if (db_num_rows($result) == 1) {
+ login = '$login'");
- $new_uid = db_fetch_result($result, 0, "id");
-
- print "<div class=\"notice\">Added user <b>".$_GET["login"].
- "</b> with password <b>$tmp_user_pwd</b>.</div>";
-
- initialize_user($link, $new_uid);
+ if (db_num_rows($result) == 0) {
+ db_query($link, "INSERT INTO ttrss_users
+ (login,pwd_hash,access_level,last_login)
+ VALUES ('$login', '$pwd_hash', 0, NOW())");
+
+
+ $result = db_query($link, "SELECT id FROM ttrss_users WHERE
+ login = '$login' AND pwd_hash = '$pwd_hash'");
+
+ if (db_num_rows($result) == 1) {
+
+ $new_uid = db_fetch_result($result, 0, "id");
+
+ print "<div class=\"notice\">Added user <b>".$_GET["login"].
+ "</b> with password <b>$tmp_user_pwd</b>.</div>";
+
+ initialize_user($link, $new_uid);
+
+ } else {
+
+ print "<div class=\"warning\">Could not create user <b>".
+ $_GET["login"]."</b></div>";
+
+ }
} else {
-
- print "<div class=\"warning\">Error while adding user <b>".
- $_GET["login"].".</b></div>";
-
+ print "<div class=\"warning\">User <b>".
+ $_GET["login"]."</b> already exists.</div>";
}
}
} else if ($subop == "resetPass") {
}
print "<div class=\"prefGenericAddBox\">
- <input id=\"uadd_box\" onchange=\"javascript:addUser()\" size=\"40\"> ";
+ <input id=\"uadd_box\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'user_add_btn')\"
+ size=\"40\"> ";
print"<input type=\"submit\" class=\"button\"
- onclick=\"javascript:addUser()\" value=\"Add user\"></div>";
+ id=\"user_add_btn\" disabled=\"true\"
+ onclick=\"javascript:addUser()\" value=\"Create user\"></div>";
$result = db_query($link, "SELECT
id,login,access_level,email,
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
- <a href=\"javascript:selectTableRowsByIdPrefix('prefUserList',
- 'UMRR-', 'UMCHK-', true)\">All</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('prefUserList',
- 'UMRR-', 'UMCHK-', false)\">None</a>
+ <a href=\"javascript:selectPrefRows('user', true)\">All</a>,
+ <a href=\"javascript:selectPrefRows('user', false)\">None</a>
</td</tr>";
print "<tr class=\"title\">
<td align='center' width=\"5%\"> </td>
- <td width='20%'>Username</td>
+ <td width='20%'>Login</td>
<td width='20%'>E-mail</td>
<td width='20%'>Access Level</td>
<td width='20%'>Last login</td></tr>";
$access_level_names = array(0 => "User", 10 => "Administrator");
-/* if ($uid == $_SESSION["uid"]) {
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
- id=\"UMCHK-".$line["id"]."\"></td>";
-
- print "<td>".$line["login"]."</td>";
- print "<td>".$line["email"]."</td>";
- print "<td>".$line["access_level"]."</td>";
+ if (!$edit_uid || $subop != "edit") {
- } else */ if (!$edit_uid || $subop != "edit") {
-
- print "<td align='center'><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"user\");'
type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
print "<td><a href=\"javascript:editUser($uid);\">" .
$line["login"] . "</td>";
+ if (!$line["email"]) $line["email"] = " ";
+
print "<td><a href=\"javascript:editUser($uid);\">" .
$line["email"] . "</td>";
} else if ($uid != $edit_uid) {
+ if (!$line["email"]) $line["email"] = " ";
+
print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"UMCHK-".$line["id"]."\"></td>";
print "<td><input id=\"iedit_email\" value=\"".$line["email"].
"\"></td>";
-// print "<td><input id=\"iedit_ulevel\" value=\"".$line["access_level"].
-// "\"></td>";
-
print "<td>";
print "<select id=\"iedit_ulevel\">";
foreach (array_keys($access_level_names) as $al) {
print "</table>";
- print "<p>";
+ print "<p id='userOpToolbar'>";
if ($subop == "edit") {
print "Edit user:
print "
Selection:
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:selectedUserDetails()\" value=\"User details\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedUser()\" value=\"Edit\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:removeSelectedUsers()\" value=\"Remove\">
- <input type=\"submit\" class=\"button\"
+ <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:resetSelectedUserPass()\" value=\"Reset password\">";
}
$uid = sprintf("%d", $_GET["id"]);
+ print "<div id=\"infoBoxTitle\">User details</div>";
+
print "<div class='infoBoxContents'>";
$result = db_query($link, "SELECT login,
return;
}
- print "<h1>User Details</h1>";
+# print "<h1>User Details</h1>";
+
+ $login = db_fetch_result($result, 0, "login");
+
+# print "<h1>$login</h1>";
print "<table width='100%'>";
- $login = db_fetch_result($result, 0, "login");
$last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
strtotime(db_fetch_result($result, 0, "last_login")));
$access_level = db_fetch_result($result, 0, "access_level");
$stored_articles = db_fetch_result($result, 0, "stored_articles");
- print "<tr><td>Username</td><td>$login</td></tr>";
- print "<tr><td>Access level</td><td>$access_level</td></tr>";
+# print "<tr><td>Username</td><td>$login</td></tr>";
+# print "<tr><td>Access level</td><td>$access_level</td></tr>";
print "<tr><td>Last logged in</td><td>$last_login</td></tr>";
print "<tr><td>Stored articles</td><td>$stored_articles</td></tr>";
print "<ul class=\"userFeedList\">";
+ $row_class = "odd";
+
while ($line = db_fetch_assoc($result)) {
$icon_file = ICONS_URL."/".$line["id"].".ico";
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- print "<li>$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+ print "<li class=\"$row_class\">$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+
+ $row_class = toggleEvenOdd($row_class);
+
}
if (db_num_rows($result) < $num_feeds) {
}
- if ($op == "feed-details") {
-
-// $feed_id = $_GET["id"];
-
- $feed_ids = split(",", db_escape_string($_GET["id"]));
-
- print "<div class=\"infoBoxContents\">";
-
- foreach ($feed_ids as $feed_id) {
-
- $result = db_query($link,
- "SELECT
- title,feed_url,
- SUBSTRING(last_updated,1,16) as last_updated,
- icon_url,site_url,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id) AS total,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND unread = true) AS unread,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND marked = true) AS marked
- FROM ttrss_feeds
- WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
-
- if (db_num_rows($result) == 0) return;
-
- $title = db_unescape_string(db_fetch_result($result, 0, "title"));
- $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
- strtotime(db_fetch_result($result, 0, "last_updated")));
- $feed_url = db_fetch_result($result, 0, "feed_url");
- $icon_url = db_fetch_result($result, 0, "icon_url");
- $total = db_fetch_result($result, 0, "total");
- $unread = db_fetch_result($result, 0, "unread");
- $marked = db_fetch_result($result, 0, "marked");
- $site_url = db_fetch_result($result, 0, "site_url");
-
- $result = db_query($link, "SELECT COUNT(id) AS subscribed
- FROM ttrss_feeds WHERE feed_url = '$feed_url' AND private = false");
-
- $subscribed = db_fetch_result($result, 0, "subscribed");
-
- $icon_file = ICONS_DIR . "/$feed_id.ico";
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img width=\"16\" height=\"16\"
- src=\"" . ICONS_URL . "/$feed_id.ico\">";
- } else {
- $feed_icon = "";
- }
-
- print "<h1>$feed_icon $title</h1>";
-
- print "<table width='100%'>";
-
- if ($site_url) {
- print "<tr><td width='30%'>Link</td>
- <td><a href=\"$site_url\">$site_url</a>
- <a href=\"$feed_url\">(feed)</a></td>
- </td></tr>";
- } else {
- print "<tr><td width='30%'>Feed URL</td>
- <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
- }
- print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
- print "<tr><td>Total articles</td><td>$total</td></tr>";
- print "<tr><td>Unread articles</td><td>$unread</td></tr>";
- print "<tr><td>Starred articles</td><td>$marked</td></tr>";
- print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
-
- print "</table>";
-
-/* $result = db_query($link, "SELECT title,
- SUBSTRING(updated,1,16) AS updated,unread
- FROM ttrss_entries,ttrss_user_entries
- WHERE ref_id = id AND feed_id = '$feed_id'
- ORDER BY date_entered DESC LIMIT 5");
-
- if (db_num_rows($result) > 0) {
-
- print "<h1>Latest headlines</h1>";
-
- print "<ul class=\"nomarks\">";
-
- while ($line = db_fetch_assoc($result)) {
- if ($line["unread"] == "t" || $line["unread"] == "1") {
- $line["title"] = "<b>" . $line["title"] . "</b>";
- }
- print "<li>" . $line["title"].
- " <span class=\"insensitive\">(" .
- date(get_pref($link, 'SHORT_DATE_FORMAT'),
- strtotime($line["updated"])).
- ")</span></li>";
- }
-
- print "</ul>";
-
- } */
- }
-
- print "</div>";
-
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
- }
-
if ($op == "pref-feed-browser") {
if (!ENABLE_FEED_BROWSER) {
return;
}
+ print "<p>This panel shows feeds subscribed by other users of this system, just in case you are interested in some of them too.</p>";
+
+ $limit = db_escape_string($_GET["limit"]);
+
+ if (!$limit) $limit = 25;
+
$result = db_query($link, "SELECT feed_url,count(id) AS subscribers
FROM ttrss_feeds
WHERE auth_login = '' AND auth_pass = '' AND private = false
- GROUP BY feed_url ORDER BY subscribers DESC LIMIT 100");
-
+ GROUP BY feed_url ORDER BY subscribers DESC LIMIT $limit");
+
+ print "<div style=\"float : right\">
+ Top <select id=\"feedBrowserLimit\">";
+
+ foreach (array(25, 50, 100) as $l) {
+ $issel = ($l == $limit) ? "selected" : "";
+ print "<option $issel>$l</option>";
+ }
+
+ print "</select>
+ <input type=\"submit\" class=\"button\"
+ onclick=\"updateBigFeedBrowser()\" value=\"Show\">
+ </div>";
+
+ print "<p id=\"fbrOpToolbar\">Selection:
+ <input type='submit' class='button' onclick=\"feedBrowserSubscribe()\"
+ disabled=\"true\" value=\"Subscribe\">";
+
print "<ul class='nomarks' id='browseBigFeedList'>";
$feedctr = 0;
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB'
+ $check_box = "<input onclick='toggleSelectFBListRow(this)' class='feedBrowseCB'
type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
$class = ($feedctr % 2) ? "even" : "odd";
print "</ul>";
- print "<p>Selection:
- <input type='submit' class='button' onclick=\"feedBrowserSubscribe()\"
- value=\"Subscribe\"></p>";
-
print "</div>";
}
+ function check_configuration_variables() {
+ if (!defined('SESSION_EXPIRE_TIME')) {
+ return "config: SESSION_EXPIRE_TIME is undefined";
+ }
+
+ if (SESSION_EXPIRE_TIME < 60) {
+ return "config: SESSION_EXPIRE_TIME is too low (less than 60)";
+ }
+
+ if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME_REMEMBER) {
+ return "config: SESSION_EXPIRE_TIME should be greater or equal to" .
+ "SESSION_COOKIE_LIFETIME_REMEMBER";
+ }
+
+ if (defined('DISABLE_SESSIONS')) {
+ return "config: you have enabled DISABLE_SESSIONS. Please disable this option.";
+ }
+
+ if (DATABASE_BACKED_SESSIONS && SINGLE_USER_MODE) {
+ return "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE";
+ }
+
+ return false;
+ }
+
db_close($link);
?>
git.wh0rd.org / tt-rss.git / blobdiff