mikuli.cz

commit 0fe5a20c79d49da7306ccb73b6ef3c083abab86b
parent bc980fae91e10af0c49474a22c0033194b36cb9c
Author: markseu <mark2011@mayberg.se>
Date:   Tue, 26 Apr 2016 12:14:30 +0200

System update (Yellow information)

Diffstat:
M
system/config/config.ini
 | 
1
+
M
system/plugins/core.php
 | 
38
+++++++++++++++++++++-----------------

2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/system/config/config.ini b/system/config/config.ini
@@ -48,6 +48,7 @@ WebinterfaceLocation: /edit/
 WebinterfaceUserPasswordMinLength: 4
 WebinterfaceUserHashAlgorithm: bcrypt
 WebinterfaceUserHashCost: 10
+WebinterfaceUserStatus: active
 WebinterfaceUserHome: /
 WebinterfaceUserFile: user.ini
 WebinterfaceNewFile: page-new-(.*).txt
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -549,27 +549,31 @@ class YellowPage
 		{
 			if($name=="yellow" && $shortcut)
 			{
-				$output = "<span class=\"".htmlspecialchars($name)."\">\n";
-				if(empty($text))
+				$output = "Yellow ".YellowCore::Version;
+				if(!empty($text))
 				{
-					$serverSoftware = $this->yellow->toolbox->getServerSoftware();
-					$output .= "Yellow ".YellowCore::Version.", PHP ".PHP_VERSION.", $serverSoftware<br />\n";
-					foreach($this->yellow->plugins->getData() as $key=>$value)
+					$output = "<span class=\"".htmlspecialchars($name)."\">\n";
+					if($text == "version")
 					{
-						$output .= htmlspecialchars("$key $value")."<br />\n";
-					}
-					foreach($this->yellow->themes->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";
+						$serverSoftware = $this->yellow->toolbox->getServerSoftware();
+						$output .= "Yellow ".YellowCore::Version.", PHP ".PHP_VERSION.", $serverSoftware<br />\n";
+						foreach($this->yellow->plugins->getData() as $key=>$value)
+						{
+							$output .= htmlspecialchars("$key $value")."<br />\n";
+						}
+						foreach($this->yellow->themes->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";
+						}
 					}
+					$output .= "</span>\n";
+					if($this->parserSafeMode) $this->error(500, "Yellow '$text' is not available in safe mode!");
 				}
-				if($this->parserSafeMode) $this->error(500, "Yellow information are not available in safe mode!");
-				$output .= "</span>\n";
 			}
 		}
 		if(defined("DEBUG") && DEBUG>=3 && !empty($name)) echo "YellowPage::parseContentBlock name:$name shortcut:$shortcut<br/>\n";