- Added (clickable) placeholders to client messaging function. - Added chec...

ftimme

2012-05-30 2cb1563f63386b35a69e460051aa9b4a2851d104

 interface/web/sites/webdav_user_edit.php

@@ -114,7 +114,9 @@
       */
      if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
      if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';

      if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />';
      if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'./')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />';
		
      parent::onSubmit();
   }

@@ -166,12 +168,13 @@
      $data = $app->db->queryOneRecord("SELECT * FROM webdav_user WHERE webdav_user_id = ".intval($this->id));
      $this->dataRecord["username"] = $data['username'];
      $this->dataRecord["dir"]      = $data['dir'];
      $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
       * needs (only if the pwd is changed)
       */
      if (isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
      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;
      }