1 |
Index: frontends/php/authentication.php |
2 |
=================================================================== |
3 |
--- frontends/php/authentication.php (revision 32376) |
4 |
+++ frontends/php/authentication.php (revision 32393) |
5 |
@@ -101,12 +101,11 @@ |
6 |
$config['authentication_type'] = $_REQUEST['config']; |
7 |
|
8 |
// check login/password |
9 |
- $login = API::User()->ldapLogin(array( |
10 |
- 'user' => get_request('user', $USER_DETAILS['alias']), |
11 |
- 'password' => get_request('user_password', ''), |
12 |
- 'cnf' => $ldap_cnf |
13 |
- )); |
14 |
+ $ldap = new CLdap($ldap_cnf); |
15 |
+ $ldap->connect(); |
16 |
+ $login = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', '')); |
17 |
if (!$login) { |
18 |
+ error(_('Login name or password is incorrect')); |
19 |
throw new Exception(); |
20 |
} |
21 |
|
22 |
@@ -129,12 +128,13 @@ |
23 |
} |
24 |
elseif (isset($_REQUEST['test'])) { |
25 |
// check login/password |
26 |
- $result = API::User()->ldapLogin(array( |
27 |
- 'user' => get_request('user', $USER_DETAILS['alias']), |
28 |
- 'password' => get_request('user_password', ''), |
29 |
- 'cnf' => $ldap_cnf |
30 |
- )); |
31 |
+ $ldap = new CLdap($ldap_cnf); |
32 |
+ $ldap->connect(); |
33 |
+ $result = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', '')); |
34 |
|
35 |
+ if (!$result) |
36 |
+ error(_('Login name or password is incorrect'));{ |
37 |
+ } |
38 |
show_messages($result, _('LDAP login successful'), _('LDAP login was not successful')); |
39 |
} |
40 |
} |
41 |
Index: frontends/php/api/classes/CUser.php |
42 |
=================================================================== |
43 |
--- frontends/php/api/classes/CUser.php (revision 32376) |
44 |
+++ frontends/php/api/classes/CUser.php (revision 32393) |
45 |
@@ -822,15 +822,12 @@ |
46 |
// ****************************************************************************** |
47 |
// LOGIN Methods |
48 |
// ****************************************************************************** |
49 |
- public function ldapLogin($user) { |
50 |
- $cnf = isset($user['cnf']) ? $user['cnf'] : null; |
51 |
- |
52 |
- if (is_null($cnf)) { |
53 |
- $config = select_config(); |
54 |
- foreach ($config as $id => $value) { |
55 |
- if (zbx_strpos($id, 'ldap_') !== false) { |
56 |
- $cnf[str_replace('ldap_', '', $id)] = $config[$id]; |
57 |
- } |
58 |
+ protected function ldapLogin($user) { |
59 |
+ $config = select_config(); |
60 |
+ $cnf = array(); |
61 |
+ foreach ($config as $id => $value) { |
62 |
+ if (zbx_strpos($id, 'ldap_') !== false) { |
63 |
+ $cnf[str_replace('ldap_', '', $id)] = $config[$id]; |
64 |
} |
65 |
} |
66 |
|