diff --git a/include/functions.php b/include/functions.php index 535d47674..5d5550059 100644 --- a/include/functions.php +++ b/include/functions.php @@ -75,10 +75,7 @@ $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"]; } @@ -89,11 +86,7 @@ _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"); @@ -753,7 +746,7 @@ } } - function login_sequence($link, $login_form = 0) { + function login_sequence($link) { $_SESSION["prefs_cache"] = false; if (SINGLE_USER_MODE) { @@ -769,7 +762,7 @@ 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 */ @@ -2816,15 +2809,8 @@ 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 index 345767fbd..000000000 --- a/mobile/article.php +++ /dev/null @@ -1,24 +0,0 @@ - - diff --git a/mobile/backend.php b/mobile/backend.php deleted file mode 100644 index 98e30bd13..000000000 --- a/mobile/backend.php +++ /dev/null @@ -1,55 +0,0 @@ - - diff --git a/mobile/cat.php b/mobile/cat.php deleted file mode 100644 index 74d488e1f..000000000 --- a/mobile/cat.php +++ /dev/null @@ -1,21 +0,0 @@ - - diff --git a/mobile/feed.php b/mobile/feed.php deleted file mode 100644 index f7b7443d3..000000000 --- a/mobile/feed.php +++ /dev/null @@ -1,25 +0,0 @@ - - diff --git a/mobile/home.php b/mobile/home.php deleted file mode 100644 index 71194da0a..000000000 --- a/mobile/home.php +++ /dev/null @@ -1,25 +0,0 @@ - diff --git a/mobile/image.php b/mobile/image.php deleted file mode 100644 index 765fcc240..000000000 --- a/mobile/image.php +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/mobile/index.php b/mobile/index.php deleted file mode 100644 index edbf586e0..000000000 --- a/mobile/index.php +++ /dev/null @@ -1,82 +0,0 @@ - - - - - -Tiny Tiny RSS - - - - - - - - - - - - - - -
-

- - Preferences -
- - - - - diff --git a/mobile/login_form.php b/mobile/login_form.php deleted file mode 100644 index 98c0bfdbc..000000000 --- a/mobile/login_form.php +++ /dev/null @@ -1,58 +0,0 @@ - - - - -Tiny Tiny RSS - - - - - - - - - - - - - -
-

- - -
- -
" - method="post"> - - - -
- -
- - -
- -
- - -
- -
- -
- - - - - - - diff --git a/mobile/logout.php b/mobile/logout.php deleted file mode 100644 index 46d7ec8ee..000000000 --- a/mobile/logout.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/mobile/mobile-functions.php b/mobile/mobile-functions.php deleted file mode 100644 index 39b89fa9c..000000000 --- a/mobile/mobile-functions.php +++ /dev/null @@ -1,546 +0,0 @@ - 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 '"; - - } - - 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 ""; - } else if ($cat_id == -1) { - - $title = __('Special'); - - print ""; - } else if ($cat_id == -2) { - - $title = __('Labels'); - - print ""; - } - } - - function render_categories_list($link) { - $owner_uid = $_SESSION["uid"]; - - $cat_browse = mobile_get_pref($link, "BROWSE_CATS"); - - print '"; - } - - 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 "
- - - - -
-

Search

- Cancel - Search - - - -
-
"; - - if ($cat_id) { - $cat_title = getCategoryTitle($link, $cat_id); - - print "