mikuli.cz

commit d810f03580395bf0b590dea91c5a22b9cb57c143
parent 4924922d56aad164b2137ab39c393a0c62866ac1
Author: markseu <mark2011@mayberg.se>
Date:   Fri, 14 Feb 2020 00:44:10 +0100

Updated core, check content encoding for Steffen

Diffstat:
M
system/extensions/core.php
 | 
4
+---
M
system/extensions/update.php
 | 
3
+++

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -68,8 +68,6 @@ class YellowCore {
         $this->system->setDefault("coreLogFile", "yellow.log");
         $troubleshooting = "<a href=\"https://datenstrom.se/yellow/help/troubleshooting\">See troubleshooting</a>.";
         extension_loaded("mbstring") || die("Datenstrom Yellow requires PHP mbstring extension! $troubleshooting");
-        extension_loaded("curl") || die("Datenstrom Yellow requires PHP cURL extension! $troubleshooting");
-        extension_loaded("zip") || die("Datenstrom Yellow requires PHP zip extension! $troubleshooting");
     }
     
     public function __destruct() {
@@ -1833,7 +1831,7 @@ class YellowLookup {
         $pathHome = $this->yellow->system->get("coreContentHomeDir");
         $fileDefault = $this->yellow->system->get("coreContentDefaultFile");
         $fileExtension = $this->yellow->system->get("coreContentExtension");
-        if (substru($fileName, 0, strlenu($pathBase))==$pathBase) {
+        if (substru($fileName, 0, strlenu($pathBase))==$pathBase && mb_check_encoding($fileName, "UTF-8")) {
             $fileName = substru($fileName, strlenu($pathBase));
             $tokens = explode("/", $fileName);
             if (!empty($pathRoot)) {
diff --git a/system/extensions/update.php b/system/extensions/update.php
@@ -19,6 +19,9 @@ class YellowUpdate {
         $this->yellow->system->setDefault("updateVersionFile", "version.ini");
         $this->yellow->system->setDefault("updateWaffleFile", "waffle.ini");
         $this->yellow->system->setDefault("updateNotification", "none");
+        $troubleshooting = "<a href=\"https://datenstrom.se/yellow/help/troubleshooting\">See troubleshooting</a>.";
+        extension_loaded("curl") || die("Datenstrom Yellow requires PHP cURL extension! $troubleshooting");
+        extension_loaded("zip") || die("Datenstrom Yellow requires PHP zip extension! $troubleshooting");
     }
     
     // Handle request