From ba68b6815ab31d17cda113e7990eeb07558b02a9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 14:23:35 +0400
Subject: db updates, remove init_connection()

---
 plugins/mobile/article.php | 2 +-
 plugins/mobile/backend.php | 2 +-
 plugins/mobile/cat.php     | 2 +-
 plugins/mobile/feed.php    | 2 +-
 plugins/mobile/home.php    | 2 +-
 plugins/mobile/index.php   | 2 +-
 plugins/mobile/prefs.php   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/mobile')

diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index f6aed994f..c73c0fca5 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index a88e02a92..dc657ed40 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -23,7 +23,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	if (!$_SESSION["uid"]) return;
 
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index 7b5cf43f9..acd7f6f34 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index 6eae741ac..22590f195 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index 03fccb3e2..f0ebf6a11 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 3feec7531..3fd496d04 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -18,7 +18,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 ?>
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index 323196254..e6d4a7b40 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -20,7 +20,7 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);
+	init_plugins($link);
 
 	login_sequence($link, true);
 ?>
-- 
cgit v1.2.3


From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 16:23:15 +0400
Subject: remove $link

---
 plugins/mobile/article.php          | 12 ++---
 plugins/mobile/backend.php          | 24 +++++-----
 plugins/mobile/cat.php              |  6 +--
 plugins/mobile/feed.php             | 14 +++---
 plugins/mobile/home.php             |  8 ++--
 plugins/mobile/index.php            |  8 ++--
 plugins/mobile/init.php             |  3 --
 plugins/mobile/mobile-functions.php | 90 ++++++++++++++++++-------------------
 plugins/mobile/prefs.php            | 14 +++---
 9 files changed, 88 insertions(+), 91 deletions(-)

(limited to 'plugins/mobile')

diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index c73c0fca5..17fc39395 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -20,13 +20,13 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$id = db_escape_string($link, $_REQUEST["id"]);
-	$feed_id = db_escape_string($link, $_REQUEST["feed"]);
-	$cat_id = db_escape_string($link, $_REQUEST["cat"]);
-	$is_cat = db_escape_string($link, $_REQUEST["is_cat"]);
+	$id = db_escape_string( $_REQUEST["id"]);
+	$feed_id = db_escape_string( $_REQUEST["feed"]);
+	$cat_id = db_escape_string( $_REQUEST["cat"]);
+	$is_cat = db_escape_string( $_REQUEST["is_cat"]);
 
