From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.

---
 interface/web/designer/module_nav_edit.php |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/web/designer/module_nav_edit.php b/interface/web/designer/module_nav_edit.php
index 27fbb78..a7acf40 100644
--- a/interface/web/designer/module_nav_edit.php
+++ b/interface/web/designer/module_nav_edit.php
@@ -34,12 +34,10 @@
 if($_SESSION['s']['user']['typ'] != 'admin'){
     die('Admin permissions required.');
 }
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
 
 //* Check permissions for module
-if(!stristr($_SESSION['s']['user']['modules'],$_SESSION['s']['module']['name'])) {
-	header('Location: ../index.php');
-	exit;
-}
+$app->auth->check_module_permissions('designer');
 
 //* Load template
 $app->uses('tpl');

--
Gitblit v1.9.1