From kde-commits  Mon Sep 10 09:51:06 2018
From: Alexander Schmidt <null () kde ! org>
Date: Mon, 10 Sep 2018 09:51:06 +0000
To: kde-commits
Subject: [ocs-webserver/dev] application/modules/default/models/Ocs: opencode update
Message-Id: <E1fzIqY-0005mq-Ed () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153657307904568

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/07ed1e550e497edbf5029c4af67738df635c0=
2cb

diff --git a/application/modules/default/models/Ocs/OpenCode.php b/applicat=
ion/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 =3D $this->mapUserData($member_data);
 =

-        $userId =3D $this->getUser($data['extern_uid']);
+        $user =3D $this->getUser($data['extern_uid']);
 =

-        if (empty($userId)) {
+        if (empty($user)) {
             $data['skip_confirmation'] =3D 'true';
 =

             return $this->httpUserCreate($data);
@@ -72,7 +72,7 @@ class Default_Model_Ocs_OpenCode
             $data['skip_reconfirmation'] =3D 'true';
             unset($data['password']);
 =

-            return $this->httpUserUpdate($data, $userId);
+            return $this->httpUserUpdate($data, $user['id']);
         }
 =

         $this->messages[0] =3D 'User exists and we do not update. Use the =
force parameter instead.';
@@ -250,15 +250,15 @@ class Default_Model_Ocs_OpenCode
         $member_data =3D $this->getMemberData($member_id, false);
         $data =3D $this->mapUserData($member_data);
 =

-        $userId =3D $this->getUser($data['extern_uid']);
+        $user =3D $this->getUser($data['extern_uid']);
 =

-        if (empty($userId)) {
+        if (empty($user)) {
             $this->messages[0] =3D 'Not deleted. User not exists. ';
 =

             return false;
         }
 =

-        return $this->httpUserDelete($userId);
+        return $this->httpUserDelete($user['id']);
     }
 =

     /**