Merge branch 'master' of git://github.com/richbeales/Tiny-Tiny-RSS into richbeales...

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 3d6b7c89ad16c1e7e7febdfced11d730877920a2..0e2a922ba1239870bcbbe38cccdef5ad7f58979b 100644 (file)
--- 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");
@@ -523,7 +516,7 @@
 
        function initialize_user_prefs($link, $uid, $profile = false) {
 
-               $uid = db_escape_string($uid);
+               $uid = db_escape_string($link, $uid);
 
                if (!$profile) {
                        $profile = "NULL";
@@ -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 */
@@ -918,7 +911,7 @@
                        }
                }
 
-               if (db_escape_string("testTEST") != "testTEST") {
+               if (db_escape_string($link, "testTEST") != "testTEST") {
                        $error_code = 12;
                }
 
@@ -1093,7 +1086,7 @@
                        } else { // tag
                                db_query($link, "BEGIN");
 
-                               $tag_name = db_escape_string($feed);
+                               $tag_name = db_escape_string($link, $feed);
 
                                $result = db_query($link, "SELECT post_int_id FROM ttrss_tags
                                        WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid");
@@ -1290,7 +1283,7 @@
                        return 0;
                } else if ($feed != "0" && $n_feed == 0) {
 
-                       $feed = db_escape_string($feed);
+                       $feed = db_escape_string($link, $feed);
 
                        $result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
                                FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
@@ -1831,11 +1824,6 @@
        function make_init_params($link) {
                $params = array();
 
-               $params["sign_progress"] = "images/indicator_white.gif";
-               $params["sign_progress_tiny"] = "images/indicator_tiny.gif";
-               $params["sign_excl"] = "images/sign_excl.svg";
-               $params["sign_info"] = "images/sign_info.svg";
-
                foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
                        "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
                        "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
@@ -2034,6 +2022,8 @@
                $data['last_article_id'] = getLastArticleId($link);
                $data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
 
+               $data['dep_ts'] = calculate_dep_timestamp();
+
                if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
 
                        $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
@@ -2754,7 +2744,7 @@
 
        function get_article_tags($link, $id, $owner_uid = 0, $tag_cache = false) {
 
-               $a_id = db_escape_string($id);
+               $a_id = db_escape_string($link, $id);
 
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -2789,7 +2779,7 @@
 
                        /* update the cache */
 
-                       $tags_str = db_escape_string(join(",", $tags));
+                       $tags_str = db_escape_string($link, join(",", $tags));
 
                        db_query($link, "UPDATE ttrss_user_entries
                                SET tag_cache = '$tags_str' WHERE ref_id = '$id'
@@ -2819,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;
        }
 
@@ -3528,7 +3511,7 @@
                if (db_num_rows($result) == 1) {
                        return db_fetch_result($result, 0, "access_key");
                } else {
-                       $key = db_escape_string(sha1(uniqid(rand(), true)));
+                       $key = db_escape_string($link, sha1(uniqid(rand(), true)));
 
                        $result = db_query($link, "INSERT INTO ttrss_access_keys
                                (access_key, feed_id, is_cat, owner_uid)
@@ -3882,7 +3865,7 @@
 
                        if ($regexp_valid) {
 
-                               $rule['reg_exp'] = db_escape_string($rule['reg_exp']);
+                               $rule['reg_exp'] = db_escape_string($link, $rule['reg_exp']);
 
                                switch ($rule["type"]) {
                                        case "title":
@@ -3913,7 +3896,7 @@
                                }
 
                                if (isset($rule["feed_id"]) && $rule["feed_id"] > 0) {
-                                       $qpart .= " AND feed_id = " . db_escape_string($rule["feed_id"]);
+                                       $qpart .= " AND feed_id = " . db_escape_string($link, $rule["feed_id"]);
                                }
 
                                if (isset($rule["cat_id"])) {
@@ -4103,4 +4086,23 @@
                echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
        }
 
+       function calculate_dep_timestamp() {
+               $files = array_merge(glob("js/*.js"), glob("*.css"));
+
+               $max_ts = -1;
+
+               foreach ($files as $file) {
+                       if (filemtime($file) > $max_ts) $max_ts = filemtime($file);
+               }
+
+               return $max_ts;
+       }
+
+    function get_site_title() {
+        $original_title = "Tiny Tiny RSS";
+        if (defined("SITE_TITLE")) {
+            return SITE_TITLE;
+        }
+        return $original_title;
+    }
 ?>