]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.php
modify include path order (closes #514)
[tt-rss.git] / prefs.php
index 41744357077c73f71306f2be74d73ee4cea7aac2..d83e2ddf3491b9248e139c900e5f85a4afce01eb 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,35 +1,38 @@
 <?php
-       require_once "functions.php"; 
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
+
+       require_once "functions.php";
        require_once "sessions.php";
        require_once "sanity_check.php";
-       require_once "version.php"; 
+       require_once "version.php";
        require_once "config.php";
        require_once "db-prefs.php";
 
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
+       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       init_connection($link);
+       if (!init_connection($link)) return;
 
        login_sequence($link);
 
        $dt_add = time();
 
        no_cache_incantation();
-       
+
        header('Content-Type: text/html; charset=utf-8');
-       
+
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-       <title>Tiny Tiny RSS : Preferences</title>
+       <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
        <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
        <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
        <?php print_theme_includes($link) ?>
        <?php print_user_stylesheet($link) ?>
-       
+
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
        <script type="text/javascript" src="lib/prototype.js"></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>
+       <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/deprecated.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/prefs.js?<?php echo $dt_add ?>"></script>
 
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-               
+
        <script type="text/javascript">
                Event.observe(window, 'load', function() {
                        init();
 
 </head>
 
+<body id="ttrssPrefs" class="claro">
+
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="cmdline" style="display : none"></div>
 
-<body id="ttrssPrefs" class="claro">
-
 <div id="overlay">
        <div id="overlay_inner">
                <div class="insensitive"><?php echo __("Loading, please wait...") ?></div>
                </div>
                <noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
        </div>
-</div> 
-
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php rounded_table_start("hho"); ?>
-       <?php include "help/4.php" ?>
-       <?php rounded_table_end(); ?>
 </div>
 
-<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
 
-<div id="main" dojoType="dijit.layout.BorderContainer">
+<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
 <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-       <img style="float : left" src="<?php echo theme_image($link, 'images/logo_wide.png') ?>" title="Tiny Tiny RSS"/>        
-
-       <?php if (!SINGLE_USER_MODE) { ?>
-               <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
-       <?php } ?>
-       <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> | 
-       <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
-       <?php if (!SINGLE_USER_MODE) { ?>
-               | <a href="logout.php"><?php echo __('Logout') ?></a>
-       <?php } ?>
+       <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> |
+       <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
 </div>
 
+<div id="main" dojoType="dijit.layout.BorderContainer">
+
 <div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
-<div id="genConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="genConfigTab" dojoType="dijit.layout.ContentPane"
        href="backend.php?op=pref-prefs"
        title="<?php echo __('Preferences') ?>"></div>
-<div id="feedConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
        href="backend.php?op=pref-feeds"
        title="<?php echo __('Feeds') ?>"></div>
-<div id="filterConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
        href="backend.php?op=pref-filters"
        title="<?php echo __('Filters') ?>"></div>
-<div id="labelConfigTab" dojoType="dijit.layout.ContentPane" 
+<div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
        href="backend.php?op=pref-labels"
        title="<?php echo __('Labels') ?>"></div>
 <?php if ($_SESSION["access_level"] >= 10) { ?>
-       <div id="userConfigTab" dojoType="dijit.layout.ContentPane" 
+       <div id="userConfigTab" dojoType="dijit.layout.ContentPane"
                href="backend.php?op=pref-users"
                title="<?php echo __('Users') ?>"></div>
 <?php } ?>
+<?php if ($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) { ?>
+       <div id="instanceConfigTab" dojoType="dijit.layout.ContentPane"
+               href="backend.php?op=pref-instances"
+               title="<?php echo __('Linked') ?>"></div>
+<?php } ?>
+
 </div>
 
 <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
-       <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
-       <?php if (!defined('HIDE_VERSION')) { ?>
-                v<?php echo VERSION ?> 
-       <?php } ?>
-       &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
+       <a class="insensitive" target="_blank" href="http://tt-rss.org/">
+       Tiny Tiny RSS</a> &copy; 2005-<?php echo date('Y') ?>
+       <a class="insensitive" target="_blank"
+       href="http://fakecake.org/">Andrew Dolgov</a>
 </div> <!-- footer -->
 
 </div>