X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=index.php;h=66314ad17d2271b653e7822989529a6c8234d9b8;hb=a86255572a9b9a278a14a1f19dd89e8c80e7db72;hp=7fb7a7878732c146cfbc0a16f1f1d6eb34ccb85c;hpb=ceb78471089b69f433bb41646e2c5016a4a19a1d;p=tt-rss.git

diff --git a/index.php b/index.php
index 7fb7a787..66314ad1 100644
--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
 	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
+	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
@@ -29,28 +30,22 @@
 
 	$mobile = new Mobile_Detect();
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	if (!init_connection($link)) return;
-
-	global $pluginhost;
+	if (!init_plugins()) return;
 
 	if (!$_REQUEST['mobile']) {
-		if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
+		if ($mobile->isTablet() && PluginHost::getInstance()->get_plugin("digest")) {
 			header('Location: backend.php?op=digest');
 			exit;
-		} else if ($mobile->isMobile() && $pluginhost->get_plugin("mobile")) {
+		} else if ($mobile->isMobile() && PluginHost::getInstance()->get_plugin("mobile")) {
 			header('Location: backend.php?op=mobile');
 			exit;
-		} else if ($mobile->isMobile() && $pluginhost->get_plugin("digest")) {
+		} else if ($mobile->isMobile() && PluginHost::getInstance()->get_plugin("digest")) {
 			header('Location: backend.php?op=digest');
 			exit;
 		}
 	}
 
-	login_sequence($link);
-
-	no_cache_incantation();
+	login_sequence();
 
 	header('Content-Type: text/html; charset=utf-8');
 
@@ -61,23 +56,28 @@
 <head>
 	<title>Tiny Tiny RSS</title>
 
+	<script type="text/javascript">
+		var __ttrss_version = "<?php echo VERSION ?>"
+	</script>
+
 	<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-	<?php echo stylesheet_tag("tt-rss.css"); ?>
-	<?php echo stylesheet_tag("cdm.css"); ?>
+	<?php echo stylesheet_tag("css/layout.css"); ?>
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
-		if ($theme) {
-			echo stylesheet_tag("themes/$theme");
+		$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
+		if ($theme && theme_valid("$theme")) {
+			echo stylesheet_tag(get_theme_path($theme));
+		} else {
+			echo stylesheet_tag("themes/default.css");
 		}
 	}
 	?>
 
-	<?php print_user_stylesheet($link) ?>
+	<?php print_user_stylesheet() ?>
 
 	<style type="text/css">
 	<?php
-		foreach ($pluginhost->get_plugins() as $n => $p) {
+		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_css")) {
 				echo $p->get_css();
 			}
@@ -88,11 +88,20 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 	<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
 
+	<script>
+		dojoConfig = {
+			async: true,
+			cacheBust: new Date(),
+			packages: [
+				{ name: "fox", location: "../../js" },
+			]
+		};
+	</script>
+
 	<?php
 	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
+				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
 				"lib/dojo/dojo.js",
-				"lib/dijit/dijit.js",
 				"lib/dojo/tt-rss-layer.js",
 				"errors.php?mode=js") as $jsfile) {
 
@@ -101,25 +110,30 @@
 	} ?>
 
 	<script type="text/javascript">
+		require({cache:{}});
 	<?php
-		require 'lib/jshrink/Minifier.php';
+		require_once 'lib/jshrink/Minifier.php';
 
-		global $pluginhost;
+		print get_minified_js(array("tt-rss",
+			"functions", "feedlist", "viewfeed", "PluginHost"));
 
-		foreach ($pluginhost->get_plugins() as $n => $p) {
+		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
+				echo "try {";
 				echo JShrink\Minifier::minify($p->get_js());
+				echo "} catch (e) {
+				 	console.warn('failed to initialize plugin JS: $n');
+					console.warn(e);
+				}";
 			}
 		}
 
-		print get_minified_js(array("tt-rss",
-			"functions", "feedlist", "viewfeed", "FeedTree"));
-
 		init_js_translations();
 	?>
 	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<meta name="referrer" content="no-referrer"/>
 
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
@@ -140,11 +154,8 @@
 	</div>
 </div>
 
-<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div>
-
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="notify" class="notify"></div>
 <div id="cmdline" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
 
