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

System update (summer remix)

Browse source
This commit is contained in:
markseu 2016-08-12 21:49:55 +02:00
parent 9fdc17b8f1
commit e8f26e4fdb
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
system/plugins/core.php
View file

@ -2262,19 +2262,25 @@ class YellowLookup
return $name;
}
// Return file path for new page
function findFileNew($fileName, $fileNew, $pathBase, $nameDefault)
// Return file path from config
function findFileFromConfig($fileName, $fileNameBase, $nameDefault)
{
$pathBase = $this->yellow->config->get("configDir");
if(preg_match("/^.*\/(.+?)$/", dirname($fileName), $matches)) $name = $this->normaliseName($matches[1]);
$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNew);
$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNameBase);
if(!is_file($fileName))
{
$name = $this->normaliseName($nameDefault);
$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNew);
$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNameBase);
}
return $fileName;
}
function findFileNew($fileName, $fileNew, $pathBase, $nameDefault)
{
return $this->findFileFromConfig($fileName, $fileNew, $nameDefault); //TODO: Remove later
}
// Return file path from title
function findFileFromTitle($titlePrefix, $titleText, $fileName, $fileDefault, $fileExtension)
{
@ -2287,6 +2293,28 @@ class YellowLookup
return dirname($fileName)."/".$fileNamePrefix.$fileNameText;
}
// Return file path for new page
function findFilePageNew($fileName, $prefix = "")
{
$tokens = explode('/', $fileName);
for($i=0; $i<count($tokens)-1; ++$i)
{
if(!is_dir($path.$tokens[$i]) && !preg_match("/^[\d\-\_\.]+(.*)$/", $tokens[$i]))
{
$number = 1;
foreach($this->yellow->toolbox->getDirectoryEntries($path, "/^[\d\-\_\.]+(.*)$/", true, true, false) as $entry)
{
if($number!=1 && $number!=intval($entry)) break;
$number = intval($entry)+1;
}
$tokens[$i] = (empty($prefix) ? "$number-" : $prefix).$tokens[$i];
}
$path .= $tokens[$i]."/";
}
$path .= $tokens[$i];
return $path;
}
// Normalise file/directory/other name
function normaliseName($text, $removePrefix = true, $removeExtension = false, $filterStrict = false)
{