]> git.wh0rd.org Git - tt-rss.git/commitdiff
remove long deprecated mobile/
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 21 Mar 2013 19:47:44 +0000 (23:47 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 21 Mar 2013 19:47:44 +0000 (23:47 +0400)
14 files changed:
include/functions.php
mobile/article.php [deleted file]
mobile/backend.php [deleted file]
mobile/cat.php [deleted file]
mobile/feed.php [deleted file]
mobile/home.php [deleted file]
mobile/image.php [deleted file]
mobile/index.php [deleted file]
mobile/login_form.php [deleted file]
mobile/logout.php [deleted file]
mobile/mobile-functions.php [deleted file]
mobile/mobile.css [deleted file]
mobile/mobile.js [deleted file]
mobile/prefs.php [deleted file]

index 535d476740ab3fee376da01452b0b13903a25699..5d5550059b5b695c7f5ff3f9d21d69e22fa49925 100644 (file)
                        $lang = _TRANSLATION_OVERRIDE_DEFAULT;
                }
 
-               /* In login action of mobile version */
-               if ($_POST["language"] && defined('MOBILE_VERSION')) {
-                       $lang = $_POST["language"];
-               } else if ($_SESSION["language"] && $_SESSION["language"] != "auto") {
+               if ($_SESSION["language"] && $_SESSION["language"] != "auto") {
                        $lang = $_SESSION["language"];
                }
 
                                _setlocale(LC_ALL, $lang);
                        }
 
-                       if (defined('MOBILE_VERSION')) {
-                               _bindtextdomain("messages", "../locale");
-                       } else {
-                               _bindtextdomain("messages", "locale");
-                       }
+                       _bindtextdomain("messages", "locale");
 
                        _textdomain("messages");
                        _bind_textdomain_codeset("messages", "UTF-8");
                }
        }
 
