From e1f76af0068bd2cf5ce4a4203b7727d5b3111c04 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Apr 2013 22:01:02 +0400
Subject: block listing of several util directories; deny access to config.php

---
 js/index.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 js/index.html

(limited to 'js')

diff --git a/js/index.html b/js/index.html
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3-54-g00ecf


From e8f9069c5c44fb4512247dbc9d280152e760331a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 14 Apr 2013 10:23:01 +0400
Subject: quickAddFeed: add placeholder select element to feeds dropdown

---
 js/functions.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/functions.js b/js/functions.js
index 82cfa9054..07eed2ad9 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -810,7 +810,7 @@ function quickAddFeed() {
 								notify('');
 								Element.hide("feed_add_spinner");
 
-								console.log("GOT RC: " + rc);
+								console.log(rc);
 
 								switch (parseInt(rc['code'])) {
 								case 1:
@@ -866,6 +866,8 @@ function quickAddFeed() {
 									while (select.getOptions().length > 0)
 										select.removeOption(0);
 
+									select.addOption({value: '', label: __("Expand to select feed")});
+
 									var count = 0;
 									for (var feedUrl in feeds) {
 										select.addOption({value: feedUrl, label: feeds[feedUrl]});
-- 
cgit v1.2.3-54-g00ecf


From e43a9c4a01bf095b740e35711c79f6a0ca3374ba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 13:16:14 +0400
Subject: add a %d articles selected element

---
 classes/feeds.php |  1 +
 js/functions.js   |  6 ++++++
 js/viewfeed.js    | 24 ++++++++++++++++++++++++
 tt-rss.css        |  3 +++
 4 files changed, 34 insertions(+)

(limited to 'js')

diff --git a/classes/feeds.php b/classes/feeds.php
index 2f8dcb5ec..c7b7a83e6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -49,6 +49,7 @@ class Feeds extends Handler_Protected {
 		// right part
 
 		$reply .= "<span class='r'>";
+		$reply .= "<span id='selected_prompt'></span>";
 		$reply .= "<span id='feed_title'>";
 
 		if ($feed_site_url) {
diff --git a/js/functions.js b/js/functions.js
index 07eed2ad9..9336433ca 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -368,6 +368,9 @@ function toggleSelectRow2(sender, row, is_cdm) {
 		row.addClassName('Selected');
 	else
 		row.removeClassName('Selected');
+
+	if (typeof updateSelectedPrompt != undefined)
+		updateSelectedPrompt();
 }
 
 
@@ -379,6 +382,9 @@ function toggleSelectRow(sender, row) {
 		row.addClassName('Selected');
 	else
 		row.removeClassName('Selected');
+
+	if (typeof updateSelectedPrompt != undefined)
+		updateSelectedPrompt();
 }
 
 function checkboxToggleElement(elem, id) {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index da5ded64f..519ab3449 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -639,11 +639,33 @@ function toggleSelected(id, force_on) {
 				if (cb) cb.attr("checked", true);
 			}
 		}
+
+		updateSelectedPrompt();
 	} catch (e) {
 		exception_error("toggleSelected", e);
 	}
 }
 
+function updateSelectedPrompt() {
+	try {
+		var count = getSelectedArticleIds2().size();
+		var elem = $("selected_prompt");
+
+		if (elem) {
+			elem.innerHTML = ngettext("%d article selected",
+					"%d articles selected", count).replace("%d", count);
+
+			if (count > 0)
+				Element.show(elem);
+			else
+				Element.hide(elem);
+		}
+
+	} catch (e) {
+		exception_error("updateSelectedPrompt", e);
+	}
+}
+
 function toggleUnread_afh(effect) {
 	try {
 
@@ -960,6 +982,8 @@ function selectArticles(mode) {
 			}
 		});
 
+		updateSelectedPrompt();
+
 	} catch (e) {
 		exception_error("selectArticles", e);
 	}
diff --git a/tt-rss.css b/tt-rss.css
index 6067ca7d6..d2e854d8f 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1019,3 +1019,6 @@ div.hl.active a.title {
 	color : #4684ff;
 }
 
+#selected_prompt {
+	margin-right : 25px;
+}
-- 
cgit v1.2.3-54-g00ecf


From 40fe2d73821788e7c202191dc7b94b025585d338 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 15:44:38 +0400
Subject: remove js-based player, better mp3 support detection for html5 audio

---
 classes/rpc.php       |  1 +
 include/functions.php | 11 ++---------
 js/tt-rss.js          |  6 +++++-
 js/viewfeed.js        | 28 ----------------------------
 4 files changed, 8 insertions(+), 38 deletions(-)

(limited to 'js')

diff --git a/classes/rpc.php b/classes/rpc.php
index 1569a9a35..b6d552868 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -334,6 +334,7 @@ class RPC extends Handler_Protected {
 	function sanityCheck() {
 		$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
 		$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
+		$_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
 
 		$reply = array();
 
diff --git a/include/functions.php b/include/functions.php
index 018520648..87eb3d6a9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2990,19 +2990,12 @@
 		if (strpos($ctype, "audio/") === 0) {
 
 			if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-				strpos($_SERVER['HTTP_USER_AGENT'], "Chrome") !== false ||
-				strpos($_SERVER['HTTP_USER_AGENT'], "Safari") !== false )) {
+				$_SESSION["hasMp3"])) {
 
-				$id = 'AUDIO-' . uniqid();
-
-				$entry .= "<audio id=\"$id\"\" controls style='display : none'>
+				$entry .= "<audio controls>
 					<source type=\"$ctype\" src=\"$url\"></source>
 					</audio>";
 
-				$entry .= "<span onclick=\"player(this)\"
-					title=\"".__("Click to play")."\" status=\"0\"
-					class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
-
 			} else {
 
 				$entry .= "<object type=\"application/x-shockwave-flash\"
diff --git a/js/tt-rss.js b/js/tt-rss.js
index a572e5324..fe12297d4 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -248,11 +248,15 @@ function init() {
 
 		loading_set_progress(20);
 
-		var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
+		var a = document.createElement('audio');
+
+		var hasAudio = !!a.canPlayType;
 		var hasSandbox = "sandbox" in document.createElement("iframe");
+		var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
 
 		new Ajax.Request("backend.php",	{
 			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+				hasMp3: hasMp3,
 				hasSandbox: hasSandbox},
 			onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 519ab3449..ddee1e461 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -2027,34 +2027,6 @@ function initHeadlinesMenu() {
 	}
 }
 
-
-function player(elem) {
-	var aid = elem.getAttribute("audio-id");
-	var status = elem.getAttribute("status");
-
-	var audio = $(aid);
-
-	if (audio) {
-		if (status == 0) {
-			audio.play();
-			status = 1;
-			elem.innerHTML = __("Playing...");
-			elem.title = __("Click to pause");
-			elem.addClassName("playing");
-		} else {
-			audio.pause();
-			status = 0;
-			elem.innerHTML = __("Play");
-			elem.title = __("Click to play");
-			elem.removeClassName("playing");
-		}
-
-		elem.setAttribute("status", status);
-	} else {
-		alert("Your browser doesn't seem to support HTML5 audio.");
-	}
-}
-
 function cache_set(id, obj) {
 	//console.log("cache_set: " + id);
 	if (has_storage)
-- 
cgit v1.2.3-54-g00ecf


From 3cc5a3cd43be77b64e395d8a9178814330505ce2 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 16 Apr 2013 20:08:17 -0500
Subject: minor typo fix in hash_get()

---
 js/tt-rss.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index fe12297d4..9a223733f 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -1076,7 +1076,7 @@ function hash_get(key) {
 		kv = window.location.hash.substring(1).toQueryParams();
 		return kv[key];
 	} catch (e) {
-		exception_error("hash_set", e);
+		exception_error("hash_get", e);
 	}
 }
 function hash_set(key, value) {
-- 
cgit v1.2.3-54-g00ecf


From 2cbdc95bb00faad46df8976cf9b33e1bc188ec91 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 08:42:39 +0400
Subject: add a separate tab for the logger

---
 classes/pref/prefs.php  | 45 ----------------------------
 classes/pref/system.php | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
 js/prefs.js             | 11 +++++++
 prefs.php               |  3 ++
 4 files changed, 92 insertions(+), 45 deletions(-)
 create mode 100644 classes/pref/system.php

(limited to 'js')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index dcd83ae26..2f316b48b 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -725,51 +725,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>"; #pane
 
-		if ($_SESSION["access_level"] == 10) {
-
-			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
-			print "<h2>".__("Error Log")."</h2>";
-
-			$result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
-				created_at, login FROM ttrss_error_log
-				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
-				ORDER BY ttrss_error_log.id DESC
-				LIMIT 100");
-
-			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
-
-			print "<tr class=\"title\">
-				<td width='5%'>".__("Error")."</td>
-				<td>".__("Filename")."</td>
-				<td>".__("Message")."</td>
-				<td width='5%'>".__("User")."</td>
-				<td width='5%'>".__("Date")."</td>
-				</tr>";
-
-			while ($line = db_fetch_assoc($result)) {
-				print "<tr class=\"errrow\">";
-
-				foreach ($line as $k => $v) {
-					$line[$k] = htmlspecialchars($v);
-				}
-
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
-
-				print "<td class='timestamp'>" .
-					make_local_datetime($this->link,
-					$line["created_at"], false) . "</td>";
-
-				print "</tr>";
-			}
-
-			print "</table>";
-
-			print "</div>";
-		}
-
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
 
 		print "<h2>".__("Plugins")."</h2>";
diff --git a/classes/pref/system.php b/classes/pref/system.php
new file mode 100644
index 000000000..2957b7b96
--- /dev/null
+++ b/classes/pref/system.php
@@ -0,0 +1,78 @@
+<?php
+
+class Pref_System extends Handler_Protected {
+
+	function __construct($link, $args) {
+		parent::__construct($link, $args);
+	}
+
+	function before($method) {
+		if (parent::before($method)) {
+			if ($_SESSION["access_level"] < 10) {
+				print __("Your access level is insufficient to open this tab.");
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	function csrf_ignore($method) {
+		$csrf_ignored = array("index");
+
+		return array_search($method, $csrf_ignored) !== false;
+	}
+
+	function index() {
+
+		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
+
+		$result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
+			created_at, login FROM ttrss_error_log
+			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
+			ORDER BY ttrss_error_log.id DESC
+			LIMIT 100");
+
+		print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+
+		print "<tr class=\"title\">
+			<td width='5%'>".__("Error")."</td>
+			<td>".__("Filename")."</td>
+			<td>".__("Message")."</td>
+			<td width='5%'>".__("User")."</td>
+			<td width='5%'>".__("Date")."</td>
+			</tr>";
+
+		while ($line = db_fetch_assoc($result)) {
+			print "<tr class=\"errrow\">";
+
+			foreach ($line as $k => $v) {
+				$line[$k] = htmlspecialchars($v);
+			}
+
+			print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+			print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+			print "<td class='errstr'>" . $line["errstr"] . "</td>";
+			print "<td class='login'>" . $line["login"] . "</td>";
+
+			print "<td class='timestamp'>" .
+				make_local_datetime($this->link,
+				$line["created_at"], false) . "</td>";
+
+			print "</tr>";
+		}
+
+		print "</table>";
+
+		print "</div>";
+
+		global $pluginhost;
+		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+			"hook_prefs_tab", "prefSystem");
+
+		print "</div>"; #container
+	}
+
+}
+?>
diff --git a/js/prefs.js b/js/prefs.js
index b1decede5..8612b70fb 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -852,6 +852,15 @@ function updatePrefsList() {
 		} });
 }
 
+function updateSystemList() {
+	new Ajax.Request("backend.php", {
+		parameters: "?op=pref-system",
+		onComplete: function(transport) {
+			dijit.byId('systemConfigTab').attr('content', transport.responseText);
+			notify("");
+		} });
+}
+
 function selectTab(id, noupdate, method) {
 	try {
 		if (!noupdate) {
@@ -867,6 +876,8 @@ function selectTab(id, noupdate, method) {
 				updatePrefsList();
 			} else if (id == "userConfig") {
 				updateUsersList();
+			} else if (id == "systemConfig") {
+				updateSystemList();
 			}
 
 			var tab = dijit.byId(id + "Tab");
diff --git a/prefs.php b/prefs.php
index 476ad2578..a047931c6 100644
--- a/prefs.php
+++ b/prefs.php
@@ -130,6 +130,9 @@
 	<div id="userConfigTab" dojoType="dijit.layout.ContentPane"
 		href="backend.php?op=pref-users"
 		title="<?php echo __('Users') ?>"></div>
+	<div id="systemConfigTab" dojoType="dijit.layout.ContentPane"
+		href="backend.php?op=pref-system"
+		title="<?php echo __('System') ?>"></div>
 <?php } ?>
 <?php
 	$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
-- 
cgit v1.2.3-54-g00ecf


From 89473cb5c62f886ffa06642dacf53254e584d21f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 09:09:51 +0400
Subject: feedtree: don't request null icon

---
 include/functions.php | 2 ++
 js/FeedTree.js        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/include/functions.php b/include/functions.php
index 0148d069d..43138a1f9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1851,6 +1851,8 @@
 			}
 			break;
 		}
+
+		return false;
 	}
 
 	function getFeedTitle($link, $id, $cat = false) {
diff --git a/js/FeedTree.js b/js/FeedTree.js
index bb50d6fbb..fbddb708f 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -100,7 +100,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 	_createTreeNode: function(args) {
 		var tnode = new dijit._TreeNode(args);
 
-		if (args.item.icon)
+		if (args.item.icon && args.item.icon[0])
 			tnode.iconNode.src = args.item.icon[0];
 
 		var id = args.item.id[0];
-- 
cgit v1.2.3-54-g00ecf


From 95437e9e0756edacb835843074c12632c11a64b1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 10:50:46 +0400
Subject: tweak notify layout/display

---
 index.php       |  2 +-
 js/functions.js | 44 ++++++++++++++------------------------------
 prefs.php       |  2 +-
 tt-rss.css      | 27 +++++++++++++++++----------
 4 files changed, 33 insertions(+), 42 deletions(-)

(limited to 'js')

diff --git a/index.php b/index.php
index 2fa856631..066b25fa5 100644
--- a/index.php
+++ b/index.php
@@ -138,7 +138,7 @@
 	</div>
 </div>
 
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="notify" class="notify" style="display : none"></div>
 <div id="cmdline" style="display : none"></div>
 <div id="headlines-tmp" style="display : none"></div>
 
diff --git a/js/functions.js b/js/functions.js
index 9336433ca..e02767504 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1,8 +1,8 @@
-var notify_silent = false;
 var loading_progress = 0;
 var sanity_check_done = false;
 var init_params = {};
 var _label_base_index = -1024;
+var notify_hide_timerid = false;
 
 Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
 	function (callOriginal, options) {
@@ -147,42 +147,28 @@ function param_unescape(arg) {
 		return unescape(arg);
 }
 
-var notify_hide_timerid = false;
 
 function hide_notify() {
-	var n = $("notify");
-	if (n) {
-		n.style.display = "none";
-	}
-}
-
-function notify_silent_next() {
-	notify_silent = true;
+	Element.hide('notify');
 }
 
 function notify_real(msg, no_hide, n_type) {
 
-	if (notify_silent) {
-		notify_silent = false;
-		return;
-	}
-
 	var n = $("notify");
-	var nb = $("notify_body");
 
-	if (!n || !nb) return;
+	if (!n) return;
 
 	if (notify_hide_timerid) {
 		window.clearTimeout(notify_hide_timerid);
 	}
 
 	if (msg == "") {
-		if (n.style.display == "block") {
+		if (Element.visible(n)) {
 			notify_hide_timerid = window.setTimeout("hide_notify()", 0);
 		}
 		return;
 	} else {
-		n.style.display = "block";
+		Element.show(n);
 	}
 
 	/* types:
@@ -194,33 +180,31 @@ function notify_real(msg, no_hide, n_type) {
 
 	*/
 
-	msg = __(msg);
+	msg = "<span class=\"msg\"> " + __(msg) + "</span>";
 
 	if (n_type == 1) {
 		n.className = "notify";
 	} else if (n_type == 2) {
 		n.className = "notify progress";
-		msg = "<img src='images/indicator_white.gif'> " + msg;
+		msg = "<span><img src='images/indicator_white.gif'></span>" + msg;
+		no_hide = true;
 	} else if (n_type == 3) {
 		n.className = "notify error";
-		msg = "<img src='images/sign_excl.svg'> " + msg;
+		msg = "<span><img src='images/sign_excl.svg'></span>" + msg;
 	} else if (n_type == 4) {
 		n.className = "notify info";
-		msg = "<img src='images/sign_info.svg'> " + msg;
-	}
-
-	if (no_hide) {
-		msg += " <span>(<a href='#' onclick=\"notify('')\">" +
-			__("close") + "</a>)</span>";
+		msg = "<span><img src='images/sign_info.svg'></span>" + msg;
 	}
 
+	msg += " <span><img src=\"images/close_notify.svg\" class=\"close\" title=\"" +
+		__("Click to close") + "\" onclick=\"notify('')\"></span>";
 
 //	msg = "<img src='images/live_com_loading.gif'> " + msg;
 
-	nb.innerHTML = msg;
+	n.innerHTML = msg;
 
 	if (!no_hide) {
-		notify_hide_timerid = window.setTimeout("hide_notify()", 3000);
+		notify_hide_timerid = window.setTimeout("hide_notify()", 5*1000);
 	}
 }
 
diff --git a/prefs.php b/prefs.php
index a047931c6..e3b62da70 100644
--- a/prefs.php
+++ b/prefs.php
@@ -93,7 +93,7 @@
 
 <body id="ttrssPrefs" class="claro">
 
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="notify" class="notify" style="display : none"></div>
 <div id="cmdline" style="display : none"></div>
 
 <div id="overlay">
diff --git a/tt-rss.css b/tt-rss.css
index d2e854d8f..8e87d6598 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -132,14 +132,12 @@ a:hover {
 }
 
 #notify {
-	top : 25px;
+	bottom : 10px;
 	right : 10px;
 	border-width : 1px;
 	border-style : solid;
 	position : absolute;	
-	display : none;
-	float : right;
-	font-size : 11px;
+	font-size : 12px;
 	z-index : 99;
 	padding : 5px;
 	min-width : 200px;
@@ -148,7 +146,21 @@ a:hover {
 
 #notify img {
 	vertical-align : middle;
-	margin-right : 4px;
+	max-height : 14px;
+}
+
+#notify span.msg {
+	width : 100%;
+}
+
+#notify span.close {
+	text-align : right;
+}
+
+#notify span {
+	display : table-cell;
+	vertical-align : middle;
+	padding : 4px;
 }
 
 .notify {
@@ -171,11 +183,6 @@ a:hover {
 	border-color : #ff0000;
 }
 
-.notify.error span:hover {
-	color : red;
-	cursor : pointer;
-}
-
 .hl.Unread div.hlTitle {
 	font-weight : bold;
 }
-- 
cgit v1.2.3-54-g00ecf


From da76e61af8d8c9129acfbf0db670342853a62747 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 19:58:04 +0400
Subject: catchupAllFeeds: do not call obsolete callback

---
 js/tt-rss.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 9a223733f..9e4cb63ce 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -134,7 +134,8 @@ function catchupAllFeeds() {
 		new Ajax.Request("backend.php", {
 			parameters: query_str,
 			onComplete: function(transport) {
-				feedlist_callback2(transport);
+				request_counters(true);
+				viewCurrentFeed();
 			} });
 
 		global_unread = 0;
-- 
cgit v1.2.3-54-g00ecf


From ebec81a6fb2dff0b2fe6b569b021e057995ee6c7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 13:17:28 +0400
Subject: subscribe: verify XML before adding to the database; fetch: try to
 work around entity problems if initial parsing fails

---
 include/functions.php | 19 +++++++++++++++++++
 include/rssfuncs.php  | 29 ++++++++++++++++++++++++++++-
 js/functions.js       | 38 +++++---------------------------------
 3 files changed, 52 insertions(+), 34 deletions(-)

(limited to 'js')

diff --git a/include/functions.php b/include/functions.php
index 4cc8f134d..8ac5753c9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1558,6 +1558,7 @@
 	 *                     Here you should call extractfeedurls in rpc-backend
 	 *                     to get all possible feeds.
 	 *                 5 - Couldn't download the URL content.
+	 *                 6 - Content is an invalid XML.
 	 */
 	function subscribe_to_feed($url, $cat_id = 0,
 			$auth_login = '', $auth_pass = '') {
@@ -1588,6 +1589,18 @@
 			$url = key($feedUrls);
 		}
 
+		libxml_use_internal_errors(true);
+		$doc = new DOMDocument();
+		$doc->loadXML(html_entity_decode($contents));
+		$error = libxml_get_last_error();
+		libxml_clear_errors();
+
+		if ($error) {
+			$error_message = format_libxml_error($error);
+
+			return array("code" => 6, "message" => $error_message);
+		}
+
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
 		} else {
@@ -4203,4 +4216,10 @@
 		return LABEL_BASE_INDEX - 1 + abs($feed);
 	}
 
+	function format_libxml_error($error) {
+		return T_sprintf("LibXML error %s at line %d (column %d): %s",
+				$error->code, $error->line, $error->column,
+				$error->message);
+	}
+
 ?>
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 31d35bf8e..47d622169 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -316,6 +316,25 @@
 					_debug("update_rss_feed: fetch done.");
 				}
 
+				$error = verify_feed_xml($feed_data);
+
+				if ($error) {
+					if ($debug_enabled) {
+						_debug("update_rss_feed: error verifying XML, code: " . $error->code);
+					}
+
+					if ($error->code == 26) {
+						if ($debug_enabled) {
+							_debug("update_rss_feed: got error 26, trying to decode entities...");
+						}
+
+						$feed_data = html_entity_decode($feed_data, ENT_COMPAT, 'UTF-8');
+
+						$error = verify_feed_xml($feed_data);
+
+						if ($error) $feed_data = '';
+					}
+				}
 			}
 
 			if (!$feed_data) {
@@ -559,7 +578,7 @@
 					_debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]");
 				}
 
-				$entry_title = html_entity_decode($item->get_title());
+				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -1421,5 +1440,13 @@
 			mb_strtolower(strip_tags($title), 'utf-8'));
 	}
 
