diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-06-30 09:01:20 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-06-30 09:01:20 -0300 |
commit | 3deb92f7c836ed149cd7e50367052a3af60c420d (patch) | |
tree | 8254782fc5eecbe633c5753af0abc63b20a5917e /usr/local/www/firewall_aliases_edit.php | |
parent | 477654da47e20a35541a02f6b59a69ae7f4b4df2 (diff) | |
download | pfsense-3deb92f7c836ed149cd7e50367052a3af60c420d.zip pfsense-3deb92f7c836ed149cd7e50367052a3af60c420d.tar.gz |
Revert "Implemment gettext() calls"
This reverts commit 49031495b501e4477941fa6248fe94cc698f9dcd.
A lot of mistakes
Conflicts:
usr/local/www/firewall_nat.php
Diffstat (limited to 'usr/local/www/firewall_aliases_edit.php')
-rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index e44229e..a7e50b6 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -137,15 +137,12 @@ if ($_POST) { $x = is_validaliasname($_POST['name']); if (!isset($x)) { $input_errors[] = gettext("Reserved word used for alias name."); - } - else if ($_POST['type'] == "port" && (getservbyname($_POST['name'], "tcp") || getservbyname($_POST['name'], "udp"))) - { - $input_errors[] = gettext("Reserved word used for alias name."); - } - else { - if (is_validaliasname($_POST['name']) == false) + } else if ($_POST['type'] == "port" && (getservbyname($_POST['name'], "tcp") || getservbyname($_POST['name'], "udp"))) { + $input_errors[] = gettext("Reserved word used for alias name.)"; + } else { + if (is_validaliasname($_POST['name']) == false) $input_errors[] = gettext("The alias name may only consist of the characters a-z, A-Z, 0-9, _."); - } + } /* check for name conflicts */ if (empty($a_aliases[$id])) { foreach ($a_aliases as $alias) { @@ -262,7 +259,7 @@ if ($_POST) { if (!is_ipaddr($_POST["address{$x}"]) && !is_hostname($_POST["address{$x}"]) && !is_iprange($_POST["address{$x}"])) - $input_errors[] = sprintf(gettext("%s is not a valid %s alias."), $_POST["address{$x}"], $_POST['type']); + $input_errors[] = sprintf(gettext("%s is not a valid %s alias."), $_POST["address{$x}"], $_POST['type']; } if (is_iprange($_POST["address{$x}"])) { list($startip, $endip) = explode('-', $_POST["address{$x}"]); |