Refactored code

Author: markseuffert

system/extensions/update-available.ini

@@ -149,14 +149,14 @@ system/themes/copenhagen.css: copenhagen.css, create, update, careful
 system/themes/copenhagen.png: copenhagen.png, create
 
 Extension: Core
-Version: 0.9.25
+Version: 0.9.26
 Description: Core functionality of your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DocumentationLanguage: en, de, sv
-Published: 2026-03-19 23:52:59
+Published: 2026-03-20 10:32:34
 Status: available
 system/workers/core.php: core.php, create, update
 system/extensions/core.php: corepatch.txt, update

system/extensions/update-installed.ini

@@ -1,14 +1,14 @@
 # Datenstrom Yellow update settings for installed extensions
 
 Extension: Core
-Version: 0.9.25
+Version: 0.9.26
 Description: Core functionality of your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DocumentationLanguage: en, de, sv
-Published: 2026-03-19 23:52:59
+Published: 2026-03-20 10:32:34
 Status: available
 system/workers/core.php: core.php, create, update
 system/extensions/core.php: corepatch.txt, update

system/workers/core.php

@@ -2,7 +2,7 @@
 // Core extension, https://github.com/annaesvensson/yellow-core
 
 class YellowCore {
-    const VERSION = "0.9.25";
+    const VERSION = "0.9.26";
     const RELEASE = "0.9";
     public $content;        // content files
     public $media;          // media files
@@ -145,13 +145,6 @@ public function processRequest($scheme, $address, $base, $location, $fileName, $
             }
             if (!is_readable($fileName)) $this->page->error(404);
         }
-        if ($this->system->get("coreDebugMode")>=1 && ($this->lookup->isContentFile($fileName) || $this->page->isError())) {
-            $layout = $this->page->get("layout");
-            $theme = $this->page->get("theme");
-            echo "YellowCore::processRequest file:$fileName<br />\n";
-            echo "YellowCore::processRequest layout:$layout theme:$theme<br />\n";
-
-        }
         return $statusCode;
     }
 
@@ -160,12 +153,6 @@ public function processRequestError() {
         ob_clean();
         $statusCode = $this->sendPage($this->page->scheme, $this->page->address, $this->page->base,
             $this->page->location, $this->page->fileName, false, false);
-        if ($this->system->get("coreDebugMode")>=1) {
-            $layout = $this->page->get("layout");
-            $theme = $this->page->get("theme");
-            echo "YellowCore::processRequestError file:".$this->page->fileName."<br />\n";
-            echo "YellowCore::processRequestError layout:$layout theme:$theme<br />\n";
-        }
         return $statusCode;
     }
 
@@ -193,8 +180,8 @@ public function exitFatalError($errorMessage = "") {
     }
 
     // Send page response
-    public function sendPage($scheme, $address, $base, $location, $fileName, $cacheable, $showSource) {
-        $rawData = $showSource ? $this->toolbox->readFile($fileName) : $this->page->getRawDataError();
+    public function sendPage($scheme, $address, $base, $location, $fileName, $cacheable, $regular) {
+        $rawData = $regular ? $this->toolbox->readFile($fileName) : $this->page->getRawDataError();
         $statusCode = max($this->page->statusCode, 200);
         $errorMessage = $this->page->errorMessage;
         $this->page = new YellowPage($this);
@@ -208,6 +195,11 @@ public function sendPage($scheme, $address, $base, $location, $fileName, $cachea
             foreach ($this->page->headerData as $key=>$value) {
                 echo "YellowCore::sendPage $key: $value<br />\n";
             }
+            $fileNameResponse = $regular ? $this->page->fileName : $this->page->getFileNameError();
+            $layout = $this->page->get("layout");
+            $theme = $this->page->get("theme");
+            echo "YellowCore::sendPage file:$fileNameResponse<br />\n";
+            echo "YellowCore::sendPage layout:$layout theme:$theme<br />\n";
         }
         return $statusCode;
     }
@@ -3497,9 +3489,7 @@ public function getLastModified($httpFormat = false) {
     // Return raw data for error page
     public function getRawDataError() {
         $statusCode = $this->statusCode;
-        $sharedLocation = $this->yellow->content->getHomeLocation($this->location)."shared/";
-        $fileNameError = $this->yellow->lookup->findFileFromContentLocation($sharedLocation, true).$this->yellow->system->get("coreContentErrorFile");
-        $fileNameError = str_replace("(.*)", $statusCode, $fileNameError);
+        $fileNameError = $this->getFileNameError();
         $languageError = $this->yellow->lookup->findContentLanguage($this->fileName, $this->yellow->system->get("language"));
         if (is_file($fileNameError)) {
             $rawData = $this->yellow->toolbox->readFile($fileNameError);
@@ -3513,6 +3503,13 @@ public function getRawDataError() {
         return $rawData;
     }
 
+    // Return file name for error page
+    public function getFileNameError() {
+        $sharedLocation = $this->yellow->content->getHomeLocation($this->location)."shared/";
+        $fileNameError = $this->yellow->lookup->findFileFromContentLocation($sharedLocation, true).$this->yellow->system->get("coreContentErrorFile");
+        return str_replace("(.*)", $this->statusCode, $fileNameError);
+    }
+    
     // Return page status code, number or HTTP format
     public function getStatusCode($httpFormat = false) {
         $statusCode = $this->statusCode;