+	function verify_feed_xml($feed_data) {
+		libxml_use_internal_errors(true);
+		$doc = new DOMDocument();
+		$doc->loadXML($feed_data);
+		$error = libxml_get_last_error();
+		libxml_clear_errors();
+		return $error;
+	}
 
 ?>
diff --git a/js/functions.js b/js/functions.js
index e02767504..04be58bf7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -816,39 +816,6 @@ function quickAddFeed() {
 									alert(__("Specified URL doesn't seem to contain any feeds."));
 									break;
 								case 4:
-									/* notify_progress("Searching for feed urls...", true);
-
-									new Ajax.Request("backend.php", {
-										parameters: 'op=rpc&method=extractfeedurls&url=' + param_escape(feed_url),
-										onComplete: function(transport, dialog, feed_url) {
-
-											notify('');
-
-											var reply = JSON.parse(transport.responseText);
-
-											var feeds = reply['urls'];
-
-											console.log(transport.responseText);
-
-											var select = dijit.byId("feedDlg_feedContainerSelect");
-
-											while (select.getOptions().length > 0)
-												select.removeOption(0);
-
-											var count = 0;
-											for (var feedUrl in feeds) {
-												select.addOption({value: feedUrl, label: feeds[feedUrl]});
-												count++;
-											}
-
-//											if (count > 5) count = 5;
-//											select.size = count;
-
-											Effect.Appear('feedDlg_feedsContainer', {duration : 0.5});
-										}
-									});
-									break; */
-
 									feeds = rc['feeds'];
 
 									var select = dijit.byId("feedDlg_feedContainerSelect");
@@ -871,6 +838,11 @@ function quickAddFeed() {
 									alert(__("Couldn't download the specified URL: %s").
 											replace("%s", rc['message']));
 									break;
+								case 6:
+									alert(__("XML validation failed: %s").
+											replace("%s", rc['message']));
+									break;
+									break;
 								case 0:
 									alert(__("You are already subscribed to this feed."));
 									break;
-- 
cgit v1.2.3-54-g00ecf


From f66492d357010a2e5ec11e07fd6db9825184d37d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 20 Apr 2013 10:43:21 +0400
Subject: better javascript error reporting, save error reports in tt-rss log

---
 classes/rpc.php | 11 +++++++++++
 js/functions.js | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/classes/rpc.php b/classes/rpc.php
index 61c815b36..750aa2cb1 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -634,5 +634,16 @@ class RPC extends Handler_Protected {
 		}
 	}
 
+	function log() {
+		$logmsg = $this->dbh->escape_string($_REQUEST['logmsg']);
+
+		if ($logmsg) {
+			Logger::get()->log_error(E_USER_WARNING,
+				$logmsg, '[client-js]', 0, false);
+		}
+
+		echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+
+	}
 }
 ?>
