support comments on simplepie properly

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 1ecf1f9f57787b07d7f8bfc51e5833e67e3a40a9..445a8fa75e2b5b8da50990b62d3f6f545cb7f907 100644 (file)
--- a/index.php
+++ b/index.php
@@ -5,8 +5,8 @@
                exit;
        }
 
-       set_include_path(get_include_path() . PATH_SEPARATOR .
-               dirname(__FILE__) ."/include");
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
 
        require_once "functions.php";
        require_once "sessions.php";
@@ -18,9 +18,14 @@
 
        $mobile = new Mobile_Detect();
 
-       if ($mobile->isMobile() && !$mobile->isTablet() && !$_REQUEST['mobile']) {
-               header('Location: mobile/index.php');
-               exit;
+       if (!$_REQUEST['mobile']) {
+               if ($mobile->isTablet()) {
+                       header('Location: digest.php');
+                       exit;
+               } else if ($mobile->isMobile()) {
+                       header('Location: mobile/index.php');
+                       exit;
+               }
        }
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
@@ -74,7 +79,11 @@
                }
 
                foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) {
-                       echo JSMin::minify(file_get_contents("js/$js.js"));
+                       if (!isset($_GET['debug'])) {
+                               echo JSMin::minify(file_get_contents("js/$js.js"));
+                       } else {
+                               echo file_get_contents("js/$js.js");
+                       }
                }
        ?>
        </script>
@@ -101,7 +110,7 @@
 </div>
 
 <div id="header">
-       <?php if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) { ?>
+       <?php if (!$_SESSION["hide_hello"]) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
        <a href="prefs.php"><?php echo __('Preferences') ?></a>
@@ -111,7 +120,7 @@
                                <?php echo __('Comments?') ?></a>
        <?php } ?>
 
-       <?php if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) { ?>
+       <?php if (!$_SESSION["hide_logout"]) { ?>
                        | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
        <?php } ?>
 
@@ -175,7 +184,7 @@
                </select>
 
                <button dojoType="dijit.form.Button" name="update"
-                       onclick="scheduleFeedUpdate()">
+                       onclick="viewCurrentFeed()">
                        <?php echo __('Update') ?></button>
 
                <button dojoType="dijit.form.Button"