backend/loading: add missed break

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 9ed250cf5f4386aaaf234d0f11923cb80f41cccc..308ade0a727a44e1230f28e5d1f2e6c362dba61b 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -60,7 +60,7 @@
 
        if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds" &&
                        $op != "rss" && $op != "getUnread" && $op != "getProfiles" &&
-                       $op != "pubsub") {
+                       $op != "logout" && $op != "pubsub") {
 
                header("Content-Type: text/plain");
                print json_encode(array("error" => array("code" => 6)));
@@ -124,7 +124,7 @@
 
        $error = sanity_check($link);
 
-       if ($error['code'] != 0) {
+       if ($error['code'] != 0 && $op != "logout") {
                print json_encode(array("error" => $error));
                return;
        }
@@ -211,10 +211,12 @@
                        } else if ($mode == "zoom") {
                                array_push($articles, format_article($link, $id, false, true, true));
                        } else if ($mode == "raw") {
-                               if ($_REQUEST['html']) header("Content-Type: text/html");
+                               if ($_REQUEST['html']) {
+                                       header("Content-Type: text/html");
+                                       print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>';
+                               }
 
                                $article = format_article($link, $id, false);
-                               print $article['id'] . "\n\n";
                                print $article['content'];
                                return;
                        } else {
@@ -499,8 +501,10 @@
                break; // digestSend
 
                case "loading":
+                       header("Content-type: text/html");
                        print __("Loading, please wait...") . " " .
                                "<img src='images/indicator_tiny.gif'>";
+               break;
 
                case "getProfiles":
                        $login = db_escape_string($_REQUEST["login"]);
@@ -568,6 +572,16 @@
                        }
 
                break;
+
+               case "logout":
+                       logout_user();
+                       header("Location: tt-rss.php");
+               break;
+
+               default:
+                       header("Content-Type: text/plain");
+                       print json_encode(array("error" => array("code" => 7)));
+               break;
        } // Select action according to $op value.
 
        // We close the connection to database.