webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stevee/proxy-cgi-ldap-hostname' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-01-26 20:10:10 +01:00
parent b21d4f81e0 dcfc6334b9
commit f1245444a8
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
html/cgi-bin/proxy.cgi
View File

@@ -358,12 +358,17 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
goto ERROR;
}
if (!($proxysettings{'UPSTREAM_PROXY'} eq '')) {
my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
if (!(&General::validip($temp[0]))) {
$errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
goto ERROR;
}
if (!($proxysettings{'UPSTREAM_PROXY'} eq ''))
{
my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
if (!(&General::validip($temp[0])))
{
if (!(&General::validdomainname($temp[0])))
{
$errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
goto ERROR;
}
}
}
if (!($proxysettings{'CACHE_SIZE'} =~ /^\d+/) ||
($proxysettings{'CACHE_SIZE'} < 10))
@@ -512,8 +517,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
}
if (!&General::validip($proxysettings{'LDAP_SERVER'}))
{
$errormessage = $Lang::tr{'advproxy errmsg ldap server'};
goto ERROR;
if (!&General::validdomainname($proxysettings{'LDAP_SERVER'}))
{
$errormessage = $Lang::tr{'advproxy errmsg ldap server'};
goto ERROR;
}
}
if (!&General::validport($proxysettings{'LDAP_PORT'}))
{

4
langs/de/cgi-bin/de.pl
View File

@@ -223,13 +223,13 @@
'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse',
'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
'advproxy errmsg invalid upstream proxy' => 'Ungültige IP/Hostname für Upstream-Proxy',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
'advproxy errmsg ldap port' => 'Ungültige LDAP-Portnummer',
'advproxy errmsg ldap server' => 'Ungültige IP-Adresse für den LDAP-Server',
'advproxy errmsg ldap server' => 'Ungültige IP-Adresse/Hostname für den LDAP-Server',
'advproxy errmsg max userip' => 'Ungültige Anzahl von IP-Adressen pro Benutzer',
'advproxy errmsg mem cache size' => 'Ungültiger Wert für die Größe des RAM-Cachespeichers',
'advproxy errmsg no browser' => 'Mindestens ein Browser oder Client muss für den Web-Zugriff zugelassen sein',

4
langs/en/cgi-bin/en.pl
View File

@@ -223,13 +223,13 @@
'advproxy errmsg invalid mac' => 'Invalid MAC address',
'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP/hostname',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
'advproxy errmsg invalid user' => 'Username does not exist',
'advproxy errmsg ldap base dn' => 'LDAP base DN required',
'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
'advproxy errmsg ldap port' => 'Invalid LDAP port number',
'advproxy errmsg ldap server' => 'Invalid IP address for LDAP Server',
'advproxy errmsg ldap server' => 'Invalid IP address/hostname for LDAP Server',
'advproxy errmsg max userip' => 'Invalid number of IP addresses per user',
'advproxy errmsg mem cache size' => 'Invalid value for memory cache size',
'advproxy errmsg no browser' => 'At least one browser or client must be selected for web access',