";
+ $entry_comments = "$num_comments comments";
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "comments";
+ $entry_comments = "comments";
}
}
@@ -4602,7 +4730,7 @@
print "![](\"images/down_arrow.png\"){kind=icon}
+ __("Actions...") . "
";
@@ -4024,12 +4164,19 @@
";
}
@@ -4164,11 +4270,7 @@
if (db_num_rows($result) > 0) {
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- if ($_COOKIE["ttrss_vf_lclps"] == 1) {
- $cat_hidden = true;
- } else {
- $cat_hidden = false;
- }
+ $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
printCategoryHeader($link, -2, $cat_hidden, true);
@@ -4181,16 +4283,10 @@
$label_id = -$line['id'] - 11;
$count = getFeedUnread($link, $label_id);
-
- $class = "label";
-
- if ($count > 0) {
- $class .= "Unread";
- }
printFeedEntry($label_id,
- $class, $line["caption"],
- $count, "images/label.png", $link,
+ "label", $line["caption"],
+ $count, false, $link,
false, false, false,
$line['fg_color'], $line['bg_color']);
@@ -4235,13 +4331,12 @@
ON
(ttrss_feeds.id = feed_id)
WHERE
- ttrss_feeds.hidden = false AND
ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
ORDER BY $order_by_qpart";
$result = db_query($link, $query);
- $actid = $_GET["actid"];
+ $actid = $_REQUEST["actid"];
/* real feeds */
@@ -4255,14 +4350,14 @@
while ($line = db_fetch_assoc($result)) {
- $feed = trim($line["title"]);
+ $feed = htmlspecialchars(trim($line["title"]));
if (!$feed) $feed = "[Untitled]";
$feed_id = $line["id"];
$unread = $line["unread"];
- $subop = $_GET["subop"];
+ $subop = $_REQUEST["subop"];
if (get_pref($link, 'HEADLINES_SMART_DATE')) {
$last_updated = smart_date_time(strtotime($line["last_updated_noms"]));
@@ -4300,8 +4395,6 @@
$class = "feed";
}
- if ($unread > 0) $class .= "Unread";
-
if ($actid == $feed_id) {
$class .= "Selected";
}
@@ -4320,19 +4413,17 @@
// workaround for NULL category
if ($category == __("Uncategorized")) {
- if ($_COOKIE["ttrss_vf_uclps"] == 1) {
- $collapsed = "t";
- }
+ $collapsed = get_pref($link, "_COLLAPSED_UNCAT");
}
- $cat_id = sprintf("%d", $cat_id);
+ $cat_id = (int) $cat_id;
printCategoryHeader($link, $cat_id, $collapsed, true);
}
printFeedEntry($feed_id, $class, $feed, $unread,
- ICONS_URL."/$feed_id.ico", $link, $rtl_content,
+ false, $link, $rtl_content,
$last_updated, $line["last_error"]);
++$lnum;
@@ -4378,13 +4469,8 @@
foreach (array_keys($tags) as $tag) {
$unread = $tags[$tag];
-
$class = "tag";
-
- if ($unread > 0) {
- $class .= "Unread";
- }
-
+
printFeedEntry($tag, $class, $tag, $unread, "images/tag.png", $link);
}
@@ -4436,6 +4522,7 @@
function tag_is_valid($tag) {
if ($tag == '') return false;
if (preg_match("/^[0-9]*$/", $tag)) return false;
+ if (mb_strlen($tag) > 250) return false;
if (function_exists('iconv')) {
$tag = iconv("utf-8", "utf-8", $tag);
@@ -4446,11 +4533,16 @@
return true;
}
- function render_login_form($link, $mobile = false) {
- if (!$mobile) {
+ function render_login_form($link, $mobile = 0) {
+ switch ($mobile) {
+ case 0:
require_once "login_form.php";
- } else {
+ break;
+ case 1:
require_once "mobile/login_form.php";
+ break;
+ case 2:
+ require_once "mobile/classic/login_form.php";
}
}
@@ -4464,18 +4556,21 @@
}
function format_warning($msg, $id = "") {
+ global $link;
return "![](\"images/cat-collapse.png\" "\\"\".__('Click")
$tmp_category";
+ id=\"FCATN-$cat_id\" $browse_cat_link/>$tmp_category";
print "";
@@ -4101,56 +4247,16 @@
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- if ($_COOKIE["ttrss_vf_vclps"] == 1) {
- $cat_hidden = true;
- } else {
- $cat_hidden = false;
- }
+ $cat_hidden = get_pref($link, "_COLLAPSED_SPECIAL");
printCategoryHeader($link, -1, $cat_hidden, false);
}
- $num_starred = getFeedUnread($link, -1);
- $num_published = getFeedUnread($link, -2);
- $num_fresh = getFeedUnread($link, -3);
- $num_total = getFeedUnread($link, -4);
-
- $class = "virt";
-
- if ($num_total > 0) $class .= "Unread";
-
- printFeedEntry(-4, $class, __("All articles"), $num_total,
- "images/tag.png", $link);
-
- $class = "virt";
-
- if ($num_fresh > 0) $class .= "Unread";
-
- printFeedEntry(-3, $class, __("Fresh articles"), $num_fresh,
- "images/fresh.png", $link);
-
- $class = "virt";
-
- if ($num_starred > 0) $class .= "Unread";
-
- $is_ie = (strpos($_SESSION["client.userAgent"], "MSIE") !== false);
-
- if ($is_ie) {
- $mark_img_ext = "gif";
- } else {
- $mark_img_ext = "png";
+ foreach (array(-4, -3, -1, -2, 0) as $i) {
+ printFeedEntry($i, "virt", false, false,
+ false, $link);
}
- printFeedEntry(-1, $class, __("Starred articles"), $num_starred,
- "images/mark_set.$mark_img_ext", $link);
-
- $class = "virt";
-
- if ($num_published > 0) $class .= "Unread";
-
- printFeedEntry(-2, $class, __("Published articles"), $num_published,
- "images/pub_set.gif", $link);
-
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "![](\"images/sign_excl.gif\")
$msg$msg
![](\"images/sign_info.gif\")
$msg$msg
$msg$msg
";
+ ";
if (!$zoom_mode) {
print "$tags_str
(+)";
- if (defined('_ENABLE_INLINE_VIEW')) {
-
- print "
![Inline](\"images/art-inline.png\" "\".__(")
";
-
- }
-
- print "![Zoom](\"images/art-zoom.png\" "\".__(")
";
$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
- print "![PubNote](\"images/art-pub-note.png\" "\".__(")
";
+ } else {
+ $tags_str = strip_tags($tags_str);
+ print "$tags_str";
}
print "
";
+
+ print "";
+ if (!get_pref($link, "STRIP_IMAGES")) {
+ if ($always_display_enclosures || !preg_match("/
";
+ }
}
}
}
@@ -4742,8 +4882,8 @@
} else {
print "