Merge pull request #3 from lindesbs/develop

Develop
lindesbs · Jun 3, 2023 · 4ab7cdc · 4ab7cdc
2 parents 060146b + caaf3e5
commit 4ab7cdc
Showing 1 changed file with 27 additions and 9 deletions.
diff --git a/src/Controller/BackendImportController.php b/src/Controller/BackendImportController.php
@@ -2,13 +2,15 @@
 
 namespace lindesbs\pageyaml\Controller;
 
+use Contao\Controller;
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\Input;
 use Contao\PageModel;
 use Contao\StringUtil;
 use Contao\System;
 use Doctrine\DBAL\Connection;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Yaml\Yaml;
@@ -39,7 +41,10 @@ public function renderForm(): string
         $this->framework->initialize();
         $request = $this->requestStack->getCurrentRequest();
 
-        $this->handlePOSTData($request);
+        if ($this->handlePOSTData($request))
+        {
+            Controller::redirect('contao?do=page');
+        }
 
         $strFileSelections = $this->getYamlFiles();
 
@@ -58,7 +63,7 @@ public function renderForm(): string
     }
 
 
-    protected function walk($pageKey, $pageData, $pid = 0)
+    protected function walk($pageKey, $pageData, $pid = 0): void
     {
         $alias = null;
 
@@ -89,19 +94,31 @@ protected function walk($pageKey, $pageData, $pid = 0)
         }
         $objPage->published = true;
 
-        $nodes = [];
+        // Ist die Bezeichnung numerisch, wird dies als Errorpage gewertet
+        if (is_int($pageKey))
+        {
+            $objPage->type = 'error_'.$pageKey;
+        }
 
+        $nodes = [];
 
         if (is_array($pageData)) {
             foreach ($pageData as $arrayKey => $arrayValue) {
 
                 if (str_starts_with($arrayKey, '~')) {
                     $key = ltrim($arrayKey, '~');
                     $objPage->$key = $arrayValue;
+
+                    continue;
                 }
-                else {
-                    $nodes[$arrayKey] = $arrayValue;
+
+                if (str_starts_with($arrayKey,'_'))
+                {
+                    $objPage->visible = true;
+                    $objPage->hide = true;
                 }
+
+                $nodes[$arrayKey] = $arrayValue;
             }
         }
 
@@ -138,10 +155,10 @@ public function getYamlFiles(): array
     }
 
     /**
-     * @param \Symfony\Component\HttpFoundation\Request|null $request
-     * @return void
+     * @param Request|null $request
+     * @return bool
      */
-    public function handlePOSTData(?\Symfony\Component\HttpFoundation\Request $request): bool
+    public function handlePOSTData(?Request $request): bool
     {
         if (($request->getMethod() === 'POST') &&
             ($request->get('FORM_ID') === 'PAGEYAML_UPLOAD')) {
@@ -154,9 +171,10 @@ public function handlePOSTData(?\Symfony\Component\HttpFoundation\Request $reque
 
             $this->walk(key($fileData), array_pop(array_values($fileData)));
 
+            return true;
         }
 
-        return true;
+        return false;
     }