Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 72cefc438c0d279be66cd95c7b42a021ae647d51

 interface/lib/classes/functions.inc.php

@@ -190,7 +190,7 @@
         $regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
      } else {
         // IPv6
         $regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i";
         $regex = "/(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/";
      }

      $server_by_id = array();
@@ -390,7 +390,45 @@
         return getimagesizefromstring($string);
      }      
   }
	
   public function password($minLength = 10, $special = false){
      global $app;
	
      $iteration = 0;
      $password = "";
      $maxLength = $minLength + 5;
      $length = $this->getRandomInt($minLength, $maxLength);

      while($iteration < $length){
         $randomNumber = (floor(((mt_rand() / mt_getrandmax()) * 100)) % 94) + 33;
         if(!$special){
            if (($randomNumber >=33) && ($randomNumber <=47)) { continue; }
            if (($randomNumber >=58) && ($randomNumber <=64)) { continue; }
            if (($randomNumber >=91) && ($randomNumber <=96)) { continue; }
            if (($randomNumber >=123) && ($randomNumber <=126)) { continue; }
         }
         $iteration++;
         $password .= chr($randomNumber);
      }
      $app->uses('validate_password');
      if($app->validate_password->password_check('', $password, '') !== false) $password = $this->password($minLength, $special);
      return $password;
   }

   public function getRandomInt($min, $max){
      return floor((mt_rand() / mt_getrandmax()) * ($max - $min + 1)) + $min;
   }
	
   public function generate_customer_no(){
      global $app;
      // generate customer no.
      $customer_no = mt_rand(100000, 999999);
      while($app->db->queryOneRecord("SELECT client_id FROM client WHERE customer_no = ?", $customer_no)) {
         $customer_no = mt_rand(100000, 999999);
      }
		
      return $customer_no;
   }
}

?>