diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php index 4028024f8..7645435c9 100644 --- a/src/www/system_authservers.php +++ b/src/www/system_authservers.php @@ -320,7 +320,7 @@ else :?> url += '&cert='; - var oWin = window.open(url,"OPNsense","width=620,height=400,top=150,left=150"); + var oWin = window.open(url,"OPNsense","width=620,height=400,top=150,left=150, scrollbars=yes"); if (oWin==null || typeof(oWin)=="undefined") alert(""); } diff --git a/src/www/system_usermanager_settings_ldapacpicker.php b/src/www/system_usermanager_settings_ldapacpicker.php index 2cd6b95c6..0be1eefb9 100644 --- a/src/www/system_usermanager_settings_ldapacpicker.php +++ b/src/www/system_usermanager_settings_ldapacpicker.php @@ -1,8 +1,8 @@ - All rights reserved. + Copyright (C) 2014-2015 Deciso B.V. + Copyright (C) 2007 Scott Ullrich + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -31,7 +31,6 @@ require_once("auth.inc"); include('head.inc'); $ous = array(); - if (isset($_GET['basedn']) && isset($_GET['host'])) { if (isset($_GET['cert'])) { $authcfg = array(); @@ -50,69 +49,65 @@ if (isset($_GET['basedn']) && isset($_GET['host'])) { $ldap_full_url .= ":{$_GET['port']}"; } - $ldap_auth = new OPNsense\Auth\LDAP($_GET['basedn'] - , isset($_GET['proto']) ? $_GET['proto'] : 3 - ); + $ldap_auth = new OPNsense\Auth\LDAP($_GET['basedn'], isset($_GET['proto']) ? $_GET['proto'] : 3); $ldap_is_connected = $ldap_auth->connect($ldap_full_url - , !empty($_GET['binddn']) ? $_GET['binddn'] : null + , !empty($_GET['binddn']) ? $_GET['binddn'] : null , !empty($_GET['bindpw']) ? $_GET['bindpw'] : null ); if ($ldap_is_connected) { $ous = $ldap_auth->listOUs(); } } - ?> - +
- -

- - - - - - - \n"; - } - } - ?> - - - - -
- -
{$ou}
- -
+ if (empty($ous)) :?> +

+ + else :?> +
+
+
+
+ + + + + + + + + + + + + + +
>
+ +
+
+
+
+
+
- +