diff --git a/js/functions.js b/js/functions.js
index 04be58bf7..8442e1c9f 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -50,6 +50,21 @@ function exception_error(location, e, ext_info) {
 			}
 		}
 
+		try {
+			new Ajax.Request("backend.php", {
+				parameters: {op: "rpc", method: "log", logmsg: msg},
+				onComplete: function (transport) {
+					console.log(transport.responseText);
+				} });
+
+		} catch (eii) {
+			console.log("Exception while trying to log the error.");
+			console.log(eii);
+		}
+
+		msg += "<p>"+ __("The error will be reported to the configured log destination.") +
+			"</p>";
+
 		var content = "<div class=\"fatalError\">" +
 			"<pre>" + msg + "</pre>";
 
@@ -106,7 +121,28 @@ function exception_error(location, e, ext_info) {
 
 		dialog.show();
 
-	} catch (e) {
+	} catch (ei) {
+		console.log("Exception while trying to report an exception. Oh boy.");
+		console.log(ei);
+		console.log("Original exception:");
+		console.log(e);
+
+		msg += "\n\nAdditional exception caught while trying to show the error dialog.\n\n" +  format_exception_error('exception_error', ei);
+
+		try {
+			new Ajax.Request("backend.php", {
+				parameters: {op: "rpc", method: "log", logmsg: msg},
+				onComplete: function (transport) {
+					console.log(transport.responseText);
+				} });
+
+		} catch (eii) {
+			console.log("Third exception while trying to log the error! Seriously?");
+			console.log(eii);
+		}
+
+		msg += "\n\nThe error will be reported to the configured log destination.";
+
 		alert(msg);
 	}
 
