From 3398c250f817f4ad0fb14d6a981e0c570224c996 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Thu, 10 Jun 2010 16:07:41 -0400
Subject: [PATCH] enhanced handling of local config file
---
install/tpl/config.inc.php.master | 2 +-
interface/lib/config.inc.php | 2 +-
interface/web/client/client_edit.php | 6 +++---
interface/web/client/reseller_edit.php | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index b1456ee..68fd74f 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -113,7 +113,7 @@
//** Interface
-define('ISPC_INTERFACE_MODULES_ENABLED', 'dashboard,mail,sites,dns,tools');
+$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
//** Logging
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 6a34dd8..7fc53f9 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -101,7 +101,7 @@
//** Interface
-define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools');
+$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
//** Logging
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 1a24b09..5714220 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -134,14 +134,14 @@
the data was successful inserted in the database.
*/
function onAfterInsert() {
- global $app;
+ global $app, $conf;
// Create the group for the client
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".mysql_real_escape_string($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
$groups = $groupid;
$username = $app->db->quote($this->dataRecord["username"]);
$password = $app->db->quote($this->dataRecord["password"]);
- $modules = ISPC_INTERFACE_MODULES_ENABLED;
+ $modules = $conf['interface_modules_enabled'];
if($this->dataRecord["limit_client"] > 0) $modules .= ',client';
$startmodule = 'mail';
$usertheme = $app->db->quote($this->dataRecord["usertheme"]);
@@ -207,7 +207,7 @@
// reseller status changed
if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
- $modules = ISPC_INTERFACE_MODULES_ENABLED;
+ $modules = $conf['interface_modules_enabled'];
if($this->dataRecord["limit_client"] > 0) $modules .= ',client';
$modules = $app->db->quote($modules);
$client_id = $this->id;
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
index 2e8fb94..b58ba8f 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -136,14 +136,14 @@
the data was successful inserted in the database.
*/
function onAfterInsert() {
- global $app;
+ global $app, $conf;
// Create the group for the reseller
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".mysql_real_escape_string($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
$groups = $groupid;
$username = $app->db->quote($this->dataRecord["username"]);
$password = $app->db->quote($this->dataRecord["password"]);
- $modules = ISPC_INTERFACE_MODULES_ENABLED.',client';
+ $modules = $conf['interface_modules_enabled'] . ',client';
$startmodule = 'client';
$usertheme = $app->db->quote($this->dataRecord["usertheme"]);
$type = 'user';
@@ -170,7 +170,7 @@
the data was successful updated in the database.
*/
function onAfterUpdate() {
- global $app;
+ global $app, $conf;
// username changed
if(isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
@@ -202,7 +202,7 @@
// reseller status changed
if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
- $modules = ISPC_INTERFACE_MODULES_ENABLED.',client';
+ $modules = $conf['interface_modules_enabled'] . ',client';
$modules = $app->db->quote($modules);
$client_id = $this->id;
$sql = "UPDATE sys_user SET modules = '$modules' WHERE client_id = $client_id";
--
Gitblit v1.9.1