updater: render login form on access level violation (closes #123)

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index 88d750b6bd46a0ddd50beb475b59ffa21e99fc6f..b6c656b6a2ec8a9c59c72c2d0c78c5d4eab57ee1 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -56,7 +56,9 @@ function logout_callback() {
        var container = document.getElementById('notify');
        if (xmlhttp.readyState == 4) {
                try {
-                       window.location.reload(true);
+                       var date = new Date();
+                       var timestamp = Math.round(date.getTime() / 1000);
+                       window.location.href = "tt-rss.php";
                } catch (e) {
                        exception_error("logout_callback", e);
                }
@@ -101,34 +103,18 @@ function delay(gap) {
 }
 
 var notify_hide_timerid = false;
-var notify_last_doc = false;
-
-var notify_effect = false; 
 
 function hide_notify() {
-       if (notify_last_doc) {
-               var n = notify_last_doc.getElementById("notify");               
+       var n = document.getElementById("notify");
+       if (n) {
                n.style.display = "none";
-
-/*             if (browser_has_opacity()) {
-                       if (notify_opacity >= 0) {
-                               notify_opacity = notify_opacity - 0.1;
-                               n.style.opacity = notify_opacity;
-                               notify_hide_timerid = window.setTimeout("hide_notify()", 20);   
-                       } else {
-                               n.style.display = "none";
-                               n.style.opacity = 1;
-                       }
-               } else {
-                       n.style.display = "none";
-               } */
        }
 } 
 
-function notify_real(msg, doc, no_hide, is_err) {
+function notify_real(msg, no_hide, n_type) {
 
-       var n = doc.getElementById("notify");
-       var nb = doc.getElementById("notify_body");
+       var n = document.getElementById("notify");
+       var nb = document.getElementById("notify_body");
 
        if (!n || !nb) return;
 
@@ -136,9 +122,6 @@ function notify_real(msg, doc, no_hide, is_err) {
                window.clearTimeout(notify_hide_timerid);
        }
 
-       notify_last_doc = doc;
-       notify_opacity = 1;
-
        if (msg == "") {
                if (n.style.display == "block") {
                        notify_hide_timerid = window.setTimeout("hide_notify()", 0);
@@ -148,16 +131,30 @@ function notify_real(msg, doc, no_hide, is_err) {
                n.style.display = "block";
        }
 
-       if (is_err) {
-               n.className = "notifyError";
-//             n.style.backgroundColor = "#ffcccc";
-//             n.style.color = "black";
-//             n.style.borderColor = "#ff0000";
-       } else {
+       /* types:
+
+               1 - generic
+               2 - progress
+               3 - error
+               4 - info
+
+       */
+
+       if (typeof __ != 'undefined') {
+               msg = __(msg);
+       }
+
+       if (n_type == 1) {
                n.className = "notify";
-//             n.style.backgroundColor = "#fff7d5";
-//             n.style.borderColor = "#d7c47a";
-//             n.style.color = "black";
+       } else if (n_type == 2) {
+               n.className = "notifyProgress";
+               msg = "<img src='images/indicator_white.gif'> " + msg;
+       } else if (n_type == 3) {
+               n.className = "notifyError";
+               msg = "<img src='images/sign_excl.png'> " + msg;
+       } else if (n_type == 4) {
+               n.className = "notifyInfo";
+               msg = "<img src='images/sign_info.png'> " + msg;
        }
 
 //     msg = "<img src='images/live_com_loading.gif'> " + msg;
@@ -169,16 +166,26 @@ function notify_real(msg, doc, no_hide, is_err) {
        }
 }
 
-function p_notify(msg, no_hide, is_err) {
-       notify_real(msg, document, no_hide, is_err);
+function notify(msg, no_hide) {
+       notify_real(msg, no_hide, 1);
+}
+
+function notify_progress(msg, no_hide) {
+       notify_real(msg, no_hide, 2);
+}
+
+function notify_error(msg, no_hide) {
+       notify_real(msg, no_hide, 3);
+
 }
 
-function notify(msg, no_hide, is_err) {
-       notify_real(msg, document, no_hide, is_err);
+function notify_info(msg, no_hide) {
+       notify_real(msg, no_hide, 4);
 }
 
 function printLockingError() {
-       notify("Please wait until operation finishes");}
+       notify_info("Please wait until operation finishes.");
+}
 
 function hotkey_handler(e) {
 
@@ -421,7 +428,7 @@ function setCookie(name, value, lifetime, path, domain, secure) {
        
        if (lifetime) {
                d = new Date();
-               d.setTime(lifetime * 1000);
+               d.setTime(d.getTime() + (lifetime * 1000));
        }
        
        int_setCookie(name, value, d, path, domain, secure);
@@ -664,14 +671,14 @@ function parse_counters(reply, scheduled_call) {
 function parse_counters_reply(xmlhttp, scheduled_call) {
 
        if (!xmlhttp.responseXML) {
-               notify("refetch_callback: backend did not return valid XML", true, true);
+               notify_error("Backend did not return valid XML", true);
                return;
        }
 
        var reply = xmlhttp.responseXML.firstChild;
        
        if (!reply) {
-               notify("refetch_callback: backend did not return expected XML object", true, true);
+               notify_error("Backend did not return expected XML object", true);
                updateTitle("");
                return;
        } 
@@ -1317,7 +1324,7 @@ function displayDlg(id, param) {
                return
        }
 
-       notify("");
+       notify_progress("Loading, please wait...");
 
        xmlhttp.open("GET", "backend.php?op=dlg&id=" +
                param_escape(id) + "&param=" + param_escape(param), true);
@@ -1340,7 +1347,9 @@ function infobox_submit_callback() {
                        }
                } catch (e) { }
 
-               notify(xmlhttp.responseText);
+               if (xmlhttp.responseText) {
+                       notify_info(xmlhttp.responseText);
+               }
 
        } 
 }
@@ -1361,7 +1370,7 @@ function infobox_callback() {
        }
 }
 
-function qaddFilter() {
+function addFilter() {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -1394,10 +1403,10 @@ function toggleSubmitNotEmpty(e, submit_id) {
 }
 
 function isValidURL(s) {
-       return s.match("http://") != null || s.match("https://") != null;
+       return s.match("http://") != null || s.match("https://") != null || s.match("feed://") != null;
 }
 
-function qafAdd() {
+function qaddFeed() {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -1412,7 +1421,7 @@ function qafAdd() {
                return false;
        }
 
-       notify("Adding feed...", true);
+       notify_progress("Adding feed...");
 
        closeInfoBox();
 
@@ -1491,9 +1500,31 @@ function debug(msg) {
 }
 
 function getInitParam(key) {
-       return getMainContext().init_params[key];
+       var c = getCookie("TTIP:" + key);
+       if (c) {
+               return c;
+       } else {
+               return getMainContext().init_params[key];
+       }
+}
+
+function storeInitParam(key, value) {
+       try {
+               init_params[key] = value;
+               debug("storeInitParam: " + key + " => " + value + 
+                       " (" + getInitParam("cookie_lifetime") + ")");
+               if (getInitParam("cookie_lifetime") > 0) {
+                       setCookie("TTIP:" + key, value, getInitParam("cookie_lifetime"));
+               } else {
+                       setCookie("TTIP:" + key, value);
+               }
+       } catch (e) {
+               exception_error("storeInitParam", e);
+       }
 }
 
+
+/*
 function storeInitParam(key, value, is_client) {
        try {
                if (!is_client) {
@@ -1510,7 +1541,7 @@ function storeInitParam(key, value, is_client) {
        } catch (e) {
                exception_error("storeInitParam", e);
        }
-}
+} */
 
 /*
 function storeInitParams(params, is_client) {
@@ -1538,14 +1569,16 @@ function fatalError(code, message) {
        try {   
 
                if (code == 6) {
-                       //window.location.href = "login.php?rt=none";                   
+                       window.location.href = "tt-rss.php";                    
                } else if (code == 5) {
                        window.location.href = "update.php";
                } else {
                        var fe = document.getElementById("fatal_error");
                        var fc = document.getElementById("fatal_error_msg");
        
-                       fc.innerHTML = "Code " + code + ": " + message;
+                       if (message == "") message = "Unknown error";
+
+                       fc.innerHTML = "<img src='images/sign_excl.png'> " + message + " (Code " + code + ")";
        
                        fe.style.display = "block";
                }
@@ -1620,6 +1653,9 @@ function explainError(code) {
 function logoutUser() {
        try {
                if (xmlhttp_ready(xmlhttp_rpc)) {
+
+                       notify_progress("Logging out, please wait...", true);
+
                        xmlhttp_rpc.open("GET", "backend.php?op=rpc&subop=logout", true);
                        xmlhttp_rpc.onreadystatechange=logout_callback;
                        xmlhttp_rpc.send(null);