-       function login_sequence($link, $login_form = 0) {
+       function login_sequence($link) {
                $_SESSION["prefs_cache"] = false;
 
                if (SINGLE_USER_MODE) {
                                         authenticate_user($link, null, null, true);
                                }
 
-                               if (!$_SESSION["uid"]) render_login_form($link, $login_form);
+                               if (!$_SESSION["uid"]) render_login_form($link);
 
                        } else {
                                /* bump login timestamp */
                return true;
        }
 
-       function render_login_form($link, $form_id = 0) {
-               switch ($form_id) {
-               case 0:
-                       require_once "login_form.php";
-                       break;
-               case 1:
-                       require_once "mobile/login_form.php";
-                       break;
-               }
+       function render_login_form($link) {
+               require_once "login_form.php";
                exit;
        }
 
diff --git a/mobile/article.php b/mobile/article.php
deleted file mode 100644 (file)
index 345767f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-       header('Content-Type: text/html; charset=utf-8');
-
-       define('MOBILE_VERSION', true);
-
-       require_once "../config.php";
-       require_once "mobile-functions.php";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, 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($link, $id, $feed_id, $cat_id, $is_cat);
-?>
-
diff --git a/mobile/backend.php b/mobile/backend.php
deleted file mode 100644 (file)
index 98e30bd..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-       header('Content-Type: text/html; charset=utf-8');
-
-       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";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, true);
-
-       $op = $_REQUEST["op"];
-
-       switch ($op) {
-       case "toggleMarked":
-               $cmode = db_escape_string($_REQUEST["mark"]);
-               $id = db_escape_string($_REQUEST["id"]);
-
-               markArticlesById($link, array($id), $cmode);
-               break;
-       case "togglePublished":
-               $cmode = db_escape_string($_REQUEST["pub"]);
-               $id = db_escape_string($_REQUEST["id"]);
-
-               publishArticlesById($link, array($id), $cmode);
-               break;
-       case "toggleUnread":
-               $cmode = db_escape_string($_REQUEST["unread"]);
-               $id = db_escape_string($_REQUEST["id"]);
-
-               catchupArticlesById($link, array($id), $cmode);
-               break;
-
-       case "setPref":
-               $id = db_escape_string($_REQUEST["id"]);
-               $value = db_escape_string($_REQUEST["to"]);
-               mobile_set_pref($link, $id, $value);
-               print_r($_SESSION);
-               break;
-       default:
-               print json_encode(array("error", "UNKNOWN_METHOD"));
-               break;
-       }
-?>
-
diff --git a/mobile/cat.php b/mobile/cat.php
deleted file mode 100644 (file)
index 74d488e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-       header('Content-Type: text/html; charset=utf-8');
-
-       define('MOBILE_VERSION', true);
-
-       require_once "../config.php";
-       require_once "mobile-functions.php";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, true);
-
-       $cat_id = db_escape_string($_REQUEST["id"]);
-
-       render_category($link, $cat_id);
-?>
-
diff --git a/mobile/feed.php b/mobile/feed.php
deleted file mode 100644 (file)
index f7b7443..0000000
+++ /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);
-
-       require_once "../config.php";
-       require_once "mobile-functions.php";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, 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($link, $feed_id, $cat_id, $offset, $search, $is_cat);
-?>
-
diff --git a/mobile/home.php b/mobile/home.php
deleted file mode 100644 (file)
index 71194da..0000000
+++ /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);
-
-       require_once "../config.php";
-       require_once "mobile-functions.php";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, true);
-
-       $use_cats = mobile_get_pref($link, 'ENABLE_CATS');
-       $offset = (int) db_escape_string($_REQUEST["skip"]);
-
-       if ($use_cats) {
-               render_categories_list($link);
-       } else {
-               render_flat_feed_list($link, $offset);
-       }
-?>
diff --git a/mobile/image.php b/mobile/image.php
deleted file mode 100644 (file)
index 765fcc2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-       set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
-               dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-               dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
-               get_include_path());
-
-       require_once "config.php";
-
-       chdir('..');
-
-       $filename = CACHE_DIR . '/images/' . sha1($_GET['url']) . '.png';
-
-       if (file_exists($filename)) {
-               header("Content-type: image/png");
-               echo file_get_contents($filename);
-       } else {
-               header("Location: " . $_GET['url']);
-       }
-?>
diff --git a/mobile/index.php b/mobile/index.php
deleted file mode 100644 (file)
index edbf586..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-       header('Content-Type: text/html; charset=utf-8');
-
-       define('MOBILE_VERSION', true);
-
-       require_once "../config.php";
-       require_once "mobile-functions.php";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, 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="../lib/iui/iui-logo-touch-icon.png" />
-<meta name="apple-touch-fullscreen" content="YES" />
-<style type="text/css" media="screen">@import "../lib/iui/iui.css";</style>
-<script type="application/x-javascript" src="../lib/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(../lib/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($link, 'ENABLE_CATS');
-       $offset = (int) db_escape_string($_REQUEST["skip"]);
-
-       if ($use_cats) {
-               render_categories_list($link);
-       } else {
-               render_flat_feed_list($link, $offset);
-       }
-       ?>
-
-</body>
-</html>
diff --git a/mobile/login_form.php b/mobile/login_form.php
deleted file mode 100644 (file)
index 98c0bfd..0000000
+++ /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="../lib/iui/iui-logo-touch-icon.png" />
-<meta name="apple-touch-fullscreen" content="YES" />
-<style type="text/css" media="screen">@import "../lib/iui/iui.css";</style>
-<script type="application/x-javascript" src="../lib/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/mobile/logout.php b/mobile/logout.php
deleted file mode 100644 (file)
index 46d7ec8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-       require_once "mobile-functions.php";
-
-       logout_user();
-
-       header("Location: index.php");
-?>
diff --git a/mobile/mobile-functions.php b/mobile/mobile-functions.php
deleted file mode 100644 (file)
index 39b89fa..0000000
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-       set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
-               dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-               dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
-               get_include_path());
-
-       require_once "functions.php";
-       require_once "sessions.php";
-       require_once "version.php";
-       require_once "db-prefs.php";
-
-       define('TTRSS_SESSION_NAME', 'ttrss_m_sid');
-
-       /* TODO replace with interface to db-prefs */
-
-       function mobile_pref_toggled($link, $id) {
-               if (get_pref($link, "_MOBILE_$id"))
-                       return "true";
-               else
-                       return "";
-       }
-
-       function mobile_get_pref($link, $id) {
-               //return $_SESSION["mobile-prefs"][$id];
-               return get_pref($link, "_MOBILE_$id");
-       }
-
-       function mobile_set_pref($link, $id, $value) {
-               //$_SESSION["mobile-prefs"][$id] = $value;
-               return set_pref($link, "_MOBILE_$id", $value);
-       }
-
-       function mobile_feed_has_icon($id) {
-               $filename = "../".ICONS_DIR."/$id.ico";
-
-               return file_exists($filename) && filesize($filename) > 0;
-       }
-
-       function render_flat_feed_list($link, $offset) {
-               $owner_uid = $_SESSION["uid"];
-               $limit = 0;
-
-               if (!$offset) $offset = 0;
-
-               if (mobile_get_pref($link, "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($link, "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($link, "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($link, $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($link, "SORT_FEEDS_UNREAD")) {
-                               $order_by = "unread DESC, title";
-                       } else {
-                               $order_by = "title";
-                       }
-
-                       $result = db_query($link, "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($link, $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($link, "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($link, $id);
-                               $unread = getFeedUnread($link, $id, false);
-                               $icon = getFeedIcon($id);
-
-                               if ($unread > 0) {
-                                       $title = $title . " ($unread)";
-                                       $class = '';
-                               } else {
-                                       $class = 'oldItem';
-                               }
-
-                               if ($unread > 0 || !mobile_get_pref($link, "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($link, "SELECT id, caption FROM ttrss_labels2
-                               WHERE owner_uid = '$owner_uid'");
-
-                       $label_data = array();
-
-                       while ($line = db_fetch_assoc($result)) {
-
-                               $id = -$line["id"] - 11;
-
-                               $unread = getFeedUnread($link, $id);
-                               $title = $line["caption"];
-
-                               if ($unread > 0) {
-                                       $title = $title . " ($unread)";
-                                       $class = '';
-                               } else {
-                                       $class = 'oldItem';
-                               }
-
-                               if ($unread > 0 || !mobile_get_pref($link, "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($link, "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($link, $id);
-                       $unread = getFeedUnread($link, $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($link, "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($link, $line["id"], true);
-                               $id = $line["id"];
-
-                               if ($unread > 0) {
-                                       $line["title"] = $line["title"] . " ($unread)";
-                                       $class = '';
-                               } else {
-                                       $class = 'oldItem';
-                               }
-
-                               if ($unread > 0 || !mobile_get_pref($link, "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($link, "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);
-                       $title = "Uncategorized";
-
-                       if ($unread > 0) {
-                               $title = "$title ($unread)";
-                               $class = '';
-                       } else {
-                               $class = 'oldItem';
-                       }
-
-                       if ($unread > 0 || !mobile_get_pref($link, "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($link, $feed_id, $cat_id, $offset, $search,
-               $is_cat = false) {
-
-               $feed_id = $feed_id;
-               $limit = 15;
-               $filter = '';
-
-               if (!mobile_get_pref($link, "HIDE_READ"))
-                       $view_mode = "all_articles";
-               else
-                       $view_mode = 'adaptive';
-
-               if ($search) {
-                       $search_mode = 'this_feed';
-               } else {
-                       $search_mode = '';
-               }
-
-               $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
-                       $view_mode, $is_cat, $search, $search_mode,
-                       "score DESC, date_entered ".(mobile_get_pref($link, '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($link, $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($link, $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($link, $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($link, $query);
-
-               if (db_num_rows($result) != 0) {
-
-                       $line = db_fetch_assoc($result);
-
-                       $tmp_result = db_query($link, "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);
-
-                       $title = $line["title"];
-                       $article_link = $line["link"];
-
-                       if (!$is_cat)
-                               $feed_title = getFeedTitle($link, $feed_id);
-                       else
-                               $feed_title = getCategoryTitle($link, $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_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($link, $line["content"]);
-                       $content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
-
-                       if (!mobile_get_pref($link, "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/mobile/mobile.css b/mobile/mobile.css
deleted file mode 100644 (file)
index 8068e3d..0000000
+++ /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/mobile/mobile.js b/mobile/mobile.js
deleted file mode 100644 (file)
index 3fed3a1..0000000
+++ /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/mobile/prefs.php b/mobile/prefs.php
deleted file mode 100644 (file)
index 6b053dc..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-       header('Content-Type: text/html; charset=utf-8');
-
-       define('MOBILE_VERSION', true);
-
-       require_once "../config.php";
-       require_once "mobile-functions.php";
-
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       init_connection($link);
-
-       login_sequence($link, 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($link, "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>
-
-
-<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>
-
-<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>
-
-<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>
-
-<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>
-
-</fieldset>