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

added support for shared content folder

Browse source
This commit is contained in:
markseu 2019-01-28 11:37:49 +01:00
parent f6aa26b316
commit dd6cb86ccf
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
system/config/config.ini
View file

@ -32,6 +32,7 @@ TrashDir: system/trash/
ContentDir: content/
ContentRootDir: default/
ContentHomeDir: home/
ContentSharedDir: shared/
ContentPagination: page
ContentDefaultFile: page.md
ContentExtension: .md

14
system/plugins/core.php
View file

@ -56,6 +56,7 @@ class YellowCore {
$this->config->setDefault("contentDir", "content/");
$this->config->setDefault("contentRootDir", "default/");
$this->config->setDefault("contentHomeDir", "home/");
$this->config->setDefault("contentSharedDir", "shared/");
$this->config->setDefault("contentPagination", "page");
$this->config->setDefault("contentDefaultFile", "page.md");
$this->config->setDefault("contentExtension", ".md");
@ -415,7 +416,7 @@ class YellowPage {
$this->parser = null;
$this->parserData = "";
$this->safeMode = intval($this->yellow->config->get("safeMode"));
$this->available = true;
$this->available = $this->yellow->lookup->isAvailableLocation($this->location, $this->fileName);
$this->visible = $this->yellow->lookup->isVisibleLocation($this->location, $this->fileName);
$this->active = $this->yellow->lookup->isActiveLocation($this->location, $this->yellow->page->location);
$this->cacheable = $cacheable;
@ -2247,6 +2248,17 @@ class YellowLookup {
return $nested;
}
// Check if location is available
public function isAvailableLocation($location, $fileName) {
$available = true;
$pathBase = $this->yellow->config->get("contentDir");
if (substru($fileName, 0, strlenu($pathBase))==$pathBase) {
$sharedLocation = $this->yellow->pages->getHomeLocation($location).$this->yellow->config->get("contentSharedDir");
if (substru($location, 0, strlenu($sharedLocation))==$sharedLocation) $available = false;
}
return $available;
}
// Check if location is visible
public function isVisibleLocation($location, $fileName) {
$visible = true;