mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-10 23:24:07 +02:00
Code Issues Releases Wiki Activity

#431 general structure changes

Browse Source
This commit is contained in:
Awilum
2018-02-28 15:45:05 +03:00
parent 9ca91aa2ce
commit a616757ee0
10 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
monstra/Pages.php
View File

@@ -88,7 +88,7 @@ class Pages
*/
public static function getPages($url = '', $order_by = 'date', $order_type = 'DESC', $ignore = array('404'), $limit = null)
{
$pages = File::scan(STORAGE_PATH . '/pages/' . $url, 'md');
$pages = File::scan(CONTENT_PATH . '/pages/' . $url, 'md');
if ($pages) {
foreach ($pages as $page) {
@@ -110,7 +110,7 @@ class Pages
$_pages[$key] = Yaml::parse($_page[1]);
$url = str_replace(STORAGE_PATH . '/pages', Url::getBase(), $page);
$url = str_replace(CONTENT_PATH . '/pages', Url::getBase(), $page);
$url = str_replace('index.md', '', $url);
$url = str_replace('.md', '', $url);
$url = str_replace('\\', '/', $url);
@@ -165,23 +165,23 @@ class Pages
public static function getPage($url)
{
// If url is empty that its a homepage
// If url is empty then its a homepage
if ($url) {
$file = STORAGE_PATH . '/pages/' . $url;
$file = CONTENT_PATH . '/pages/' . $url;
} else {
$file = STORAGE_PATH . '/pages/' . 'index';
$file = CONTENT_PATH . '/pages/' . Config::get('site.pages.main') . '/' . 'index';
}
// Select the file
if (is_dir($file)) {
$file = STORAGE_PATH . '/pages/' . $url .'/index.md';
$file = CONTENT_PATH . '/pages/' . $url .'/index.md';
} else {
$file .= '.md';
}
// Get 404 page if file not exists
if (!file_exists($file)) {
$file = STORAGE_PATH . '/pages/' . '404.md';
$file = CONTENT_PATH . '/pages/404/' . 'index.md';
Response::status(404);
}
@@ -197,7 +197,7 @@ class Pages
$page = Yaml::parse($_page[1]);
$url = str_replace(STORAGE_PATH . '/pages', Url::getBase(), $file);
$url = str_replace(CONTENT_PATH . '/pages', Url::getBase(), $file);
$url = str_replace('index.md', '', $url);
$url = str_replace('.md', '', $url);
$url = str_replace('\\', '/', $url);