doc/sample-insert-hosted-user_types.php lib/hosted lib/kolab_client_task.php

[Torsten Grote]

 doc/sample-insert-hosted-user_types.php |    2 ++
 lib/hosted/kolab_client_task_signup.php |    8 --------
 lib/kolab_client_task.php               |    8 ++++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 19baddb981b3bd87c4fc870100a6c997e19b70e3
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Jul 23 12:34:13 2012 +0200

    use password type for password field in hosted

diff --git a/doc/sample-insert-hosted-user_types.php b/doc/sample-insert-hosted-user_types.php
index fd82e61..dcb0fa6 100644
--- a/doc/sample-insert-hosted-user_types.php
+++ b/doc/sample-insert-hosted-user_types.php
@@ -70,6 +70,7 @@
                     "sn" => Array(),
                     "uid" => Array(),
                     "userpassword" => Array(
+                            "type" => "password",
 //                            "optional" => true,
                         ),
                 ),
@@ -154,6 +155,7 @@
                     "sn" => Array(),
                     "uid" => Array(),
                     "userpassword" => Array(
+                            "type" => "password",
 //                            "optional" => true,
                         ),
                 ),
diff --git a/lib/hosted/kolab_client_task_signup.php b/lib/hosted/kolab_client_task_signup.php
index 2709adc..f55cf24 100644
--- a/lib/hosted/kolab_client_task_signup.php
+++ b/lib/hosted/kolab_client_task_signup.php
@@ -225,14 +225,6 @@ class kolab_client_task_signup extends kolab_client_task
         // Add password confirmation
         if (isset($fields['userpassword'])) {
             $fields['userpassword2'] = $fields['userpassword'];
-            // Add 'Generate password' link
-            if (empty($fields['userpassword']['readonly'])) {
-                $fields['userpassword']['suffix'] = kolab_html::a(array(
-                    'content' => $this->translate('password.generate'),
-                    'href'    => '#',
-                    'onclick' => "kadm.generate_password('userpassword')",
-                ));
-            }
         }
         
         // Change field labels for hosted case
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 8d5d0b3..b41d75b 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -739,6 +739,14 @@ class kolab_client_task
             }
             break;
 
+        case 'password':
+            $result['type'] = kolab_form::INPUT_PASSWORD;
+
+            if (isset($field['maxlength'])) {
+                $result['maxlength'] = $field['maxlength'];
+            }
+            break;
+
         default:
             $result['type'] = kolab_form::INPUT_TEXT;
             if (isset($field['maxlength'])) {