mikuli.cz

commit 97d7a6c8d207d69296548bd6b154c8b34903dc8e
parent d7b7023a616823c5950e1a806d7e82c838f8e725
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 19 Feb 2020 17:53:29 +0100

Updated extensions, troubleshooting

Diffstat:
M
system/extensions/core.php
 | 
2
+-
M
system/extensions/image.php
 | 
4
++--
M
system/extensions/install.php
 | 
10
+++++-----
M
system/extensions/update.php
 | 
4
++--

4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -75,7 +75,7 @@ class YellowCore {
     // Handle initialisation
     public function load() {
         $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("mbstring") || die("Datenstrom Yellow requires PHP extension 'mbstring'! $troubleshooting");
         version_compare(PHP_VERSION, "5.6", ">=") || die("Datenstrom Yellow requires PHP 5.6 or higher! $troubleshooting");
         if (defined("DEBUG") && DEBUG>=3) {
             $serverVersion = $this->toolbox->getServerVersion();
diff --git a/system/extensions/image.php b/system/extensions/image.php
@@ -19,8 +19,8 @@ class YellowImage {
         $this->yellow->system->setDefault("imageThumbnailDir", "media/thumbnails/");
         $this->yellow->system->setDefault("imageThumbnailJpgQuality", "80");
         $troubleshooting = "<a href=\"https://datenstrom.se/yellow/help/troubleshooting\">See troubleshooting</a>.";
-        extension_loaded("gd") || die("Datenstrom Yellow requires PHP GD extension! $troubleshooting");
-        extension_loaded("exif") || die("Datenstrom Yellow requires PHP Exif extension! $troubleshooting");
+        extension_loaded("gd") || die("Datenstrom Yellow requires PHP extension 'gd'! $troubleshooting");
+        extension_loaded("exif") || die("Datenstrom Yellow requires PHP extension 'exif'! $troubleshooting");
     }
 
     // Handle page content of shortcut
diff --git a/system/extensions/install.php b/system/extensions/install.php
@@ -13,8 +13,8 @@ class YellowInstall {
     public function onLoad($yellow) {
         $this->yellow = $yellow;
         $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");
+        extension_loaded("curl") || die("Datenstrom Yellow requires PHP extension 'curl'! $troubleshooting");
+        extension_loaded("zip") || die("Datenstrom Yellow requires PHP extension 'zip'! $troubleshooting");
     }
     
     // Handle request
@@ -23,9 +23,9 @@ class YellowInstall {
         if ($this->yellow->lookup->isContentFile($fileName) || empty($fileName)) {
             $server = $this->yellow->toolbox->getServerVersion(true);
             $troubleshooting = "<a href=\"https://datenstrom.se/yellow/help/troubleshooting\">See troubleshooting</a>.";
-            $this->checkServerConfiguration($server) || die("Datenstrom Yellow requires $server configuration file! $troubleshooting");
-            $this->checkServerRewrite($scheme, $address, $base, $location, $fileName) || die("Datenstrom Yellow requires $server rewrite module! $troubleshooting");
-            $this->checkServerAccess() || die("Datenstrom Yellow requires $server write access! $troubleshooting");
+            $this->checkServerConfiguration($server) || die("Datenstrom Yellow requires a configuration file for $server! $troubleshooting");
+            $this->checkServerRewrite($scheme, $address, $base, $location, $fileName) || die("Datenstrom Yellow requires rewrite support for $server! $troubleshooting");
+            $this->checkServerAccess() || die("Datenstrom Yellow requires write access for $server! $troubleshooting");
             $statusCode = $this->processRequestInstall($scheme, $address, $base, $location, $fileName);
         }
         return $statusCode;
diff --git a/system/extensions/update.php b/system/extensions/update.php
@@ -20,8 +20,8 @@ class YellowUpdate {
         $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");
+        extension_loaded("curl") || die("Datenstrom Yellow requires PHP extension 'curl'! $troubleshooting");
+        extension_loaded("zip") || die("Datenstrom Yellow requires PHP extension 'zip'! $troubleshooting");
     }
     
     // Handle request