3 commits - lib/client

Torsten Grote grote at kolabsys.com
Thu Sep 27 11:59:05 CEST 2012


 lib/client/kolab_client_task_signup.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bb4f8e53b81e0e49d4fe8f18acbd59515e86e486
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Sep 27 11:57:30 2012 +0200

    fixed translation issues with signup

diff --git a/lib/client/kolab_client_task_signup.php b/lib/client/kolab_client_task_signup.php
index b3b8615..de43c45 100644
--- a/lib/client/kolab_client_task_signup.php
+++ b/lib/client/kolab_client_task_signup.php
@@ -167,7 +167,7 @@ class kolab_client_task_signup extends kolab_client_task
             $this->output->command('display_message', 'internalerror', 'error');
             return;
         } else {
-            $this->output->set_object('taskcontent', 'signup.usercreated');
+            $this->output->set_object('taskcontent', $this->translate('signup.usercreated'));
         }
     }
 
@@ -255,7 +255,7 @@ class kolab_client_task_signup extends kolab_client_task
 
         $form->set_title($this->translate('signup.formtitle'));
 
-        $this->output->add_translation('user.password.mismatch', 'signup.wronguid');
+        $this->output->add_translation('user.password.mismatch', 'signup.wronguid', 'signup.userexists');
 
         return $form->output();
     }


commit 0be8a38eda2e60c6373a360439c5479cac28e3be
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Sep 27 11:50:57 2012 +0200

    fixed signup bug introduced in f70608cc

diff --git a/lib/client/kolab_client_task_signup.php b/lib/client/kolab_client_task_signup.php
index e39a158..b3b8615 100644
--- a/lib/client/kolab_client_task_signup.php
+++ b/lib/client/kolab_client_task_signup.php
@@ -64,6 +64,8 @@ class kolab_client_task_signup extends kolab_client_task
     {
         if(is_null($domain)) {
             $this->domain = $this->config_get('primary_domain');
+        } else {
+            $this->domain = $domain;
         }
 
         // Login ($result is a kolab_client_api_result instance)


commit 285f2d4565bfa1c9203c85878b9c5d582abc85e9
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Sep 27 11:50:30 2012 +0200

    removed old code from hosted signup

diff --git a/lib/client/kolab_client_task_signup.php b/lib/client/kolab_client_task_signup.php
index a320216..e39a158 100644
--- a/lib/client/kolab_client_task_signup.php
+++ b/lib/client/kolab_client_task_signup.php
@@ -232,8 +232,6 @@ class kolab_client_task_signup extends kolab_client_task
             // TODO use type info from user types table
             $fields['cn']['type'] = kolab_form::INPUT_HIDDEN;
 
-            // TODO auto generate value again with indirect API call
-            $fields['cn']['value'] = 'temporary fake cn';
             $fields['sn']['onchange'] = '';
             $fields['givenname']['onchange'] = '';
         }
@@ -255,7 +253,7 @@ class kolab_client_task_signup extends kolab_client_task
 
         $form->set_title($this->translate('signup.formtitle'));
 
-        $this->output->add_translation('user.password.mismatch', 'user.add.success', 'signup.wronguid');
+        $this->output->add_translation('user.password.mismatch', 'signup.wronguid');
 
         return $form->output();
     }





More information about the commits mailing list