rework article view header

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

index f6b862f0760d020bff1f944d24e43566b1c42d6a..5a56f896fdd0bb49a22911f9ce89091afb5cb1c5 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,6 +1,7 @@
  <?
         session_start();
  
+       require_once "sanity_check.php";
         require_once "version.php"; 
         require_once "config.php";
         require_once "db-prefs.php";
@@ -8,31 +9,23 @@
  
         $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
  
-       if (!SINGLE_USER_MODE) {
-
-               if (!USE_HTTP_AUTH) {
-                       if (!$_SESSION["uid"]) {
-                               header("Location: login.php");
-                               exit;
-                       }
-               } else {
-                       authenticate_user($link);
-               }
-       } else {
-               $_SESSION["uid"] = 1;
-               $_SESSION["name"] = "admin";
-       }
-
-
-       initialize_user_prefs($link, $_SESSION["uid"]); 
-       // FIXME this needs to be moved somewhere after user creation
-
+       login_sequence($link);
  ?>
  <html>
  <head>
         <title>Tiny Tiny RSS : Preferences</title>
         <link rel="stylesheet" href="tt-rss.css" type="text/css">
  
+       <?      $user_theme = $_SESSION["theme"];
+               if ($user_theme) { ?>
+               <link rel="stylesheet" type="text/css" href="themes/<?= $user_theme ?>/theme.css">
+       <? } ?>
+
+       <? $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
+       <? if ($user_css_url) { ?>
+               <link type="text/css" href="<?= $user_css_url ?>"/> 
+       <? } ?>
+
         <? if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?>
  
                 <link rel="stylesheet" href="tt-rss_compact.css" type="text/css">
@@ -65,28 +58,39 @@
                                 <img src="images/ttrss_logo.png" alt="logo">    
                         </td>
                         <td align="right" valign="top">
-                               <div id="notify"><span id="notify_body"></div>
+                               <div id="notify"><span id="notify_body">&nbsp;</span></div>
                         </td>
                 </tr><tr><td class="welcomePrompt">
                         <? if (!SINGLE_USER_MODE) { ?>
-                       Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td>
+                               Hello, <b><?= $_SESSION["name"] ?></b>
+                               (<a href="logout.php">Logout</a>)
                         <? } ?>
+                       </td>
                 </tr></table>
         </td>
  </tr>
+<? } else { ?>
+<tr><td colspan="2" align="right">
+       <div id="notify"><span id="notify_body">&nbsp;</span></div>
+       <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+</td></tr>
  <? } ?>
  <tr>
         <td class="prefsTabs" align="left" valign="bottom">
-               <input id="genConfigTab" class="prefsTab" type="submit" value="User Preferences"
+               <input id="genConfigTab" class="prefsTab" type="submit" value="Preferences"
                         onclick="selectTab('genConfig')">
                 <input id="feedConfigTab" class="prefsTab" type="submit" value="Feed Configuration"
                         onclick="selectTab('feedConfig')">
                 <input id="filterConfigTab" class="prefsTab" type="submit" value="Content Filtering"
                         onclick="selectTab('filterConfig')">
-               <? if (get_pref($link, 'ENABLE_LABELS')) { ?>
+               <? if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) { ?>
                 <input id="labelConfigTab" class="prefsTab" type="submit" value="Label Editor"
                         onclick="selectTab('labelConfig')">
                 <? } ?>
+               <? if ($_SESSION["access_level"] >= 10) { ?>
+               <input id="userConfigTab" class="prefsTab" type="submit" value="User Manager"
+                       onclick="selectTab('userConfig')">
+               <? } ?>         
         </td>
         <td class="prefsToolbar" valign="middle" align="right"> 
                 <input type="submit" onclick="gotoMain()" class="button" value="Return to main">
@@ -102,7 +106,7 @@
  <? if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
  <tr>
         <td class="footer" colspan="2">
-               <a href="http://bah.spb.su/~fox/tt-rss/">Tiny-Tiny RSS</a> v<?= VERSION ?> &copy; 2005 Andrew Dolgov
+               <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> &copy; 2005 Andrew Dolgov
                 <? if (WEB_DEMO_MODE) { ?>
                 <br>Running in demo mode, some functionality is disabled.
                 <? } ?>