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

Core update (Nikke remix)

Browse source
This commit is contained in:
markseu 2015-05-17 13:20:32 +02:00
parent 56f3fb024f
commit 3c0fc3d017
6 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

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

2
system/core/core-webinterface.css
View file

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

2
system/core/core-webinterface.js
View file

@ -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)); },

17
system/core/core-webinterface.php
View file

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

2
system/core/core.php
View file

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

1
system/themes/snippets/footer.php
View file

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