update password requirement descriptions

panel/classes/Panel.php

@@ -113,35 +113,39 @@ class Panel {
 
     }
 
-    $character_class = 0;
+    if(strlen($password) < 15) {
 
-    if (preg_match('/[[:lower:]]/', $password)) {
+      $character_class = 0;
 
-      $character_class++;
+      if (preg_match('/[[:lower:]]/', $password)) {
 
-    }
+        $character_class++;
 
-    if (preg_match('/[[:upper:]]/', $password)) {
+      }
 
-      $character_class++;
+      if (preg_match('/[[:upper:]]/', $password)) {
 
-    }
+        $character_class++;
 
-    if (preg_match('/[[:digit:]]/', $password)) {
+      }
 
-      $character_class++;
+      if (preg_match('/[[:digit:]]/', $password)) {
 
-    }
+        $character_class++;
 
-    if (preg_match('/[[:punct:]]/', $password)) {
+      }
 
-      $character_class++;
+      if (preg_match('/[[:punct:]]/', $password)) {
 
-    }
+        $character_class++;
 
-    if ($character_class < 3) {
+      }
 
-      $messages[] = "Password must contain characters from at least three of the following four groups: Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters.";
+      if ($character_class < 3) {
+
+        $messages[] = "Passwords under 15 characters must contain characters from at least three of the following four groups: Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters. Passwords 15 or more characters long do not have any complexity requirements.";
+
+      }
 
     }
 

panel/classes/Panel/Vmail/MboxesEdit.php

@@ -76,7 +76,7 @@ class MboxesEdit extends \Panel\Vmail {
       $ratelimit = "NULL";
     }
     $f3->call('\Panel::validateEmailRatelimit', $ratelimit);
-    $f3->call('\Panel::validateEmailFiltering', $filtering);
+    $f3->call('\Panel::validateEmailFiltering', $filter);
 
     /* check for validation errors */
     if ($f3->exists('SESSION.messages')) {

panel/ui/vmail/mboxes-add.html

@@ -91,8 +91,9 @@
 <p>
 <b>Account</b> is the "local-part" of the email address and can contain letters, numbers, and periods.<br>
 <b>Password</b> must be at least 8 characters with 12 or more being highly recommended.<br>
-The password must contain characters from at least three of the following four groups:<br>
+Passwords under 15 characters must contain characters from at least three of the following four groups:<br>
-Lower Case Letters, Upper Case Letters, Numbers, Punctuation/Special Characters.<br>
+Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters.<br>
+Passwords 15 or more characters long do not have any complexity requirements.<br>
 <b>Status</b> can be used to temporarily disable the email account. If the account is enabled with the Admin option they can managed all email accounts.<br>
 <b>Quota</b> is the storage limit in GB for the email account.<br>
 <b>Rate Limit</b> is the hourly sending rate limit for the email account, and is multiplied by 10 for the daily sending limit.<br>

panel/ui/vmail/mboxes-edit.html

@@ -88,8 +88,9 @@
 </form>
 <p>
 <b>Password</b> must be at least 8 characters with 12 or more being highly recommended.<br>
-The password must contain characters from at least three of the following four groups:<br>
+Passwords under 15 characters must contain characters from at least three of the following four groups:<br>
-Lower Case Letters, Upper Case Letters, Numbers, Punctuation/Special Characters.<br>
+Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters.<br>
+Passwords 15 or more characters long do not have any complexity requirements.<br>
 <b>Status</b> can be used to temporarily disable the email account. If the account is enabled with the Admin option they can managed all email accounts.<br>
 <b>Quota</b> is the storage limit in GB for the email account.<br>
 <b>Rate Limit</b> is the hourly sending rate limit for the email account, and is multiplied by 10 for the daily sending limit.<br>