diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-14 08:18:34 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-14 08:18:34 +0000 |
| commit | bd7019c8f72545516194e557593b6be4f4ab406c (patch) | |
| tree | b809708a879cb75ec2254c5565ad5e27c281d9c2 | |
| parent | b53549257f043bb4a7e621a234d35a1321f0a3a2 (diff) | |
| download | zabbix-bd7019c8f72545516194e557593b6be4f4ab406c.tar.gz zabbix-bd7019c8f72545516194e557593b6be4f4ab406c.tar.xz zabbix-bd7019c8f72545516194e557593b6be4f4ab406c.zip | |
- [DEV-137] fixes for user creation (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5908 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | frontends/php/include/perm.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/users.php | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php index a9f2ba93..3e830fe9 100644 --- a/frontends/php/include/perm.inc.php +++ b/frontends/php/include/perm.inc.php @@ -143,7 +143,7 @@ function ldap_authentication($user,$passwd,$cnf=NULL){ } } } - + $ldap = new CLdap($cnf); $ldap->connect(); diff --git a/frontends/php/users.php b/frontends/php/users.php index 56215f55..7ec6d593 100644 --- a/frontends/php/users.php +++ b/frontends/php/users.php @@ -145,11 +145,17 @@ include_once 'include/page_header.php'; } } else if(isset($_REQUEST['save'])){ + $config = select_config(); + $user_groups = get_request('user_groups', array()); $user_medias = get_request('user_medias', array()); $_REQUEST['password1'] = get_request('password1', null); $_REQUEST['password2'] = get_request('password2', null); + + if($config['authentication_type'] != ZBX_AUTH_INTERNAL){ + $_REQUEST['password1'] = $_REQUEST['password2'] = 'zabbix'; + } if($_REQUEST['password1']!=$_REQUEST['password2']){ if(isset($_REQUEST['userid'])) |