X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=index.php;h=36d87558f9c024ffaace4a71cd90da92733e925a;hb=23419d117bf6db266ce2fc4b7e8d14e96b788f9b;hp=3a68c90f67b202d1f68af8e814e8e5fa476f2041;hpb=854a2ace869b29f805d203bb74968ef1500eb54b;p=tt-rss.git

diff --git a/index.php b/index.php
index 3a68c90f..36d87558 100644
--- a/index.php
+++ b/index.php
@@ -5,11 +5,11 @@
 		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";
+	require_once "functions.php";
 	require_once "sanity_check.php";
 	require_once "version.php";
 	require_once "config.php";
@@ -18,9 +18,15 @@
 
 	$mobile = new Mobile_Detect();
 
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+
+	if (!init_connection($link)) return;
+
+	global $pluginhost;
+
 	if (!$_REQUEST['mobile']) {
-		if ($mobile->isTablet()) {
-			header('Location: digest.php');
+		if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
+			header('Location: backend.php?op=digest');
 			exit;
 		} else if ($mobile->isMobile()) {
 			header('Location: mobile/index.php');
@@ -28,9 +34,6 @@
 		}
 	}
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	if (!init_connection($link)) return;
 
 	login_sequence($link);
 
@@ -71,10 +74,11 @@
 	<?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));
+		global $pluginhost;
+
+		foreach ($pluginhost->get_plugins() as $n => $p) {
+			if (method_exists($p, "get_js")) {
+				echo JSMin::minify($p->get_js());
 			}
 		}
 
@@ -110,7 +114,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>
@@ -120,7 +124,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 } ?>
 
@@ -131,8 +135,6 @@
 		alt="new_version_icon"/>
 </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>
 <div id="auxDlg" style="display : none"></div>
@@ -183,21 +185,8 @@
 			<option value="score"><?php echo __('Score') ?></option>
 		</select>
 
-		&nbsp;
-
-		<!-- <input dojoType="dijit.form.CheckBox" type="checkbox"
-			onchange="viewCurrentFeed()"
-			name="include_children" id="include_children">
-		<label id="include_children_label" for="include_children">
-			<?php echo __('With subcategories') ?></label> -->
-
-		<button dojoType="dijit.form.ToggleButton" name="include_children"
-			id="include_children"
-			onchange="viewCurrentFeed()">
-			<?php echo __('With subcategories') ?></button>
-
 		<button dojoType="dijit.form.Button" name="update"
-			onclick="scheduleFeedUpdate()">
+			onclick="viewCurrentFeed()">
 			<?php echo __('Update') ?></button>
 
 		<button dojoType="dijit.form.Button"
@@ -220,8 +209,10 @@
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
 					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
+					<?php if ($pluginhost->get_plugin("digest")) { ?>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
+					<?php } ?>
+						<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>