From 378935a8a92592cf1ef164b4d969c376c46a78c6 Mon Sep 17 00:00:00 2001
From: nveid <nveid@ispconfig3>
Date: Fri, 09 Dec 2011 02:35:24 -0500
Subject: [PATCH] Fixed mysql error when switching from "Options" tab to "Ftp User" edit tab, the onUpdate thought we were trying to change the Website because the Options Datalog didn't have the parent_domain_id and the Ftp User tab did.
---
interface/web/designer/module_list.php | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/interface/web/designer/module_list.php b/interface/web/designer/module_list.php
index 6449037..92aa4f0 100644
--- a/interface/web/designer/module_list.php
+++ b/interface/web/designer/module_list.php
@@ -30,49 +30,40 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
+$app->tpl->newTemplate('form.tpl.htm');
$app->tpl->setInclude('content_tpl','templates/module_list.htm');
-// lese Module aus
-$bgcolor = "#FFFFFF";
+//* Pick out modules
+$bgcolor = '#FFFFFF';
$modules_list = array();
-$handle = @opendir($conf["rootpath"]."/web");
+$handle = @opendir(ISPC_WEB_PATH);
while ($file = @readdir ($handle)) {
- if ($file != "." && $file != "..") {
- if(@is_dir($conf["rootpath"]."/web/".$file)) {
- if(is_file($conf["rootpath"]."/web/".$file."/lib/module.conf.php") and $file != 'login') {
- include_once($conf["rootpath"]."/web/".$file."/lib/module.conf.php");
-
- // Farbwechsel
- $bgcolor = ($bgcolor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
-
- $modules_list[] = array( 'module' => $module["name"],
- 'title' => $module["title"],
- 'bgcolor' => $bgcolor);
+ if ($file != '.' && $file != '..') {
+ if(@is_dir(ISPC_WEB_PATH."/$file")) {
+ if(is_file(ISPC_WEB_PATH."/$file/lib/module.conf.php") and $file != 'login') {
+ include_once(ISPC_WEB_PATH."/$file/lib/module.conf.php");
+ $modules_list[] = array( 'module' => $module['name'],
+ 'title' => $module['title'],
+ 'bgcolor' => ($bgcolor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF'
+ );
}
}
}
}
+$app->tpl->setLoop('records', $modules_list);
-$app->tpl->setLoop('records',$modules_list);
-
-// loading language file
-$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_module_list.lng";
+//* loading language file
+$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_module_list.lng';
include($lng_file);
$app->tpl->setVar($wb);
$app->tpl_defaults();
$app->tpl->pparse();
-
-
?>
\ No newline at end of file
--
Gitblit v1.9.1