remove $link

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index e390edffdd69a29e1d72f4201045cc6e22e827de..cb95b96f0219afdc4fe7e359e3a0a41597588611 100644 (file)
--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
        set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
                get_include_path());
 
+       require_once "autoload.php";
        require_once "sessions.php";
        require_once "functions.php";
        require_once "sanity_check.php";
@@ -31,7 +32,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       if (!init_connection($link)) return;
+       if (!init_plugins()) return;
 
        global $pluginhost;
 
@@ -48,9 +49,7 @@
                }
        }
 
-       login_sequence($link);
-
-       no_cache_incantation();
+       login_sequence();
 
        header('Content-Type: text/html; charset=utf-8');
 
@@ -66,14 +65,14 @@
        <?php echo stylesheet_tag("cdm.css"); ?>
 
        <?php if ($_SESSION["uid"]) {
-               $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
+               $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
                if ($theme) {
                        echo stylesheet_tag("themes/$theme");
                }
        }
        ?>
 
-       <?php print_user_stylesheet($link) ?>
+       <?php print_user_stylesheet() ?>
 
        <style type="text/css">
        <?php
@@ -140,7 +139,7 @@
        </div>
 </div>
 
-<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="headlines-tmp" style="display : none"></div>
 
@@ -185,17 +184,23 @@
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
                        <option value="feed_dates"><?php echo __('Newest first') ?></option>
                        <option value="date_reverse"><?php echo __('Oldest first') ?></option>
+                       <option value="title"><?php echo __('Title') ?></option>
                </select>
 
-               <select title="<?php echo __('Mark feed as read') ?>"
-                       onchange="catchupCurrentFeed(event)"
-                       dojoType="dijit.form.Select" name="catchup_feed">
-                       <option selected="selected" value="default"><?php echo __('Mark as read') ?></option>
-                       <option value="all"><?php echo __('All articles') ?></option>
-                       <option value="1day"><?php echo __('Older than one day') ?></option>
-                       <option value="1week"><?php echo __('Older than one week') ?></option>
-                       <option value="2weeks"><?php echo __('Older than two weeks') ?></option>
-               </select>
+               <div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
+                       <span><?php echo __('Mark as read') ?></span>
+                       <div dojoType="dijit.DropDownMenu">
+                               <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
+                                       <?php echo __('Older than one day') ?>
+                               </div>
+                               <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
+                                       <?php echo __('Older than one week') ?>
+                               </div>
+                               <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
+                                       <?php echo __('Older than two weeks') ?>
+                               </div>
+                       </div>
+               </div>
 
                </form>
 
@@ -280,7 +285,7 @@
 </div>
 </div>
 
-<?php db_close($link); ?>
+<?php db_close(); ?>
 
 </body>
 </html>