]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
headlines subtoolbar, misc api changes
[tt-rss.git] / tt-rss.php
diff --git a/tt-rss.php b/tt-rss.php
index 0f4a72dc1f49c89160f22c53b9ae1251d5f17968..cb2021fded6fc55c5d8bd6d4e1313a11cccf8526 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.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,20 +9,7 @@
 
        $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?rt=tt-rss.php");
-                               exit;
-                       }
-               } else {
-                       authenticate_user($link);
-               }
-       } else {
-               $_SESSION["uid"] = 1;
-               $_SESSION["name"] = "admin";
-       }
+       login_sequence($link);
 
 ?>
 <html>
@@ -30,6 +18,16 @@
 
        <link rel="stylesheet" type="text/css" href="tt-rss.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">
@@ -51,20 +49,10 @@
 
 <body onload="init()">
 
-<? if (get_pref($link, 'ENABLE_SPLASH')) { ?>
-<div id="splash">
-       <table width='100%' height='100%'><tr>
-               <td class="innerSplash" valign="middle" align="center">
-               <img src="images/ttrss_logo.png" alt="logo">            
-               <p>Loading, please wait...</p>
-       </td></tr></table>
-</div>
-<? } ?>
-
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
 <? if (get_pref($link, 'DISPLAY_HEADER')) { ?>
 <tr>
-       <td colspan="2">
+       <td colspan="2" class="headerBox">
                <table cellspacing="0" cellpadding="0" width="100%"><tr>
                        <td rowspan="2" class="header" valign="middle"> 
                                <img src="images/ttrss_logo.png" alt="logo">    
@@ -73,31 +61,43 @@
                                <div id="notify"><span id="notify_body"></div>
                        </td>
 
-                       <div id="userDlg">&nbsp;</div>
+                       <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
 
                </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 { ?>
-       <div id="userDlg">&nbsp;</div>
+<tr><td align="right" colspan="2">
+       <div id="notify"><span id="notify_body"></div>
+       <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+</td></tr>
 <? } ?>
 <tr>
        <td valign="top" rowspan="3" class="feeds"> 
+               <table class="innerFeedTable" 
+                       cellspacing="0" cellpadding="0" height="100%" width="100%">
+               <tr><td>
+                       <div id="dispSwitch"> 
+                       <a id="dispSwitchPrompt" href="javascript:toggleTags()">display tags</a>
+               </div>
+               </td></tr>      
+               <tr><td height="100%" width="100%" valign="top">
                
                <!-- <div id="feeds">&nbsp;</div> -->
 
-               <div id="dispSwitch"> 
-                       <a id="dispSwitchPrompt" href="javascript:toggleTags()">display tags</a>
-               </div>
 
                <iframe frameborder="0" 
                        src="backend.php?op=error&msg=Loading,%20please wait..."
                        id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
 
+               </td></tr></table>
+
                <? if (get_pref($link, 'DISPLAY_FEEDLIST_ACTIONS')) { ?>
 
                <div align="center">All feeds: 
@@ -111,6 +111,7 @@
                <input type="submit" class="button" onclick="allFeedsMenuGo()" value="Go">
 
                </div>
+               
 
                <? } ?>
 
@@ -130,9 +131,7 @@
                <input type="submit" 
                        class="button" onclick="javascript:search()" value="Search">
 
-               &nbsp; 
-               
-               View: 
+               &nbsp;View: 
                
                <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
                        <option>All Articles</option>
@@ -173,11 +172,19 @@
                
                </select>
 
+<!--           &nbsp;Selection:
+
+               <select id="headopbox">
+                       <option id="hopToggleRead">Toggle (un)read</option>
+               </select>
+
+               <input class="button" type="submit" onclick="headopGo()" value="Go"> -->
+
                &nbsp;Feed: <input class="button" type="submit"
                        onclick="javascript:viewCurrentFeed(0, 'ForceUpdate')" value="Update">
 
                <input class="button" type="submit" id="btnMarkFeedAsRead"
-                       onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read">
+                       onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read"> 
 
                </td>
                <td align="right">
@@ -214,7 +221,7 @@
 <? if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
 <tr>
        <td colspan="2" class="footer">
-               <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.
                <? } ?>
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/