| 
                                                        @@ -50,7 +50,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    50
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    50
                                                                                                                                                                                                 | 
                                                                     $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    51
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    51
                                                                                                                                                                                                 | 
                                                                     $response = $workflow->run($request);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    52
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    52
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    53
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if (   $workflow->get_state() == 'save'  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    53
                                                                                                                                                                                                 | 
                                                            +        if ($workflow->get_state() == 'save'  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    54
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    54
                                                                                                                                                                                                 | 
                                                                         && $this->create_account($this->person, $data["controller"]->get_form_values())) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    55
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    55
                                                                                                                                                                                                 | 
                                                                         midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), sprintf($this->_l10n->get('person %s created'), $this->person->name)); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    56
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    56
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -83,7 +83,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    83
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    83
                                                                                                                                                                                                 | 
                                                                     $person = new midcom_db_person($guid);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    84
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    84
                                                                                                                                                                                                 | 
                                                                     $accounthelper = new org_openpsa_user_accounthelper($person);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    85
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    85
                                                                                                                                                                                                 | 
                                                                     if ($accounthelper->welcome_email()) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    86
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -            midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('password reset and mail to %s sent'), $person->email )); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    86
                                                                                                                                                                                                 | 
                                                            +            midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('password reset and mail to %s sent'), $person->email)); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    87
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    87
                                                                                                                                                                                                 | 
                                                                     } else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    88
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    88
                                                                                                                                                                                                 | 
                                                                         midcom::get()->uimessages->add($this->_l10n->get($this->_component), $accounthelper->errstr, 'error');   | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    89
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    89
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -139,7 +139,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    139
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    139
                                                                                                                                                                                                 | 
                                                                     $accounthelper = new org_openpsa_user_accounthelper($this->person);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    140
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    140
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    141
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    141
                                                                                                                                                                                                 | 
                                                                     // Update account  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    142
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if (   !$accounthelper->set_account($controller->get_form_values()["username"], $password)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    142
                                                                                                                                                                                                 | 
                                                            +        if (!$accounthelper->set_account($controller->get_form_values()["username"], $password)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    143
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    143
                                                                                                                                                                                                 | 
                                                                         && midcom_connection::get_error() != MGD_ERR_OK) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    144
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    144
                                                                                                                                                                                                 | 
                                                                         // Failure, give a message  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    145
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    145
                                                                                                                                                                                                 | 
                                                                         midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get("failed to update the user account, reason") . ': ' . midcom_connection::get_error_string(), 'error'); |