modify include path order (closes #514)

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

index 11dab397706556c25bc75bbaa2b59c69e62a5450..d83e2ddf3491b9248e139c900e5f85a4afce01eb 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,4 +1,7 @@
  <?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";
@@ -8,7 +11,7 @@
  
         $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
  
-       init_connection($link);
+       if (!init_connection($link)) return;
  
         login_sequence($link);
  
@@ -23,7 +26,7 @@
         "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 ?>"/>
  
@@ -41,10 +44,9 @@
  
         <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"/>
  
@@ -56,11 +58,11 @@
  
  </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>
@@ -71,16 +73,12 @@
         </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>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
  
  <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
  
  <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-       <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> |
+       <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> |
         <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
  </div>
  
@@ -103,6 +101,8 @@
         <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>