rework login process, drop http auth

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index 17370dfdd159c4967a55c16789489546b597cf41..88d750b6bd46a0ddd50beb475b59ffa21e99fc6f 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -11,6 +11,14 @@ function is_opera() {
        return navigator.userAgent.match("Opera");
 }
 
+function is_khtml() {
+       return navigator.userAgent.match("KHTML");
+}
+
+function is_safari() {
+       return navigator.userAgent.match("Safari");
+}
+
 function exception_error(location, e, silent) {
        var msg;
 
@@ -44,6 +52,17 @@ function xmlhttp_ready(obj) {
        return obj.readyState == 4 || obj.readyState == 0 || !obj.readyState;
 }
 
+function logout_callback() {
+       var container = document.getElementById('notify');
+       if (xmlhttp.readyState == 4) {
+               try {
+                       window.location.reload(true);
+               } catch (e) {
+                       exception_error("logout_callback", e);
+               }
+       }
+}
+
 function notify_callback() {
        var container = document.getElementById('notify');
        if (xmlhttp.readyState == 4) {
@@ -214,13 +233,13 @@ function hotkey_handler(e) {
                        if (new_feed) viewfeed(new_feed, '');
                }
 
-               if (keycode == 78 || keycode == 40) { // n, down
+               if (!is_safari() && (keycode == 78 || keycode == 40)) { // n, down
                        if (typeof moveToPost != 'undefined') {
                                return moveToPost('next');
                        }
                }
        
-               if (keycode == 80 || keycode == 38) { // p, up
+               if (!is_safari() && (keycode == 80 || keycode == 38)) { // p, up
                        if (typeof moveToPost != 'undefined') {
                                return moveToPost('prev');
                        }
@@ -249,10 +268,22 @@ function hotkey_handler(e) {
                        viewFeedGoPage(0);
                }
 
-               if (keycode == 69 && shift_key) {
+               if (keycode == 69 && shift_key) { // e
                        return editFeedDlg(getActiveFeedId());
                }
 
+               if (keycode == 70 && shift_key) { // f
+                       if (getActiveFeedId()) {
+                               return catchupCurrentFeed();
+                       }
+               }
+
+               if (keycode == 80 && shift_key) { // p 
+                       if (getActiveFeedId()) {
+                               return catchupPage();
+                       }
+               }
+
                if (typeof localHotkeyHandler != 'undefined') {
                        try {
                                return localHotkeyHandler(e);
@@ -802,6 +833,10 @@ function update_all_counters(feed) {
 
                debug("update_all_counters QUERY: " + query);
 
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+               query = query + "&ts=" + timestamp
+
                xmlhttp_rpc.open("GET", query, true);
                xmlhttp_rpc.onreadystatechange=all_counters_callback;
                xmlhttp_rpc.send(null);
@@ -1502,16 +1537,17 @@ function storeInitParams(params, is_client) {
 function fatalError(code, message) {
        try {   
 
-               if (code != 6) {
-
+               if (code == 6) {
+                       //window.location.href = "login.php?rt=none";                   
+               } 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;
        
                        fe.style.display = "block";
-               } else {
-                       window.location.href = "login.php?rt=none";                     
                }
 
        } catch (e) {
@@ -1580,3 +1616,17 @@ function filterDlgCheckAction(sender) {
 function explainError(code) {
        return displayDlg("explainError", code);
 }
+
+function logoutUser() {
+       try {
+               if (xmlhttp_ready(xmlhttp_rpc)) {
+                       xmlhttp_rpc.open("GET", "backend.php?op=rpc&subop=logout", true);
+                       xmlhttp_rpc.onreadystatechange=logout_callback;
+                       xmlhttp_rpc.send(null);
+               } else {
+                       printLockingError();
+               }
+       } catch (e) {
+               exception_error("logoutUser", e);
+       }
+}