From 6bb878746c5918e5065bc19394e074d57f32238a Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 00:23:01 -0400
Subject: [PATCH] * Silenced some warning with E_STRICT * replaces " with ' where applicable
---
interface/web/index.php | 2 ++
interface/web/nav.php | 52 +++++++++++++++++++++++++++-------------------------
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/interface/web/index.php b/interface/web/index.php
index 7bd0456..419f755 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -28,6 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+error_reporting(E_ALL|E_STRICT);
+
require_once('../lib/config.inc.php');
require_once('../lib/app.inc.php');
diff --git a/interface/web/nav.php b/interface/web/nav.php
index 4ca9b4b..1683f6d 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -35,55 +35,57 @@
//die('HHH');
-if($_GET["nav"] == 'top') {
+//** Top Naviation
+if(isset($_GET['nav']) && $_GET['nav'] == 'top') {
- $app->tpl->newTemplate("topnav.tpl.htm");
+ $app->tpl->newTemplate('topnav.tpl.htm');
- // Checke User Login and current module
- if(!is_array($_SESSION["s"]['user']) or !is_array($_SESSION["s"]["module"])) {
- // Loading Login Module
+ //* Check User Login and current module
+ if(!isset($_SESSION['s']['user']) or !is_array($_SESSION['s']['user']) or !is_array($_SESSION['s']['module'])) {
+ //* Loading Login Module
include_once('login/lib/module.conf.php');
- $_SESSION["s"]['module'] = $module;
- $topnav[] = array( 'title' => "Login",
+ $_SESSION['s']['module'] = $module;
+ $topnav[] = array( 'title' => 'Login',
'active' => 1);
$module = null;
unset($module);
} else {
- // Loading modules of the user and building top navigation
- $modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+ //* Loading modules of the user and building top navigation
+ $modules = explode(',', $_SESSION['s']['user']['modules']);
if(is_array($modules)) {
foreach($modules as $mt) {
- if(is_file($mt."/lib/module.conf.php")) {
- include_once($mt."/lib/module.conf.php");
- $active = ($module["name"] == $_SESSION["s"]["module"]["name"])?1:0;
- $topnav[] = array( 'title' => $app->lng($module["title"]),
- 'active' => $active,
- 'module' => $module["name"]);
+ if(is_file($mt.'/lib/module.conf.php')) {
+ include_once($mt.'/lib/module.conf.php');
+ $active = ($module['name'] == $_SESSION['s']['module']['name']) ? 1 : 0;
+ $topnav[] = array( 'title' => $app->lng($module['title']),
+ 'active' => $active,
+ 'module' => $module['name']);
}
}
}
}
- // Topnavigation
+ //* Topnavigation
$app->tpl->setLoop('nav_top',$topnav);
}
-if($_GET["nav"] == 'side') {
+//** Side Naviation
+if(isset($_GET['nav']) && $_GET['nav'] == 'side') {
- $app->tpl->newTemplate("sidenav.tpl.htm");
+ $app->tpl->newTemplate('sidenav.tpl.htm');
- // translating module navigation
+ //* translating module navigation
$nav_translated = array();
- if(is_array($_SESSION["s"]["module"]["nav"])) {
- foreach($_SESSION["s"]["module"]["nav"] as $nav) {
+ if(isset($_SESSION['s']['module']['nav']) && is_array($_SESSION['s']['module']['nav'])) {
+ foreach($_SESSION['s']['module']['nav'] as $nav) {
$tmp_items = array();
- foreach($nav["items"] as $item) {
- $item["title"] = $app->lng($item["title"]);
+ foreach($nav['items'] as $item) {
+ $item['title'] = $app->lng($item['title']);
$tmp_items[] = $item;
}
- $nav["title"] = $app->lng($nav["title"]);
- $nav["items"] = $tmp_items;
+ $nav['title'] = $app->lng($nav['title']);
+ $nav['items'] = $tmp_items;
$nav_translated[] = $nav;
}
} else {
--
Gitblit v1.9.1