summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/forms.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-07-02 13:14:35 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-07-02 13:14:35 +0000
commit15b3431d068216bb134c64ff52af63bebc8f45f0 (patch)
tree71e8667413452be6de6a27de24e32f634131d8cd /frontends/php/include/forms.inc.php
parent9c1ce6fd1d7f4617f0796fa9eb9246e4e184813c (diff)
downloadzabbix-15b3431d068216bb134c64ff52af63bebc8f45f0.tar.gz
zabbix-15b3431d068216bb134c64ff52af63bebc8f45f0.tar.xz
zabbix-15b3431d068216bb134c64ff52af63bebc8f45f0.zip
- [DEV-144] improvements in users authentication methods (Artem)
- [ZBX-387] fixed issue with undefined function ctype_digit (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5814 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/forms.inc.php')
-rw-r--r--frontends/php/include/forms.inc.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 4e8a8294..71f0c653 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -778,7 +778,9 @@
$frmUser->AddRow(S_SURNAME, new CTextBox("surname",$surname,40));
}
- if(ZBX_AUTH_INTERNAL == $config['authentication_type']){
+ $auth_type = (isset($userid))?get_user_system_auth($userid):$config['authentication_type'];
+
+ if(ZBX_AUTH_INTERNAL == $auth_type){
if(!isset($userid) || isset($change_password)){
$frmUser->AddRow(S_PASSWORD, new CPassBox("password1",$password1,20));
$frmUser->AddRow(S_PASSWORD_ONCE_AGAIN, new CPassBox("password2",$password2,20));
@@ -795,8 +797,8 @@
}
else{
if(!isset($userid) || isset($change_password)){
- $frmUser->addVar('password1','zabbix');
- $frmUser->addVar('password2','zabbix');
+ $frmUser->addVar('password1','');
+ $frmUser->addVar('password2','');
}
}