-  	render_article($link, $id, $feed_id, $cat_id, $is_cat);
+  	render_article( $id, $feed_id, $cat_id, $is_cat);
 ?>
 
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index dc657ed40..a62f462d5 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -31,28 +31,28 @@
 
 	switch ($op) {
 	case "toggleMarked":
-		$cmode = db_escape_string($link, $_REQUEST["mark"]);
-		$id = db_escape_string($link, $_REQUEST["id"]);
+		$cmode = db_escape_string( $_REQUEST["mark"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		markArticlesById($link, array($id), $cmode);
+		markArticlesById( array($id), $cmode);
 		break;
 	case "togglePublished":
-		$cmode = db_escape_string($link, $_REQUEST["pub"]);
-		$id = db_escape_string($link, $_REQUEST["id"]);
+		$cmode = db_escape_string( $_REQUEST["pub"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		publishArticlesById($link, array($id), $cmode);
+		publishArticlesById( array($id), $cmode);
 		break;
 	case "toggleUnread":
-		$cmode = db_escape_string($link, $_REQUEST["unread"]);
-		$id = db_escape_string($link, $_REQUEST["id"]);
+		$cmode = db_escape_string( $_REQUEST["unread"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		catchupArticlesById($link, array($id), $cmode);
+		catchupArticlesById( array($id), $cmode);
 		break;
 
 	case "setPref":
-		$id = db_escape_string($link, $_REQUEST["id"]);
-		$value = db_escape_string($link, $_REQUEST["to"]);
-		mobile_set_pref($link, $id, $value);
+		$id = db_escape_string( $_REQUEST["id"]);
+		$value = db_escape_string( $_REQUEST["to"]);
+		mobile_set_pref( $id, $value);
 		print_r($_SESSION);
 		break;
 	default:
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index acd7f6f34..ec5bbf3d9 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -20,10 +20,10 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$cat_id = db_escape_string($link, $_REQUEST["id"]);
+	$cat_id = db_escape_string( $_REQUEST["id"]);
 
-  	render_category($link, $cat_id);
+  	render_category( $cat_id);
 ?>
 
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index 22590f195..08e916e21 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$feed_id = db_escape_string($link, $_REQUEST["id"]);
-	$cat_id = db_escape_string($link, $_REQUEST["cat"]);
-	$offset = (int) db_escape_string($link, $_REQUEST["skip"]);
-	$search = db_escape_string($link, $_REQUEST["search"]);
-	$is_cat = (bool) db_escape_string($link, $_REQUEST["is_cat"]);
+	$feed_id = db_escape_string( $_REQUEST["id"]);
+	$cat_id = db_escape_string( $_REQUEST["cat"]);
+	$offset = (int) db_escape_string( $_REQUEST["skip"]);
+	$search = db_escape_string( $_REQUEST["search"]);
+	$is_cat = (bool) db_escape_string( $_REQUEST["is_cat"]);
 
-  	render_headlines_list($link, $feed_id, $cat_id, $offset, $search, $is_cat);
+  	render_headlines_list( $feed_id, $cat_id, $offset, $search, $is_cat);
 ?>
 
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index f0ebf6a11..57b18cd85 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 
-	$use_cats = mobile_get_pref($link, 'ENABLE_CATS');
-	$offset = (int) db_escape_string($link, $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref( 'ENABLE_CATS');
+	$offset = (int) db_escape_string( $_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list($link, $offset);
+		render_flat_feed_list( $offset);
 	}
 ?>
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 3fd496d04..8202f4043 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -20,7 +20,7 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -76,13 +76,13 @@
     </div>
 
 	<?php
-	$use_cats = mobile_get_pref($link, 'ENABLE_CATS');
-	$offset = (int) db_escape_string($link, $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref( 'ENABLE_CATS');
+	$offset = (int) db_escape_string( $_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list($link, $offset);
+		render_flat_feed_list( $offset);
 	}
 	?>
 
diff --git a/plugins/mobile/init.php b/plugins/mobile/init.php
index 0ebbcced1..ad2d1cdd9 100644
--- a/plugins/mobile/init.php
+++ b/plugins/mobile/init.php
@@ -1,7 +1,5 @@
 <?php
 class Mobile extends Plugin implements IHandler {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +10,6 @@ class Mobile extends Plugin implements IHandler {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_handler("mobile", "index", $this);
diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php
index 8e5cb7010..0395ee7a5 100644
--- a/plugins/mobile/mobile-functions.php
+++ b/plugins/mobile/mobile-functions.php
@@ -8,34 +8,34 @@
 
 	/* TODO replace with interface to db-prefs */
 
-	function mobile_pref_toggled($link, $id) {
-		if (get_pref($link, "_MOBILE_$id"))
+	function mobile_pref_toggled( $id) {
+		if (get_pref( "_MOBILE_$id"))
 			return "true";
 		else
 			return "";
 	}
 
-	function mobile_get_pref($link, $id) {
+	function mobile_get_pref( $id) {
 		//return $_SESSION["mobile-prefs"][$id];
-		return get_pref($link, "_MOBILE_$id");
+		return get_pref( "_MOBILE_$id");
 	}
 
-	function mobile_set_pref($link, $id, $value) {
+	function mobile_set_pref( $id, $value) {
 		//$_SESSION["mobile-prefs"][$id] = $value;
-		return set_pref($link, "_MOBILE_$id", $value);
+		return set_pref( "_MOBILE_$id", $value);
 	}
 
 	function mobile_feed_has_icon($id) {
 		return file_exists("../../".ICONS_DIR."/$id.ico");
 	}
 
-	function render_flat_feed_list($link, $offset) {
+	function render_flat_feed_list( $offset) {
 		$owner_uid = $_SESSION["uid"];
 		$limit = 0;
 
 		if (!$offset) $offset = 0;
 
-		if (mobile_get_pref($link, "SORT_FEEDS_UNREAD")) {
+		if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
 			$order_by = "unread DESC, title";
 		} else {
 			$order_by = "title";
@@ -47,7 +47,7 @@
 			$limit_qpart = "";
 		}
 
-		$result = db_query($link, "SELECT id,
+		$result = db_query( "SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -85,7 +85,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -103,7 +103,7 @@
 
 	}
 
-	function render_category($link, $cat_id, $offset) {
+	function render_category( $cat_id, $offset) {
 		$owner_uid = $_SESSION["uid"];
 
 		if ($cat_id >= 0) {
@@ -114,13 +114,13 @@
 				$cat_query = "cat_id IS NULL";
 			}
 
-			if (mobile_get_pref($link, "SORT_FEEDS_UNREAD")) {
+			if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
 				$order_by = "unread DESC, title";
 			} else {
 				$order_by = "title";
 			}
 
-			$result = db_query($link, "SELECT id,
+			$result = db_query( "SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -132,7 +132,7 @@
 				$cat_query
 			ORDER BY $order_by");
 
-			$title = getCategoryTitle($link, $cat_id);
+			$title = getCategoryTitle( $cat_id);
 
 			print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
@@ -158,7 +158,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -174,8 +174,8 @@
 				myBackHref='home.php'>";
 
 			foreach (array(-4, -3, -1, -2, 0) as $id) {
-				$title = getFeedTitle($link, $id);
-				$unread = getFeedUnread($link, $id, false);
+				$title = getFeedTitle( $id);
+				$unread = getFeedUnread( $id, false);
 				$icon = getFeedIcon($id);
 
 				if ($unread > 0) {
@@ -185,7 +185,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-1'>
 						<img class='tinyIcon' src='../$icon'/>$title</a></li>";
@@ -200,7 +200,7 @@
 			print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
 
-			$result = db_query($link, "SELECT id, caption FROM ttrss_labels2
+			$result = db_query( "SELECT id, caption FROM ttrss_labels2
 				WHERE owner_uid = '$owner_uid'");
 
 			$label_data = array();
@@ -209,7 +209,7 @@
 
 				$id = label_to_feed_id($line["id"]);
 
-				$unread = getFeedUnread($link, $id);
+				$unread = getFeedUnread( $id);
 				$title = $line["caption"];
 
 				if ($unread > 0) {
@@ -219,7 +219,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-2'>$title</a></li>";
 				}
@@ -231,7 +231,7 @@
 	function render_categories_list($link) {
 		$owner_uid = $_SESSION["uid"];
 
-		$cat_browse = mobile_get_pref($link, "BROWSE_CATS");
+		$cat_browse = mobile_get_pref( "BROWSE_CATS");
 
 		print '<ul id="home" title="'.__('Home').'" selected="true"
 			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
@@ -239,8 +239,8 @@
 //		print "<li><a href='#searchForm'>Search...</a></li>";
 
 		foreach (array(-1, -2) as $id) {
-			$title = getCategoryTitle($link, $id);
-			$unread = getFeedUnread($link, $id, true);
+			$title = getCategoryTitle( $id);
+			$unread = getFeedUnread( $id, true);
 			if ($unread > 0) {
 				$title = $title . " ($unread)";
 				$class = '';
@@ -254,7 +254,7 @@
 				print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>";
 		}
 
-		$result = db_query($link, "SELECT
+		$result = db_query( "SELECT
 				ttrss_feed_categories.id,
 				ttrss_feed_categories.title,
 				COUNT(ttrss_feeds.id) AS num_feeds
@@ -269,7 +269,7 @@
 
 			if ($line["num_feeds"] > 0) {
 
-				$unread = getFeedUnread($link, $line["id"], true);
+				$unread = getFeedUnread( $line["id"], true);
 				$id = $line["id"];
 
 				if ($unread > 0) {
@@ -279,7 +279,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 
 					if ($cat_browse)
 						print "<li class='$class'><a href='cat.php?id=$id'>" .
@@ -292,13 +292,13 @@
 		}
 
 
-		$result = db_query($link, "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
+		$result = db_query( "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
 			cat_id IS NULL and owner_uid = '$owner_uid'");
 
 		$num_feeds = db_fetch_result($result, 0, "nf");
 
 		if ($num_feeds > 0) {
-			$unread = getFeedUnread($link, 0, true);
+			$unread = getFeedUnread( 0, true);
 			$title = "Uncategorized";
 
 			if ($unread > 0) {
@@ -308,7 +308,7 @@
 				$class = 'oldItem';
 			}
 
-			if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
+			if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
 				if ($cat_browse)
 					print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>";
 				else
@@ -320,14 +320,14 @@
 		print "</ul>";
 	}
 
-	function render_headlines_list($link, $feed_id, $cat_id, $offset, $search,
+	function render_headlines_list( $feed_id, $cat_id, $offset, $search,
 		$is_cat = false) {
 
 		$feed_id = $feed_id;
 		$limit = 15;
 		$filter = '';
 
-		if (!mobile_get_pref($link, "HIDE_READ"))
+		if (!mobile_get_pref( "HIDE_READ"))
 			$view_mode = "all_articles";
 		else
 			$view_mode = 'adaptive';
@@ -338,9 +338,9 @@
 			$search_mode = '';
 		}
 
-		$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
+		$qfh_ret = queryFeedHeadlines( $feed_id, $limit,
 			$view_mode, $is_cat, $search, $search_mode,
-			"score DESC, date_entered ".(mobile_get_pref($link, 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
+			"score DESC, date_entered ".(mobile_get_pref( 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
 
 		$result = $qfh_ret[0];
 		$feed_title = $qfh_ret[1];
@@ -364,7 +364,7 @@
 			  </form>";
 
 			if ($cat_id) {
-				$cat_title = getCategoryTitle($link, $cat_id);
+				$cat_title = getCategoryTitle( $cat_id);
 
 				print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\"
 					myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>";
@@ -413,7 +413,7 @@
 //		print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>";
 
 		$next_offset = $offset + $num_headlines;
-		$num_unread = getFeedUnread($link, $feed_id, $is_cat);
+		$num_unread = getFeedUnread( $feed_id, $is_cat);
 
 		/* FIXME needs normal implementation */
 
@@ -435,7 +435,7 @@
 
 	}
 
-	function render_article($link, $id, $feed_id, $cat_id, $is_cat) {
+	function render_article( $id, $feed_id, $cat_id, $is_cat) {
 
 		$query = "SELECT title,link,content,feed_id,comments,int_id,
 			marked,unread,published,
@@ -445,33 +445,33 @@
 			WHERE	id = '$id' AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query($link, $query);
+		$result = db_query( $query);
 
 		if (db_num_rows($result) != 0) {
 
 			$line = db_fetch_assoc($result);
 
-			$tmp_result = db_query($link, "UPDATE ttrss_user_entries
+			$tmp_result = db_query( "UPDATE ttrss_user_entries
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$updated_fmt = make_local_datetime($link, $line['updated'], false);
+			$updated_fmt = make_local_datetime( $line['updated'], false);
 
 			$title = $line["title"];
 			$article_link = $line["link"];
 
 			if (!$is_cat)
-				$feed_title = getFeedTitle($link, $feed_id);
+				$feed_title = getFeedTitle( $feed_id);
 			else
-				$feed_title = getCategoryTitle($link, $feed_id);
+				$feed_title = getCategoryTitle( $feed_id);
 
 			print "<div class=\"panel\" id=\"article-$id\" title=\"$title\"
 				selected=\"true\"
 				myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
 
 			if ($line['feed_id'] != $feed_id) {
-				$real_feed_title = getFeedTitle($link, $line['feed_id']);
+				$real_feed_title = getFeedTitle( $line['feed_id']);
 				$real_feed_id = $line['feed_id'];
 				$feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)";
 			}
@@ -497,10 +497,10 @@
 
 //			print "</fieldset>";
 
-			$content = sanitize($link, $line["content"]);
+			$content = sanitize( $line["content"]);
 			$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
 
-			if (!mobile_get_pref($link, "SHOW_IMAGES")) {
+			if (!mobile_get_pref( "SHOW_IMAGES")) {
 				$content = preg_replace('/<img[^>]+>/is', '', $content);
 			}
 
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index e6d4a7b40..78b6e8a7b 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -22,7 +22,7 @@
 
 	init_plugins($link);
 
-	login_sequence($link, true);
+	login_sequence( true);
 ?>
 
 <div class="panel" id="prefs" selected="yes" title="Preferences"
@@ -32,33 +32,33 @@
 
 <div class="row">
 	<label><?php echo __('Enable categories') ?></label>
-	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Browse categories like folders') ?></label>
-	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 
 <div class="row">
 	<label><?php echo __('Show images in posts') ?></label>
-	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Hide read articles and feeds') ?></label>
-	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Sort feeds by unread count') ?></label>
-	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Reverse headline order (oldest first)') ?></label>
-	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 </fieldset>
-- 
cgit v1.2.3


From a42c55f02b7e313ab61bf826794d0888f2dceae1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 18:34:18 +0400
Subject: fix blank character after opening bracket in function calls

---
 plugins/mobile/article.php          | 12 ++---
 plugins/mobile/backend.php          | 24 +++++-----
 plugins/mobile/cat.php              |  6 +--
 plugins/mobile/feed.php             | 14 +++---
 plugins/mobile/home.php             |  8 ++--
 plugins/mobile/index.php            |  8 ++--
 plugins/mobile/mobile-functions.php | 90 ++++++++++++++++++-------------------
 plugins/mobile/prefs.php            | 14 +++---
 8 files changed, 88 insertions(+), 88 deletions(-)

(limited to 'plugins/mobile')

diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index 17fc39395..f51c8962c 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -20,13 +20,13 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$id = db_escape_string( $_REQUEST["id"]);
-	$feed_id = db_escape_string( $_REQUEST["feed"]);
-	$cat_id = db_escape_string( $_REQUEST["cat"]);
-	$is_cat = db_escape_string( $_REQUEST["is_cat"]);
+	$id = db_escape_string($_REQUEST["id"]);
+	$feed_id = db_escape_string($_REQUEST["feed"]);
+	$cat_id = db_escape_string($_REQUEST["cat"]);
+	$is_cat = db_escape_string($_REQUEST["is_cat"]);
 
-  	render_article( $id, $feed_id, $cat_id, $is_cat);
+  	render_article($id, $feed_id, $cat_id, $is_cat);
 ?>
 
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index a62f462d5..872798814 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -31,28 +31,28 @@
 
 	switch ($op) {
 	case "toggleMarked":
-		$cmode = db_escape_string( $_REQUEST["mark"]);
-		$id = db_escape_string( $_REQUEST["id"]);
+		$cmode = db_escape_string($_REQUEST["mark"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		markArticlesById( array($id), $cmode);
+		markArticlesById(array($id), $cmode);
 		break;
 	case "togglePublished":
-		$cmode = db_escape_string( $_REQUEST["pub"]);
-		$id = db_escape_string( $_REQUEST["id"]);
+		$cmode = db_escape_string($_REQUEST["pub"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		publishArticlesById( array($id), $cmode);
+		publishArticlesById(array($id), $cmode);
 		break;
 	case "toggleUnread":
-		$cmode = db_escape_string( $_REQUEST["unread"]);
-		$id = db_escape_string( $_REQUEST["id"]);
+		$cmode = db_escape_string($_REQUEST["unread"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		catchupArticlesById( array($id), $cmode);
+		catchupArticlesById(array($id), $cmode);
 		break;
 
 	case "setPref":
-		$id = db_escape_string( $_REQUEST["id"]);
-		$value = db_escape_string( $_REQUEST["to"]);
-		mobile_set_pref( $id, $value);
+		$id = db_escape_string($_REQUEST["id"]);
+		$value = db_escape_string($_REQUEST["to"]);
+		mobile_set_pref($id, $value);
 		print_r($_SESSION);
 		break;
 	default:
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index ec5bbf3d9..5164d0049 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -20,10 +20,10 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$cat_id = db_escape_string( $_REQUEST["id"]);
+	$cat_id = db_escape_string($_REQUEST["id"]);
 
-  	render_category( $cat_id);
+  	render_category($cat_id);
 ?>
 
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index 08e916e21..e09f9432a 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$feed_id = db_escape_string( $_REQUEST["id"]);
-	$cat_id = db_escape_string( $_REQUEST["cat"]);
-	$offset = (int) db_escape_string( $_REQUEST["skip"]);
-	$search = db_escape_string( $_REQUEST["search"]);
-	$is_cat = (bool) db_escape_string( $_REQUEST["is_cat"]);
+	$feed_id = db_escape_string($_REQUEST["id"]);
+	$cat_id = db_escape_string($_REQUEST["cat"]);
+	$offset = (int) db_escape_string($_REQUEST["skip"]);
+	$search = db_escape_string($_REQUEST["search"]);
+	$is_cat = (bool) db_escape_string($_REQUEST["is_cat"]);
 
-  	render_headlines_list( $feed_id, $cat_id, $offset, $search, $is_cat);
+  	render_headlines_list($feed_id, $cat_id, $offset, $search, $is_cat);
 ?>
 
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index 57b18cd85..71ef81def 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -20,14 +20,14 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 
-	$use_cats = mobile_get_pref( 'ENABLE_CATS');
-	$offset = (int) db_escape_string( $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref('ENABLE_CATS');
+	$offset = (int) db_escape_string($_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list( $offset);
+		render_flat_feed_list($offset);
 	}
 ?>
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 8202f4043..7154ebdc2 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -20,7 +20,7 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -76,13 +76,13 @@
     </div>
 
 	<?php
-	$use_cats = mobile_get_pref( 'ENABLE_CATS');
-	$offset = (int) db_escape_string( $_REQUEST["skip"]);
+	$use_cats = mobile_get_pref('ENABLE_CATS');
+	$offset = (int) db_escape_string($_REQUEST["skip"]);
 
 	if ($use_cats) {
 		render_categories_list($link);
 	} else {
-		render_flat_feed_list( $offset);
+		render_flat_feed_list($offset);
 	}
 	?>
 
diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php
index 0395ee7a5..dd5914516 100644
--- a/plugins/mobile/mobile-functions.php
+++ b/plugins/mobile/mobile-functions.php
@@ -8,34 +8,34 @@
 
 	/* TODO replace with interface to db-prefs */
 
-	function mobile_pref_toggled( $id) {
-		if (get_pref( "_MOBILE_$id"))
+	function mobile_pref_toggled($id) {
+		if (get_pref("_MOBILE_$id"))
 			return "true";
 		else
 			return "";
 	}
 
-	function mobile_get_pref( $id) {
+	function mobile_get_pref($id) {
 		//return $_SESSION["mobile-prefs"][$id];
-		return get_pref( "_MOBILE_$id");
+		return get_pref("_MOBILE_$id");
 	}
 
-	function mobile_set_pref( $id, $value) {
+	function mobile_set_pref($id, $value) {
 		//$_SESSION["mobile-prefs"][$id] = $value;
-		return set_pref( "_MOBILE_$id", $value);
+		return set_pref("_MOBILE_$id", $value);
 	}
 
 	function mobile_feed_has_icon($id) {
 		return file_exists("../../".ICONS_DIR."/$id.ico");
 	}
 
-	function render_flat_feed_list( $offset) {
+	function render_flat_feed_list($offset) {
 		$owner_uid = $_SESSION["uid"];
 		$limit = 0;
 
 		if (!$offset) $offset = 0;
 
-		if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
+		if (mobile_get_pref("SORT_FEEDS_UNREAD")) {
 			$order_by = "unread DESC, title";
 		} else {
 			$order_by = "title";
@@ -47,7 +47,7 @@
 			$limit_qpart = "";
 		}
 
-		$result = db_query( "SELECT id,
+		$result = db_query("SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -85,7 +85,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -103,7 +103,7 @@
 
 	}
 
-	function render_category( $cat_id, $offset) {
+	function render_category($cat_id, $offset) {
 		$owner_uid = $_SESSION["uid"];
 
 		if ($cat_id >= 0) {
@@ -114,13 +114,13 @@
 				$cat_query = "cat_id IS NULL";
 			}
 
-			if (mobile_get_pref( "SORT_FEEDS_UNREAD")) {
+			if (mobile_get_pref("SORT_FEEDS_UNREAD")) {
 				$order_by = "unread DESC, title";
 			} else {
 				$order_by = "title";
 			}
 
-			$result = db_query( "SELECT id,
+			$result = db_query("SELECT id,
 				title,
 			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
 				WHERE feed_id = ttrss_feeds.id AND unread = true
@@ -132,7 +132,7 @@
 				$cat_query
 			ORDER BY $order_by");
 
-			$title = getCategoryTitle( $cat_id);
+			$title = getCategoryTitle($cat_id);
 
 			print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
@@ -158,7 +158,7 @@
 					$icon_url = "../../images/blank_icon.gif";
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" .
 						"<img class='tinyIcon' src='$icon_url'/>".
 						$line["title"] . "</a></li>";
@@ -174,8 +174,8 @@
 				myBackHref='home.php'>";
 
 			foreach (array(-4, -3, -1, -2, 0) as $id) {
-				$title = getFeedTitle( $id);
-				$unread = getFeedUnread( $id, false);
+				$title = getFeedTitle($id);
+				$unread = getFeedUnread($id, false);
 				$icon = getFeedIcon($id);
 
 				if ($unread > 0) {
@@ -185,7 +185,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-1'>
 						<img class='tinyIcon' src='../$icon'/>$title</a></li>";
@@ -200,7 +200,7 @@
 			print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."'
 				myBackHref='home.php'>";
 
-			$result = db_query( "SELECT id, caption FROM ttrss_labels2
+			$result = db_query("SELECT id, caption FROM ttrss_labels2
 				WHERE owner_uid = '$owner_uid'");
 
 			$label_data = array();
@@ -209,7 +209,7 @@
 
 				$id = label_to_feed_id($line["id"]);
 
-				$unread = getFeedUnread( $id);
+				$unread = getFeedUnread($id);
 				$title = $line["caption"];
 
 				if ($unread > 0) {
@@ -219,7 +219,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 					print "<li class='$class'>
 						<a href='feed.php?id=$id&cat=-2'>$title</a></li>";
 				}
@@ -231,7 +231,7 @@
 	function render_categories_list($link) {
 		$owner_uid = $_SESSION["uid"];
 
-		$cat_browse = mobile_get_pref( "BROWSE_CATS");
+		$cat_browse = mobile_get_pref("BROWSE_CATS");
 
 		print '<ul id="home" title="'.__('Home').'" selected="true"
 			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
@@ -239,8 +239,8 @@
 //		print "<li><a href='#searchForm'>Search...</a></li>";
 
 		foreach (array(-1, -2) as $id) {
-			$title = getCategoryTitle( $id);
-			$unread = getFeedUnread( $id, true);
+			$title = getCategoryTitle($id);
+			$unread = getFeedUnread($id, true);
 			if ($unread > 0) {
 				$title = $title . " ($unread)";
 				$class = '';
@@ -254,7 +254,7 @@
 				print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>";
 		}
 
-		$result = db_query( "SELECT
+		$result = db_query("SELECT
 				ttrss_feed_categories.id,
 				ttrss_feed_categories.title,
 				COUNT(ttrss_feeds.id) AS num_feeds
@@ -269,7 +269,7 @@
 
 			if ($line["num_feeds"] > 0) {
 
-				$unread = getFeedUnread( $line["id"], true);
+				$unread = getFeedUnread($line["id"], true);
 				$id = $line["id"];
 
 				if ($unread > 0) {
@@ -279,7 +279,7 @@
 					$class = 'oldItem';
 				}
 
-				if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 
 					if ($cat_browse)
 						print "<li class='$class'><a href='cat.php?id=$id'>" .
@@ -292,13 +292,13 @@
 		}
 
 
-		$result = db_query( "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
+		$result = db_query("SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
 			cat_id IS NULL and owner_uid = '$owner_uid'");
 
 		$num_feeds = db_fetch_result($result, 0, "nf");
 
 		if ($num_feeds > 0) {
-			$unread = getFeedUnread( 0, true);
+			$unread = getFeedUnread(0, true);
 			$title = "Uncategorized";
 
 			if ($unread > 0) {
@@ -308,7 +308,7 @@
 				$class = 'oldItem';
 			}
 
-			if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) {
+			if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
 				if ($cat_browse)
 					print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>";
 				else
@@ -320,14 +320,14 @@
 		print "</ul>";
 	}
 
-	function render_headlines_list( $feed_id, $cat_id, $offset, $search,
+	function render_headlines_list($feed_id, $cat_id, $offset, $search,
 		$is_cat = false) {
 
 		$feed_id = $feed_id;
 		$limit = 15;
 		$filter = '';
 
-		if (!mobile_get_pref( "HIDE_READ"))
+		if (!mobile_get_pref("HIDE_READ"))
 			$view_mode = "all_articles";
 		else
 			$view_mode = 'adaptive';
@@ -338,9 +338,9 @@
 			$search_mode = '';
 		}
 
-		$qfh_ret = queryFeedHeadlines( $feed_id, $limit,
+		$qfh_ret = queryFeedHeadlines($feed_id, $limit,
 			$view_mode, $is_cat, $search, $search_mode,
-			"score DESC, date_entered ".(mobile_get_pref( 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
+			"score DESC, date_entered ".(mobile_get_pref('REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
 
 		$result = $qfh_ret[0];
 		$feed_title = $qfh_ret[1];
@@ -364,7 +364,7 @@
 			  </form>";
 
 			if ($cat_id) {
-				$cat_title = getCategoryTitle( $cat_id);
+				$cat_title = getCategoryTitle($cat_id);
 
 				print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\"
 					myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>";
@@ -413,7 +413,7 @@
 //		print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>";
 
 		$next_offset = $offset + $num_headlines;
-		$num_unread = getFeedUnread( $feed_id, $is_cat);
+		$num_unread = getFeedUnread($feed_id, $is_cat);
 
 		/* FIXME needs normal implementation */
 
@@ -435,7 +435,7 @@
 
 	}
 
-	function render_article( $id, $feed_id, $cat_id, $is_cat) {
+	function render_article($id, $feed_id, $cat_id, $is_cat) {
 
 		$query = "SELECT title,link,content,feed_id,comments,int_id,
 			marked,unread,published,
@@ -445,33 +445,33 @@
 			WHERE	id = '$id' AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		if (db_num_rows($result) != 0) {
 
 			$line = db_fetch_assoc($result);
 
-			$tmp_result = db_query( "UPDATE ttrss_user_entries
+			$tmp_result = db_query("UPDATE ttrss_user_entries
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$updated_fmt = make_local_datetime( $line['updated'], false);
+			$updated_fmt = make_local_datetime($line['updated'], false);
 
 			$title = $line["title"];
 			$article_link = $line["link"];
 
 			if (!$is_cat)
-				$feed_title = getFeedTitle( $feed_id);
+				$feed_title = getFeedTitle($feed_id);
 			else
-				$feed_title = getCategoryTitle( $feed_id);
+				$feed_title = getCategoryTitle($feed_id);
 
 			print "<div class=\"panel\" id=\"article-$id\" title=\"$title\"
 				selected=\"true\"
 				myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
 
 			if ($line['feed_id'] != $feed_id) {
-				$real_feed_title = getFeedTitle( $line['feed_id']);
+				$real_feed_title = getFeedTitle($line['feed_id']);
 				$real_feed_id = $line['feed_id'];
 				$feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)";
 			}
@@ -497,10 +497,10 @@
 
 //			print "</fieldset>";
 
-			$content = sanitize( $line["content"]);
+			$content = sanitize($line["content"]);
 			$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
 
-			if (!mobile_get_pref( "SHOW_IMAGES")) {
+			if (!mobile_get_pref("SHOW_IMAGES")) {
 				$content = preg_replace('/<img[^>]+>/is', '', $content);
 			}
 
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index 78b6e8a7b..ac7762fe5 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -22,7 +22,7 @@
 
 	init_plugins($link);
 
-	login_sequence( true);
+	login_sequence(true);
 ?>
 
 <div class="panel" id="prefs" selected="yes" title="Preferences"
@@ -32,33 +32,33 @@
 
 <div class="row">
 	<label><?php echo __('Enable categories') ?></label>
-	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Browse categories like folders') ?></label>
-	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 
 <div class="row">
 	<label><?php echo __('Show images in posts') ?></label>
-	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Hide read articles and feeds') ?></label>
-	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Sort feeds by unread count') ?></label>
-	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 <div class="row">
 	<label><?php echo __('Reverse headline order (oldest first)') ?></label>
-	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
 </fieldset>
-- 
cgit v1.2.3


From d10e0993b5afba5e50e2dada02f910d12ce67496 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 19:17:23 +0400
Subject: fix plugins/mobile

---
 plugins/mobile/article.php          | 4 ----
 plugins/mobile/backend.php          | 4 ----
 plugins/mobile/cat.php              | 4 ----
 plugins/mobile/feed.php             | 4 ----
 plugins/mobile/home.php             | 4 ----
 plugins/mobile/index.php            | 4 ----
 plugins/mobile/mobile-functions.php | 3 +++
 plugins/mobile/prefs.php            | 4 ----
 8 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'plugins/mobile')

diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
index f51c8962c..64768c983 100644
--- a/plugins/mobile/article.php
+++ b/plugins/mobile/article.php
@@ -16,10 +16,6 @@
 	require_once "config.php";
 	require_once "mobile-functions.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	login_sequence(true);
 
 	$id = db_escape_string($_REQUEST["id"]);
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
index 872798814..4065dc2a4 100644
--- a/plugins/mobile/backend.php
+++ b/plugins/mobile/backend.php
@@ -21,10 +21,6 @@
 	require_once "version.php";
 	require_once "db-prefs.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	if (!$_SESSION["uid"]) return;
 
 	$op = $_REQUEST["op"];
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
index 5164d0049..21d04550f 100644
--- a/plugins/mobile/cat.php
+++ b/plugins/mobile/cat.php
@@ -16,10 +16,6 @@
 	require_once "config.php";
 	require_once "mobile-functions.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	login_sequence(true);
 
 	$cat_id = db_escape_string($_REQUEST["id"]);
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
index e09f9432a..345026efd 100644
--- a/plugins/mobile/feed.php
+++ b/plugins/mobile/feed.php
@@ -16,10 +16,6 @@
 	require_once "config.php";
 	require_once "mobile-functions.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	login_sequence(true);
 
 	$feed_id = db_escape_string($_REQUEST["id"]);
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
index 71ef81def..3039635a5 100644
--- a/plugins/mobile/home.php
+++ b/plugins/mobile/home.php
@@ -16,10 +16,6 @@
 	require_once "config.php";
 	require_once "mobile-functions.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	login_sequence(true);
 
 	$use_cats = mobile_get_pref('ENABLE_CATS');
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
index 7154ebdc2..9e9c339e3 100644
--- a/plugins/mobile/index.php
+++ b/plugins/mobile/index.php
@@ -16,10 +16,6 @@
 	require_once "config.php";
 	require_once "mobile-functions.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	login_sequence(true);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php
index dd5914516..1e65a3c36 100644
--- a/plugins/mobile/mobile-functions.php
+++ b/plugins/mobile/mobile-functions.php
@@ -1,9 +1,12 @@
 <?php
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "version.php";
 	require_once "db-prefs.php";
 
+	init_plugins();
+
 	define('TTRSS_SESSION_NAME', 'ttrss_m_sid');
 
 	/* TODO replace with interface to db-prefs */
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
index ac7762fe5..9c630359c 100644
--- a/plugins/mobile/prefs.php
+++ b/plugins/mobile/prefs.php
@@ -18,10 +18,6 @@
 	require_once "config.php";
 	require_once "mobile-functions.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_plugins($link);
-
 	login_sequence(true);
 ?>
 
-- 
cgit v1.2.3


From 106a3de91c7c8c6c275323152de414253f01127a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 17:31:56 +0400
Subject: plugins: bump API version

---
 plugins/mobile/init.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/mobile')

diff --git a/plugins/mobile/init.php b/plugins/mobile/init.php
index ad2d1cdd9..1a59fe33c 100644
--- a/plugins/mobile/init.php
+++ b/plugins/mobile/init.php
@@ -37,6 +37,9 @@ class Mobile extends Plugin implements IHandler {
 
 	}
 
+	function api_version() {
+		return 2;
+	}
 
 }
 ?>
-- 
cgit v1.2.3


From d88922a5d31062196da6e69ab109079cda8867b2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 10:08:34 +0400
Subject: digest and mobile (old) moved to -contrib repository

---
 plugins/mobile/article.php                 |  28 --
 plugins/mobile/backend.php                 |  59 ----
 plugins/mobile/cat.php                     |  25 --
 plugins/mobile/feed.php                    |  29 --
 plugins/mobile/home.php                    |  29 --
 plugins/mobile/index.php                   |  86 -----
 plugins/mobile/init.php                    |  45 ---
 plugins/mobile/iui/LICENSE.txt             |  21 --
 plugins/mobile/iui/NOTICE.txt              |  33 --
 plugins/mobile/iui/backButton.png          | Bin 816 -> 0 bytes
 plugins/mobile/iui/blueButton.png          | Bin 517 -> 0 bytes
 plugins/mobile/iui/cancel.png              | Bin 362 -> 0 bytes
 plugins/mobile/iui/grayButton.png          | Bin 943 -> 0 bytes
 plugins/mobile/iui/iui-logo-touch-icon.png | Bin 2887 -> 0 bytes
 plugins/mobile/iui/iui.css                 | 398 ---------------------
 plugins/mobile/iui/iui.js                  | 542 -----------------------------
 plugins/mobile/iui/iuix.css                |   1 -
 plugins/mobile/iui/iuix.js                 |   1 -
 plugins/mobile/iui/listArrow.png           | Bin 259 -> 0 bytes
 plugins/mobile/iui/listArrowSel.png        | Bin 308 -> 0 bytes
 plugins/mobile/iui/listGroup.png           | Bin 2867 -> 0 bytes
 plugins/mobile/iui/loading.gif             | Bin 1435 -> 0 bytes
 plugins/mobile/iui/pinstripes.png          | Bin 117 -> 0 bytes
 plugins/mobile/iui/redButton.png           | Bin 947 -> 0 bytes
 plugins/mobile/iui/selection.png           | Bin 159 -> 0 bytes
 plugins/mobile/iui/thumb.png               | Bin 2835 -> 0 bytes
 plugins/mobile/iui/toggle.png              | Bin 2815 -> 0 bytes
 plugins/mobile/iui/toggleOn.png            | Bin 163 -> 0 bytes
 plugins/mobile/iui/toolButton.png          | Bin 531 -> 0 bytes
 plugins/mobile/iui/toolbar.png             | Bin 171 -> 0 bytes
 plugins/mobile/iui/whiteButton.png         | Bin 978 -> 0 bytes
 plugins/mobile/login_form.php              |  58 ---
 plugins/mobile/logout.php                  |  15 -
 plugins/mobile/mobile-functions.php        | 542 -----------------------------
 plugins/mobile/mobile.css                  |  38 --
 plugins/mobile/mobile.js                   | 163 ---------
 plugins/mobile/prefs.php                   |  60 ----
 37 files changed, 2173 deletions(-)
 delete mode 100644 plugins/mobile/article.php
 delete mode 100644 plugins/mobile/backend.php
 delete mode 100644 plugins/mobile/cat.php
 delete mode 100644 plugins/mobile/feed.php
 delete mode 100644 plugins/mobile/home.php
 delete mode 100644 plugins/mobile/index.php
 delete mode 100644 plugins/mobile/init.php
 delete mode 100644 plugins/mobile/iui/LICENSE.txt
 delete mode 100644 plugins/mobile/iui/NOTICE.txt
 delete mode 100644 plugins/mobile/iui/backButton.png
 delete mode 100644 plugins/mobile/iui/blueButton.png
 delete mode 100644 plugins/mobile/iui/cancel.png
 delete mode 100644 plugins/mobile/iui/grayButton.png
 delete mode 100644 plugins/mobile/iui/iui-logo-touch-icon.png
 delete mode 100644 plugins/mobile/iui/iui.css
 delete mode 100644 plugins/mobile/iui/iui.js
 delete mode 100644 plugins/mobile/iui/iuix.css
 delete mode 100644 plugins/mobile/iui/iuix.js
 delete mode 100644 plugins/mobile/iui/listArrow.png
 delete mode 100644 plugins/mobile/iui/listArrowSel.png
 delete mode 100644 plugins/mobile/iui/listGroup.png
 delete mode 100644 plugins/mobile/iui/loading.gif
 delete mode 100644 plugins/mobile/iui/pinstripes.png
 delete mode 100644 plugins/mobile/iui/redButton.png
 delete mode 100644 plugins/mobile/iui/selection.png
 delete mode 100644 plugins/mobile/iui/thumb.png
 delete mode 100644 plugins/mobile/iui/toggle.png
 delete mode 100644 plugins/mobile/iui/toggleOn.png
 delete mode 100644 plugins/mobile/iui/toolButton.png
 delete mode 100644 plugins/mobile/iui/toolbar.png
 delete mode 100644 plugins/mobile/iui/whiteButton.png
 delete mode 100644 plugins/mobile/login_form.php
 delete mode 100644 plugins/mobile/logout.php
 delete mode 100644 plugins/mobile/mobile-functions.php
 delete mode 100644 plugins/mobile/mobile.css
 delete mode 100644 plugins/mobile/mobile.js
 delete mode 100644 plugins/mobile/prefs.php

(limited to 'plugins/mobile')

diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php
deleted file mode 100644
index 64768c983..000000000
--- a/plugins/mobile/article.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	define('MOBILE_VERSION', true);
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	login_sequence(true);
-
-	$id = db_escape_string($_REQUEST["id"]);
-	$feed_id = db_escape_string($_REQUEST["feed"]);
-	$cat_id = db_escape_string($_REQUEST["cat"]);
-	$is_cat = db_escape_string($_REQUEST["is_cat"]);
-
-  	render_article($id, $feed_id, $cat_id, $is_cat);
-?>
-
diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php
deleted file mode 100644
index 4065dc2a4..000000000
--- a/plugins/mobile/backend.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	define('MOBILE_VERSION', true);
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "version.php";
-	require_once "db-prefs.php";
-
-	if (!$_SESSION["uid"]) return;
-
-	$op = $_REQUEST["op"];
-
-	switch ($op) {
-	case "toggleMarked":
-		$cmode = db_escape_string($_REQUEST["mark"]);
-		$id = db_escape_string($_REQUEST["id"]);
-
-		markArticlesById(array($id), $cmode);
-		break;
-	case "togglePublished":
-		$cmode = db_escape_string($_REQUEST["pub"]);
-		$id = db_escape_string($_REQUEST["id"]);
-
-		publishArticlesById(array($id), $cmode);
-		break;
-	case "toggleUnread":
-		$cmode = db_escape_string($_REQUEST["unread"]);
-		$id = db_escape_string($_REQUEST["id"]);
-
-		catchupArticlesById(array($id), $cmode);
-		break;
-
-	case "setPref":
-		$id = db_escape_string($_REQUEST["id"]);
-		$value = db_escape_string($_REQUEST["to"]);
-		mobile_set_pref($id, $value);
-		print_r($_SESSION);
-		break;
-	default:
-		print json_encode(array("error", "UNKNOWN_METHOD"));
-		break;
-	}
-?>
-
diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php
deleted file mode 100644
index 21d04550f..000000000
--- a/plugins/mobile/cat.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	define('MOBILE_VERSION', true);
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	login_sequence(true);
-
-	$cat_id = db_escape_string($_REQUEST["id"]);
-
-  	render_category($cat_id);
-?>
-
diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php
deleted file mode 100644
index 345026efd..000000000
--- a/plugins/mobile/feed.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	define('MOBILE_VERSION', true);
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	login_sequence(true);
-
-	$feed_id = db_escape_string($_REQUEST["id"]);
-	$cat_id = db_escape_string($_REQUEST["cat"]);
-	$offset = (int) db_escape_string($_REQUEST["skip"]);
-	$search = db_escape_string($_REQUEST["search"]);
-	$is_cat = (bool) db_escape_string($_REQUEST["is_cat"]);
-
-  	render_headlines_list($feed_id, $cat_id, $offset, $search, $is_cat);
-?>
-
diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php
deleted file mode 100644
index 3039635a5..000000000
--- a/plugins/mobile/home.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	define('MOBILE_VERSION', true);
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	login_sequence(true);
-
-	$use_cats = mobile_get_pref('ENABLE_CATS');
-	$offset = (int) db_escape_string($_REQUEST["skip"]);
-
-	if ($use_cats) {
-		render_categories_list($link);
-	} else {
-		render_flat_feed_list($offset);
-	}
-?>
diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php
deleted file mode 100644
index 9e9c339e3..000000000
--- a/plugins/mobile/index.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	define('MOBILE_VERSION', true);
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	login_sequence(true);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Tiny Tiny RSS</title>
-<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
-<link rel="apple-touch-icon" href="iui/iui-logo-touch-icon.png" />
-<meta name="apple-touch-fullscreen" content="YES" />
-<style type="text/css" media="screen">@import "iui/iui.css";</style>
-<script type="application/x-javascript" src="iui/iui.js"></script>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<script type="text/javascript" src="../../lib/prototype.js"></script>
-<script type="text/javascript" src="mobile.js"></script>
-<style type="text/css" media="screen">@import "mobile.css";</style>
-</head>
-
-<style type="text/css">
-	img { max-width : 75%; }
-
-	li.oldItem {
-		color : gray;
-	}
-
-	#myBackButton {
-	    display: none;
-	    left: 6px;
-	    right: auto;
-	    padding: 0;
-	    max-width: 55px;
-	    border-width: 0 8px 0 14px;
-	    -webkit-border-image: url(iui/backButton.png) 0 8 0 14;
-	}
-
-	img.tinyIcon {
-		max-width : 16px;
-		max-height : 16px;
-		margin-right : 10px;
-		vertical-align : middle;
-	}
-
-	a img {
-		border-width : 0px;
-	}
-</style>
-
-<body>
-    <div class="toolbar">
-        <h1 id="pageTitle"></h1>
-		  <a id="myBackButton" class="button" href="#"></a>
-        <a class="button" href="prefs.php">Preferences</a>
-    </div>
-
-	<?php
-	$use_cats = mobile_get_pref('ENABLE_CATS');
-	$offset = (int) db_escape_string($_REQUEST["skip"]);
-
-	if ($use_cats) {
-		render_categories_list($link);
-	} else {
-		render_flat_feed_list($offset);
-	}
-	?>
-
-</body>
-</html>
diff --git a/plugins/mobile/init.php b/plugins/mobile/init.php
deleted file mode 100644
index 1a59fe33c..000000000
--- a/plugins/mobile/init.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-class Mobile extends Plugin implements IHandler {
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Classic mobile version for tt-rss (unsupported)",
-			"fox",
-			true);
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_handler("mobile", "index", $this);
-	}
-
-	function index() {
-		header("Content-type: text/html; charset=utf-8");
-
-		header("Location: plugins/mobile/index.php");
-	}
-
-	/* function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/digest.js");
-	} */
-
-	function csrf_ignore($method) {
-		return true; //in_array($method, array("index"));
-	}
-
-	function before($method) {
-		return true;
-	}
-
-	function after() {
-
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/mobile/iui/LICENSE.txt b/plugins/mobile/iui/LICENSE.txt
deleted file mode 100644
index c9d2a0d65..000000000
--- a/plugins/mobile/iui/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2007-2009, iUI Project Members
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the iUI Project nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/mobile/iui/NOTICE.txt b/plugins/mobile/iui/NOTICE.txt
deleted file mode 100644
index 3a23f563b..000000000
--- a/plugins/mobile/iui/NOTICE.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-NOTICE.txt - iUI credits and copyright notices
-
-   iUI is Copyright (c) 2007-2009 by the iUI project members: 
-           M. Sean Gilligan (msgilligan)
-       Past members:  	 
-           Joe  Hewitt (joehewitt)
-           Christopher Allen (ChristopherA)
-
-CREDITS
-	schlueter - committed fixes for issues #9, #11, #63 -- added samples
-	???       - created iUI icon
-	kris.tate - named it "iUI", created Google Code project, initial checkin
-	others    - let us know if we missed you
-	iUI users - thanks for your patience, feedback, and bug reports
-
-THIRD PARTY COMPONENTS
-
-   * iUI includes software developed by the Mozilla Project
-        Copyright (c) 1997-2007, Netscape Communications Corporation and others.
-        All rights reserved.
-        http://www.mozilla.org/rhino/
-
-   * iUI includes software developed by the Dojo Foundation
-        http://dojotoolkit.org/docs/shrinksafe
-
-   * iUI includes software developed by LCA Soft  Ltd.
-        http://www.lcasoft.com/compress-js.html
-
-   * iUI includes software developed by the ant-googlcode Project
-        http://code.google.com/p/ant-googlecode/
-
-
-
diff --git a/plugins/mobile/iui/backButton.png b/plugins/mobile/iui/backButton.png
deleted file mode 100644
index e27ea8cdf..000000000
Binary files a/plugins/mobile/iui/backButton.png and /dev/null differ
diff --git a/plugins/mobile/iui/blueButton.png b/plugins/mobile/iui/blueButton.png
deleted file mode 100644
index 0f92dfd94..000000000
Binary files a/plugins/mobile/iui/blueButton.png and /dev/null differ
diff --git a/plugins/mobile/iui/cancel.png b/plugins/mobile/iui/cancel.png
deleted file mode 100644
index 5f6dcc87d..000000000
Binary files a/plugins/mobile/iui/cancel.png and /dev/null differ
diff --git a/plugins/mobile/iui/grayButton.png b/plugins/mobile/iui/grayButton.png
deleted file mode 100644
index 0ce6a30d4..000000000
Binary files a/plugins/mobile/iui/grayButton.png and /dev/null differ
diff --git a/plugins/mobile/iui/iui-logo-touch-icon.png b/plugins/mobile/iui/iui-logo-touch-icon.png
deleted file mode 100644
index 8817b3022..000000000
Binary files a/plugins/mobile/iui/iui-logo-touch-icon.png and /dev/null differ
diff --git a/plugins/mobile/iui/iui.css b/plugins/mobile/iui/iui.css
deleted file mode 100644
index 3933dbad9..000000000
--- a/plugins/mobile/iui/iui.css
+++ /dev/null
@@ -1,398 +0,0 @@
-/* iui.css (c) 2007-9 by iUI Project Members, see LICENSE.txt for license */
-body {
-    margin: 0;
-    font-family: Helvetica;
-    background: #FFFFFF;
-    color: #000000;
-    overflow-x: hidden;
-    -webkit-user-select: none;
-    -webkit-text-size-adjust: none;
-}
-
-body > *:not(.toolbar) {
-    display: none;
-    position: absolute;
-    margin: 0;
-    padding: 0;
-    left: 0;
-    top: 45px;
-    width: 100%;
-    min-height: 372px;
-    -webkit-transition-duration: 300ms;
-    -webkit-transition-property: -webkit-transform;
-    -webkit-transform: translateX(0%);
-}
-
-body[orient="landscape"] > *:not(.toolbar) {
-    min-height: 268px;
-}
-
-body > *[selected="true"] {
-    display: block;
-}
-
-a[selected], a:active {
-    background-color: #194fdb !important;
-    background-image: url(listArrowSel.png), url(selection.png) !important;
-    background-repeat: no-repeat, repeat-x;
-    background-position: right center, left top;
-    color: #FFFFFF !important;
-}
-
-a[selected="progress"] {
-    background-image: url(loading.gif), url(selection.png) !important;
-}
-
-/************************************************************************************************/
-
-body > .toolbar {
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    border-bottom: 1px solid #2d3642;
-    border-top: 1px solid #6d84a2;
-    padding: 10px;
-    height: 45px;
-    background: url(toolbar.png) #6d84a2 repeat-x;
-}
-
-.toolbar > h1 {
-    position: absolute;
-    overflow: hidden;
-    left: 50%;
-    margin: 1px 0 0 -75px;
-    height: 45px;
-    font-size: 20px;
-    width: 150px;
-    font-weight: bold;
-    text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
-    text-align: center;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    color: #FFFFFF;
-}
-
-body[orient="landscape"] > .toolbar > h1 {
-    margin-left: -125px;
-    width: 250px;
-}
-
-.button {
-    position: absolute;
-    overflow: hidden;
-    top: 8px;
-    right: 6px;
-    margin: 0;
-    border-width: 0 5px;
-    padding: 0 3px;
-    width: auto;
-    height: 30px;
-    line-height: 30px;
-    font-family: inherit;
-    font-size: 12px;
-    font-weight: bold;
-    color: #FFFFFF;
-    text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0;
-    text-overflow: ellipsis;
-    text-decoration: none;
-    white-space: nowrap;
-    background: none;
-    -webkit-border-image: url(toolButton.png) 0 5 0 5;
-}
-
-.blueButton {
-    -webkit-border-image: url(blueButton.png) 0 5 0 5;
-    border-width: 0 5px;
-}
-
-.leftButton {
-    left: 6px;
-    right: auto;
-}
-
-#backButton {
-    display: none;
-    left: 6px;
-    right: auto;
-    padding: 0;
-    max-width: 55px;
-    border-width: 0 8px 0 14px;
-    -webkit-border-image: url(backButton.png) 0 8 0 14;
-}
-
-.whiteButton,
-.redButton,
-.grayButton {
-    display: block;
-    border-width: 0 12px;
-    padding: 10px;
-    text-align: center;
-    font-size: 20px;
-    font-weight: bold;
-    text-decoration: inherit;
-    color: inherit;
-}
-
-.whiteButton {
-    -webkit-border-image: url(whiteButton.png) 0 12 0 12;
-    text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
-}
-
-.redButton {
-    -webkit-border-image: url(redButton.png) 0 12 0 12;
-    color:#fff;
-    text-shadow: #7a0001 0 -1px 0;
-}
-
-.grayButton {
-    -webkit-border-image: url(grayButton.png) 0 12 0 12;
-    color: #FFFFFF;
-}
-
-/************************************************************************************************/
-
-body > ul > li {
-    position: relative;
-    margin: 0;
-    border-bottom: 1px solid #E0E0E0;
-    padding: 8px 0 8px 10px;
-    font-size: 20px;
-    font-weight: bold;
-    list-style: none;
-}
-
-body > ul > li.group {
-    position: relative;
-    top: -1px;
-    margin-bottom: -2px;
-    border-top: 1px solid #7d7d7d;
-    border-bottom: 1px solid #999999;
-    padding: 1px 10px;
-    background: url(listGroup.png) repeat-x;
-    font-size: 17px;
-    font-weight: bold;
-    text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
-    color: #FFFFFF;
-}
-
-body > ul > li.group:first-child {
-    top: 0;
-    border-top: none;
-}
-
-body > ul > li > a {
-    display: block;
-    margin: -8px 0 -8px -10px;
-    padding: 8px 32px 8px 10px;
-    text-decoration: none;
-    color: inherit;
-    background: url(listArrow.png) no-repeat right center;
-}
-
-a[target="_replace"] {
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    padding-top: 25px;
-    padding-bottom: 25px;
-    font-size: 18px;
-    color: cornflowerblue;
-    background-color: #FFFFFF;
-    background-image: none;
-}
-
-/************************************************************************************************/
-    
-body > .dialog {
-    top: 0;
-    width: 100%;
-    min-height: 417px;
-    z-index: 2;
-    background: rgba(0, 0, 0, 0.8);
-    padding: 0;
-    text-align: right;
-}
-
-.dialog > fieldset {
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    width: 100%;
-    margin: 0;
-    border: none;
-    border-top: 1px solid #6d84a2;
-    padding: 10px 6px;
-    background: url(toolbar.png) #7388a5 repeat-x;
-}
-
-.dialog > fieldset > h1 {
-    margin: 0 10px 0 10px;
-    padding: 0;
-    font-size: 20px;
-    font-weight: bold;
-    color: #FFFFFF;
-    text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
-    text-align: center;
-}
-
-.dialog > fieldset > label {
-    position: absolute;
-    margin: 16px 0 0 6px;
-    font-size: 14px;
-    color: #999999;
-}
-
-/*input:not(input[type|=radio]):not(input[type|=checkbox]) {*/
-input[type|=text], input[type|=password] {
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    width: 100%;
-    margin: 8px 0 0 0;
-    padding: 6px 6px 6px 44px;
-    font-size: 16px;
-    font-weight: normal;
-}
-
-/************************************************************************************************/
-
-body > .panel {
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    padding: 10px;
-    background: #c8c8c8 url(pinstripes.png);
-}
-
-.panel > fieldset {
-    position: relative;
-    margin: 0 0 20px 0;
-    padding: 0;
-    background: #FFFFFF;
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    border: 1px solid #999999;
-    text-align: right;
-    font-size: 16px;
-}
-
-.row  {
-    position: relative;
-    min-height: 42px;
-    border-bottom: 1px solid #999999;
-    -webkit-border-radius: 0;
-    text-align: left;
-}
-
-fieldset > .row:last-child {
-    border-bottom: none !important;
-}
-
-/*.row > input:not(input[type|=radio]):not(input[type|=checkbox]) {*/
-.row > input[type|=text], .row > input[type|=password] {
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    margin: 0;
-    border: none;
-    padding: 12px 10px 0 110px;
-/*    height: 42px;*/
-    background: none;
-}
-.row > input[type|=radio], .row > input[type|=checkbox] {
-  margin: 7px 7px 0 0;
-  height: 25px;
-  width: 25px;
-}
-
-.row > label {
-    position: absolute;
-    margin: 0 0 0 14px;
-    line-height: 42px;
-    font-weight: bold;
-}
-
-.row > span {
-    position: absolute;
-    padding: 12px 10px 0 110px;
-    margin: 0;
-}
-
-.row > .toggle {
-    position: absolute;
-    top: 6px;
-    right: 6px;
-    width: 100px;
-    height: 28px;
-}
-
-.toggle {
-    border: 1px solid #888888;
-    -webkit-border-radius: 6px;
-    background: #FFFFFF url(toggle.png) repeat-x;
-    font-size: 19px;
-    font-weight: bold;
-    line-height: 30px;
-}
-
-.toggle[toggled="true"] {
-    border: 1px solid #143fae;
-    background: #194fdb url(toggleOn.png) repeat-x;
-}
-
-.toggleOn {
-    display: none;
-    position: absolute;
-    width: 60px;
-    text-align: center;
-    left: 0;
-    top: 0;
-    color: #FFFFFF;
-    text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
-}
-
-.toggleOff {
-    position: absolute;
-    width: 60px;
-    text-align: center;
-    right: 0;
-    top: 0;
-    color: #666666;
-}
-
-.toggle[toggled="true"] > .toggleOn {
-    display: block;
-}
-
-.toggle[toggled="true"] > .toggleOff {
-    display: none;
-}
-
-.thumb {
-    position: absolute;
-    top: -1px;
-    left: -1px;
-    width: 40px;
-    height: 28px;    
-    border: 1px solid #888888;
-    -webkit-border-radius: 6px;
-    background: #ffffff url(thumb.png) repeat-x;
-}
-
-.toggle[toggled="true"] > .thumb {
-    left: auto;
-    right: -1px;
-}
-
-.panel > h2 {
-    margin: 0 0 8px 14px;
-    font-size: inherit;
-    font-weight: bold;
-    color: #4d4d70;
-    text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0;
-}
-
-/************************************************************************************************/
-
-#preloader {
-    display: none;
-    background-image: url(loading.gif), url(selection.png),
-        url(blueButton.png), url(listArrowSel.png), url(listGroup.png);
-}
diff --git a/plugins/mobile/iui/iui.js b/plugins/mobile/iui/iui.js
deleted file mode 100644
index 0937afe05..000000000
--- a/plugins/mobile/iui/iui.js
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
-   Copyright (c) 2007-9, iUI Project Members
-   See LICENSE.txt for licensing terms
- */
-
-
-(function() {
-
-var slideSpeed = 20;
-var slideInterval = 0;
-
-var currentPage = null;
-var currentDialog = null;
-var currentWidth = 0;
-var currentHash = location.hash;
-var hashPrefix = "#_";
-var pageHistory = [];
-var newPageCount = 0;
-var checkTimer;
-var hasOrientationEvent = false;
-var portraitVal = "portrait";
-var landscapeVal = "landscape";
-
-// *************************************************************************************************
-
-window.iui =
-{
-	animOn: true,	// Slide animation with CSS transition is now enabled by default where supported
-
-	showPage: function(page, backwards)
-	{
-		if (page)
-		{
-			if (currentDialog)
-			{
-				currentDialog.removeAttribute("selected");
-				currentDialog = null;
-			}
-
-			if (hasClass(page, "dialog"))
-				showDialog(page);
-			else
-			{
-				var fromPage = currentPage;
-				currentPage = page;
-
-				if (fromPage)
-					setTimeout(slidePages, 0, fromPage, page, backwards);
-				else
-					updatePage(page, fromPage);
-			}
-		}
-	},
-
-	showPageById: function(pageId)
-	{
-		var page = $(pageId);
-		if (page)
-		{
-			var index = pageHistory.indexOf(pageId);
-			var backwards = index != -1;
-			if (backwards)
-				pageHistory.splice(index, pageHistory.length);
-
-			iui.showPage(page, backwards);
-		}
-	},
-
-	showPageByHref: function(href, args, method, replace, cb, bw)
-	{
-		var req = new XMLHttpRequest();
-		req.onerror = function()
-		{
-			if (cb)
-				cb(false);
-		};
-		
-		req.onreadystatechange = function()
-		{
-			if (req.readyState == 4)
-			{
-				if (replace)
-					replaceElementWithSource(replace, req.responseText);
-				else
-				{
-					var frag = document.createElement("div");
-					frag.innerHTML = req.responseText;
-					iui.insertPages(frag.childNodes, bw);
-				}
-				if (cb)
-					setTimeout(cb, 1000, true);
-			}
-		};
-
-		if (args)
-		{
-			req.open(method || "GET", href, true);
-			req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-			req.setRequestHeader("Content-Length", args.length);
-			req.send(args.join("&"));
-		}
-		else
-		{
-			req.open(method || "GET", href, true);
-			req.send(null);
-		}
-	},
-	
-	insertPages: function(nodes, bw)
-	{
-		var targetPage;
-		for (var i = 0; i < nodes.length; ++i)
-		{
-			var child = nodes[i];
-			if (child.nodeType == 1)
-			{
-				if (!child.id)
-					child.id = "__" + (++newPageCount) + "__";
-
-				var clone = $(child.id);
-				if (clone)
-					clone.parentNode.replaceChild(child, clone);
-				else
-					document.body.appendChild(child);
-
-				if (child.getAttribute("selected") == "true" || !targetPage)
-					targetPage = child;
-				
-				--i;
-			}
-		}
-
-		if (targetPage)
-			iui.showPage(targetPage, bw);	 
-	},
-
-	getSelectedPage: function()
-	{
-		for (var child = document.body.firstChild; child; child = child.nextSibling)
-		{
-			if (child.nodeType == 1 && child.getAttribute("selected") == "true")
-				return child;
-		}	 
-	},
-	isNativeUrl: function(href)
-	{
-		for(var i = 0; i < iui.nativeUrlPatterns.length; i++)
-		{
-			if(href.match(iui.nativeUrlPatterns[i])) return true;
-		}
-		return false;
-	},
-	nativeUrlPatterns: [
-		new RegExp("^http:\/\/maps.google.com\/maps\?"),
-		new RegExp("^mailto:"),
-		new RegExp("^tel:"),
-		new RegExp("^http:\/\/www.youtube.com\/watch\\?v="),
-		new RegExp("^http:\/\/www.youtube.com\/v\/"),
-		new RegExp("^javascript:"),
-
-	]
-};
-
-// *************************************************************************************************
-
-addEventListener("load", function(event)
-{
-	var page = iui.getSelectedPage();
-	var locPage = getPageFromLoc();
-		
-	if (page)
-			iui.showPage(page);
-	
-	if (locPage && (locPage != page))
-		iui.showPage(locPage);
-	
-	setTimeout(preloadImages, 0);
-	if (typeof window.onorientationchange == "object")
-	{
-		window.onorientationchange=orientChangeHandler;
-		hasOrientationEvent = true;
-		setTimeout(orientChangeHandler, 0);
-	}
-	setTimeout(checkOrientAndLocation, 0);
-	checkTimer = setInterval(checkOrientAndLocation, 300);
-}, false);
-
-addEventListener("unload", function(event)
-{
-	return;
-}, false);
-	
-addEventListener("click", function(event)
-{
-	var link = findParent(event.target, "a");
-	if (link)
-	{
-		function unselect() { link.removeAttribute("selected"); }
-		
-		if (link.href && link.hash && link.hash != "#" && !link.target)
-		{
-			link.setAttribute("selected", "true");
-			iui.showPage($(link.hash.substr(1)));
-			setTimeout(unselect, 500);
-		}
-		else if (link == $("backButton"))
-			history.back();
-		else if (link.getAttribute("type") == "submit")
-		{
-			var form = findParent(link, "form");
-			if (form.target == "_self")
-			{
-			    form.submit();
-			    return;  // return so we don't preventDefault
-			}
-			submitForm(form);
-		}
-		else if (link.getAttribute("type") == "cancel")
-			cancelDialog(findParent(link, "form"));
-		else if (link.target == "_replace")
-		{
-			link.setAttribute("selected", "progress");
-			iui.showPageByHref(link.href, null, null, link, unselect);
-		}
-		else if (iui.isNativeUrl(link.href))
-		{
-			return;
-		}
-		else if (link.target == "_webapp")
-		{
-			location.href = link.href;
-		}
-		else if (!link.target)
-		{
-			link.setAttribute("selected", "progress");
-			var bw = link.getAttribute("backwards");
-			iui.showPageByHref(link.href, null, null, null, unselect, bw);
-		}
-		else
-			return;
-		
-		event.preventDefault();		   
-	}
-}, true);
-
-addEventListener("click", function(event)
-{
-	var div = findParent(event.target, "div");
-	if (div && hasClass(div, "toggle"))
-	{
-		div.setAttribute("toggled", div.getAttribute("toggled") != "true");
-		event.preventDefault();		   
-	}
-}, true);
-
-function getPageFromLoc()
-{
-	var page;
-	var result = location.hash.match(/#_([^\?_]+)/);
-	if (result)
-		page = result[1];
-	if (page)
-		page = $(page);
-	return page;
-}
-
-function orientChangeHandler()
-{
-	var orientation=window.orientation;
-	switch(orientation)
-	{
-	case 0:
-		setOrientation(portraitVal);
-		break;	
-		
-	case 90:
-	case -90: 
-		setOrientation(landscapeVal);
-		break;
-	}
-}
-
-
-function checkOrientAndLocation()
-{
-	if (!hasOrientationEvent)
-	{
-	  if (window.innerWidth != currentWidth)
-	  {	  
-		  currentWidth = window.innerWidth;
-		  var orient = currentWidth == 320 ? portraitVal : landscapeVal;
-		  setOrientation(orient);
-	  }
-	}
-
-	if (location.hash != currentHash)
-	{
-		var pageId = location.hash.substr(hashPrefix.length);
-		iui.showPageById(pageId);
-	}
-}
-
-function setOrientation(orient)
-{
-	document.body.setAttribute("orient", orient);
-	setTimeout(scrollTo, 100, 0, 1);
-}
-
-function showDialog(page)
-{
-	currentDialog = page;
-	page.setAttribute("selected", "true");
-	
-	if (hasClass(page, "dialog") && !page.target)
-		showForm(page);
-}
-
-function showForm(form)
-{
-	form.onsubmit = function(event)
-	{
-		event.preventDefault();
-		submitForm(form);
-	};
-	
-	form.onclick = function(event)
-	{
-		if (event.target == form && hasClass(form, "dialog"))
-			cancelDialog(form);
-	};
-}
-
-function cancelDialog(form)
-{
-	form.removeAttribute("selected");
-}
-
-function updatePage(page, fromPage)
-{
-	if (!page.id)
-		page.id = "__" + (++newPageCount) + "__";
-
-	location.hash = currentHash = hashPrefix + page.id;
-	pageHistory.push(page.id);
-
-	var pageTitle = $("pageTitle");
-	if (page.title)
-		pageTitle.innerHTML = page.title;
-
-	if (page.localName.toLowerCase() == "form" && !page.target)
-		showForm(page);
-		
-	var backButton = $("backButton");
-	if (backButton)
-	{
-		var prevPage = $(pageHistory[pageHistory.length-2]);
-		if (prevPage && !page.getAttribute("hideBackButton"))
-		{
-			backButton.style.display = "inline";
-			backButton.innerHTML = prevPage.title ? prevPage.title : "Back";
-		}
-		else
-			backButton.style.display = "none";
-	}	
-
-	var backButton = $("myBackButton");
-	if (backButton)
-	{
-		var label = page.getAttribute("myBackLabel");
-
-		if (label)
-		{
-			backButton.style.display = "inline";
-			backButton.innerHTML = label;
-			backButton.href = page.getAttribute("myBackHref");
-			//backButton.target = page.getAttribute("myBackTarget");
-			target = page.getAttribute("myBackTarget");
-			if (target == null)
-				backButton.target = '';
-		    else
-				backButton.target = target;
-			backButton.setAttribute("backwards", "true");
-		}
-		else
-			backButton.style.display = "none";
-	}	 
-
-}
-
-function slidePages(fromPage, toPage, backwards)
-{		 
-	var axis = (backwards ? fromPage : toPage).getAttribute("axis");
-
-	clearInterval(checkTimer);
-	
-	if (canDoSlideAnim() && axis != 'y')
-	{
-	  slide2(fromPage, toPage, backwards, slideDone);
-	}
-	else
-	{
-	  slide1(fromPage, toPage, backwards, axis, slideDone);
-	}
-
-	function slideDone()
-	{
-	  if (!hasClass(toPage, "dialog"))
-		  fromPage.removeAttribute("selected");
-	  checkTimer = setInterval(checkOrientAndLocation, 300);
-	  setTimeout(updatePage, 0, toPage, fromPage);
-	  fromPage.removeEventListener('webkitTransitionEnd', slideDone, false);
-	}
-}
-
-function canDoSlideAnim()
-{
-  return (iui.animOn) && (typeof WebKitCSSMatrix == "object");
-}
-
-function slide1(fromPage, toPage, backwards, axis, cb)
-{
-	if (axis == "y")
-		(backwards ? fromPage : toPage).style.top = "100%";
-	else
-		toPage.style.left = "100%";
-
-	scrollTo(0, 1);
-	toPage.setAttribute("selected", "true");
-	var percent = 100;
-	slide();
-	var timer = setInterval(slide, slideInterval);
-
-	function slide()
-	{
-		percent -= slideSpeed;
-		if (percent <= 0)
-		{
-			percent = 0;
-			clearInterval(timer);
-			cb();
-		}
-	
-		if (axis == "y")
-		{
-			backwards
-				? fromPage.style.top = (100-percent) + "%"
-				: toPage.style.top = percent + "%";
-		}
-		else
-		{
-			fromPage.style.left = (backwards ? (100-percent) : (percent-100)) + "%"; 
-			toPage.style.left = (backwards ? -percent : percent) + "%"; 
-		}
-	}
-}
-
-
-function slide2(fromPage, toPage, backwards, cb)
-{
-	toPage.style.webkitTransitionDuration = '0ms'; // Turn off transitions to set toPage start offset
-	// fromStart is always 0% and toEnd is always 0%
-	// iPhone won't take % width on toPage
-	var toStart = 'translateX(' + (backwards ? '-' : '') + window.innerWidth +	'px)';
-	var fromEnd = 'translateX(' + (backwards ? '100%' : '-100%') + ')';
-	toPage.style.webkitTransform = toStart;
-	toPage.setAttribute("selected", "true");
-	toPage.style.webkitTransitionDuration = '';	  // Turn transitions back on
-	function startTrans()
-	{
-		fromPage.style.webkitTransform = fromEnd;
-		toPage.style.webkitTransform = 'translateX(0%)'; //toEnd
-	}
-	fromPage.addEventListener('webkitTransitionEnd', cb, false);
-	setTimeout(startTrans, 0);
-}
-
-function preloadImages()
-{
-	var preloader = document.createElement("div");
-	preloader.id = "preloader";
-	document.body.appendChild(preloader);
-}
-
-function submitForm(form)
-{
-	iui.showPageByHref(form.action || "POST", encodeForm(form), form.method);
-}
-
-function encodeForm(form)
-{
-	function encode(inputs)
-	{
-		for (var i = 0; i < inputs.length; ++i)
-		{
-			if (inputs[i].name)
-				args.push(inputs[i].name + "=" + escape(inputs[i].value));
-		}
-	}
-
-	var args = [];
-	encode(form.getElementsByTagName("input"));
-	encode(form.getElementsByTagName("textarea"));
-	encode(form.getElementsByTagName("select"));
-	return args;	
-}
-
-function findParent(node, localName)
-{
-	while (node && (node.nodeType != 1 || node.localName.toLowerCase() != localName))
-		node = node.parentNode;
-	return node;
-}
-
-function hasClass(self, name)
-{
-	var re = new RegExp("(^|\\s)"+name+"($|\\s)");
-	return re.exec(self.getAttribute("class")) != null;
-}
-
-function replaceElementWithSource(replace, source)
-{
-	var page = replace.parentNode;
-	var parent = replace;
-	while (page.parentNode != document.body)
-	{
-		page = page.parentNode;
-		parent = parent.parentNode;
-	}
-
-	var frag = document.createElement(parent.localName);
-	frag.innerHTML = source;
-
-	page.removeChild(parent);
-
-	while (frag.firstChild)
-		page.appendChild(frag.firstChild);
-}
-
-function $(id) { return document.getElementById(id); }
-function ddd() { console.log.apply(console, arguments); }
-
-})();
diff --git a/plugins/mobile/iui/iuix.css b/plugins/mobile/iui/iuix.css
deleted file mode 100644
index 1df7e8a00..000000000
--- a/plugins/mobile/iui/iuix.css
+++ /dev/null
@@ -1 +0,0 @@
-body{margin:0;font-family:Helvetica;background:#FFF;color:#000;overflow-x:hidden;-webkit-user-select:none;-webkit-text-size-adjust:none;}body>*:not(.toolbar){display:none;position:absolute;margin:0;padding:0;left:0;top:45px;width:100%;min-height:372px;-webkit-transition-duration:300ms;-webkit-transition-property:-webkit-transform;-webkit-transform:translateX(0%);}body[orient="landscape"]>*:not(.toolbar){min-height:268px;}body>*[selected="true"]{display:block;}a[selected],a:active{background-color:#194fdb!important;background-image:url(listArrowSel.png),url(selection.png)!important;background-repeat:no-repeat,repeat-x;background-position:right center,left top;color:#FFF!important;}a[selected="progress"]{background-image:url(loading.gif),url(selection.png)!important;}body>.toolbar{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border-bottom:1px solid #2d3642;border-top:1px solid #6d84a2;padding:10px;height:45px;background:url(toolbar.png) #6d84a2 repeat-x;}.toolbar>h1{position:absolute;overflow:hidden;left:50%;margin:1px 0 0 -75px;height:45px;font-size:20px;width:150px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;text-overflow:ellipsis;white-space:nowrap;color:#FFF;}body[orient="landscape"]>.toolbar>h1{margin-left:-125px;width:250px;}.button{position:absolute;overflow:hidden;top:8px;right:6px;margin:0;border-width:0 5px;padding:0 3px;width:auto;height:30px;line-height:30px;font-family:inherit;font-size:12px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.6) 0 -1px 0;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;background:none;-webkit-border-image:url(toolButton.png) 0 5 0 5;}.blueButton{-webkit-border-image:url(blueButton.png) 0 5 0 5;border-width:0 5px;}.leftButton{left:6px;right:auto;}#backButton{display:none;left:6px;right:auto;padding:0;max-width:55px;border-width:0 8px 0 14px;-webkit-border-image:url(backButton.png) 0 8 0 14;}.whiteButton,.redButton,.grayButton{display:block;border-width:0 12px;padding:10px;text-align:center;font-size:20px;font-weight:bold;text-decoration:inherit;color:inherit;}.whiteButton{-webkit-border-image:url(whiteButton.png) 0 12 0 12;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}.redButton{-webkit-border-image:url(redButton.png) 0 12 0 12;color:#fff;text-shadow:#7a0001 0 -1px 0;}.grayButton{-webkit-border-image:url(grayButton.png) 0 12 0 12;color:#FFF;}body>ul>li{position:relative;margin:0;border-bottom:1px solid #E0E0E0;padding:8px 0 8px 10px;font-size:20px;font-weight:bold;list-style:none;}body>ul>li.group{position:relative;top:-1px;margin-bottom:-2px;border-top:1px solid #7d7d7d;border-bottom:1px solid #999;padding:1px 10px;background:url(listGroup.png) repeat-x;font-size:17px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 1px 0;color:#FFF;}body>ul>li.group:first-child{top:0;border-top:none;}body>ul>li>a{display:block;margin:-8px 0 -8px -10px;padding:8px 32px 8px 10px;text-decoration:none;color:inherit;background:url(listArrow.png) no-repeat right center;}a[target="_replace"]{box-sizing:border-box;-webkit-box-sizing:border-box;padding-top:25px;padding-bottom:25px;font-size:18px;color:cornflowerblue;background-color:#FFF;background-image:none;}body>.dialog{top:0;width:100%;min-height:417px;z-index:2;background:rgba(0,0,0,0.8);padding:0;text-align:right;}.dialog>fieldset{box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:0;border:none;border-top:1px solid #6d84a2;padding:10px 6px;background:url(toolbar.png) #7388a5 repeat-x;}.dialog>fieldset>h1{margin:0 10px 0 10px;padding:0;font-size:20px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;}.dialog>fieldset>label{position:absolute;margin:16px 0 0 6px;font-size:14px;color:#999;}input:not(input[type|=radio]):not(input[type|=checkbox]){box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:8px 0 0 0;padding:6px 6px 6px 44px;font-size:16px;font-weight:normal;}body>.panel{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:10px;background:#c8c8c8 url(pinstripes.png);}.panel>fieldset{position:relative;margin:0 0 20px 0;padding:0;background:#FFF;-webkit-border-radius:10px;-moz-border-radius:10px;border:1px solid #999;text-align:right;font-size:16px;}.row{position:relative;min-height:42px;border-bottom:1px solid #999;-webkit-border-radius:0;text-align:right;}fieldset>.row:last-child{border-bottom:none!important;}.row>input:not(input[type|=radio]):not(input[type|=checkbox]){box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;margin:0;border:none;padding:12px 10px 0 110px;height:42px;background:none;}.row>input[type|=radio],.row>input[type|=checkbox]{margin:7px 7px 0 0;height:25px;width:25px;}.row>label{position:absolute;margin:0 0 0 14px;line-height:42px;font-weight:bold;}.row>span{position:absolute;padding:12px 10px 0 110px;margin:0;}.row>.toggle{position:absolute;top:6px;right:6px;width:100px;height:28px;}.toggle{border:1px solid #888;-webkit-border-radius:6px;background:#FFF url(toggle.png) repeat-x;font-size:19px;font-weight:bold;line-height:30px;}.toggle[toggled="true"]{border:1px solid #143fae;background:#194fdb url(toggleOn.png) repeat-x;}.toggleOn{display:none;position:absolute;width:60px;text-align:center;left:0;top:0;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;}.toggleOff{position:absolute;width:60px;text-align:center;right:0;top:0;color:#666;}.toggle[toggled="true"]>.toggleOn{display:block;}.toggle[toggled="true"]>.toggleOff{display:none;}.thumb{position:absolute;top:-1px;left:-1px;width:40px;height:28px;border:1px solid #888;-webkit-border-radius:6px;background:#fff url(thumb.png) repeat-x;}.toggle[toggled="true"]>.thumb{left:auto;right:-1px;}.panel>h2{margin:0 0 8px 14px;font-size:inherit;font-weight:bold;color:#4d4d70;text-shadow:rgba(255,255,255,0.75) 2px 2px 0;}#preloader{display:none;background-image:url(loading.gif),url(selection.png),url(blueButton.png),url(listArrowSel.png),url(listGroup.png);}
\ No newline at end of file
diff --git a/plugins/mobile/iui/iuix.js b/plugins/mobile/iui/iuix.js
deleted file mode 100644
index 09d2eb993..000000000
--- a/plugins/mobile/iui/iuix.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var _1=20;var _2=0;var _3=null;var _4=null;var _5=0;var _6=location.hash;var _7="#_";var _8=[];var _9=0;var _a;var _b=false;var _c="portrait";var _d="landscape";window.iui={animOn:true,showPage:function(_e,_f){if(_e){if(_4){_4.removeAttribute("selected");_4=null;}if(hasClass(_e,"dialog")){showDialog(_e);}else{var _10=_3;_3=_e;if(_10){setTimeout(slidePages,0,_10,_e,_f);}else{updatePage(_e,_10);}}}},showPageById:function(_11){var _12=$(_11);if(_12){var _13=_8.indexOf(_11);var _14=_13!=-1;if(_14){_8.splice(_13,_8.length);}iui.showPage(_12,_14);}},showPageByHref:function(_15,_16,_17,_18,cb){var req=new XMLHttpRequest();req.onerror=function(){if(cb){cb(false);}};req.onreadystatechange=function(){if(req.readyState==4){if(_18){replaceElementWithSource(_18,req.responseText);}else{var _1b=document.createElement("div");_1b.innerHTML=req.responseText;iui.insertPages(_1b.childNodes);}if(cb){setTimeout(cb,1000,true);}}};if(_16){req.open(_17||"GET",_15,true);req.setRequestHeader("Content-Type","application/x-www-form-urlencoded");req.setRequestHeader("Content-Length",_16.length);req.send(_16.join("&"));}else{req.open(_17||"GET",_15,true);req.send(null);}},insertPages:function(_1c){var _1d;for(var i=0;i<_1c.length;++i){var _1f=_1c[i];if(_1f.nodeType==1){if(!_1f.id){_1f.id="__"+(++_9)+"__";}var _20=$(_1f.id);if(_20){_20.parentNode.replaceChild(_1f,_20);}else{document.body.appendChild(_1f);}if(_1f.getAttribute("selected")=="true"||!_1d){_1d=_1f;}--i;}}if(_1d){iui.showPage(_1d);}},getSelectedPage:function(){for(var _21=document.body.firstChild;_21;_21=_21.nextSibling){if(_21.nodeType==1&&_21.getAttribute("selected")=="true"){return _21;}}},isNativeUrl:function(_22){for(var i=0;i<iui.nativeUrlPatterns.length;i++){if(_22.match(iui.nativeUrlPatterns[i])){return true;}}return false;},nativeUrlPatterns:[new RegExp("^http://maps.google.com/maps?"),new RegExp("^mailto:"),new RegExp("^tel:"),new RegExp("^http://www.youtube.com/watch\\?v="),new RegExp("^http://www.youtube.com/v/"),new RegExp("^javascript:"),]};addEventListener("load",function(_24){var _25=iui.getSelectedPage();var _26=getPageFromLoc();if(_25){iui.showPage(_25);}if(_26&&(_26!=_25)){iui.showPage(_26);}setTimeout(preloadImages,0);if(typeof window.onorientationchange=="object"){window.onorientationchange=orientChangeHandler;_b=true;setTimeout(orientChangeHandler,0);}setTimeout(checkOrientAndLocation,0);_a=setInterval(checkOrientAndLocation,300);},false);addEventListener("unload",function(_27){return;},false);addEventListener("click",function(_28){var _29=findParent(_28.target,"a");if(_29){function unselect(){_29.removeAttribute("selected");}if(_29.href&&_29.hash&&_29.hash!="#"&&!_29.target){_29.setAttribute("selected","true");iui.showPage($(_29.hash.substr(1)));setTimeout(unselect,500);}else{if(_29==$("backButton")){history.back();}else{if(_29.getAttribute("type")=="submit"){var _2a=findParent(_29,"form");if(_2a.target=="_self"){_2a.submit();return;}submitForm(_2a);}else{if(_29.getAttribute("type")=="cancel"){cancelDialog(findParent(_29,"form"));}else{if(_29.target=="_replace"){_29.setAttribute("selected","progress");iui.showPageByHref(_29.href,null,null,_29,unselect);}else{if(iui.isNativeUrl(_29.href)){return;}else{if(_29.target=="_webapp"){location.href=_29.href;}else{if(!_29.target){_29.setAttribute("selected","progress");iui.showPageByHref(_29.href,null,null,null,unselect);}else{return;}}}}}}}}_28.preventDefault();}},true);addEventListener("click",function(_2b){var div=findParent(_2b.target,"div");if(div&&hasClass(div,"toggle")){div.setAttribute("toggled",div.getAttribute("toggled")!="true");_2b.preventDefault();}},true);function getPageFromLoc(){var _2d;var _2e=location.hash.match(/#_([^\?_]+)/);if(_2e){_2d=_2e[1];}if(_2d){_2d=$(_2d);}return _2d;}function orientChangeHandler(){var _2f=window.orientation;switch(_2f){case 0:setOrientation(_c);break;case 90:case -90:setOrientation(_d);break;}}function checkOrientAndLocation(){if(!_b){if(window.innerWidth!=_5){_5=window.innerWidth;var _30=_5==320?_c:_d;setOrientation(_30);}}if(location.hash!=_6){var _31=location.hash.substr(_7.length);iui.showPageById(_31);}}function setOrientation(_32){document.body.setAttribute("orient",_32);setTimeout(scrollTo,100,0,1);}function showDialog(_33){_4=_33;_33.setAttribute("selected","true");if(hasClass(_33,"dialog")&&!_33.target){showForm(_33);}}function showForm(_34){_34.onsubmit=function(_35){_35.preventDefault();submitForm(_34);};_34.onclick=function(_36){if(_36.target==_34&&hasClass(_34,"dialog")){cancelDialog(_34);}};}function cancelDialog(_37){_37.removeAttribute("selected");}function updatePage(_38,_39){if(!_38.id){_38.id="__"+(++_9)+"__";}location.hash=_6=_7+_38.id;_8.push(_38.id);var _3a=$("pageTitle");if(_38.title){_3a.innerHTML=_38.title;}if(_38.localName.toLowerCase()=="form"&&!_38.target){showForm(_38);}var _3b=$("backButton");if(_3b){var _3c=$(_8[_8.length-2]);if(_3c&&!_38.getAttribute("hideBackButton")){_3b.style.display="inline";_3b.innerHTML=_3c.title?_3c.title:"Back";}else{_3b.style.display="none";}}}function slidePages(_3d,_3e,_3f){var _40=(_3f?_3d:_3e).getAttribute("axis");clearInterval(_a);if(canDoSlideAnim()&&_40!="y"){slide2(_3d,_3e,_3f,slideDone);}else{slide1(_3d,_3e,_3f,_40,slideDone);}function slideDone(){if(!hasClass(_3e,"dialog")){_3d.removeAttribute("selected");}_a=setInterval(checkOrientAndLocation,300);setTimeout(updatePage,0,_3e,_3d);_3d.removeEventListener("webkitTransitionEnd",slideDone,false);}}function canDoSlideAnim(){return (iui.animOn)&&(typeof WebKitCSSMatrix=="object");}function slide1(_41,_42,_43,_44,cb){if(_44=="y"){(_43?_41:_42).style.top="100%";}else{_42.style.left="100%";}scrollTo(0,1);_42.setAttribute("selected","true");var _46=100;slide();var _47=setInterval(slide,_2);function slide(){_46-=_1;if(_46<=0){_46=0;clearInterval(_47);cb();}if(_44=="y"){_43?_41.style.top=(100-_46)+"%":_42.style.top=_46+"%";}else{_41.style.left=(_43?(100-_46):(_46-100))+"%";_42.style.left=(_43?-_46:_46)+"%";}}}function slide2(_48,_49,_4a,cb){_49.style.webkitTransitionDuration="0ms";var _4c="translateX("+(_4a?"-":"")+window.innerWidth+"px)";var _4d="translateX("+(_4a?"100%":"-100%")+")";_49.style.webkitTransform=_4c;_49.setAttribute("selected","true");_49.style.webkitTransitionDuration="";function startTrans(){_48.style.webkitTransform=_4d;_49.style.webkitTransform="translateX(0%)";}_48.addEventListener("webkitTransitionEnd",cb,false);setTimeout(startTrans,0);}function preloadImages(){var _4e=document.createElement("div");_4e.id="preloader";document.body.appendChild(_4e);}function submitForm(_4f){iui.showPageByHref(_4f.action||"POST",encodeForm(_4f),_4f.method);}function encodeForm(_50){function encode(_51){for(var i=0;i<_51.length;++i){if(_51[i].name){args.push(_51[i].name+"="+escape(_51[i].value));}}}var _53=[];encode(_50.getElementsByTagName("input"));encode(_50.getElementsByTagName("textarea"));encode(_50.getElementsByTagName("select"));return _53;}function findParent(_54,_55){while(_54&&(_54.nodeType!=1||_54.localName.toLowerCase()!=_55)){_54=_54.parentNode;}return _54;}function hasClass(_56,_57){var re=new RegExp("(^|\\s)"+_57+"($|\\s)");return re.exec(_56.getAttribute("class"))!=null;}function replaceElementWithSource(_59,_5a){var _5b=_59.parentNode;var _5c=_59;while(_5b.parentNode!=document.body){_5b=_5b.parentNode;_5c=_5c.parentNode;}var _5d=document.createElement(_5c.localName);_5d.innerHTML=_5a;_5b.removeChild(_5c);while(_5d.firstChild){_5b.appendChild(_5d.firstChild);}}function $(id){return document.getElementById(id);}function ddd(){console.log.apply(console,arguments);}})();
\ No newline at end of file
diff --git a/plugins/mobile/iui/listArrow.png b/plugins/mobile/iui/listArrow.png
deleted file mode 100644
index 6421a1676..000000000
Binary files a/plugins/mobile/iui/listArrow.png and /dev/null differ
diff --git a/plugins/mobile/iui/listArrowSel.png b/plugins/mobile/iui/listArrowSel.png
deleted file mode 100644
index 86832ebc7..000000000
Binary files a/plugins/mobile/iui/listArrowSel.png and /dev/null differ
diff --git a/plugins/mobile/iui/listGroup.png b/plugins/mobile/iui/listGroup.png
deleted file mode 100644
index 221553ae9..000000000
Binary files a/plugins/mobile/iui/listGroup.png and /dev/null differ
diff --git a/plugins/mobile/iui/loading.gif b/plugins/mobile/iui/loading.gif
deleted file mode 100644
index 8522ddf1a..000000000
Binary files a/plugins/mobile/iui/loading.gif and /dev/null differ
diff --git a/plugins/mobile/iui/pinstripes.png b/plugins/mobile/iui/pinstripes.png
deleted file mode 100644
index c99777512..000000000
Binary files a/plugins/mobile/iui/pinstripes.png and /dev/null differ
diff --git a/plugins/mobile/iui/redButton.png b/plugins/mobile/iui/redButton.png
deleted file mode 100644
index 210f156af..000000000
Binary files a/plugins/mobile/iui/redButton.png and /dev/null differ
diff --git a/plugins/mobile/iui/selection.png b/plugins/mobile/iui/selection.png
deleted file mode 100644
index 537e3f0b1..000000000
Binary files a/plugins/mobile/iui/selection.png and /dev/null differ
diff --git a/plugins/mobile/iui/thumb.png b/plugins/mobile/iui/thumb.png
deleted file mode 100644
index cefa8fc5e..000000000
Binary files a/plugins/mobile/iui/thumb.png and /dev/null differ
diff --git a/plugins/mobile/iui/toggle.png b/plugins/mobile/iui/toggle.png
deleted file mode 100644
index 3b62ebf26..000000000
Binary files a/plugins/mobile/iui/toggle.png and /dev/null differ
diff --git a/plugins/mobile/iui/toggleOn.png b/plugins/mobile/iui/toggleOn.png
deleted file mode 100644
index b016814de..000000000
Binary files a/plugins/mobile/iui/toggleOn.png and /dev/null differ
diff --git a/plugins/mobile/iui/toolButton.png b/plugins/mobile/iui/toolButton.png
deleted file mode 100644
index afe4d7a3e..000000000
Binary files a/plugins/mobile/iui/toolButton.png and /dev/null differ
diff --git a/plugins/mobile/iui/toolbar.png b/plugins/mobile/iui/toolbar.png
deleted file mode 100644
index 3dde94c07..000000000
Binary files a/plugins/mobile/iui/toolbar.png and /dev/null differ
diff --git a/plugins/mobile/iui/whiteButton.png b/plugins/mobile/iui/whiteButton.png
deleted file mode 100644
index 5514b2700..000000000
Binary files a/plugins/mobile/iui/whiteButton.png and /dev/null differ
diff --git a/plugins/mobile/login_form.php b/plugins/mobile/login_form.php
deleted file mode 100644
index be44ef1ab..000000000
--- a/plugins/mobile/login_form.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Tiny Tiny RSS</title>
-<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
-<link rel="apple-touch-icon" href="iui/iui-logo-touch-icon.png" />
-<meta name="apple-touch-fullscreen" content="YES" />
-<style type="text/css" media="screen">@import "iui/iui.css";</style>
-<script type="application/x-javascript" src="iui/iui.js"></script>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-</head>
-
-
-<script type="text/javascript">
-function do_login() {
-	var f = document.forms['login'];
-	f.submit();
-}
-</script>
-
-<body>
-
-    <div class="toolbar">
-        <h1 id="pageTitle"></h1>
-		  <a id="backButton" class="button" href="#"></a>
-        <a class="button blueButton" onclick='do_login()'><?php echo __('Log in') ?></a>
-    </div>
-
-	<form target="_self" title="Login" id="login" class="panel" name="login" selected="true"
-		action="../../public.php?return=<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]) ?>"
-		method="post">
-
-	<input type="hidden" name="op" value="login">
-
-	<fieldset>
-
-		<div class="row">
-			<label><?php echo __("Login:") ?></label>
-			<input type="text" autocapitalize="off" name="login">
-		</div>
-
-		<div class="row">
-		<label><?php echo __("Password:") ?></label>
-		<input type="password" name="password">
-		</div>
-
-		</fieldset>
-
-		<div align='center'><a target='_self' href='<?php echo get_self_url_prefix() ?>/index.php?mobile=false'>
-			<?php echo __("Open regular version") ?></a>
-
-	</form>
-
-</body>
-</html>
-
diff --git a/plugins/mobile/logout.php b/plugins/mobile/logout.php
deleted file mode 100644
index afc411abc..000000000
--- a/plugins/mobile/logout.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "mobile-functions.php";
-
-	logout_user();
-
-	header("Location: index.php");
-?>
diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php
deleted file mode 100644
index 1e65a3c36..000000000
--- a/plugins/mobile/mobile-functions.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "version.php";
-	require_once "db-prefs.php";
-
-	init_plugins();
-
-	define('TTRSS_SESSION_NAME', 'ttrss_m_sid');
-
-	/* TODO replace with interface to db-prefs */
-
-	function mobile_pref_toggled($id) {
-		if (get_pref("_MOBILE_$id"))
-			return "true";
-		else
-			return "";
-	}
-
-	function mobile_get_pref($id) {
-		//return $_SESSION["mobile-prefs"][$id];
-		return get_pref("_MOBILE_$id");
-	}
-
-	function mobile_set_pref($id, $value) {
-		//$_SESSION["mobile-prefs"][$id] = $value;
-		return set_pref("_MOBILE_$id", $value);
-	}
-
-	function mobile_feed_has_icon($id) {
-		return file_exists("../../".ICONS_DIR."/$id.ico");
-	}
-
-	function render_flat_feed_list($offset) {
-		$owner_uid = $_SESSION["uid"];
-		$limit = 0;
-
-		if (!$offset) $offset = 0;
-
-		if (mobile_get_pref("SORT_FEEDS_UNREAD")) {
-			$order_by = "unread DESC, title";
-		} else {
-			$order_by = "title";
-		}
-
-		if ($limit > 0) {
-			$limit_qpart = "LIMIT $limit OFFSET $offset";
-		} else {
-			$limit_qpart = "";
-		}
-
-		$result = db_query("SELECT id,
-				title,
-			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
-				WHERE feed_id = ttrss_feeds.id AND unread = true
-					AND ttrss_user_entries.ref_id = ttrss_entries.id
-					AND owner_uid = '$owner_uid') AS unread
-			FROM ttrss_feeds
-			WHERE
-				ttrss_feeds.owner_uid = '$owner_uid'
-			ORDER BY $order_by $limit_qpart");
-
-		if (!$offset) print '<ul id="home" title="'.__('Home').'" selected="true"
-			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
-
-
-	//		print "<li><a href='#cat-actions'>".__('Actions...')."</a></li>";
-
-			$num_feeds = 0;
-
-			while ($line = db_fetch_assoc($result)) {
-				$id = $line["id"];
-				$unread = $line["unread"];
-
-	//			$unread = rand(0, 100);
-
-				if ($unread > 0) {
-					$line["title"] = $line["title"] . " ($unread)";
-					$class = '';
-				} else {
-					$class = 'oldItem';
-				}
-
-				if (mobile_feed_has_icon($id)) {
-					$icon_url = "../../".ICONS_URL."/$id.ico";
-				} else {
-					$icon_url = "../../images/blank_icon.gif";
-				}
-
-				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
-					print "<li class='$class'><a href='feed.php?id=$id'>" .
-						"<img class='tinyIcon' src='$icon_url'/>".
-						$line["title"] . "</a></li>";
-				}
-
-				++$num_feeds;
-			}
-
-/*			$next_offset = $offset + $num_feeds;
-
-			print "<li><a href=\"home.php?skip=$next_offset\"
-	target=\"_replace\">Show more feeds...</a></li>"; */
-
-			if (!$offset) print "</ul>";
-
-	}
-
-	function render_category($cat_id, $offset) {
-		$owner_uid = $_SESSION["uid"];
-
-		if ($cat_id >= 0) {
-
-			if ($cat_id != 0) {
-				$cat_query = "cat_id = '$cat_id'";
-			} else {
-				$cat_query = "cat_id IS NULL";
-			}
-
-			if (mobile_get_pref("SORT_FEEDS_UNREAD")) {
-				$order_by = "unread DESC, title";
-			} else {
-				$order_by = "title";
-			}
-
-			$result = db_query("SELECT id,
-				title,
-			(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
-				WHERE feed_id = ttrss_feeds.id AND unread = true
-					AND ttrss_user_entries.ref_id = ttrss_entries.id
-					AND owner_uid = '$owner_uid') as unread
-			FROM ttrss_feeds
-			WHERE
-				ttrss_feeds.owner_uid = '$owner_uid' AND
-				$cat_query
-			ORDER BY $order_by");
-
-			$title = getCategoryTitle($cat_id);
-
-			print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."'
-				myBackHref='home.php'>";
-
-	//		print "<li><a href='#cat-actions'>".__('Actions...')."</a></li>";
-
-			while ($line = db_fetch_assoc($result)) {
-				$id = $line["id"];
-				$unread = $line["unread"];
-
-	//			$unread = rand(0, 100);
-
-				if ($unread > 0) {
-					$line["title"] = $line["title"] . " ($unread)";
-					$class = '';
-				} else {
-					$class = 'oldItem';
-				}
-
-				if (mobile_feed_has_icon($id)) {
-					$icon_url = "../../".ICONS_URL."/$id.ico";
-				} else {
-					$icon_url = "../../images/blank_icon.gif";
-				}
-
-				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
-					print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" .
-						"<img class='tinyIcon' src='$icon_url'/>".
-						$line["title"] . "</a></li>";
-				}
-			}
-
-			print "</ul>";
-		} else if ($cat_id == -1) {
-
-			$title = __('Special');
-
-			print "<ul id='cat--1' title='$title' myBackLabel='".__("Home")."'
-				myBackHref='home.php'>";
-
-			foreach (array(-4, -3, -1, -2, 0) as $id) {
-				$title = getFeedTitle($id);
-				$unread = getFeedUnread($id, false);
-				$icon = getFeedIcon($id);
-
-				if ($unread > 0) {
-					$title = $title . " ($unread)";
-					$class = '';
-				} else {
-					$class = 'oldItem';
-				}
-
-				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
-					print "<li class='$class'>
-						<a href='feed.php?id=$id&cat=-1'>
-						<img class='tinyIcon' src='../$icon'/>$title</a></li>";
-				}
-			}
-
-			print "</ul>";
-		} else if ($cat_id == -2) {
-
-			$title = __('Labels');
-
-			print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."'
-				myBackHref='home.php'>";
-
-			$result = db_query("SELECT id, caption FROM ttrss_labels2
-				WHERE owner_uid = '$owner_uid'");
-
-			$label_data = array();
-
-			while ($line = db_fetch_assoc($result)) {
-
-				$id = label_to_feed_id($line["id"]);
-
-				$unread = getFeedUnread($id);
-				$title = $line["caption"];
-
-				if ($unread > 0) {
-					$title = $title . " ($unread)";
-					$class = '';
-				} else {
-					$class = 'oldItem';
-				}
-
-				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
-					print "<li class='$class'>
-						<a href='feed.php?id=$id&cat=-2'>$title</a></li>";
-				}
-			}
-			print "</ul>";
-		}
-	}
-
-	function render_categories_list($link) {
-		$owner_uid = $_SESSION["uid"];
-
-		$cat_browse = mobile_get_pref("BROWSE_CATS");
-
-		print '<ul id="home" title="'.__('Home').'" selected="true"
-			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
-
-//		print "<li><a href='#searchForm'>Search...</a></li>";
-
-		foreach (array(-1, -2) as $id) {
-			$title = getCategoryTitle($id);
-			$unread = getFeedUnread($id, true);
-			if ($unread > 0) {
-				$title = $title . " ($unread)";
-				$class = '';
-			} else {
-				$class = 'oldItem';
-			}
-
-			if ($cat_browse)
-				print "<li class='$class'><a href='cat.php?id=$id'>$title</a></li>";
-			else
-				print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>";
-		}
-
-		$result = db_query("SELECT
-				ttrss_feed_categories.id,
-				ttrss_feed_categories.title,
-				COUNT(ttrss_feeds.id) AS num_feeds
-			FROM ttrss_feed_categories, ttrss_feeds
-			WHERE ttrss_feed_categories.owner_uid = $owner_uid
-				AND ttrss_feed_categories.id = cat_id
-				GROUP BY ttrss_feed_categories.id,
-					ttrss_feed_categories.title
-				ORDER BY ttrss_feed_categories.title");
-
-		while ($line = db_fetch_assoc($result)) {
-
-			if ($line["num_feeds"] > 0) {
-
-				$unread = getFeedUnread($line["id"], true);
-				$id = $line["id"];
-
-				if ($unread > 0) {
-					$line["title"] = $line["title"] . " ($unread)";
-					$class = '';
-				} else {
-					$class = 'oldItem';
-				}
-
-				if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
-
-					if ($cat_browse)
-						print "<li class='$class'><a href='cat.php?id=$id'>" .
-							$line["title"] . "</a></li>";
-					else
-						print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>".
-							$line["title"] . "</a></li>";
-				}
-			}
-		}
-
-
-		$result = db_query("SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE
-			cat_id IS NULL and owner_uid = '$owner_uid'");
-
-		$num_feeds = db_fetch_result($result, 0, "nf");
-
-		if ($num_feeds > 0) {
-			$unread = getFeedUnread(0, true);
-			$title = "Uncategorized";
-
-			if ($unread > 0) {
-				$title = "$title ($unread)";
-				$class = '';
-			} else {
-				$class = 'oldItem';
-			}
-
-			if ($unread > 0 || !mobile_get_pref("HIDE_READ")) {
-				if ($cat_browse)
-					print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>";
-				else
-					print "<li class='$class'><a href='feed.php?id=0&is_cat=true'>$title</a></li>";
-
-			}
-		}
-
-		print "</ul>";
-	}
-
-	function render_headlines_list($feed_id, $cat_id, $offset, $search,
-		$is_cat = false) {
-
-		$feed_id = $feed_id;
-		$limit = 15;
-		$filter = '';
-
-		if (!mobile_get_pref("HIDE_READ"))
-			$view_mode = "all_articles";
-		else
-			$view_mode = 'adaptive';
-
-		if ($search) {
-			$search_mode = 'this_feed';
-		} else {
-			$search_mode = '';
-		}
-
-		$qfh_ret = queryFeedHeadlines($feed_id, $limit,
-			$view_mode, $is_cat, $search, $search_mode,
-			"score DESC, date_entered ".(mobile_get_pref('REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
-
-		$result = $qfh_ret[0];
-		$feed_title = $qfh_ret[1];
-
-		if (!$offset) {
-
-			print "<form id=\"searchForm-$feed_id-$cat_id\" class=\"dialog\" method=\"POST\"
-				action=\"feed.php\">
-
-				<input type=\"hidden\" name=\"id\" value=\"$feed_id\">
-				<input type=\"hidden\" name=\"cat\" value=\"$cat_id\">
-
-	        <fieldset>
-			  <h1>Search</h1>
-	            <a class=\"button leftButton\" type=\"cancel\">Cancel</a>
-	            <a class=\"button blueButton\" type=\"submit\">Search</a>
-
-	            <label>Search:</label>
-					<input id=\"search\" type=\"text\" name=\"search\"/>
-	        </fieldset>
-			  </form>";
-
-			if ($cat_id) {
-				$cat_title = getCategoryTitle($cat_id);
-
-				print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\"
-					myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>";
-			} else {
-				print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\"
-					myBackLabel='".__("Home")."' myBackHref='home.php'>";
-			}
-
-			print "<li><a href='#searchForm-$feed_id-$cat_id'>Search...</a></li>";
-		}
-
-		$num_headlines = 0;
-
-		while ($line = db_fetch_assoc($result)) {
-			$id = $line["id"];
-			$real_feed_id = $line["feed_id"];
-
-			if (sql_bool_to_bool($line["unread"])) {
-				$class = '';
-			} else {
-				$class = 'oldItem';
-			}
-
-			if (mobile_feed_has_icon($real_feed_id)) {
-				$icon_url = "../../".ICONS_URL."/$real_feed_id.ico";
-			} else {
-				$icon_url = "../../images/blank_icon.gif";
-			}
-
-			print "<li class='$class'><a href='article.php?id=$id&feed=$feed_id&cat=$cat_id&is_cat=$is_cat'>
-				<img class='tinyIcon' src='$icon_url'>";
-			print $line["title"];
-			print "</a></li>";
-
-			++$num_headlines;
-
-		}
-
-		if ($num_headlines == 0 && $search) {
-			$articles_url = "feed.php?id=$feed_id&cat=$cat_id&skip=$next_offset";
-
-			print "<li><a href=\"$articles_url\">" . __("Nothing found (click to reload feed).") . "</a></li>";
-
-		}
-
-//		print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>";
-
-		$next_offset = $offset + $num_headlines;
-		$num_unread = getFeedUnread($feed_id, $is_cat);
-
-		/* FIXME needs normal implementation */
-
-		if ($num_headlines > 0 && ($num_unread == 0 || $num_unread > $next_offset)) {
-
-			if ($is_cat) {
-				$articles_url = "feed.php?id=$feed_id&skip=$next_offset".
-					"&search=$search&is_cat=true";
-			} else {
-				$articles_url = "feed.php?id=$feed_id&cat=$cat_id&skip=$next_offset".
-					"&search=$search";
-			}
-
-			print "<li><a href=\"$articles_url\"
-				target=\"_replace\">Get more articles...</a></li>";
-		}
-
-		if (!$offset) print "</ul>";
-
-	}
-
-	function render_article($id, $feed_id, $cat_id, $is_cat) {
-
-		$query = "SELECT title,link,content,feed_id,comments,int_id,
-			marked,unread,published,
-			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
-			author
-			FROM ttrss_entries,ttrss_user_entries
-			WHERE	id = '$id' AND ref_id = id AND owner_uid = " .
-				$_SESSION["uid"] ;
-
-		$result = db_query($query);
-
-		if (db_num_rows($result) != 0) {
-
-			$line = db_fetch_assoc($result);
-
-			$tmp_result = db_query("UPDATE ttrss_user_entries
-				SET unread = false,last_read = NOW()
-				WHERE ref_id = '$id'
-				AND owner_uid = " . $_SESSION["uid"]);
-
-			$updated_fmt = make_local_datetime($line['updated'], false);
-
-			$title = $line["title"];
-			$article_link = $line["link"];
-
-			if (!$is_cat)
-				$feed_title = getFeedTitle($feed_id);
-			else
-				$feed_title = getCategoryTitle($feed_id);
-
-			print "<div class=\"panel\" id=\"article-$id\" title=\"$title\"
-				selected=\"true\"
-				myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
-
-			if ($line['feed_id'] != $feed_id) {
-				$real_feed_title = getFeedTitle($line['feed_id']);
-				$real_feed_id = $line['feed_id'];
-				$feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)";
-			}
-//			print "<fieldset>";
-
-			print "<div style='float : right'>($updated_fmt)</div>";
-
-			print "<h2><a target='_blank' href='$article_link'>$title</a> $feed_link</h2>";
-
-			print "<hr>";
-
-/*			print "<div class=\"row\">";
-			print "<label id='title'><a target='_blank' href='$article_link'>$title</a></label>";
-			print "</div>"; */
-
-			$is_starred = (sql_bool_to_bool($line["marked"])) ? "true" : "false";
-			$is_published = (sql_bool_to_bool($line["published"])) ? "true" : "false";
-
-			//print "<div class=\"row\">";
-			//print "<label id='updated'>Updated:</label>";
-			//print "<input type='text' enabled='false' name='updated' disabled value='$updated_fmt'/>";
-			//print "</div>";
-
-//			print "</fieldset>";
-
-			$content = sanitize($line["content"]);
-			$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
-
-			if (!mobile_get_pref("SHOW_IMAGES")) {
-				$content = preg_replace('/<img[^>]+>/is', '', $content);
-			}
-
-			print "<p>$content</p>";
-
-            print "<div class='nav'>
-                    <label>Navigation</label>
-                    <div class='button left' onclick='goPrev($id, $feed_id, this)'>Prev</div>
-                    <div class='button right' onclick='goNext($id, $feed_id, this)'>Next</div>
-                  </div>";
-
-			print "<fieldset>";
-
-			print "<div class=\"row\">
-	                <label>Starred</label>
-	                <div class=\"toggle\" onclick=\"toggleMarked($id, this)\" toggled=\"$is_starred\"><span class=\"thumb\"></span><span class=\"toggleOn\">ON</span><span class=\"toggleOff\">OFF</span></div>
-	            </div>";
-
-			print "<div class=\"row\">
-	                <label>Published</label>
-	                <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/plugins/mobile/mobile.css b/plugins/mobile/mobile.css
deleted file mode 100644
index 8068e3d38..000000000
--- a/plugins/mobile/mobile.css
+++ /dev/null
@@ -1,38 +0,0 @@
-div.nav {
-    height: 40px;
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    background-color: #ffffff;
-    border: 1px solid #999999;
-    text-align: center;
-    margin-bottom: 1em;
-}
-div.nav label {
-    line-height: 40px;
-    color: black;
-    font-weight: bold;
-}
-div.nav .button {
-    position: static;
-    margin: 5px 10px;
-    -webkit-border-image: url(../lib/iui/whiteButton.png) 0 12 0 12;
-    text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
-    color: black;
-    cursor: pointer; /* On a touch screen ? */
-}
-div.nav .button.left {
-    float: left;
-}
-div.nav .button.right {
-    float: right;
-}
-
-ul li a.read {
-    color: #666666;
-}
-
-ul li span.browse {
-	color : #909090;
-	text-align : right;
-	float : right;
-}
diff --git a/plugins/mobile/mobile.js b/plugins/mobile/mobile.js
deleted file mode 100644
index 3fed3a1d7..000000000
--- a/plugins/mobile/mobile.js
+++ /dev/null
@@ -1,163 +0,0 @@
-var backend = "backend.php";
-
-function toggleMarked(id, elem) {
-
-	var toggled = false;
-
-	if (elem.getAttribute("toggled") == "true") {
-		toggled = 1;
-	} else {
-		toggled = 0;
-	}
-
-	var query = "op=toggleMarked&id=" + id + "&mark=" + toggled;
-
-	new Ajax.Request(backend, {
-		parameters: query,
-		onComplete: function (transport) {
-			//
-		} });
-}
-
-function togglePublished(id, elem) {
-
-	var toggled = false;
-
-	if (elem.getAttribute("toggled") == "true") {
-		toggled = 1;
-	} else {
-		toggled = 0;
-	}
-
-	var query = "op=togglePublished&id=" + id + "&pub=" + toggled;
-
-	new Ajax.Request(backend, {
-		parameters: query,
-		onComplete: function (transport) {
-			//
-		} });
-
-}
-
-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;
-
-	if (elem.getAttribute("toggled") == "true") {
-		toggled = 1;
-	} else {
-		toggled = 0;
-	}
-
-	var query = "op=setPref&id=" + id + "&to=" + toggled;
-
-	new Ajax.Request(backend, {
-		parameters: query,
-		onComplete: function (transport) {
-			//
-		} });
-
-}
-
-// Go directly to another item in the same feed
-function goToSibling(article_id, feed_id, link, step) {
-    var links = linksInFeed(feed_id);
-    for (var i=0 ; i<links.length ; i++) {
-        var re = new RegExp(".*article\\.php\\?id="+article_id+"&.*");
-        if (!re.test(links[i].href)) continue;
-        // here, we've found the current article
-        var index = i + step;
-        if (index < 0) {
-            markAsRead(feed_id);
-            iui.showPage($("feed-"+feed_id), true);
-            return false;
-        }
-        if (index >= links.length) {
-            showRestOfFeed(feed_id);
-            return false;
-        }
-        console.log(links[index]);
-        var match = links[index].href.match(/.*article\.php\?(.*)/);
-        var qs = match[1];
-        var backwards = false;
-        if (step < 0) backwards = true;
-        link.setAttribute("selected", "progress");
-        function unselect() { link.removeAttribute("selected"); }
-        iui.showPageByHref("article.php?"+qs, null, null, null, unselect, backwards);
-        return false;
-    }
-    return false;
-}
-function goPrev(article_id, feed_id, link) {
-    return goToSibling(article_id, feed_id, link, -1);
-}
-function goNext(article_id, feed_id, link) {
-    return goToSibling(article_id, feed_id, link, 1);
-}
-
-// Get all the links in the feed. The all_links variable includes the "get more article" link
-function linksInFeed(feed_id, all_links) {
-    var feed_content = $("feed-"+feed_id);
-    var links_raw = feed_content.getElementsByTagName("a");
-    if (all_links) return links_raw;
-    var links = [];
-    // filter the array to remove the "get more articles" link
-    // and the "search" link (which is always first)
-    for (var i=1 ; i<links_raw.length ; i++) {
-        if (links_raw[i].href.match(/.*article\.php\?id=.*/)) {
-            links.push(links_raw[i]);
-        }
-    }
-    return links;
-}
-
-// Adds the "read" class to all read links in the feed
-function markAsRead(feed_id) {
-    var links = linksInFeed(feed_id);
-    for (var j=0 ; j<links.length ; j++) {
-        var match = links[j].href.match(/.*article\.php\?id=(\d+)&.*/);
-        if ($("article-"+match[1])) {
-            links[j].className = "read";
-        }
-    }
-}
-
-// Go the the articles list and expand the "get more articles" link
-function showRestOfFeed(feed_id) {
-    var links_raw = linksInFeed(feed_id, true);
-    var lastlink = links_raw[links_raw.length - 1];
-    if (lastlink.target == "_replace") {
-        // It's a "get more articles" link
-        iui.showPage($("feed-"+feed_id), true);
-        // Mark old items a "read"
-        markAsRead(feed_id);
-        // Simulate click on the "get more articles" link
-        lastlink.setAttribute("selected", "progress");
-        function unselect() { lastlink.removeAttribute("selected"); }
-        setTimeout(window.scrollTo, 0, 0, 1000);
-        iui.showPageByHref(lastlink.href, null, null, lastlink, unselect);
-    } else {
-        iui.showPage($("home"), true);
-    }
-}
-
diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php
deleted file mode 100644
index 9c630359c..000000000
--- a/plugins/mobile/prefs.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	header('Content-Type: text/html; charset=utf-8');
-
-	define('MOBILE_VERSION', true);
-
-	$basedir = dirname(dirname(dirname(__FILE__)));
-
-	set_include_path(
-		dirname(__FILE__) . PATH_SEPARATOR .
-		$basedir . PATH_SEPARATOR .
-		"$basedir/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	$basedir = dirname(dirname(__FILE__));
-
-	require_once "config.php";
-	require_once "mobile-functions.php";
-
-	login_sequence(true);
-?>
-
-<div class="panel" id="prefs" selected="yes" title="Preferences"
-	myBackLabel="<?php echo __('Home') ?>" myBackHref="home.php">
-
-<fieldset>
-
-<div class="row">
-	<label><?php echo __('Enable categories') ?></label>
-	<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
-</div>
-
-<div class="row">
-	<label><?php echo __('Browse categories like folders') ?></label>
-	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
-</div>
-
-
-<div class="row">
-	<label><?php echo __('Show images in posts') ?></label>
-	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
-</div>
-
-<div class="row">
-	<label><?php echo __('Hide read articles and feeds') ?></label>
-	<div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
-</div>
-
-<div class="row">
-	<label><?php echo __('Sort feeds by unread count') ?></label>
-	<div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
-</div>
-
-<div class="row">
-	<label><?php echo __('Reverse headline order (oldest first)') ?></label>
-	<div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
-</div>
-
-</fieldset>
-- 
cgit v1.2.3