msb/vpanel-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: msb:150d64d1d060f0620e6c748190cfc1e4cf7625d4
Branches Tags
msb:master
..
compare: msb:eb782d6ccdbf0b5967589361cbbde95f21ea94ff
Branches Tags
msb:master

No commits in common. "150d64d1d060f0620e6c748190cfc1e4cf7625d4" and "eb782d6ccdbf0b5967589361cbbde95f21ea94ff" have entirely different histories.
150d64d1d0 ... eb782d6ccd

4 changed files with 20 additions and 26 deletions
Show Stats Expand all files Collapse all files

6
panel/classes/Panel.php
View File

@ -113,8 +113,6 @@ class Panel {
} }
if(strlen($password) < 15) {
$character_class = 0; $character_class = 0;
if (preg_match('/[[:lower:]]/', $password)) { if (preg_match('/[[:lower:]]/', $password)) {
@ -143,9 +141,7 @@ class Panel {
if ($character_class < 3) { 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."; $messages[] = "Password must contain characters from at least three of the following four groups: Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters.";
}
} }

2
panel/classes/Panel/Vmail/MboxesEdit.php
View File

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

5
panel/ui/vmail/mboxes-add.html
View File

@ -91,9 +91,8 @@
<p> <p>
<b>Account</b> is the "local-part" of the email address and can contain letters, numbers, and periods.<br> <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> <b>Password</b> must be at least 8 characters with 12 or more being highly recommended.<br>
Passwords under 15 characters must contain characters from at least three of the following four groups:<br> The password must contain characters from at least three of the following four groups:<br>
Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters.<br> Lower Case Letters, Upper Case Letters, Numbers, Punctuation/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>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>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> <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>

5
panel/ui/vmail/mboxes-edit.html
View File

@ -88,9 +88,8 @@
</form> </form>
<p> <p>
<b>Password</b> must be at least 8 characters with 12 or more being highly recommended.<br> <b>Password</b> must be at least 8 characters with 12 or more being highly recommended.<br>
Passwords under 15 characters must contain characters from at least three of the following four groups:<br> The password must contain characters from at least three of the following four groups:<br>
Lower Case Letters, Uppler Case Leters, Numbers, Puncuation/Special Characters.<br> Lower Case Letters, Upper Case Letters, Numbers, Punctuation/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>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>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> <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>