mikuli.cz

commit dfb6cefb0588a2fb6ef27e144777df820a1ae2b2
parent d022f5bcb029b072dc575c52a5182bc38c0964c1
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 16 Mar 2022 14:38:26 +0100

Renamed yellow.log to yellow-website.log

Diffstat:
M
system/extensions/core.php
 | 
12
++++++------
M
system/extensions/install.php
 | 
2
+-
M
system/extensions/update-current.ini
 | 
8
++++----
M
system/extensions/update.php
 | 
15
++++++++++++++-

4 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -2,7 +2,7 @@
 // Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 
 class YellowCore {
-    const VERSION = "0.8.59";
+    const VERSION = "0.8.60";
     const RELEASE = "0.8.19";
     public $page;           // current page
     public $content;        // content files
@@ -63,7 +63,7 @@ class YellowCore {
         $this->system->setDefault("coreSystemFile", "yellow-system.ini");
         $this->system->setDefault("coreUserFile", "yellow-user.ini");
         $this->system->setDefault("coreLanguageFile", "yellow-language.ini");
-        $this->system->setDefault("coreLogFile", "yellow.log");
+        $this->system->setDefault("coreWebsiteFile", "yellow-website.log");
         $this->language->setDefault("coreDateFormatShort");
         $this->language->setDefault("coreDateFormatMedium");
         $this->language->setDefault("coreDateFormatLong");
@@ -340,7 +340,7 @@ class YellowCore {
         if ($statusCode==0) {
             $line = date("Y-m-d H:i:s")." ".trim($action)." ".trim($message)."\n";
             $this->toolbox->appendFile($this->system->get("coreServerInstallDirectory").
-                $this->system->get("coreExtensionDirectory").$this->system->get("coreLogFile"), $line);
+                $this->system->get("coreExtensionDirectory").$this->system->get("coreWebsiteFile"), $line);
         }
     }
     
@@ -589,6 +589,7 @@ class YellowPage {
         }
         if (is_null($output)) {
             if ($name=="yellow" && $type=="inline") {
+                if ($text=="release") $output = "Datenstrom Yellow ".YellowCore::RELEASE;
                 if ($text=="about") {
                     $output = "Datenstrom Yellow ".YellowCore::RELEASE."<br />\n";
                     $dataCurrent = $this->yellow->extension->data;
@@ -597,10 +598,8 @@ class YellowPage {
                         $output .= ucfirst($key)." ".$value["version"]."<br />\n";
                     }
                 }
-                if ($text=="release") $output = "Datenstrom Yellow ".YellowCore::RELEASE;
-                if ($text=="error") $output = $this->get("pageError");
                 if ($text=="log") {
-                    $fileName = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreLogFile");
+                    $fileName = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreWebsiteFile");
                     $fileHandle = @fopen($fileName, "r");
                     if ($fileHandle) {
                         $dataBufferSize = 512;
@@ -613,6 +612,7 @@ class YellowPage {
                     }
                     $output = str_replace("\n", "<br />\n", htmlspecialchars($dataBuffer));
                 }
+                if ($text=="error") $output = $this->get("pageError");
             }
         }
         if ($this->yellow->system->get("coreDebugMode")>=3 && !empty($name)) {
diff --git a/system/extensions/install.php b/system/extensions/install.php
@@ -90,7 +90,7 @@ class YellowInstall {
     // Update log file
     public function updateLog() {
         $statusCode = 200;
-        $fileName = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreLogFile");
+        $fileName = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreWebsiteFile");
         if (!is_file($fileName)) {
             list($name, $version, $os) = $this->yellow->toolbox->detectServerInformation();
             $product = "Datenstrom Yellow ".YellowCore::RELEASE;
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -21,11 +21,11 @@ Tag: feature
 system/extensions/command.php: command.php, create, update
 
 Extension: Core
-Version: 0.8.59
+Version: 0.8.60
 Description: Core functionality of the website.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/core.zip
-Published: 2022-03-11 00:35:26
+Published: 2022-03-16 13:34:30
 Developer: Datenstrom
 Tag: feature
 system/extensions/core.php: core.php, create, update
@@ -131,11 +131,11 @@ system/themes/stockholm-opensans-light.woff: stockholm-opensans-light.woff, crea
 system/themes/stockholm-opensans-regular.woff: stockholm-opensans-regular.woff, create, update, careful
 
 Extension: Update
-Version: 0.8.65
+Version: 0.8.66
 Description: Keep your website up to date.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/update
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/update.zip
-Published: 2022-03-11 12:41:26
+Published: 2022-03-16 14:33:19
 Developer: Datenstrom
 Tag: feature
 system/extensions/update.php: update.php, create, update
diff --git a/system/extensions/update.php b/system/extensions/update.php
@@ -2,7 +2,7 @@
 // Update extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/update
 
 class YellowUpdate {
-    const VERSION = "0.8.65";
+    const VERSION = "0.8.66";
     const PRIORITY = "2";
     public $yellow;                 // access to API
     public $updates;                // number of updates
@@ -129,6 +129,19 @@ class YellowUpdate {
                 }
             }
         }
+        if ($action=="update") { // TODO: remove later, convert old log file
+            $fileNameOld = $this->yellow->system->get("coreExtensionDirectory")."yellow.log";
+            $fileNameNew = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreWebsiteFile");
+            if (is_file($fileNameOld)) {
+                $fileDataOld = $this->yellow->toolbox->readFile($fileNameOld);
+                $fileDataNew = $this->yellow->toolbox->readFile($fileNameNew);
+                if (!$this->yellow->toolbox->deleteFile($fileNameOld, $this->yellow->system->get("coreTrashDirectory"))) {
+                    $this->yellow->log("error", "Can't delete file '$fileNameOld'!");
+                } elseif (!$this->yellow->toolbox->createFile($fileNameNew, $fileDataOld.$fileDataNew)) {
+                    $this->yellow->log("error", "Can't write file '$fileNameNew'!");
+                }
+            }
+        }
     }
     
     // Handle request