Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2016-01-26 61a4a721c96103fbdc448f52fb0f9c2ccb33e665

 interface/lib/classes/validate_password.inc.php

@@ -33,6 +33,7 @@
   
   private function _get_password_strength($password) {
      $length = strlen($password);
		
      $points = 0;
      if ($length < 5) {
         return 1;
@@ -53,7 +54,7 @@
         $different += 1;
      }

      if (preg_match('/[`~!@#$%^&*()_+|\\=-\[\]}{\';:\/?.>,<" ]/', $password)) {
      if (preg_match('/[`~!@#$%^&*()_+|\\=\-\[\]}{\';:\/?.>,<" ]/', $password)) {
         $points += 1;
         $different += 1;
      }