2 commits - lib/client

[Aleksander Machniak]

 lib/client/kolab_client_task_signup.php |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 8860c9d40e45447df5235ee0e27de00c319c3dab
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Oct 25 13:29:07 2012 +0200

    Cleanup more data entries for API user.add call

diff --git a/lib/client/kolab_client_task_signup.php b/lib/client/kolab_client_task_signup.php
index 3565066..a80f67c 100644
--- a/lib/client/kolab_client_task_signup.php
+++ b/lib/client/kolab_client_task_signup.php
@@ -159,16 +159,18 @@ class kolab_client_task_signup extends kolab_client_task
 
         $this->api->get('system.select_domain', array('domain', $data['domain']));
 
-        // Remove domain from $data before adding user
+        // Remove some useless data from $data before adding user
         unset($data['domain']);
+        unset($data['recaptcha_challenge_field']);
+        unset($data['recaptcha_response_field']);
 
         // Add user
         $result = $this->api->post('user.add', null, $data);
 
-        if (array_key_exists('error_code', $result)) {
+        if ($code = $result->get_error_code()) {
             $this->output->command('display_message', 'internalerror', 'error');
-            return;
-        } else {
+        }
+        else {
             $this->output->set_object('taskcontent', $this->translate('signup.usercreated'));
             // TODO catch errors
             $this->send_mail($data);


commit 0c5b210711091bb3f4e3d6e11837fcc945341fb5
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Oct 25 13:16:34 2012 +0200

    Fix ouput->command() arguments

diff --git a/lib/client/kolab_client_task_signup.php b/lib/client/kolab_client_task_signup.php
index 8863c2b..3565066 100644
--- a/lib/client/kolab_client_task_signup.php
+++ b/lib/client/kolab_client_task_signup.php
@@ -101,7 +101,7 @@ class kolab_client_task_signup extends kolab_client_task
         $this->output->assign('form', $form);
         $this->output->set_env('token', $this->token);
         $this->output->set_object('taskcontent', $form);
-        $this->output->command('check_user_availability()');
+        $this->output->command('check_user_availability');
     }
 
     // check if user already exists
@@ -117,11 +117,11 @@ class kolab_client_task_signup extends kolab_client_task
         $result = $this->api->post('users.list', null, $post);
 
         if($result->get('count') > 0) {
-            $this->output->command('update_user_info("signup.userexists", "uid")');
+            $this->output->command('update_user_info', 'signup.userexists', 'uid');
             return false;
         }
 
-        $this->output->command('update_user_info("", "uid")');
+        $this->output->command('update_user_info', '', 'uid');
         return true;
     }