Merge pull request #5742 from christianbeeznest/rna-21895-2

Internal: Improve user creation and update logic for CSV sync script - refs BT#21895

Author: NicoDucou

public/main/inc/global.inc.php

@@ -142,5 +142,5 @@
     define('DEFAULT_DOCUMENT_QUOTA', 100000000);
 } catch (Exception $e) {
     $controller = new ExceptionController();
-    $controller->showAction($e);
+    $controller->show($e);
 }

public/main/inc/lib/import.lib.php

@@ -41,23 +41,15 @@ public static function csv_reader($path, $setFirstRowAsHeader = true)
      *
      * @return array returns an array (in the system encoding) that contains all data from the CSV-file
      */
-    public static function csvToArray($filename)
+    public static function csvToArray($filename, $delimiter = ';'): array
     {
         if (empty($filename)) {
             return [];
         }
 
         $reader = Reader::createFromPath($filename, 'r');
         if ($reader) {
-            $reader->setDelimiter(';');
-            //$reader->stripBom(true);
-            /*$contents = $reader->__toString();
-            if (!Utf8::isUtf8($contents)) {
-                // If file is not in utf8 try converting to ISO-8859-15
-                if ($reader->getStreamFilterMode() == 1) {
-                    $reader->appendStreamFilter('convert.iconv.ISO-8859-15/UTF-8');
-                }
-            }*/
+            $reader->setDelimiter($delimiter);
             $reader->setHeaderOffset(0);
             $iterator = $reader->getRecords();
 

src/CoreBundle/EventListener/LegacyListener.php

@@ -148,9 +148,9 @@ public function __invoke(RequestEvent $event): void
             $session->set('cid_reset', false);
         }
 
-        $session->set(
-            'access_url_id',
-            $this->accessUrlHelper->getCurrent()->getId()
-        );
+        $currentAccessUrl = $this->accessUrlHelper->getCurrent();
+        if (null !== $currentAccessUrl) {
+            $session->set('access_url_id', $currentAccessUrl->getId());
+        }
     }
 }

src/CoreBundle/ServiceHelper/AccessUrlHelper.php

@@ -29,14 +29,14 @@ public function isMultiple(): bool
         return $accessUrlEnabled;
     }
 
-    public function getFirstAccessUrl(): AccessUrl
+    public function getFirstAccessUrl(): ?AccessUrl
     {
         $urlId = $this->accessUrlRepository->getFirstId();
 
-        return $this->accessUrlRepository->find($urlId);
+        return $this->accessUrlRepository->find($urlId) ?: null;
     }
 
-    public function getCurrent(): AccessUrl
+    public function getCurrent(): ?AccessUrl
     {
         static $accessUrl;
 

src/CoreBundle/ServiceHelper/ThemeHelper.php

@@ -39,6 +39,10 @@ public function __construct(
      */
     public function getVisualTheme(): string
     {
+        if ('cli' === PHP_SAPI) {
+            return '';
+        }
+
         static $visualTheme;
 
         global $lp_theme_css;