Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/client/client_edit.php

@@ -129,7 +129,7 @@

      global $app;

      $sql = "SELECT template_id,template_name FROM client_template WHERE template_type = 'a' ORDER BY template_name ASC";
      $sql = "SELECT template_id,template_name FROM client_template WHERE template_type = 'a' and ".$app->tform->getAuthSQL('r')." ORDER BY template_name ASC";
      $tpls = $app->db->queryAllRecords($sql);
      $option = '';
      $tpl = array();
@@ -206,7 +206,7 @@
            if($reseller['customer_no_template'] != '') {
               //* Set customer no default
               $customer_no = $app->functions->intval($reseller['customer_no_start']+$reseller['customer_no_counter']);
               $customer_no_string = str_replace('[CUSTOMER_NO]',$customer_no,$reseller['customer_no_template']);
               $customer_no_string = str_replace(array('[CUSTOMER_NO]','[CLIENTID]'),array($customer_no, $reseller['client_id']),$reseller['customer_no_template']);
               $app->tpl->setVar('customer_no',$customer_no_string);
            }
         }
@@ -249,7 +249,7 @@
      $modules = $conf['interface_modules_enabled'];
      if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] > 0) $modules .= ',client';
      $startmodule = (stristr($modules, 'dashboard'))?'dashboard':'client';
      $usertheme = $this->dataRecord["usertheme"];
      $usertheme = (isset($this->dataRecord["usertheme"]) && $this->dataRecord["usertheme"] != ''? $this->dataRecord["usertheme"] : 'default');
      $type = 'user';
      $active = 1;
      $language = $this->dataRecord["language"];
@@ -408,13 +408,7 @@
      // password changed
      if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
         $password = $this->dataRecord["password"];
         $salt="$1$";
         $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
         for ($n=0;$n<8;$n++) {
            $salt.=$base64_alphabet[mt_rand(0, 63)];
         }
         $salt.="$";
         $password = crypt(stripslashes($password), $salt);
         $password = $app->auth->crypt_password($password);
         $client_id = $this->id;
         $sql = "UPDATE sys_user SET passwort = ? WHERE client_id = ?";
         $app->db->query($sql, $password, $client_id);