-- 
cgit v1.2.3-54-g00ecf


From 8d388f321b22691246393e3f812d42ab388c8c42 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 24 Apr 2013 19:49:37 +0400
Subject: add a simple JS-based hook host

---
 index.php      | 2 +-
 js/feedlist.js | 1 +
 js/tt-rss.js   | 2 ++
 js/viewfeed.js | 5 +++++
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/index.php b/index.php
index bf78be1f3..6a34be5e8 100644
--- a/index.php
+++ b/index.php
@@ -100,7 +100,7 @@
 		require 'lib/jshrink/Minifier.php';
 
 		print get_minified_js(array("tt-rss",
-			"functions", "feedlist", "viewfeed", "FeedTree"));
+			"functions", "feedlist", "viewfeed", "FeedTree", "PluginHost"));
 
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
diff --git a/js/feedlist.js b/js/feedlist.js
index f4e07517e..2c1acc310 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -139,6 +139,7 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 			onComplete: function(transport) {
 				setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
 				headlines_callback2(transport, offset, background, infscroll_req);
+				PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
 			} });
 
 	} catch (e) {
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 9e4cb63ce..3f8545149 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -40,6 +40,8 @@ function setActiveFeedId(id, is_cat) {
 		$("headlines-frame").setAttribute("is-cat", is_cat ? 1 : 0);
 
 		selectFeed(id, is_cat);
+
+		PluginHost.run(PluginHost.HOOK_FEED_SET_ACTIVE, _active_article_id);
 	} catch (e) {
 		exception_error("setActiveFeedId", e);
 	}
diff --git a/js/viewfeed.js b/js/viewfeed.js
index ddee1e461..14ef2f816 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -232,6 +232,8 @@ function render_article(article) {
 			c.domNode.scrollTop = 0;
 		} catch (e) { };
 
+		PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, article);
+
 		c.attr('content', article);
 
 		correctHeadlinesOffset(getActiveArticleId());
