Merge pull request #9637 from JakubOnderka/undefined-index-fixes

Undefined index fixes
MISP · Mar 24, 2024 · c946d7c · c946d7c
2 parents 3e4738a + 5247b9c
commit c946d7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/Model/Datasource/Database/MysqlExtended.php b/app/Model/Datasource/Database/MysqlExtended.php
@@ -177,6 +177,10 @@ public function execute($sql, $options = [], $params = [])
      */
     public function insertMulti($table, $fields, $values)
     {
+        if (empty($values)) {
+            return true;
+        }
+
         $table = $this->fullTableName($table);
         $holder = substr(str_repeat('?,', count($fields)), 0, -1);
         $fields = implode(',', array_map([$this, 'name'], $fields));

diff --git a/app/Model/Server.php b/app/Model/Server.php
@@ -583,7 +583,7 @@ private function __pullEvent($eventId, array &$successes, array &$fails, Event $
         try {
             $this->__checkIfPulledEventExistsAndAddOrUpdate($event, $eventId, $successes, $fails, $eventModel, $serverSync->server(), $user, $jobId, $force, $response);
         } catch (Exception $e) {
-            $title = __('Pulling an event (#%s) from Server #%s has failed. The sync process was not interrupted.', $eventId, $serverSync->server()['id']);
+            $title = __('Pulling an event (#%s) from Server #%s has failed. The sync process was not interrupted.', $eventId, $serverSync->serverId());
             $this->loadLog()->createLogEntry(
                 $user,
                 'error',