mikuli.cz

commit 41ef4143967694b29ad8535941392022ff456b19
parent 83611f9bfa3f069a862bbbb40a0b6402374e21ec
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 12 Aug 2020 15:00:09 +0200

Updated extensions, summertime sadness remix

Diffstat:
M
system/extensions/core.php
 | 
8
++++----
M
system/extensions/install-languages.zip
 | 
0

M
system/extensions/update.php
 | 
7
+++++--

3 files changed, 9 insertions(+), 6 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.18";
+    const VERSION = "0.8.19";
     const RELEASE = "0.8.15";
     public $page;           // current page
     public $content;        // content files
@@ -2802,7 +2802,7 @@ class YellowToolbox {
                 $textNew .= $line;
             }
             foreach ($settings as $key=>$value) {
-                $textNew .= ucfirst($key).": $value\n";
+                $textNew .= (strposu($key, "/") ? $key : ucfirst($key)).": $value\n";
             }
         } else {
             $scan = false;
@@ -2833,7 +2833,7 @@ class YellowToolbox {
                 }
             }
             foreach ($settings as $key=>$value) {
-                $textSettings .= ucfirst($key).": $value\n";
+                $textSettings .= (strposu($key, "/") ? $key : ucfirst($key)).": $value\n";
             }
             if (!empty($textMiddle)) {
                 $textMiddle = $textSettings;
@@ -3143,7 +3143,7 @@ class YellowToolbox {
                 }
                 $rawDataMiddle .= $line;
             }
-            if (!$found) $rawDataMiddle .= ucfirst($key).": $value\n";
+            if (!$found) $rawDataMiddle .= (strposu($key, "/") ? $key : ucfirst($key)).": $value\n";
             $rawDataNew = $parts[1]."---\n".$rawDataMiddle."---\n".$parts[3];
         } else {
             $rawDataNew = $rawData;
diff --git a/system/extensions/install-languages.zip b/system/extensions/install-languages.zip
Binary files differ.
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.30";
+    const VERSION = "0.8.31";
     const PRIORITY = "2";
     public $yellow;                 // access to API
     public $updates;                // number of updates
@@ -626,7 +626,7 @@ class YellowUpdate {
             ++$this->updates;
         } else {
             $statusCode = 500;
-            $this->yellow->page->error(500, "Can't find information about extension '$extension'!");
+            $this->yellow->page->error(500, "Please delete extension '$extension' manually!");
         }
         return $statusCode;
     }
@@ -755,6 +755,9 @@ class YellowUpdate {
             if (!is_file($fileNameCurrent)) $statusCode = $this->createExtensionSettings();
             $fileData = $this->yellow->toolbox->readFile($fileNameCurrent);
             $settings = $this->yellow->toolbox->getTextSettings($fileData, "extension");
+            foreach ($settings as $key=>$value) {
+                if (!$this->yellow->extension->isExisting($key)) unset($settings[$key]);
+            }
             foreach ($this->yellow->extension->data as $key=>$value) {
                 if (!$settings->isExisting($key)) $settings[$key] = new YellowArray();
                 $settings[$key]["extension"] = ucfirst($key);