0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated core, check content encoding for Steffen

Browse source
This commit is contained in:
markseu 2020-02-14 00:44:10 +01:00
parent 4924922d56
commit d810f03580
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
system/extensions/core.php
View file

@ -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)) {

3
system/extensions/update.php
View file

@ -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