From 374c8db63dca02dcf62d64448dc408897925c19f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 08:24:42 -0400
Subject: [PATCH] Improved some list templates and the dashboard template.
---
interface/web/admin/system_config_edit.php | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/interface/web/admin/system_config_edit.php b/interface/web/admin/system_config_edit.php
index 62ffef5..f6a4c05 100644
--- a/interface/web/admin/system_config_edit.php
+++ b/interface/web/admin/system_config_edit.php
@@ -49,7 +49,8 @@
$app->load('tform_actions');
class page_action extends tform_actions {
-
+
+
function onShowEdit() {
global $app, $conf;
@@ -62,6 +63,11 @@
$server_id = $this->id;
$this->dataRecord = $app->getconf->get_global_config($section);
+ if ($section == 'domains'){
+ if (isset($this->dataRecord['use_domain_module'])){
+ $_SESSION['use_domain_module_old_value'] = $this->dataRecord['use_domain_module'];
+ }
+ }
}
$record = $app->tform->getHTML($this->dataRecord, $this->active_tab,'EDIT');
@@ -78,14 +84,30 @@
$app->uses('ini_parser,getconf');
$section = $app->tform->getCurrentTab();
- $server_id = $this->id;
- $server_config_array = $app->getconf->get_global_config($server_id);
+ $server_config_array = $app->getconf->get_global_config();
$server_config_array[$section] = $app->tform->encode($this->dataRecord,$section);
$server_config_str = $app->ini_parser->get_ini_string($server_config_array);
$sql = "UPDATE sys_ini SET config = '".$app->db->quote($server_config_str)."' WHERE sysini_id = 1";
$app->db->query($sql);
+
+ /*
+ * If we should use the domain-module, we have to insert all existing domains into the table
+ * (only the first time!)
+ */
+ if (($section == 'domains') &&
+ ($_SESSION['use_domain_module_old_value'] == '') &&
+ ($server_config_array['domains']['use_domain_module'] == 'y')){
+ $sql = "REPLACE INTO domain (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain ) " .
+ "SELECT sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain " .
+ "FROM mail_domain";
+ $app->db->query($sql);
+ $sql = "REPLACE INTO domain (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain ) " .
+ "SELECT sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain " .
+ "FROM web_domain";
+ $app->db->query($sql);
+ }
}
}
--
Gitblit v1.9.1