@@ -1193,6 +1195,7 @@ function cdmScrollToArticleId(id, force) {
 
 function setActiveArticleId(id) {
 	_active_article_id = id;
+	PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id);
 }
 
 function getActiveArticleId() {
@@ -1219,6 +1222,8 @@ function unpackVisibleHeadlines() {
 					var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
 
 					if (cencw) {
+						PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child);
+
 						cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
 						cencw.setAttribute('id', '');
 						Element.show(cencw);
-- 
cgit v1.2.3-54-g00ecf


From a06045adf033a232c12cfdce1ebcc8fdaedcc3eb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 24 Apr 2013 19:51:57 +0400
Subject: add missing pluginhost source

---
 js/PluginHost.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 js/PluginHost.js

(limited to 'js')

diff --git a/js/PluginHost.js b/js/PluginHost.js
new file mode 100644
index 000000000..a3a31ce9c
--- /dev/null
+++ b/js/PluginHost.js
@@ -0,0 +1,30 @@
+// based on http://www.velvetcache.org/2010/08/19/a-simple-javascript-hooks-system
+
+var PluginHost = {
+	HOOK_ARTICLE_RENDERED: 1,
+	HOOK_ARTICLE_RENDERED_CDM: 2,
+	HOOK_ARTICLE_SET_ACTIVE: 3,
+	HOOK_FEED_SET_ACTIVE: 4,
+	HOOK_FEED_LOADED: 5,
+	hooks: [],
+	register: function (name, callback) {
+		if (typeof(this.hooks[name]) == 'undefined')
+			this.hooks[name] = [];
+
+		this.hooks[name].push(callback);
+	},
+	run: function (name, args) {
+		console.warn('PluginHost::run ' + name);
+
+		if (typeof(this.hooks[name]) != 'undefined')
+			for (i = 0; i < this.hooks[name].length; i++)
+				if (!this.hooks[name][i](args)) break;
+	}
+};
+
+/* PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED,
+		function (args) { console.log('ARTICLE_RENDERED: ' + args); return true; });
+
+PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM,
+		function (args) { console.log('ARTICLE_RENDERED_CDM: ' + args); return true; }); */
+
-- 
cgit v1.2.3-54-g00ecf


From 06a02265c47fc17bc45fe5222581873fc652ab61 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 25 Apr 2013 09:43:36 +0400
Subject: inject headlines-spacer even if cdm auto catchup is disabled

---
 js/viewfeed.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'js')

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 14ef2f816..96919dc01 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -43,9 +43,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 			if (background) {
 				var content = reply['headlines']['content'];
 
-				if (getInitParam("cdm_auto_catchup") == 1) {
-					content = content + "<div id='headlines-spacer'></div>";
-				}
+				content = content + "<div id='headlines-spacer'></div>";
 				return;
 			}
 
@@ -93,11 +91,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 					}
 				});
 
-				if (getInitParam("cdm_auto_catchup") == 1) {
-					var hsp = $("headlines-spacer");
-					if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
-					dijit.byId('headlines-frame').domNode.appendChild(hsp);
-				}
+				var hsp = $("headlines-spacer");
+				if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+				dijit.byId('headlines-frame').domNode.appendChild(hsp);
 
 				initHeadlinesMenu();
 
-- 
cgit v1.2.3-54-g00ecf


From 2779e22bf5eb8eab0af91138e0d613f604a60a1a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Apr 2013 10:09:40 +0400
Subject: js: add collapsed and expanded hooks

---
 js/PluginHost.js | 2 ++
 js/viewfeed.js   | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'js')

