modify include path order (closes #514)

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 6d0b7c645c52d742baeda9b6c2eff3b6c4b88c16..445a8fa75e2b5b8da50990b62d3f6f545cb7f907 100644 (file)
--- a/index.php
+++ b/index.php
@@ -5,7 +5,8 @@
                exit;
        }
 
-       set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
 
        require_once "functions.php";
        require_once "sessions.php";
@@ -13,6 +14,19 @@
        require_once "version.php";
        require_once "config.php";
        require_once "db-prefs.php";
+       require_once "lib/Mobile_Detect.php";
+
+       $mobile = new Mobile_Detect();
+
+       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);
 
@@ -39,6 +53,9 @@
        <?php print_theme_includes($link) ?>
        <?php print_user_stylesheet($link) ?>
 
+       <script type="text/javascript">
+       </script>
+
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
        <script type="text/javascript" src="lib/prototype.js"></script>
@@ -48,12 +65,29 @@
        <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
 
        <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/tt-rss.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/feedlist.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="js/viewfeed.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 
+       <script type="text/javascript">
+       <?php
+               require 'lib/jsmin.php';
+
+               foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
+                       $jsf = "js/".trim($p)."_button.js";
+                       if (file_exists($jsf)) {
+                               echo JSMin::minify(file_get_contents($jsf));
+                       }
+               }
+
+               foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) {
+                       if (!isset($_GET['debug'])) {
+                               echo JSMin::minify(file_get_contents("js/$js.js"));
+                       } else {
+                               echo file_get_contents("js/$js.js");
+                       }
+               }
+       ?>
+       </script>
+
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
        <script type="text/javascript">
@@ -76,7 +110,7 @@
 </div>
 
 <div id="header">
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!$_SESSION["hide_hello"]) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
        <a href="prefs.php"><?php echo __('Preferences') ?></a>
@@ -86,7 +120,7 @@
                                <?php echo __('Comments?') ?></a>
        <?php } ?>
 
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!$_SESSION["hide_logout"]) { ?>
                        | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
        <?php } ?>
 
@@ -97,9 +131,7 @@
                alt="new_version_icon"/>
 </div>
 
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php include "help/3.php" ?>
-</div>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
 
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="cmdline" style="display : none"></div>
@@ -152,7 +184,7 @@
                </select>
 
                <button dojoType="dijit.form.Button" name="update"
-                       onclick="scheduleFeedUpdate()">
+                       onclick="viewCurrentFeed()">
                        <?php echo __('Update') ?></button>
 
                <button dojoType="dijit.form.Button"
@@ -181,7 +213,6 @@
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
-                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
                                </div>
                        </div>
                </div>