mikuli.cz

commit 98faa872b200f3b9039e23f7a410d837a2ad0a8e
parent 788be0531a45cef2d1f814f790126b2c822b8e50
Author: markseu <mark2011@mayberg.se>
Date:   Thu,  8 Oct 2015 16:52:01 +0200

Core update (fika remix)

Diffstat:
M
system/plugins/commandline.php
 | 
2
+-
M
system/plugins/core.php
 | 
14
++++++++++++--
M
system/plugins/webinterface.php
 | 
9
+++++++--
M
system/themes/flatsite.css
 | 
2
+-

4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/system/plugins/commandline.php b/system/plugins/commandline.php
@@ -77,7 +77,7 @@ class YellowCommandline
 				++$updates;
 			}
 		}
-		if($statusCode != 200) echo "ERROR checking updates at $url, $versionLatest[error]\n";
+		if($statusCode != 200) echo "ERROR checking updates at $url: $versionLatest[error]\n";
 		if(!$this->yellow->config->isExisting("sitename"))
 		{
 			$fileNames = $this->yellow->toolbox->getDirectoryEntries(
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -1524,7 +1524,7 @@ class YellowPlugins
 		foreach($this->plugins as $key=>$value)
 		{
 			$this->plugins[$key]["obj"] = new $value["class"];
-			if(defined("DEBUG") && DEBUG>=3) echo "YellowPlugins::load class:$value[class] $value[version]<br/>\n";
+			if(defined("DEBUG") && DEBUG>=3) echo "YellowPlugins::load $value[class]:$value[version]<br/>\n";
 			if(method_exists($this->plugins[$key]["obj"], "onLoad")) $this->plugins[$key]["obj"]->onLoad($yellow);
 		}
 	}
@@ -1546,7 +1546,17 @@ class YellowPlugins
 		return $this->plugins[$name]["obj"];
 	}
 	
-	// Return plugins modification date, Unix time or HTTP format
+	// Return plugin version
+	function getData()
+	{
+		$version = array();
+		$version["YellowCore"] = YellowCore::Version;
+		foreach($this->plugins as $key=>$value) $version[$value["class"]] = $value[version];
+		uksort($version, strnatcasecmp);
+		return $version;
+	}
+	
+	// Return plugin modification date, Unix time or HTTP format
 	function getModified($httpFormat = false)
 	{
 		return $httpFormat ? $this->yellow->toolbox->getHttpDateFormatted($this->modified) : $this->modified;
diff --git a/system/plugins/webinterface.php b/system/plugins/webinterface.php
@@ -90,13 +90,18 @@ class YellowWebinterface
 			{
 				$serverSoftware = $this->yellow->toolbox->getServerSoftware();
 				$output .= "Yellow ".YellowCore::Version.", PHP ".PHP_VERSION.", $serverSoftware\n";
+			} else if($text == "version") {
+				foreach($this->yellow->plugins->getData() as $key=>$value)
+				{
+					$output .= htmlspecialchars("$key: $value")."<br />\n";
+				}
 			} else {
 				foreach($this->yellow->config->getData($text) as $key=>$value)
 				{
 					$output .= htmlspecialchars(ucfirst($key).": ".$value)."<br />\n";
 				}
-				if($page->parserSafeMode) $page->error(500, "Debug '$text' is not allowed!");
 			}
+			if(!empty($text) && $page->parserSafeMode) $page->error(500, "Debug '$text' is not allowed in safe mode!");
 			$output .= "</div>\n";
 		}
 		return $output;
@@ -598,7 +603,7 @@ class YellowUsers
 				   !empty($matches[5]) && !empty($matches[6]))
 				{
 					$this->set($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[6]);
-					if(defined("DEBUG") && DEBUG>=3) echo "YellowUsers::load email:$matches[1] $matches[5]<br/>\n";
+					if(defined("DEBUG") && DEBUG>=3) echo "YellowUsers::load email:$matches[1]<br/>\n";
 				}
 			}
 		}
diff --git a/system/themes/flatsite.css b/system/themes/flatsite.css
@@ -1,4 +1,4 @@
-/* Flatsite theme 0.5.7 */
+/* Flatsite theme 0.6.1 */
 /* Designer: Mark Mayberg */
 
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700);