diff --git a/js/PluginHost.js b/js/PluginHost.js
index a3a31ce9c..de4c57b60 100644
--- a/js/PluginHost.js
+++ b/js/PluginHost.js
@@ -6,6 +6,8 @@ var PluginHost = {
 	HOOK_ARTICLE_SET_ACTIVE: 3,
 	HOOK_FEED_SET_ACTIVE: 4,
 	HOOK_FEED_LOADED: 5,
+	HOOK_ARTICLE_EXPANDED: 6,
+	HOOK_ARTICLE_COLLAPSED: 7,
 	hooks: [],
 	register: function (name, callback) {
 		if (typeof(this.hooks[name]) == 'undefined')
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 96919dc01..da869d92a 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1416,6 +1416,8 @@ function cdmCollapseArticle(event, id) {
 			}
 
 			if (event) Event.stop(event);
+
+			PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id);
 		}
 
 	} catch (e) {
@@ -1503,6 +1505,8 @@ function cdmExpandArticle(id, noexpand) {
 		toggleSelected(id);
 		$("RROW-" + id).addClassName("active");
 
+		PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
+
 	} catch (e) {
 		exception_error("cdmExpandArticle", e);
 	}
-- 
cgit v1.2.3-54-g00ecf


From 204f9b186ff903bb5638320ba73614a6a89e2d6d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Apr 2013 14:04:49 +0400
Subject: remove cdmUnexpandArticle

---
 js/tt-rss.js   |  2 +-
 js/viewfeed.js | 36 ++++++++++--------------------------
 2 files changed, 11 insertions(+), 27 deletions(-)

(limited to 'js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 3f8545149..88a360f99 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -309,7 +309,7 @@ function init() {
 				var id = getActiveArticleId();
 				var elem = $("CICD-"+id);
 				if(elem.visible()) {
-					cdmUnexpandArticle(null, id);
+					cdmCollapseArticle(null, id, false);
 				}
 				else {
 					cdmExpandArticle(id);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index da869d92a..ada225cbf 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1395,8 +1395,10 @@ function catchupRelativeToArticle(below, id) {
 	}
 }
 
-function cdmCollapseArticle(event, id) {
+function cdmCollapseArticle(event, id, unmark) {
 	try {
+		if (unmark == undefined) unmark = true;
+
 		var row = $("RROW-" + id);
 		var elem = $("CICD-" + id);
 
@@ -1407,12 +1409,15 @@ function cdmCollapseArticle(event, id) {
 		  	Element.hide(elem);
 			Element.show("CEXC-" + id);
 			Element.hide(collapse);
-			row.removeClassName("active");
 
-			markHeadline(id, false);
+			if (unmark) {
+				row.removeClassName("active");
+
+				markHeadline(id, false);
 
-			if (id == getActiveArticleId()) {
-				setActiveArticleId(0);
+				if (id == getActiveArticleId()) {
+					setActiveArticleId(0);
+				}
 			}
 
 			if (event) Event.stop(event);
@@ -1425,27 +1430,6 @@ function cdmCollapseArticle(event, id) {
 	}
 }
 
-function cdmUnexpandArticle(event, id) {
-	try {
-		var row = $("RROW-" + id);
-		var elem = $("CICD-" + id);
-
-		if (elem && row) {
-			var collapse = $$("div#RROW-" + id +
-				" span[class='collapseBtn']")[0];
-
-		  	Element.hide(elem);
-			Element.show("CEXC-" + id);
-			Element.hide(collapse);
-
-			if (event) Event.stop(event);
-		}
-
-	} catch (e) {
-		exception_error("cdmUnexpandArticle", e);
-	}
-}
-
 function cdmExpandArticle(id, noexpand) {
 	try {
 		console.log("cdmExpandArticle " + id);
-- 
cgit v1.2.3-54-g00ecf


From 6bfc97da869ca180d2f5fee01c9ff503cb47b1bd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 26 Apr 2013 10:31:57 +0400
Subject: add automatic timezone (based on client tz offset)

---
 classes/rpc.php       |  1 +
 include/functions.php | 17 +++++++++++------
 js/prefs.js           |  5 ++++-
 js/tt-rss.js          |  2 ++
 lib/timezones.txt     |  1 +
 5 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'js')

diff --git a/classes/rpc.php b/classes/rpc.php
index 750aa2cb1..62d884673 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -334,6 +334,7 @@ class RPC extends Handler_Protected {
 		$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
 		$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
 		$_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
+		$_SESSION["clientTzOffset"] = $_REQUEST["clientTzOffset"];
 
 		$reply = array();
 
diff --git a/include/functions.php b/include/functions.php
index b54187e18..4272c649d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -862,13 +862,18 @@
 
 		$user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
 
-		try {
-			if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
-		} catch (Exception $e) {
-			$user_tz = $utc_tz;
-		}
+		if ($user_tz_string != 'Automatic') {
 
-		$tz_offset = $user_tz->getOffset($dt);
+			try {
+				if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+			} catch (Exception $e) {
+				$user_tz = $utc_tz;
+			}
+
+			$tz_offset = $user_tz->getOffset($dt);
+		} else {
+			$tz_offset = (int) $_SESSION["clientTzOffset"];
+		}
 
 		$user_timestamp = $dt->format('U') + $tz_offset;
 
diff --git a/js/prefs.js b/js/prefs.js
index 8612b70fb..431a1fe84 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -962,8 +962,11 @@ function init() {
 		dojo.addOnLoad(function() {
 			loading_set_progress(50);
 
+			var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
 			new Ajax.Request("backend.php", {
-				parameters: {op: "rpc", method: "sanityCheck"},
+				parameters: {op: "rpc", method: "sanityCheck",
+				 	clientTzOffset: clientTzOffset },
 					onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
 				} });
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 88a360f99..a7518959c 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -256,10 +256,12 @@ function init() {
 		var hasAudio = !!a.canPlayType;
 		var hasSandbox = "sandbox" in document.createElement("iframe");
 		var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
+		var clientTzOffset = new Date().getTimezoneOffset() * 60;
 
 		new Ajax.Request("backend.php",	{
 			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
 				hasMp3: hasMp3,
+			 	clientTzOffset: clientTzOffset,
 				hasSandbox: hasSandbox},
 			onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
diff --git a/lib/timezones.txt b/lib/timezones.txt
index 66824ec93..58108f031 100644
--- a/lib/timezones.txt
+++ b/lib/timezones.txt
@@ -1,3 +1,4 @@
+Automatic
 Africa/Abidjan
 Africa/Accra
 Africa/Addis_Ababa
-- 
cgit v1.2.3-54-g00ecf


From abbe9c1f555baa7ae14b9424ff995edb16122d1c Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 27 Apr 2013 09:45:02 -0500
Subject: minor: remove duplicate check for params

---
 js/functions.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/functions.js b/js/functions.js
index 8442e1c9f..87c52b709 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1269,13 +1269,11 @@ function backend_sanity_check_callback(transport) {
 		if (params) {
 			console.log('reading init-params...');
 
-			if (params) {
-				for (k in params) {
-					var v = params[k];
-					console.log("IP: " + k + " => " + v);
+			for (k in params) {
+				var v = params[k];
+				console.log("IP: " + k + " => " + v);
 
-					if (k == "label_base_index") _label_base_index = parseInt(v);
-				}
+				if (k == "label_base_index") _label_base_index = parseInt(v);
 			}
 
 			init_params = params;
-- 
cgit v1.2.3-54-g00ecf


From 8ceea119a8287568439a2a9d167b333f74a47e21 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Sat, 27 Apr 2013 11:01:54 -0500
Subject: Add JS PluginHost.HOOK_PARAMS_LOADED and
 PluginHost.HOOK_RUNTIME_INFO_LOADED to notify when interesting info has been
 created/updated.

---
 js/PluginHost.js | 2 ++
 js/functions.js  | 3 +++
 js/tt-rss.js     | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/PluginHost.js b/js/PluginHost.js
index de4c57b60..668d215f9 100644
--- a/js/PluginHost.js
+++ b/js/PluginHost.js
@@ -8,6 +8,8 @@ var PluginHost = {
 	HOOK_FEED_LOADED: 5,
 	HOOK_ARTICLE_EXPANDED: 6,
 	HOOK_ARTICLE_COLLAPSED: 7,
+	HOOK_PARAMS_LOADED: 8,
+	HOOK_RUNTIME_INFO_LOADED: 9,
 	hooks: [],
 	register: function (name, callback) {
 		if (typeof(this.hooks[name]) == 'undefined')
diff --git a/js/functions.js b/js/functions.js
index 87c52b709..8691c1ee5 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1277,6 +1277,9 @@ function backend_sanity_check_callback(transport) {
 			}
 
 			init_params = params;
+
+			// PluginHost might not be available on non-index pages
+			window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, init_params);
 		}
 
 		sanity_check_done = true;
diff --git a/js/tt-rss.js b/js/tt-rss.js
index a7518959c..2a741ab2d 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -753,6 +753,8 @@ function parse_runtime_info(data) {
 		init_params[k] = v;
 		notify('');
 	}
+
+	PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
 }
 
 function collapse_feedlist() {
@@ -992,7 +994,7 @@ function handle_rpc_json(transport, scheduled_call) {
 			if (counters)
 				parse_counters(counters, scheduled_call);
 
-			var runtime_info = reply['runtime-info'];;
+			var runtime_info = reply['runtime-info'];
 
 			if (runtime_info)
 				parse_runtime_info(runtime_info);
-- 
cgit v1.2.3-54-g00ecf


From 52e7b5a096f5d0d7724b6f1731559b237b2c47ae Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 23:12:54 +0400
Subject: add clear sql log button

---
 classes/pref/system.php |  7 +++++++
 js/prefs.js             | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'js')

diff --git a/classes/pref/system.php b/classes/pref/system.php
index d2b6cd746..7accb1f91 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -19,6 +19,10 @@ class Pref_System extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
+	function clearLog() {
+		$this->dbh->query("DELETE FROM ttrss_error_log");
+	}
+
 	function index() {
 
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
@@ -35,6 +39,9 @@ class Pref_System extends Handler_Protected {
 			print "<button dojoType=\"dijit.form.Button\"
 				onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
 
+			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+				onclick=\"clearSqlLog()\">".__('Clear log')."</button> ";
+
 			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
 			print "<tr class=\"title\">
diff --git a/js/prefs.js b/js/prefs.js
index 431a1fe84..4346054ef 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1833,3 +1833,21 @@ function clearPluginData(name) {
 		exception_error("clearPluginData", e);
 	}
 }
+
+function clearSqlLog() {
+
+	if (confirm(__("Clear all messages in the error log?"))) {
+
+		notify_progress("Loading, please wait...");
+		var query = "?op=pref-system&method=clearLog";
+
+		new Ajax.Request("backend.php",	{
+			parameters: query,
+			onComplete: function(transport) {
+				updateSystemList();
+			} });
+
+	}
+}
+
+
-- 
cgit v1.2.3-54-g00ecf


From 27372ddac6b17ab2700ec2f9bc6bc1ac0ea153fe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 30 Apr 2013 20:07:08 +0400
Subject: fix editArticleTags() call broken on archived feed

---
 classes/feeds.php | 2 +-
 js/tt-rss.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/classes/feeds.php b/classes/feeds.php
index 567d13b25..f21bb3ce5 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -687,7 +687,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
 						<a title=\"".__('Edit tags for this article')."\"
-						href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
+						href=\"#\" onclick=\"editArticleTags($id)\">(+)</a>";
 
 					$num_comments = $line["num_comments"];
 					$entry_comments = "";
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 2a741ab2d..c6c0c13dd 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -332,7 +332,7 @@ function init() {
 		hotkey_actions["edit_tags"] = function() {
 				var id = getActiveArticleId();
 				if (id) {
-					editArticleTags(id, getActiveFeedId(), isCdmMode());
+					editArticleTags(id);
 				};
 			}
 		hotkey_actions["dismiss_selected"] = function() {
-- 
cgit v1.2.3-54-g00ecf


From ea18cceaca2fb7562f07a78248fcc15469413629 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 2 May 2013 09:48:38 +0400
Subject: remove splash before freshfeed is loaded

---
 js/feedlist.js | 2 ++
 js/tt-rss.js   | 4 ++--
 js/viewfeed.js | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/feedlist.js b/js/feedlist.js
index 2c1acc310..932297be8 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -151,6 +151,8 @@ function feedlist_init() {
 	try {
 		console.log("in feedlist init");
 
+		loading_set_progress(50);
+
 		document.onkeydown = hotkey_handler;
 		setTimeout("hotkey_prefix_timeout()", 5*1000);
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index c6c0c13dd..577922948 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -249,7 +249,7 @@ function init() {
 		if (!genericSanityCheck())
 			return false;
 
-		loading_set_progress(20);
+		loading_set_progress(30);
 
 		var a = document.createElement('audio');
 
@@ -573,7 +573,7 @@ function init_second_stage() {
 			setActiveFeedId(hash_feed_id, hash_feed_is_cat);
 		}
 
-		loading_set_progress(30);
+		loading_set_progress(50);
 
 		// can't use cache_clear() here because viewfeed might not have initialized yet
 		if ('sessionStorage' in window && window['sessionStorage'] !== null)
diff --git a/js/viewfeed.js b/js/viewfeed.js
index ada225cbf..3e78f4ca9 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -20,8 +20,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 	try {
 		handle_rpc_json(transport);
 
-		loading_set_progress(25);
-
 		console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
 
 		var is_cat = false;
-- 
cgit v1.2.3-54-g00ecf


From b43b92928a37a5fa431a2f11ac5d3b4abf692fbc Mon Sep 17 00:00:00 2001
From: Jeffrey Tolar <tolar.jeffrey@gmail.com>
Date: Thu, 2 May 2013 18:15:41 -0500
Subject: Update selected count when collapsing an article

---
 js/viewfeed.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js')

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3e78f4ca9..75dd64f11 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1416,6 +1416,8 @@ function cdmCollapseArticle(event, id, unmark) {
 				if (id == getActiveArticleId()) {
 					setActiveArticleId(0);
 				}
+
+				updateSelectedPrompt();
 			}
 
 			if (event) Event.stop(event);
-- 
cgit v1.2.3-54-g00ecf


From 8d090a910b7e2d4d1b26e734c09eaa773b853804 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 4 May 2013 12:01:53 +0400
Subject: use css nth-child instead of old even/odd class hacks for normal mode

---
 classes/feeds.php      |  4 ++--
 classes/pref/feeds.php |  2 --
 classes/pref/prefs.php |  2 --
 classes/pref/users.php |  8 +-------
 js/viewfeed.js         | 25 -------------------------
 tt-rss.css             | 20 +++-----------------
 6 files changed, 6 insertions(+), 55 deletions(-)

(limited to 'js')

diff --git a/classes/feeds.php b/classes/feeds.php
index 1a1798151..f499fe9a6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -288,8 +288,6 @@ class Feeds extends Handler_Protected {
 			$expand_cdm = get_pref('CDM_EXPANDED');
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
-				$class = ($lnum % 2) ? "even" : "odd";
-
 				$id = $line["id"];
 				$feed_id = $line["feed_id"];
 				$label_cache = $line["label_cache"];
@@ -316,6 +314,8 @@ class Feeds extends Handler_Protected {
 					array_push($topmost_article_ids, $id);
 				}
 
+				$class = "";
+
 				if (sql_bool_to_bool($line["unread"])) {
 					$class .= " Unread";
 					++$num_unread;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e31725111..ab280a98e 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1594,7 +1594,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FUPDD-$feed_id\"";
 
@@ -1664,7 +1663,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FERDD-$feed_id\"";
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 45715488a..ba83a9900 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1041,8 +1041,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
-
 			$profile_id = $line["id"];
 			$this_row_id = "id=\"FCATR-$profile_id\"";
 
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 4b7d2d69a..d97362f9f 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -69,8 +69,6 @@ class Pref_Users extends Handler_Protected {
 
 			print "<ul class=\"userFeedList\">";
 
-			$row_class = "odd";
-
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$icon_file = ICONS_URL."/".$line["id"].".ico";
@@ -81,9 +79,7 @@ class Pref_Users extends Handler_Protected {
 					$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
 				}
 
-				print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
-
-				$row_class = $row_class == "even" ? "odd" : "even";
+				print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
 			}
 
@@ -408,8 +404,6 @@ class Pref_Users extends Handler_Protected {
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
-				$class = ($lnum % 2) ? "even" : "odd";
-
 				$uid = $line["id"];
 
 				print "<tr id=\"UMRR-$uid\">";
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3e78f4ca9..0e1e9cdba 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -134,8 +134,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 					if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-					fixHeadlinesOrder(getLoadedArticleIds());
-
 					if (getInitParam("cdm_auto_catchup") == 1) {
 						c.domNode.appendChild(hsp);
 					}
@@ -1496,26 +1494,6 @@ function cdmExpandArticle(id, noexpand) {
 	return false;
 }
 
-function fixHeadlinesOrder(ids) {
-	try {
-		for (var i = 0; i < ids.length; i++) {
-			var e = $("RROW-" + ids[i]);
-
-			if (e) {
-				if (i % 2 == 0) {
-					e.removeClassName("even");
-					e.addClassName("odd");
-				} else {
-					e.removeClassName("odd");
-					e.addClassName("even");
-				}
-			}
-		}
-	} catch (e) {
-		exception_error("fixHeadlinesOrder", e);
-	}
-}
-
 function getArticleUnderPointer() {
 	return post_under_pointer;
 }
@@ -1596,7 +1574,6 @@ function dismissSelectedArticles() {
 		if (sel.length > 0)
 			selectionToggleUnread(false);
 
-		fixHeadlinesOrder(tmp);
 
 	} catch (e) {
 		exception_error("dismissSelectedArticles", e);
@@ -1621,8 +1598,6 @@ function dismissReadArticles() {
 			}
 		}
 
-		fixHeadlinesOrder(tmp);
-
 	} catch (e) {
 		exception_error("dismissSelectedArticles", e);
 	}
diff --git a/tt-rss.css b/tt-rss.css
index 454e2ffd1..6b4a10d7d 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -187,17 +187,12 @@ a:hover {
 	font-weight : bold;
 }
 
-.hl.even.Grayed {
-	background : #f0f0f0;
+.hl.Grayed {
 	color : #909090;
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #c0c0c0;
-	border-collapse : collapse;
 }
 
-.hl.odd.Grayed {
-	color : #909090;
+#headlines-frame div.hl:nth-child(even) {
+	background : #f0f0f0;
 }
 
 .hl {
@@ -210,15 +205,6 @@ a:hover {
 	background : #ecf4ff ! important;
 }
 
-.hl.even {
-	background : #f0f0f0;
-	border-collapse : collapse;
-}
-
-.hl.odd {
-	background : white;
-}
-
 div.filterTestHolder {
 	height : 300px;
 	overflow : auto;
-- 
cgit v1.2.3-54-g00ecf


From e5e6cde06a79551c42a7821722d33683e0a6829f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 6 May 2013 12:50:52 +0400
Subject: remove support for hiding empty categories in prefs editor because
 people are dumb

---
 classes/pref/feeds.php | 14 ++------------
 js/prefs.js            | 15 ---------------
 2 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'js')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ab280a98e..da3a96282 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -36,8 +36,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		// first one is set by API
 		$show_empty_cats = $_REQUEST['force_show_empty'] ||
-			($_REQUEST['mode'] != 2 && !$search &&
-				get_pref('_PREFS_SHOW_EMPTY_CATS'));
+			($_REQUEST['mode'] != 2 && !$search);
 
 		$items = array();
 
@@ -185,8 +184,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		if ($enable_cats) {
 			$show_empty_cats = $_REQUEST['force_show_empty'] ||
-				($_REQUEST['mode'] != 2 && !$search &&
-				get_pref('_PREFS_SHOW_EMPTY_CATS'));
+				($_REQUEST['mode'] != 2 && !$search);
 
 			$result = $this->dbh->query("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title");
@@ -305,11 +303,6 @@ class Pref_Feeds extends Handler_Protected {
 		return;
 	}
 
-	function togglehiddenfeedcats() {
-		set_pref('_PREFS_SHOW_EMPTY_CATS',
-			(get_pref('_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
-	}
-
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 		$debug = isset($_REQUEST["debug"]);
 
@@ -1351,9 +1344,6 @@ class Pref_Feeds extends Handler_Protected {
 		print $error_button;
 		print $inactive_button;
 
-		print "<button onclick=\"toggleHiddenFeedCats()\"
-			dojoType=\"dijit.form.Button\">".__('(Un)hide empty categories')."</button>";
-
 		if (defined('_ENABLE_FEED_DEBUGGING')) {
 
 			print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
diff --git a/js/prefs.js b/js/prefs.js
index 4346054ef..e226459fc 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1610,21 +1610,6 @@ function resetCatOrder() {
 	}
 }
 
-function toggleHiddenFeedCats() {
-	try {
-		notify_progress("Loading, please wait...");
-
-		new Ajax.Request("backend.php", {
-			parameters: "?op=pref-feeds&method=togglehiddenfeedcats",
-			onComplete: function(transport) {
-		  		updateFeedList();
-			} });
-
-	} catch (e) {
-		exception_error("toggleHiddenFeedCats");
-	}
-}
-
 function editCat(id, item, event) {
 	try {
 		var new_name = prompt(__('Rename category to:'), item.name);
-- 
cgit v1.2.3-54-g00ecf