force scripts refresh on every reload

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

index 5a56f896fdd0bb49a22911f9ce89091afb5cb1c5..4cd1cabe9d599106e4820b2e96f5cf50896be186 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,15 +1,21 @@
  <?
-       session_start();
+       require_once "functions.php"; 
+
+       basic_nosid_redirect_check();
+
+       require_once "sessions.php";
  
         require_once "sanity_check.php";
         require_once "version.php"; 
         require_once "config.php";
         require_once "db-prefs.php";
-       require_once "functions.php"; 
  
         $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
  
         login_sequence($link);
+
+       $dt_add = time();
+
  ?>
  <html>
  <head>
@@ -38,16 +44,31 @@
         <? } ?>
  
         
-       <script type="text/javascript" src="functions.js"></script>
-       <script type="text/javascript" src="prefs.js"></script>
+       <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script>
+       <script type="text/javascript" src="prefs.js?<?= $dt_add ?>"></script>
  
         <!--[if gte IE 5.5000]>
                 <script type="text/javascript" src="pngfix.js"></script>
         <![endif]-->
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+       <script type="text/javascript">
+               if (navigator.userAgent.match("Opera")) {
+                       document.write('<link rel="stylesheet" type="text/css" href="opera.css">');
+               }
+       </script>
  </head>
  
-<body onload="init()">
+<body>
+
+<div id="piggie" class="invisible">&nbsp;</div>
+
+<script type="text/javascript">
+if (document.addEventListener) {
+       document.addEventListener("DOMContentLoaded", init, null);
+}
+window.onload = init;
+</script>
  
  <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
  <? if (get_pref($link, 'DISPLAY_HEADER')) { ?>
@@ -57,7 +78,7 @@
                         <td rowspan="2" class="header" valign="middle"> 
                                 <img src="images/ttrss_logo.png" alt="logo">    
                         </td>
-                       <td align="right" valign="top">
+                       <td valign="top" class="notifyBox">
                                 <div id="notify"><span id="notify_body">&nbsp;</span></div>
                         </td>
                 </tr><tr><td class="welcomePrompt">
@@ -70,9 +91,15 @@
         </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>
+<tr>
+       <td class="small">
+               <div id="notify"><span id="notify_body">&nbsp;</span></div>
+               <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+       </td><td class="welcomePrompt">
+               <? if (!SINGLE_USER_MODE) { ?>
+                       Hello, <b><?= $_SESSION["name"] ?></b>
+                       (<a href="logout.php">Logout</a>)
+               <? } ?>
  </td></tr>
  <? } ?>
  <tr>
@@ -81,6 +108,10 @@
                         onclick="selectTab('genConfig')">
                 <input id="feedConfigTab" class="prefsTab" type="submit" value="Feed Configuration"
                         onclick="selectTab('feedConfig')">
+               <? if (ENABLE_FEED_BROWSER) { ?>
+               <input id="feedBrowserTab" class="prefsTab" type="submit" value="Feed Browser"
+                       onclick="selectTab('feedBrowser')">
+               <? } ?>
                 <input id="filterConfigTab" class="prefsTab" type="submit" value="Content Filtering"
                         onclick="selectTab('filterConfig')">
                 <? if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) { ?>
@@ -106,7 +137,7 @@
  <? if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
  <tr>
         <td class="footer" colspan="2">
-               <a href="http://tt-rss.spb.ru/">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-2006 Andrew Dolgov
                 <? if (WEB_DEMO_MODE) { ?>
                 <br>Running in demo mode, some functionality is disabled.
                 <? } ?>
@@ -117,5 +148,20 @@
  
  <? db_close($link); ?>
  
+<script type="text/javascript">
+       /* for IE */
+       function statechange() {
+               if (document.readyState == "interactive") init();
+       }
+
+       if (document.readyState) {      
+               if (document.readyState == "interactive" || document.readyState == "complete") {
+                       init();
+               } else {
+                       document.onreadystatechange = statechange;
+               }
+       }
+</script>
+
  </body>
  </html>