From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 9 Sep 2011 10:24:14 +0000 (+0400)
Subject: mobile: fix headline ordering
X-Git-Tag: 1.5.6~26
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b9fca8678b2fc3603fc4e2d1b6da85b022f70381;p=tt-rss.git

mobile: fix headline ordering
mobile: fix htmlpurifier cache being included from wrong directory
mobile: implement ability to mark article as unread (closes #367)
---

diff --git a/functions.php b/functions.php
index 48ab664c..5ec459fa 100644
--- a/functions.php
+++ b/functions.php
@@ -120,7 +120,11 @@
 	@$config->set('HTML', 'Allowed', $allowed);
 	$config->set('Output.FlashCompat', true);
 	$config->set('Attr.EnableID', true);
-	@$config->set('Cache', 'SerializerPath', CACHE_DIR . "/htmlpurifier");
+	if (!defined('MOBILE_VERSION')) {
+		@$config->set('Cache', 'SerializerPath', CACHE_DIR . "/htmlpurifier");
+	} else {
+		@$config->set('Cache', 'SerializerPath', "../" . CACHE_DIR . "/htmlpurifier");
+	}
 
 	$purifier = new HTMLPurifier($config);
 
diff --git a/mobile/backend.php b/mobile/backend.php
index 85018c58..2e473a37 100644
--- a/mobile/backend.php
+++ b/mobile/backend.php
@@ -7,11 +7,11 @@
 
 	require_once "../config.php";
 	require_once "functions.php";
-	require_once "../functions.php"; 
+	require_once "../functions.php";
 
 	require_once "../sessions.php";
 
-	require_once "../version.php"; 
+	require_once "../version.php";
 	require_once "../db-prefs.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
@@ -35,6 +35,13 @@
 
 		publishArticlesById($link, array($id), $cmode);
 		break;
+	case "toggleUnread":
+		$cmode = db_escape_string($_REQUEST["unread"]);
+		$id = db_escape_string($_REQUEST["id"]);
+
+		catchupArticlesById($link, array($id), $cmode);
+		break;
+
 	case "setPref":
 		$id = db_escape_string($_REQUEST["id"]);
 		$value = db_escape_string($_REQUEST["to"]);
diff --git a/mobile/functions.php b/mobile/functions.php
index eb523d71..e84be934 100644
--- a/mobile/functions.php
+++ b/mobile/functions.php
@@ -339,7 +339,7 @@
 
 		$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
 			$view_mode, $is_cat, $search, $search_mode, $match_on,
-			"unread DESC, updated, score", $offset);
+			"score DESC, date_entered DESC", $offset);
 
 		$result = $qfh_ret[0];
 		$feed_title = $qfh_ret[1];
@@ -523,6 +523,12 @@
 	                <div class=\"toggle\" onclick=\"togglePublished($id, this)\" toggled=\"$is_published\"><span class=\"thumb\"></span><span class=\"toggleOn\">ON</span><span class=\"toggleOff\">OFF</span></div>
 	            </div>";
 
+			print "<div class=\"row\">
+	                <label>Unread</label>
+	                <div class=\"toggle\" onclick=\"toggleUnread($id, this)\" toggled=\"$is_unread\"><span class=\"thumb\"></span><span class=\"toggleOn\">ON</span><span class=\"toggleOff\">OFF</span></div>
+	            </div>";
+
+
 			print "</fieldset>";
 
 			print "</div>";
diff --git a/mobile/mobile.js b/mobile/mobile.js
index 6b573619..2a948ca4 100644
--- a/mobile/mobile.js
+++ b/mobile/mobile.js
@@ -39,6 +39,26 @@ function togglePublished(id, elem) {
 
 }
 
+function toggleUnread(id, elem) {
+
+	var toggled = false;
+
+	if (elem.getAttribute("toggled") == "true") {
+		toggled = 1;
+	} else {
+		toggled = 0;
+	}
+
+	var query = "?op=toggleUnread&id=" + id + "&unread=" + toggled;
+
+	new Ajax.Request(backend, {
+		parameters: query,
+		onComplete: function (transport) {
+			//
+		} });
+
+}
+
 function setPref(elem) {
 	var toggled = false;
 	var id = elem.id;