diff --git a/lib/ilias_interface/ConnectedIlias.class.php b/lib/ilias_interface/ConnectedIlias.class.php index c0fe08e9ad49d97a988b144390a0339a280326b4..5e6ae163467969c545617c3334458de50679a722 100644 --- a/lib/ilias_interface/ConnectedIlias.class.php +++ b/lib/ilias_interface/ConnectedIlias.class.php @@ -359,7 +359,6 @@ class ConnectedIlias } else { $role_id = 4; } - $this->soap_client->setCachingStatus(false); $this->soap_client->clearCache(); $user_id = $this->soap_client->addUser($user_data, $role_id); @@ -1042,17 +1041,19 @@ class ConnectedIlias */ public function checkUser() { - $user_exists = $this->soap_client->getUser($this->user->getId()); - if (!is_array($user_exists)) { - $admin_user_id = $this->soap_client->lookupUser($this->ilias_config['admin']); - $admin_user_exists = $this->soap_client->getUser($admin_user_id); - if (is_array($admin_user_exists)) { - $this->user->unsetConnection(true); - if ($this->newUser()) { - PageLayout::postSuccess(_("Neue Verknüpfung zu ILIAS-User angelegt.")); + if ($this->user->getId()) { + $user_exists = $this->soap_client->getUser($this->user->getId()); + if (!is_array($user_exists)) { + $admin_user_id = $this->soap_client->lookupUser($this->ilias_config['admin']); + $admin_user_exists = $this->soap_client->getUser($admin_user_id); + if (is_array($admin_user_exists)) { + $this->user->unsetConnection(true); + if ($this->newUser()) { + PageLayout::postSuccess(_("Neue Verknüpfung zu ILIAS-User angelegt.")); + } } - } - } else return true; + } else return true; + } return false; } diff --git a/lib/ilias_interface/IliasSoap.class.php b/lib/ilias_interface/IliasSoap.class.php index c16ba5166ec419c27a64cea4ecbc5900b020e460..eb0f6d7be13674fcd16a656364d8255c18898134 100644 --- a/lib/ilias_interface/IliasSoap.class.php +++ b/lib/ilias_interface/IliasSoap.class.php @@ -1039,7 +1039,7 @@ class IliasSoap extends StudipSoapClient $update = $user_data["id"]; $usr_xml = "<Users> -<User".($update ? ' Id="'.$user_data["id"].'"' : '')." Action=".($update ? '"Update"' : '"Insert"')."> +<User ".($update ? 'Id="'.$user_data["id"].'"' : 'Id=""')." Action=".($update ? '"Update"' : '"Insert"')."> <UDFDefinitions></UDFDefinitions> <Login>".$user_data["login"]."</Login> <Password Type=\"PLAIN\">".$user_data["passwd"]."</Password> @@ -1071,7 +1071,7 @@ class IliasSoap extends StudipSoapClient 'sid' => $this->getSID(), 'folder_id' => -1, 'usr_xml' => $usr_xml, - 'conflict_role' => 1, + 'conflict_rule' => 1, 'send_account_mail' => 0 ]; $result = $this->call('importUsers', $param);