@@ -161,12 +172,17 @@
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
 	<div id="main-toolbar" dojoType="dijit.Toolbar">
 
-		<form id="main_toolbar_form" action="" onsubmit='return false'>
+		<?php
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
+			echo $p->hook_main_toolbar_button();
+		}
+		?>
+
+		<form id="headlines-toolbar" action="" onsubmit='return false'>
+
+		</form>
 
-		<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
-			onclick="collapse_feedlist()"
-			title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
-			&lt;&lt;</button>
+		<form id="main_toolbar_form" action="" onsubmit='return false'>
 
 		<select name="view_mode" title="<?php echo __('Show articles') ?>"
 			onchange="viewModeChanged()"
@@ -176,7 +192,6 @@
 			<option value="marked"><?php echo __('Starred') ?></option>
 			<option value="published"><?php echo __('Published') ?></option>
 			<option value="unread"><?php echo __('Unread') ?></option>
-			<option value="unread_first"><?php echo __('Unread First') ?></option>
 			<option value="has_note"><?php echo __('With Note') ?></option>
 			<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
 		</select>
@@ -187,42 +202,40 @@
 			<option selected="selected" value="default"><?php echo __('Default') ?></option>
 			<option value="feed_dates"><?php echo __('Newest first') ?></option>
 			<option value="date_reverse"><?php echo __('Oldest first') ?></option>
+			<option value="title"><?php echo __('Title') ?></option>
 		</select>
 
-		<select title="<?php echo __('Mark feed as read') ?>"
-			onchange="catchupCurrentFeed(event)"
-			dojoType="dijit.form.Select" name="catchup_feed">
-			<option selected="selected" value="default"><?php echo __('Mark as read') ?></option>
-			<option value="all"><?php echo __('All articles') ?></option>
-			<option value="1day"><?php echo __('Older than one day') ?></option>
-			<option value="1week"><?php echo __('Older than one week') ?></option>
-			<option value="2weeks"><?php echo __('Older than two weeks') ?></option>
-		</select>
+		<div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
+			<span><?php echo __('Mark as read') ?></span>
+			<div dojoType="dijit.DropDownMenu">
+				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
+					<?php echo __('Older than one day') ?>
+				</div>
+				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
+					<?php echo __('Older than one week') ?>
+				</div>
+				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
+					<?php echo __('Older than two weeks') ?>
+				</div>
+			</div>
+		</div>
 
 		</form>
 
-		<?php
-			global $pluginhost;
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) {
-				 echo $p->hook_toolbar_button();
-			}
-		?>
-
 		<div class="actionChooser">
 
+			<?php
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
+					 echo $p->hook_toolbar_button();
+				}
+			?>
+
 			<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
 				title="<?php echo __("Communication problem with server.") ?>">
 			<img
-				src="images/alert.png" />
+				src="images/error.png" />
 			</button>
 
-			<button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
-			<img onclick="newVersionDlg()"
-				src="images/new_version.png"
-				title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
-			</button>
-
-
 			<div dojoType="dijit.form.DropDownButton">
 				<span><?php echo __('Actions...') ?></span>
 				<div dojoType="dijit.Menu" style="display: none">
@@ -237,18 +250,13 @@
 					<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>
-					<?php } ?> -->
-						<!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div> -->
-						<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></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> -->
 					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
 
 					<?php
-						foreach ($pluginhost->get_hooks($pluginhost::HOOK_ACTION_ITEM) as $p) {
+						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
 						 echo $p->hook_action_item();
 						}
 					?>
@@ -258,14 +266,17 @@
 					<?php } ?>
 				</div>
 			</div>
+
+			<button id="updatesIcon" dojoType="dijit.form.Button" style="display : none">
+				<img src="images/new_version.png" title="<?php echo __('Updates are available from Git.') ?>"/>
+			</button>
 		</div>
 	</div> <!-- toolbar -->
 </div> <!-- toolbar pane -->
 
 	<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
 
-		<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
-		</div>
+		<div id="floatingTitle" style="visibility : hidden"></div>
 
 		<div id="headlines-frame" dojoType="dijit.layout.ContentPane"
 				onscroll="headlines_scroll_handler(this)" region="center">
@@ -282,7 +293,5 @@
 </div>
 </div>
 
-<?php db_close($link); ?>
-
 </body>
 </html>
