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

Web interface update (new page fix for Juh)

Browse source
This commit is contained in:
markseu 2015-04-30 21:32:58 +02:00
parent e885d5f321
commit 059d386f0c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,4 @@
Yellow 0.5.3
Yellow 0.5.4
============
[![Yellow](https://raw.githubusercontent.com/wiki/datenstrom/yellow/images/yellow.jpg)](http://datenstrom.se/yellow)

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

@ -5,7 +5,7 @@
// Web interface core plugin
class YellowWebinterface
{
const Version = "0.5.3";
const Version = "0.5.4";
var $yellow; //access to API
var $active; //web interface is active? (boolean)
var $userLoginFailed; //web interface login failed? (boolean)
@ -452,8 +452,8 @@ class YellowWebinterface
{
$fileName = $this->yellow->lookup->findFileFromLocation($this->yellow->page->location);
$fileName = $this->yellow->lookup->findFileNew($fileName,
$this->yellow->config->get("configDir"), $this->yellow->config->get("webinterfaceNewFile"),
$this->yellow->config->get("contentDefaultFile"));
$this->yellow->config->get("webinterfaceNewFile"), $this->yellow->config->get("configDir"),
$this->yellow->config->get("template"));
$fileData = $this->yellow->toolbox->getFileData($fileName);
$fileData = preg_replace("/@datetime/i", date("Y-m-d H:i:s"), $fileData);
$fileData = preg_replace("/@date/i", date("Y-m-d"), $fileData);

6
system/core/core.php
View file

@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
const Version = "0.5.3";
const Version = "0.5.4";
var $page; //current page
var $pages; //pages from file system
var $files; //files from file system
@ -1928,13 +1928,13 @@ class YellowLookup
}
// Return file path for new page
function findFileNew($fileName, $pathBase, $fileNew, $fileDefault)
function findFileNew($fileName, $fileNew, $pathBase, $nameDefault)
{
if(preg_match("/^.*\/(.+?)$/", dirname($fileName), $matches)) $name = $this->normaliseName($matches[1]);
$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNew);
if(!is_file($fileName))
{
$name = $this->normaliseName($fileDefault, true, true);
$name = $this->normaliseName($nameDefault);
$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNew);
}
return $fileName;