mikuli.cz

commit 3c0fc3d017106d7d29e0d49c97a1e8e07d5c2696
parent 56f3fb024fca1ecbbbcb6071f923ac60f720e2fb
Author: markseu <mark2011@mayberg.se>
Date:   Sun, 17 May 2015 13:20:32 +0200

Core update (Nikke remix)

Diffstat:
M
README.md
 | 
4
++--
M
system/core/core-webinterface.css
 | 
2
+-
M
system/core/core-webinterface.js
 | 
2
+-
M
system/core/core-webinterface.php
 | 
17
++++++++++-------
M
system/core/core.php
 | 
2
+-
M
system/themes/snippets/footer.php
 | 
1
+

6 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-Yellow 0.5.9
-============
+Yellow 0.5.10
+=============
 [![Yellow](https://raw.githubusercontent.com/wiki/datenstrom/yellow/images/yellow.jpg)](http://datenstrom.se/yellow)
 
 Yellow is for people who make websites. [Visit the Yellow website](http://datenstrom.se/yellow).
diff --git a/system/core/core-webinterface.css b/system/core/core-webinterface.css
@@ -1,4 +1,4 @@
-/* Yellow web interface 0.5.9 */
+/* Yellow web interface 0.5.10 */
 
 .yellow-bar { position:relative; overflow:hidden; line-height:2em; margin-bottom:10px; }
 .yellow-bar-left { display:block; float:left; }
diff --git a/system/core/core-webinterface.js b/system/core/core-webinterface.js
@@ -4,7 +4,7 @@
 // Yellow main API
 var yellow =
 {
-	version: "0.5.9",
+	version: "0.5.10",
 	action: function(text) { yellow.webinterface.action(text); },
 	onClick: function(e) { yellow.webinterface.hidePanesOnClick(yellow.toolbox.getEventElement(e)); },
 	onKeydown: function(e) { yellow.webinterface.hidePanesOnKeydown(yellow.toolbox.getEventKeycode(e)); },
diff --git a/system/core/core-webinterface.php b/system/core/core-webinterface.php
@@ -5,7 +5,7 @@
 // Web interface core plugin
 class YellowWebinterface
 {
-	const Version = "0.5.9";
+	const Version = "0.5.10";
 	var $yellow;				//access to API
 	var $active;				//web interface is active? (boolean)
 	var $userLoginFailed;		//web interface login failed? (boolean)
@@ -630,12 +630,15 @@ class YellowWebinterfaceUsers
 		$algorithm = $this->yellow->config->get("webinterfaceUserHashAlgorithm");
 		$cost = $this->yellow->config->get("webinterfaceUserHashCost");
 		$hash = $this->yellow->toolbox->createHash($password, $algorithm, $cost);
-		$email = strreplaceu(',', '-', $email);
-		$hash = strreplaceu(',', '-', $hash);
-		$name = strreplaceu(',', '-', empty($name) ? $this->yellow->config->get("sitename") : $name);
-		$language = strreplaceu(',', '-', empty($language) ? $this->yellow->config->get("language") : $language);
-		$home = strreplaceu(',', '-', empty($home) ? "/" : $home);
-		$user = "$email,$hash,$name,$language,$home\n";
+		if(!empty($hash))
+		{
+			$email = strreplaceu(',', '-', $email);
+			$hash = strreplaceu(',', '-', $hash);
+			$name = strreplaceu(',', '-', empty($name) ? $this->yellow->config->get("sitename") : $name);
+			$language = strreplaceu(',', '-', empty($language) ? $this->yellow->config->get("language") : $language);
+			$home = strreplaceu(',', '-', empty($home) ? "/" : $home);
+			$user = "$email,$hash,$name,$language,$home\n";
+		}
 		return $user;
 	}
 	
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
 // Yellow main class
 class Yellow
 {
-	const Version = "0.5.9";
+	const Version = "0.5.10";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $files;				//files from file system
diff --git a/system/themes/snippets/footer.php b/system/themes/snippets/footer.php
@@ -1,5 +1,6 @@
 <div class="footer">
 <a href="<?php echo $yellow->page->base."/" ?>">&copy; 2015 <?php echo $yellow->page->getHtml("sitename") ?></a>.
+<a href="<?php echo $yellow->page->get("pageEdit") ?>">Edit</a>.
 <a href="http://datenstrom.se/yellow">Made with Yellow</a>.
 </div>
 </div>