js: misc fixes, code cleanup

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

index 129e1cf863fe4548bd10544fc4878e90d50f44ef..01f0b3ffc47a2d91fbe4862deb4b5c5b53541f34 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,6 +1,4 @@
  <?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
         require_once "functions.php"; 
         require_once "sessions.php";
         require_once "sanity_check.php";
@@ -10,9 +8,11 @@
  
         $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
  
+       init_connection($link);
+
         login_sequence($link);
  
-       $dt_add = get_script_dt_add();
+       $dt_add = time();
  
         no_cache_incantation();
         
@@ -25,13 +25,12 @@
  <head>
         <title>Tiny Tiny RSS : Preferences</title>
         <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
+       <link rel="stylesheet" type="text/css" href="infobox.css?<?php echo $dt_add ?>"/>
  
-       <?php   $user_theme = $_SESSION["theme"];
+       <?php   $user_theme = get_user_theme_path($link);
                 if ($user_theme) { ?>
-               <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css"/>
+               <link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css"/>
         <?php } ?>
-
-       <?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?>
         
         <?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
         <?php if ($user_css_url) { ?>
@@ -41,11 +40,14 @@
         <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
  
         <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" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
  
         <script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="deprecated.js?<?php echo $dt_add ?>"></script>
+
         <script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script>
  
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -84,8 +86,6 @@
  
  <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
  
-<ul id="debug_output" style='display : none'><li>&nbsp;</li></ul>
-
  <div id="prefHeader">
         <div class="topLinks">
                 <?php if (!SINGLE_USER_MODE) { ?>
@@ -96,12 +96,12 @@
                         | <a href="logout.php"><?php echo __('Logout') ?></a>
                 <?php } ?>
         </div>
-       <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>   
+       <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>      
  </div>
  
  <div id="prefTabs">
                 <div class='prefKbdHelp'>
-                       <img src="images/small_question.png" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
+                       <img src="<?php echo theme_image($link, 'images/small_question.png') ?>" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
                 </div>
  
                 <div class="firstTab">&nbsp;</div>
@@ -134,7 +134,6 @@
  
  <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
  <div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
-
  <div id="cmdline" style="display : none"></div>
  
  <div id="errorBoxShadow" style="display : none">
@@ -149,21 +148,11 @@
  <div id="dialog_overlay" style="display : none"> </div>
  
  <div id="prefFooter">
-       <?php if (defined('_DEBUG_USER_SWITCH')) { ?>
-               <select id="userSwitch" onchange="userSwitch()">
-               <?php 
-                       foreach (array('admin', 'fox', 'test') as $u) {
-                               $op_sel = ($u == $_SESSION["name"]) ? "selected" : "";
-                               print "<option $op_sel>$u</option>";
-                       }
-               ?>
-               </select>
-       <?php } ?>
         <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
         <?php if (!defined('HIDE_VERSION')) { ?>
                  v<?php echo VERSION ?> 
         <?php } ?>
-       &copy; 2005&ndash;2009 <a href="http://bah.org.ru/">Andrew Dolgov</a>
+       &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
  </div>
  
  <?php db_close($link); ?>