From 310ea4e25796080b1a7e1a0fa0a2c2f2c8a085cd Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Thu, 12 Mar 2015 23:43:31 -0500 Subject: [PATCH] Require WPA PSK where WPA-PSK is enabled. Clean up some other text. Ticket #4516 --- .../share/locale/en/LC_MESSAGES/pfSense.pot | 4 ++-- .../share/locale/ja/LC_MESSAGES/pfSense.po | 4 ++-- .../pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo | Bin 642963 -> 642980 bytes .../pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po | 4 ++-- .../share/locale/tr/LC_MESSAGES/pfSense.mo | Bin 578220 -> 578237 bytes .../share/locale/tr/LC_MESSAGES/pfSense.po | 4 ++-- usr/local/www/interfaces.php | 9 +++++++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 95c4340ea6..fff8739399 100644 --- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -13563,7 +13563,7 @@ msgid "" msgstr "" #: usr/local/www/interfaces.php:813 -msgid "The passphrase must be between 8 and 63 characters long." +msgid "The WPA passphrase must be between 8 and 63 characters long." msgstr "" #: usr/local/www/interfaces.php:1383 @@ -14750,7 +14750,7 @@ msgid "PSK:" msgstr "" #: usr/local/www/interfaces.php:3214 -msgid "Passphrase must be from 8 to 63 characters." +msgid "WPA Passphrase must be between 8 and 63 characters long." msgstr "" #: usr/local/www/interfaces.php:3218 diff --git a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po index 09134f27f6..c5379e58a7 100644 --- a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po @@ -21626,7 +21626,7 @@ msgstr ""無効なWEPキーのサイズ。サイズは40 （ 64 ）ビットキ #: usr/local/www/interfaces.php:662 usr/local/www/interfaces.php:677 #: usr/local/www/interfaces.php:718 usr/local/www/interfaces.php:714 #: usr/local/www/interfaces.php:714 -msgid "The passphrase must be between 8 and 63 characters long." +msgid "The WPA passphrase must be between 8 and 63 characters long." msgstr "パスフレーズの長さは8 〜63文字にする必要があります。" #: usr/local/www/interfaces.php:659 @@ -23167,7 +23167,7 @@ msgstr "PSK ：" #: usr/local/www/interfaces.php:2469 usr/local/www/interfaces.php:2499 #: usr/local/www/interfaces.php:2545 usr/local/www/interfaces.php:2534 #: usr/local/www/interfaces.php:2534 -msgid "Passphrase must be from 8 to 63 characters." +msgid "WPA Passphrase must be between 8 and 63 characters long." msgstr "パスフレーズは、8〜 63文字でなければなりません。" #: usr/local/www/interfaces.php:2305 usr/local/www/interfaces.php:2485 diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo index 1b8f20bf32e8d67cf3f553b0294c1be4845c5cc8..419127ad83f49a072077c2db19f8d03381628f7f 100644 GIT binary patch delta 62 zcmbO{Uwz4Z^@bM47N#xC<%d|q0~{3srn6VFm~3Bsh&g#1Gf<$NwUPyhS%H`hh}nUd LV>@dlXI~fqutOAQ delta 97 zcmZ27Uw!g?^@bM47N#xC<%hHa5{ruqGKvz5Qx$Sci%S%eQWesQ@^cj|6iV_H%#0P1 vGZKpulS@*Iinp&j#GJZ~v0!@5A!d_ypGp=WW(8t4AZ7<*j_p2`oDpFF2cIL_ diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po index 8249589e3e..985b0dcc57 100644 --- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po @@ -18334,7 +18334,7 @@ msgstr "Tamanho de chave WEP inv #: usr/local/www/interfaces.php:662 usr/local/www/interfaces.php:677 #: usr/local/www/interfaces.php:718 usr/local/www/interfaces.php:714 #: usr/local/www/interfaces.php:719 -msgid "The passphrase must be between 8 and 63 characters long." +msgid "The WPA passphrase must be between 8 and 63 characters long." msgstr "O tamanho da frase secreta deve ser entre 8 e 63 caracteres." #: usr/local/www/interfaces.php:659 @@ -19725,7 +19725,7 @@ msgstr "PSK:" #: usr/local/www/interfaces.php:2469 usr/local/www/interfaces.php:2499 #: usr/local/www/interfaces.php:2545 usr/local/www/interfaces.php:2534 #: usr/local/www/interfaces.php:2570 -msgid "Passphrase must be from 8 to 63 characters." +msgid "WPA Passphrase must be between 8 and 63 characters long." msgstr "Frase secreta deve ter de 8 a 63 caracteres." #: usr/local/www/interfaces.php:2305 usr/local/www/interfaces.php:2485 diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo index a8d57498718447f543e2aa75af3017b3579f8ed9..966197402f83f7423652f8853c722fa55cfc510f 100644 GIT binary patch delta 58 zcmZ3pRC(`G<%Sl<7N#xCTDh#@0geg*(~t15m~0QrWzL0WT#KQu_tU$~L#O&J- J@o>C43IJeU6zKo} delta 93 zcmdnHRC&!(<%Sl<7N#xCTDe*QiN(bQ8AXZ3sS3HJ#U% 63) - $input_errors[] = gettext("The passphrase must be between 8 and 63 characters long."); + $input_errors[] = gettext("The WPA passphrase must be between 8 and 63 characters long."); + } + if ($_POST['wpa_enable'] == "yes") { + if (empty($_POST['passphrase']) && stristr($_POST['wpa_key_mgmt'], "WPA-PSK")) { + $input_errors[] = gettext("A WPA Passphrase must be specified when WPA PSK is enabled."); + } } } if (!$input_errors) { @@ -3273,7 +3278,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), -
+