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/sites/webdav_user_edit.php | 71 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/interface/web/sites/webdav_user_edit.php b/interface/web/sites/webdav_user_edit.php
index 97b2bcc..174383b 100644
--- a/interface/web/sites/webdav_user_edit.php
+++ b/interface/web/sites/webdav_user_edit.php
@@ -81,7 +81,11 @@
$app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $webdavuser_prefix));
}
- $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix']));
+ if($this->dataRecord['username'] == "") {
+ $app->tpl->setVar("username_prefix", $webdavuser_prefix);
+ } else {
+ $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix']));
+ }
if($this->id > 0) {
//* we are editing a existing record
@@ -133,21 +137,6 @@
/* restrict the names */
$this->dataRecord['username'] = $webdavuser_prefix . $this->dataRecord['username'];
-
- /*
- * We shall not save the pwd in plaintext, so we store it as the hash, the apache-moule needs
- */
- $hash = md5($this->dataRecord["username"] . ':' . $this->dataRecord["dir"] . ':' . $this->dataRecord["password"]);
- $this->dataRecord["password"] = $hash;
-
- /*
- * Get the data of the domain, owning the webdav user
- */
- $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
- /* The server is the server of the domain */
- $this->dataRecord["server_id"] = $web["server_id"];
- /* The Webdav user shall be owned by the same group then the website */
- $this->dataRecord["sys_groupid"] = $web['sys_groupid'];
}
parent::onBeforeInsert();
@@ -155,6 +144,22 @@
function onAfterInsert() {
global $app, $conf;
+
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
+ $server_id = $app->functions->intval($web["server_id"]);
+
+ // The webdav user shall be owned by the same group then the website
+ $sys_groupid = $app->functions->intval($web['sys_groupid']);
+
+ /*
+ * We shall not save the pwd in plaintext, so we store it as the hash, the apache-moule needs
+ */
+ $hash = md5($this->dataRecord["username"] . ':' . $this->dataRecord["dir"] . ':' . $this->dataRecord["password"]);
+ $this->dataRecord["password"] = $hash;
+
+ $sql = "UPDATE webdav_user SET server_id = ".$server_id.", sys_groupid = '".$sys_groupid."', password = '".$this->dataRecord["password"]."' WHERE webdav_user_id = ".$this->id;
+ $app->db->query($sql);
+
}
function onBeforeUpdate() {
@@ -168,22 +173,36 @@
$this->dataRecord["username"] = $data['username'];
$this->dataRecord["dir"] = $data['dir'];
$this->dataRecord['username_prefix'] = $data['username_prefix'];
- $passwordOld = $data['password'];
-
- /*
- * We shall not save the pwd in plaintext, so we store it as the hash, the apache-moule
- * needs (only if the pwd is changed)
- */
- if ((isset($this->dataRecord["password"])) && ($this->dataRecord["password"] != '') && ($this->dataRecord["password"] != $passwordOld)) {
- $hash = md5($this->dataRecord["username"] . ':' . $this->dataRecord["dir"] . ':' . $this->dataRecord["password"]);
- $this->dataRecord["password"] = $hash;
- }
+ $this->dataRecord['passwordOld'] = $data['password'];
parent::onBeforeUpdate();
}
function onAfterUpdate() {
global $app, $conf;
+
+ //* When the site of the webdav user has been changed
+ if(isset($this->dataRecord['parent_domain_id']) && $this->oldDataRecord['parent_domain_id'] != $this->dataRecord['parent_domain_id']) {
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
+ $server_id = $app->functions->intval($web["server_id"]);
+
+ // The webdav user shall be owned by the same group then the website
+ $sys_groupid = $app->functions->intval($web['sys_groupid']);
+
+ $sql = "UPDATE webdav_user SET server_id = $server_id, sys_groupid = '$sys_groupid' WHERE webdav_user_id = ".$this->id;
+ $app->db->query($sql);
+ }
+
+ /*
+ * We shall not save the pwd in plaintext, so we store it as the hash, the apache-moule
+ * needs (only if the pwd is changed)
+ */
+ if ((isset($this->dataRecord["password"])) && ($this->dataRecord["password"] != '') && ($this->dataRecord["password"] != $this->dataRecord['passwordOld'])) {
+ $hash = md5($this->dataRecord["username"] . ':' . $this->dataRecord["dir"] . ':' . $this->dataRecord["password"]);
+ $this->dataRecord["password"] = $hash;
+ $app->db->query("UPDATE webdav_user SET password = '".$this->dataRecord["password"]."' WHERE webdav_user_id = ".$this->id);
+ }
+
}
}
--
Gitblit v1.9.1