more work on singleton-based DB

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

index 3249687532f94f31f88bf73556afa39de3307a62..7a7d2842cc99f4dd2f9a0834768363a3891a7d97 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,7 +1,18 @@
  <?php
+       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 "autoload.php";
         require_once "sessions.php";
         require_once "functions.php";
         require_once "sanity_check.php";
@@ -11,12 +22,10 @@
  
         $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
  
-       if (!init_connection($link)) return;
+       if (!init_plugins($link)) return;
  
         login_sequence($link);
  
-       no_cache_incantation();
-
         header('Content-Type: text/html; charset=utf-8');
  ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -27,6 +36,15 @@
  
         <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
         <?php echo stylesheet_tag("tt-rss.css"); ?>
+       <?php echo stylesheet_tag("prefs.css"); ?>
+
+       <?php if ($_SESSION["uid"]) {
+               $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+               if ($theme) {
+                       echo stylesheet_tag("themes/$theme");
+               }
+       }
+       ?>
  
         <?php print_user_stylesheet($link) ?>
  
@@ -38,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) {
  
@@ -57,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();
         ?>
@@ -75,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">
@@ -88,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>
@@ -114,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,
@@ -123,7 +143,11 @@
  
  <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
         <a class="insensitive" target="_blank" href="http://tt-rss.org/">
-       Tiny Tiny RSS</a> &copy; 2005-<?php echo date('Y') ?>
+       Tiny Tiny RSS</a>
+       <?php if (!defined('HIDE_VERSION')) { ?>
+                v<?php echo VERSION ?>
+       <?php } ?>
+       &copy; 2005-<?php echo date('Y') ?>
         <a class="insensitive" target="_blank"
         href="http://fakecake.org/">Andrew Dolgov</a>
  </div> <!-- footer -->