X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=prefs.php;h=6a83295f87b671b83a02c6f619481f27485b4643;hb=ace47aefa718eafb6ab1ab7bb9758bc91b082cb2;hp=7a7d2842cc99f4dd2f9a0834768363a3891a7d97;hpb=404e2e3603c852a3f82a21c14b8888005e2b3f99;p=tt-rss.git

diff --git a/prefs.php b/prefs.php
index 7a7d2842..6a83295f 100644
--- a/prefs.php
+++ b/prefs.php
@@ -20,11 +20,9 @@
 	require_once "config.php";
 	require_once "db-prefs.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+	if (!init_plugins()) return;
 
-	if (!init_plugins($link)) return;
-
-	login_sequence($link);
+	login_sequence();
 
 	header('Content-Type: text/html; charset=utf-8');
 ?>
@@ -34,29 +32,32 @@
 <head>
 	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></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("prefs.css"); ?>
+	<?php echo stylesheet_tag("css/layout.css"); ?>
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
-		if ($theme) {
+		$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
+		if ($theme && file_exists("themes/$theme")) {
 			echo stylesheet_tag("themes/$theme");
+		} else {
+			echo stylesheet_tag("themes/default.css");
 		}
 	}
 	?>
 
-	<?php print_user_stylesheet($link) ?>
+	<?php print_user_stylesheet() ?>
 
 	<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/scriptaculous/scriptaculous.js?load=effects,controls",
 				"lib/dojo/dojo.js",
-				"lib/dijit/dijit.js",
-				"lib/CheckBoxTree.js",
 				"lib/dojo/tt-rss-layer.js",
 				"errors.php?mode=js") as $jsfile) {
 
@@ -65,18 +66,17 @@
 	} ?>
 
 	<script type="text/javascript">
+		require({cache:{}});
 	<?php
-		require 'lib/jshrink/Minifier.php';
-
-		global $pluginhost;
+		require_once 'lib/jshrink/Minifier.php';
 
-		foreach ($pluginhost->get_plugins() as $n => $p) {
+		foreach (PluginHost::getInstance()->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", "PrefFeedTree", "PrefFilterTree", "PrefLabelTree"));
+		print get_minified_js(array("../lib/CheckBoxTree","functions", "deprecated", "prefs", "PrefFeedTree", "PrefFilterTree", "PrefLabelTree"));
 
 		init_js_translations();
 	?>
@@ -136,7 +136,7 @@
 		title="<?php echo __('System') ?>"></div>
 <?php } ?>
 <?php
-	$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
+	PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
 		"hook_prefs_tabs", false);
 ?>
 </div>
@@ -154,7 +154,5 @@
 
 </div>
 
-<?php db_close($link); ?>
-
 </body>
 </html>
