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

System update (better navigation, better numbers)

Browse source
This commit is contained in:
markseu 2017-08-14 13:54:30 +02:00
parent c51cd8eda1
commit bfbddf87b4
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
system/plugins/core.php
View file

@ -482,7 +482,6 @@ class YellowPage
if(!$this->isExisting("titleContent")) $this->set("titleContent", $this->get("title"));
if(!$this->isExisting("titleNavigation")) $this->set("titleNavigation", $this->get("title"));
if(!$this->isExisting("titleHeader")) $this->set("titleHeader", $titleHeader);
if(!$this->isExisting("status") && !is_readable($this->fileName)) $this->set("status", "ignore");
if($this->get("status")=="hidden") $this->available = false;
$this->set("pageRead", $this->yellow->lookup->normaliseUrl(
$this->yellow->config->get("serverScheme"),
@ -1387,15 +1386,7 @@ class YellowPages
function top($showInvisible = false)
{
$rootLocation = $this->getRootLocation($this->yellow->page->location);
$pages = new YellowPageCollection($this->yellow);
foreach($this->scanLocation($rootLocation) as $page)
{
if($page->isAvailable() && ($page->isVisible() || $showInvisible))
{
if(is_readable($page->fileName)) $pages->append($page);
}
}
return $pages;
return $this->getChildren($rootLocation, $showInvisible);
}
// Return page collection with path ancestry
@ -1460,7 +1451,7 @@ class YellowPages
{
if($page->isAvailable() && ($page->isVisible() || $showInvisible))
{
if(!$this->yellow->lookup->isRootLocation($page->location)) $pages->append($page);
if(!$this->yellow->lookup->isRootLocation($page->location) && is_readable($page->fileName)) $pages->append($page);
}
}
return $pages;
@ -1475,7 +1466,7 @@ class YellowPages
{
if($page->isAvailable() && ($page->isVisible() || $showInvisible))
{
if(!$this->yellow->lookup->isRootLocation($page->location)) $pages->append($page);
if(!$this->yellow->lookup->isRootLocation($page->location) && is_readable($page->fileName)) $pages->append($page);
if(!$this->yellow->lookup->isFileLocation($page->location) && $levelMax!=0)
{
$pages->merge($this->getChildrenRecursive($page->location, $showInvisible, $levelMax));
@ -2946,6 +2937,19 @@ class YellowToolbox
return $contentType;
}
// Return number of bytes
function getNumberBytes($string)
{
$bytes = intval($string);
switch(strtoupperu(substru($string, -1)))
{
case 'G': $bytes *= 1024*1024*1024; break;
case 'M': $bytes *= 1024*1024; break;
case 'K': $bytes *= 1024; break;
}
return $bytes;
}
// Return files and directories
function getDirectoryEntries($path, $regex = "/.*/", $sort = true, $directories = true, $includePath = true)
{