From 1302aa509e21771044ab813bec89e722dca805ec Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 22 Jan 2015 05:45:38 -0500
Subject: [PATCH] - No webdav users could be created because password validation failed.
---
interface/web/sites/webdav_user_edit.php | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/interface/web/sites/webdav_user_edit.php b/interface/web/sites/webdav_user_edit.php
index fcea99e..174383b 100644
--- a/interface/web/sites/webdav_user_edit.php
+++ b/interface/web/sites/webdav_user_edit.php
@@ -137,12 +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;
}
parent::onBeforeInsert();
@@ -156,9 +150,16 @@
// 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;
+
+ /*
+ * 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() {
@@ -172,16 +173,7 @@
$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();
}
@@ -200,6 +192,17 @@
$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