X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=prefs.php;h=0add206e43c0de29bb54353d3f4aab5ce2f20c0f;hb=f820f205d0ec1c5ce9027e49755fc8642b0c5b42;hp=58a078b1faba627c2faf5c0d9578891eb6d74ee0;hpb=7b28a986978e25fbc5ecdb468a48efbf158f641d;p=tt-rss.git

diff --git a/prefs.php b/prefs.php
index 58a078b1..0add206e 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,9 +1,19 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	if (file_exists("install") && !file_exists("config.php")) {
+		header("Location: install/");
+	}
+
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
+
+	if (!file_exists("config.php")) {
+		print "<b>Fatal Error</b>: You forgot to copy
+		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
+		exit;
+	}
 
-	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";
@@ -15,38 +25,54 @@
 
 	login_sequence($link);
 
-	$dt_add = time();
-
 	no_cache_incantation();
 
 	header('Content-Type: text/html; charset=utf-8');
-
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
 	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
-	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
-	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
-	<?php print_theme_includes($link) ?>
+	<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+	<?php echo stylesheet_tag("tt-rss.css"); ?>
+	<?php echo stylesheet_tag("prefs.css"); ?>
+
 	<?php print_user_stylesheet($link) ?>
 
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
+	<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
+
+	<?php
+	foreach (array("lib/prototype.js",
+				"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
+				"lib/dojo/dojo.js",
+				"lib/dijit/dijit.js",
+				"lib/dojo/tt-rss-layer.js",
+				"errors.php?mode=js") as $jsfile) {
 
-	<script type="text/javascript" src="lib/prototype.js"></script>
-	<script type="text/javascript" src="lib/position.js"></script>
-	<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
-	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
-	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
-	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
+		echo javascript_tag($jsfile);
 
-	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
+	} ?>
+
+	<script type="text/javascript">
+	<?php
+		require 'lib/jshrink/Minifier.php';
 
-	<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/deprecated.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="js/prefs.js?<?php echo $dt_add ?>"></script>
+		global $pluginhost;
+
+		foreach ($pluginhost->get_plugins() as $n => $p) {
+			if (method_exists($p, "get_prefs_js")) {
+				echo JShrink\Minifier::minify($p->get_prefs_js());
+			}
+		}
+
+		print get_minified_js(array("functions", "deprecated", "prefs"));
+
+		init_js_translations();
+	?>
+	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
@@ -73,12 +99,10 @@
 	</div>
 </div>
 
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
-
 <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
 <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-	<a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> |
+	<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
 	<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
 </div>
 
@@ -102,12 +126,10 @@
 		href="backend.php?op=pref-users"
 		title="<?php echo __('Users') ?>"></div>
 <?php } ?>
-<?php if ($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) { ?>
-	<div id="instanceConfigTab" dojoType="dijit.layout.ContentPane"
-		href="backend.php?op=pref-instances"
-		title="<?php echo __('Linked') ?>"></div>
-<?php } ?>
-
+<?php
+	$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
+		"hook_prefs_tabs", false);
+?>
 </div>
 
 <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
