diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index b1456ee7c1d0758a95b1cba88fe24168b4b241a0..68fd74f9bba540a1941de49e4d71caad1745b1e2 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -113,7 +113,7 @@ $conf["server_id"] = "{server_id}"; //** 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 6a34dd8ff7204713279d29bf5a8f16df4d87a6d4..7fc53f98e7a27c769228bc4dd109ef903594d6ed 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -101,7 +101,7 @@ $conf["server_id"] = "1"; //** 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 1a24b094b778dba94aab15f58e8da0dc10449638..5714220234e5518d575615bdb5e6a4b2de3de214 100644 --- a/interface/web/client/client_edit.php +++ b/interface/web/client/client_edit.php @@ -134,14 +134,14 @@ class page_action extends tform_actions { 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 @@ class page_action extends tform_actions { // 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 2e8fb949cc219f22e4ad326d11561c25f77fd910..b58ba8f7c5cb69af2a70c64d1e9863f7e9d70bf7 100644 --- a/interface/web/client/reseller_edit.php +++ b/interface/web/client/reseller_edit.php @@ -136,14 +136,14 @@ class page_action extends tform_actions { 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 @@ class page_action extends tform_actions { 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 @@ class page_action extends tform_actions { // 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";