Resolve #3595 "ILIAS-Schnittstelle: Anlegen von neuen Nutzern schlägt fehl mit Ilias 8"

Closes #3595

Merge request studip/studip!2486

lib/ilias_interface/ConnectedIlias.class.php

@@ -349,7 +349,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);
@@ -1026,6 +1025,7 @@ class ConnectedIlias
      */
     public function checkUser()
     {
+        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']);
@@ -1037,6 +1037,7 @@ class ConnectedIlias
                     }
                 }
             } else return true;
+        }
         return false;
     }
 

lib/ilias_interface/IliasSoap.class.php

@@ -1038,7 +1038,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>
@@ -1070,7 +1070,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);