[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ocs-webserver/dev] application/modules/default/models/Ocs: opencode update
From:       Alexander Schmidt <null () kde ! org>
Date:       2018-09-10 9:51:06
Message-ID: E1fzIqY-0005mq-Ed () code ! kde ! org
[Download RAW message or body]

Git commit 07ed1e550e497edbf5029c4af67738df635c02cb by Alexander Schmidt.
Committed on 10/09/2018 at 09:51.
Pushed by alexanderschmidt into branch 'dev'.

opencode update

M  +6    -6    application/modules/default/models/Ocs/OpenCode.php

https://commits.kde.org/ocs-webserver/07ed1e550e497edbf5029c4af67738df635c02cb

diff --git a/application/modules/default/models/Ocs/OpenCode.php \
b/application/modules/default/models/Ocs/OpenCode.php index 7f176a6f..88d75a70 100644
--- a/application/modules/default/models/Ocs/OpenCode.php
+++ b/application/modules/default/models/Ocs/OpenCode.php
@@ -60,9 +60,9 @@ class Default_Model_Ocs_OpenCode
 
         $data = $this->mapUserData($member_data);
 
-        $userId = $this->getUser($data['extern_uid']);
+        $user = $this->getUser($data['extern_uid']);
 
-        if (empty($userId)) {
+        if (empty($user)) {
             $data['skip_confirmation'] = 'true';
 
             return $this->httpUserCreate($data);
@@ -72,7 +72,7 @@ class Default_Model_Ocs_OpenCode
             $data['skip_reconfirmation'] = 'true';
             unset($data['password']);
 
-            return $this->httpUserUpdate($data, $userId);
+            return $this->httpUserUpdate($data, $user['id']);
         }
 
         $this->messages[0] = 'User exists and we do not update. Use the force \
parameter instead.'; @@ -250,15 +250,15 @@ class Default_Model_Ocs_OpenCode
         $member_data = $this->getMemberData($member_id, false);
         $data = $this->mapUserData($member_data);
 
-        $userId = $this->getUser($data['extern_uid']);
+        $user = $this->getUser($data['extern_uid']);
 
-        if (empty($userId)) {
+        if (empty($user)) {
             $this->messages[0] = 'Not deleted. User not exists. ';
 
             return false;
         }
 
-        return $this->httpUserDelete($userId);
+        return $this->httpUserDelete($user['id']);
     }
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]