Require WPA PSK where WPA-PSK is enabled. Clean up some other text. Ticket #4516

This commit is contained in:
Chris Buechler 2015-03-12 23:43:31 -05:00
parent 4958ca9eed
commit 310ea4e257
7 changed files with 15 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -14110,7 +14110,7 @@ msgstr ""
"olmalıdır."
#: 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 "Şifre uzunluğu 8 ila 63 karakter arası olmalıdır."
#: usr/local/www/interfaces.php:1383
@ -15380,7 +15380,7 @@ msgid "PSK:"
msgstr "PSK:"
#: 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 "Şifre 8 ila 63 karakter olmalıdır."
#: usr/local/www/interfaces.php:3218

View File

@ -878,7 +878,12 @@ if ($_POST['apply']) {
if ($_POST['passphrase']) {
$passlen = strlen($_POST['passphrase']);
if ($passlen < 8 || $passlen > 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"),
</td>
</tr>
</table>
<br /><?=gettext("Passphrase must be from 8 to 63 characters."); ?>
<br /><?=gettext("WPA Passphrase must be between 8 and 63 characters long."); ?>
</td>
</tr>
<tr>