- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 interface/web/admin/users_edit.php

@@ -98,21 +98,21 @@

      $client = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = ?", $this->id);
      $client_id = $app->functions->intval($client['client_id']);
      $username = $app->db->quote($this->dataRecord["username"]);
      $old_username = $app->db->quote($this->oldDataRecord['username']);
      $username = $this->dataRecord["username"];
      $old_username = $this->oldDataRecord['username'];

      // username changed
      if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
         $sql = "UPDATE client SET username = ? WHERE client_id = ? AND username = ?";
         $app->db->query($sql, $username, $client_id, $old_username);
         $tmp = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE client_id = ?", $client_id);
         $app->db->datalogUpdate("sys_group", "name = '$username'", 'groupid', $tmp['groupid']);
         $app->db->datalogUpdate("sys_group", array("name" => $username), 'groupid', $tmp['groupid']);
         unset($tmp);
      }

      // password changed
      if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord["passwort"]) && $this->dataRecord["passwort"] != '') {
         $password = $app->db->quote($this->dataRecord["passwort"]);
         $password = $this->dataRecord["passwort"];
         $salt="$1$";
         $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
         for ($n=0;$n<8;$n++) {
@@ -126,7 +126,7 @@

      // language changed
      if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
         $language = $app->db->quote($this->dataRecord["language"]);
         $language = $this->dataRecord["language"];
         $sql = "UPDATE client SET language = ? WHERE client_id = ? AND username = ?";
         $app->db->query($sql, $language, $client_id, $username);
      }