summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-02-21 17:44:00 +0100
committerAleksander Machniak <alec@alec.pl>2012-02-21 17:44:00 +0100
commit1bb745b3c394d1eb023d61e80593e1b489d2f4d4 (patch)
tree02777491b893a3b13071356febf7c5a43a84d9c9
parentdb5d28fb5bcf6cd09377b0bad104c3db28372e19 (diff)
downloadwebadmin-1bb745b3c394d1eb023d61e80593e1b489d2f4d4.tar.gz
Rename password to userpassword
-rw-r--r--lib/client/kolab_client_task_user.php8
-rw-r--r--public_html/js/kolab_admin.js4
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index 67d3796..5548a3a 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -280,7 +280,7 @@ class kolab_client_task_user extends kolab_client_task
'maxlength' => 50,
'required' => true,
),
- 'password' => array(
+ 'userpassword' => array(
'label' => 'user.password',
'description' => 'user.password.desc',
'type' => kolab_form::INPUT_TEXT,
@@ -288,7 +288,7 @@ class kolab_client_task_user extends kolab_client_task
'required' => true,
'system' => true,
),
- 'password2' => array(
+ 'userpassword2' => array(
'label' => 'user.password-confirm',
'description' => 'user.password-confirm.desc',
'type' => kolab_form::INPUT_TEXT,
@@ -427,8 +427,8 @@ class kolab_client_task_user extends kolab_client_task
// New user form
if ($new) {
// Pre-populate password fields
- $pass = $this->api->get('form_value.generate_password');
- $data['password'] = $data['password2'] = $pass->get('password');
+ $pass = $this->api->get('form_value.generate_userpassword');
+ $data['userpassword'] = $data['userpassword2'] = $pass->get('userpassword');
// Page title
$title = $this->translate('user.add');
diff --git a/public_html/js/kolab_admin.js b/public_html/js/kolab_admin.js
index 51c89cd..761fdab 100644
--- a/public_html/js/kolab_admin.js
+++ b/public_html/js/kolab_admin.js
@@ -498,9 +498,9 @@ function kolab_admin()
this.form_error_clear();
// check password
- if (data.password != data.password2) {
+ if (data.userpassword != data.userpassword2) {
this.display_message('user.password.mismatch', 'error');
- this.form_value_error('password2');
+ this.form_value_error('userpassword2');
return;
}