summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato.botelho@bluepex.com>2010-08-13 11:08:58 -0300
committerRenato Botelho <renato.botelho@bluepex.com>2010-08-13 11:08:58 -0300
commitbfa790df99cc92d974f17e3d63ac346a90c8d28a (patch)
tree2bb9289edf43ec1096d48a70c497fd6eff36257c
parentec325889dc8a9a9ee4476bea6cb17cc4b63e28fe (diff)
parent5f25bfea6de50b8b0ebb03e41eb343d61940303b (diff)
downloadpfsense-bfa790df99cc92d974f17e3d63ac346a90c8d28a.zip
pfsense-bfa790df99cc92d974f17e3d63ac346a90c8d28a.tar.gz
Merge remote branch 'mainline/master' into js
-rw-r--r--usr/local/www/diag_smart.php1
-rwxr-xr-xusr/local/www/vpn_pptp_users_edit.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/usr/local/www/diag_smart.php b/usr/local/www/diag_smart.php
index 690155e..11aae90 100644
--- a/usr/local/www/diag_smart.php
+++ b/usr/local/www/diag_smart.php
@@ -207,7 +207,6 @@ switch($action)
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Email Address"); ?></td>
- <td width="22%" valign="top" class="vncell"><?=gettext("Email Adress"); ?></td>
<td width="78%" class="vtable">
<input type="text" name="smartmonemail" value="<?=$pconfig['smartmonemail']?>"/>
</td>
diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php
index 9494c76..f159931 100755
--- a/usr/local/www/vpn_pptp_users_edit.php
+++ b/usr/local/www/vpn_pptp_users_edit.php
@@ -87,6 +87,9 @@ if ($_POST) {
if (preg_match("/[[:cntrl:]\"]/", $_POST['password']))
$input_errors[] = gettext("The password contains invalid characters.");
+ if (preg_match("/^!/", $_POST['password']))
+ $input_errors[] = gettext("The password cannot start with '!'.");
+
if (($_POST['password']) && ($_POST['password'] != $_POST['password2'])) {
$input_errors[] = gettext("The passwords do not match.");
}
OpenPOWER on IntegriCloud