SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Support per-directory 404.md files

Browse Source
This commit is contained in:
Daniel Rudolf 2015-10-04 15:24:38 +02:00
parent 3f7b0998c6
commit 77f939028c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Pico.php
View File

@ -271,7 +271,7 @@ class Pico
$this->triggerEvent('on404ContentLoading', array(&$this->requestFile)); $this->triggerEvent('on404ContentLoading', array(&$this->requestFile));
header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
$this->rawContent = $this->load404Content(); $this->rawContent = $this->load404Content($this->requestFile);
$this->triggerEvent('on404ContentLoaded', array(&$this->rawContent)); $this->triggerEvent('on404ContentLoaded', array(&$this->rawContent));
} }
@ -555,11 +555,23 @@ class Pico
/** /**
* Returns the raw contents of the 404 file if the requested file wasn't found * Returns the raw contents of the 404 file if the requested file wasn't found
* *
* @return string raw contents of the 404 file * @param string $file path to requested (but not existing) file
* @return string raw contents of the 404 file
*/ */
public function load404Content() public function load404Content($file)
{ {
return $this->loadFileContent($this->getConfig('content_dir') . '404' . $this->getConfig('content_ext')); $errorFileDir = substr($file, strlen($this->getConfig('content_dir')));
do {
$errorFileDir = dirname($errorFileDir);
$errorFile = $errorFileDir . '/404' . $this->getConfig('content_ext');
} while (!file_exists($this->getConfig('content_dir') . $errorFile) && ($errorFileDir !== '.'));
if (!file_exists($this->getConfig('content_dir') . $errorFile)) {
$errorFile = ($errorFileDir === '.') ? '404' . $this->getConfig('content_ext') : $errorFile;
throw new RuntimeException('Required "' . $errorFile .'" not found');
}
return $this->loadFileContent($this->getConfig('content_dir') . $errorFile);
} }
/** /**