remove $link

[tt-rss.git] / prefs.php
diff --git a/prefs.php b/prefs.php

index 387ea97b436697f5fa1f5deaa1b95d3d17809a54..54d5ebad8cf7c47b4ba98759941ed92f5e8a9cc8 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -12,6 +12,7 @@
                 exit;
         }
  
+       require_once "autoload.php";
         require_once "sessions.php";
         require_once "functions.php";
         require_once "sanity_check.php";
@@ -21,11 +22,9 @@
  
         $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
  
-       if (!init_connection($link)) return;
+       if (!init_plugins()) return;
  
-       login_sequence($link);
-
-       no_cache_incantation();
+       login_sequence();
  
         header('Content-Type: text/html; charset=utf-8');
  ?>
@@ -40,14 +39,14 @@
         <?php echo stylesheet_tag("prefs.css"); ?>
  
         <?php if ($_SESSION["uid"]) {
-               $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+               $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
                 if ($theme) {
                         echo stylesheet_tag("themes/$theme");
                 }
         }
         ?>
  
-       <?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" />
@@ -57,6 +56,7 @@
                                 "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
                                 "lib/dojo/dojo.js",
                                 "lib/dijit/dijit.js",
+                               "lib/CheckBoxTree.js",
                                 "lib/dojo/tt-rss-layer.js",
                                 "errors.php?mode=js") as $jsfile) {
  
@@ -76,7 +76,7 @@
                         }
                 }
  
-               print get_minified_js(array("functions", "deprecated", "prefs"));
+               print get_minified_js(array("functions", "deprecated", "prefs", "PrefFeedTree", "PrefFilterTree", "PrefLabelTree"));
  
                 init_js_translations();
         ?>
@@ -94,7 +94,7 @@
  
  <body id="ttrssPrefs" class="claro">
  
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="notify" class="notify" style="display : none"></div>
  <div id="cmdline" style="display : none"></div>
  
  <div id="overlay">
@@ -107,8 +107,6 @@
         </div>
  </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="gotoMain()"><?php echo __('Exit preferences') ?></a>
@@ -133,6 +131,9 @@
         <div id="userConfigTab" dojoType="dijit.layout.ContentPane"
                 href="backend.php?op=pref-users"
                 title="<?php echo __('Users') ?>"></div>
+       <div id="systemConfigTab" dojoType="dijit.layout.ContentPane"
+               href="backend.php?op=pref-system"
+               title="<?php echo __('System') ?>"></div>
  <?php } ?>
  <?php
         $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
@@ -153,7 +154,7 @@
  
  </div>
  
-<?php db_close($link); ?>
+<?php db_close(); ?>
  
  </body>
  </html>