config: remove ENABLE_TRANSLATIONS

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 5839c0d2b2a650009a7fff26d8a08c0f6c2d77f5..fd5ad6e7d5587f0e24a2d6c6aa15715ab66d4d3d 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -24,9 +24,7 @@
 
        no_cache_incantation();
 
-       if (ENABLE_TRANSLATIONS == true) {
-               startup_gettext();
-       }
+       startup_gettext();
 
        $script_started = getmicrotime();
 
@@ -48,17 +46,10 @@
 
        $print_exec_time = false;
 
-       if ((!$op || $op == "rpc" || $op == "rss" ||
-                       $op == "digestSend" || $op == "dlg" ||
-                       $op == "globalUpdateFeeds") && !$_REQUEST["noxml"]) {
-                               header("Content-Type: application/xml; charset=utf-8");
-
-               } else {
-               if (!$_REQUEST["noxml"]) {
-                       header("Content-Type: text/html; charset=utf-8");
-               } else {
+       if ((!$op || $op == "rss" || $op == "dlg") && !$_REQUEST["noxml"]) {
+                       header("Content-Type: application/xml; charset=utf-8");
+       } else {
                        header("Content-Type: text/plain; charset=utf-8");
-               }
        }
 
        if (ENABLE_GZIP_OUTPUT) {
@@ -69,18 +60,6 @@
                authenticate_user($link, "admin", null);
        }
 
-       /* if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds"
-               && $op != "rss" && $op != "getUnread" && $op != "publish" && $op != "getProfiles") {
-
-               if ($op == "rpc" || $op == "viewfeed" || $op == "view") {
-                       print_error_xml(6); exit;
-               } else {
-                       header("Location: tt-rss.php?return=" .
-                               urlencode($_SERVER['REQUEST_URI']));
-               }
-               exit;
-       } */
-
        if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds" &&
                                $op != "rss" && $op != "getUnread" && $op != "getProfiles") {
 
@@ -144,7 +123,12 @@
        require_once "modules/pref-labels.php";
        require_once "modules/pref-users.php";
 
-       if (!sanity_check($link)) { return; }
+       $error = sanity_check($link);
+
+       if ($error['code'] != 0) {
+               print json_encode(array("error" => $error));
+               return;
+       }
 
        switch($op) { // Select action according to $op value.
                case "rpc":
@@ -435,16 +419,8 @@
                break; // pref-pub-items
 
                case "globalUpdateFeeds":
-                       // update feeds of all users, may be used anonymously
-
-                       print "<!--";
                        // Update all feeds needing a update.
                        update_daemon_common($link, 0, true, true);
-                       print " -->";
-
-                       print "<rpc-reply>
-                               <message msg=\"All feeds updated\"/>
-                       </rpc-reply>";
                break; // globalUpdateFeeds
 
                case "pref-feed-browser":
@@ -490,8 +466,6 @@
                        $login = db_escape_string($_REQUEST["login"]);
                        $fresh = $_REQUEST["fresh"] == "1";
 
-                       header("Content-Type: text/plain; charset=utf-8");
-
                        $result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'");
 
                        if (db_num_rows($result) == 1) {
@@ -512,13 +486,11 @@
                break; // getUnread
 
                case "digestTest":
-                       header("Content-Type: text/plain");
                        print_r(prepare_headlines_digest($link, $_SESSION["uid"]));
                        $print_exec_time = false;
                break; // digestTest
 
                case "digestSend":
-                       header("Content-Type: text/plain");
                        send_headlines_digests($link);
                        $print_exec_time = false;
                break; // digestSend