From 54afe0e3036f339e623e98f5d3fbb397376c7ca2 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 15 Feb 2015 04:05:48 -0500
Subject: [PATCH] allow ipv6 for openvz-container
---
interface/web/client/domain_edit.php | 70 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/interface/web/client/domain_edit.php b/interface/web/client/domain_edit.php
index cca5c2d..889bb4f 100644
--- a/interface/web/client/domain_edit.php
+++ b/interface/web/client/domain_edit.php
@@ -89,7 +89,7 @@
if(is_array($clients)) {
foreach( $clients as $client) {
$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
- $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
+ $client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
}
}
$app->tpl->setVar("client_group_id", $client_select);
@@ -147,9 +147,10 @@
}
else {
/*
- * We edit a existing one, but there is nothing to edit
+ * We edit a existing one, but domain name can't be changed
*/
- $this->dataRecord = $app->tform->getDataRecord($this->id);
+ $oldData = $app->tform->getDataRecord($this->id);
+ $this->dataRecord["domain"] = $oldData["domain"];
}
} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
if ($this->id == 0) {
@@ -165,9 +166,10 @@
}
else {
/*
- * We edit a existing one, but there is nothing to edit
+ * We edit a existing one, but domain name can't be changed
*/
- $this->dataRecord = $app->tform->getDataRecord($this->id);
+ $oldData = $app->tform->getDataRecord($this->id);
+ $this->dataRecord["domain"] = $oldData["domain"];
}
} else {
if($this->id > 0) {
@@ -193,12 +195,68 @@
// make sure that the record belongs to the client group and not the admin group when admin inserts it
// also make sure that the user can not delete domain created by a admin
- if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) {
+ if(($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) || ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) {
$client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
$app->db->query("UPDATE domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$this->id);
}
}
+ function onAfterUpdate() {
+ global $app, $conf;
+
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && isset($this->dataRecord["client_group_id"])) {
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT client.client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $group = $app->db->queryOneRecord("SELECT sys_group.groupid FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." AND sys_group.groupid = ".$this->dataRecord["client_group_id"]." ORDER BY client.company_name, client.contact_name, sys_group.name");
+ $this->dataRecord["client_group_id"] = $group["groupid"];
+ }
+
+ // make sure that the record belongs to the client group and not the admin group when admin inserts it
+ // also make sure that the user can not delete domain created by a admin
+ if(isset($this->dataRecord["client_group_id"])) {
+ $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
+ $app->db->query("UPDATE domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$this->id);
+
+ $data = new tform_actions();
+ $tform = $app->tform;
+ $app->tform = new tform();
+
+ $app->tform->loadFormDef("../dns/form/dns_soa.tform.php");
+ $data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE origin LIKE '".$this->dataRecord['domain'].".'");
+ if ($data->oldDataRecord) {
+ $data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
+ $data->id = $data->dataRecord['id'];
+ $app->plugin->raiseEvent("dns:dns_soa:on_after_update", $data);
+ }
+
+ $app->tform->loadFormDef("../dns/form/dns_slave.tform.php");
+ $data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM dns_slave WHERE origin LIKE '".$this->dataRecord['domain'].".'");
+ if ($data->oldDataRecord) {
+ $data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
+ $data->id = $data->dataRecord['id'];
+ $app->plugin->raiseEvent("dns:dns_slave:on_after_update", $data);
+ }
+
+ $app->tform->loadFormDef("../mail/form/mail_domain.tform.php");
+ $data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = '".$this->dataRecord['domain']."'");
+ if ($data->oldDataRecord) {
+ $data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
+ $data->id = $data->dataRecord['domain_id'];
+ $app->plugin->raiseEvent("mail:mail_domain:on_after_update", $data);
+ }
+
+ $app->tform->loadFormDef("../sites/form/web_vhost_domain.tform.php");
+ $data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain = '".$this->dataRecord['domain']."'");
+ if ($data->oldDataRecord) {
+ $data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
+ $data->id = $data->dataRecord['domain_id'];
+ $app->plugin->raiseEvent("sites:web_vhost_domain:on_after_update", $data);
+ }
+
+ $app->tform = $tform;
+ }
+ }
+
}
$page = new page_action;
--
Gitblit v1.9.1