D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #251 from BrandonOCasey/first_page_fix

Browse Source 
fixed index from always being used rather than first_page
This commit is contained in:
Denis Kisselev 2014-12-11 17:55:49 -08:00
commit 5ec4a86cf6
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/daux.php
View File

@ -46,6 +46,9 @@
$request = DauxHelper::get_request(); $request = DauxHelper::get_request();
$request = urldecode($request); $request = urldecode($request);
$request_type = isset($query['method']) ? $query['method'] : ''; $request_type = isset($query['method']) ? $query['method'] : '';
if($request == 'first_page') {
$request = $this->tree->first_page->uri;
}
switch ($request_type) { switch ($request_type) {
case 'DauxEdit': case 'DauxEdit':
if ($this->options['file_editor']) { if ($this->options['file_editor']) {
@ -105,7 +108,7 @@
if (!is_dir($this->docs_path) && !is_dir($this->docs_path = $this->local_base . DIRECTORY_SEPARATOR . $this->docs_path)) { if (!is_dir($this->docs_path) && !is_dir($this->docs_path = $this->local_base . DIRECTORY_SEPARATOR . $this->docs_path)) {
$this->generate_error_page('Docs Directory not found', $this->generate_error_page('Docs Directory not found',
'The Docs directory does not exist. Check the path again : ' . $this->docs_path, ErrorPage::FATAL_ERROR_TYPE); 'The Docs directory does not exist. Check the path again : ' . $this->docs_path, ErrorPage::FATAL_ERROR_TYPE);
return; return;
} }
if (!isset($global_config['valid_markdown_extensions'])) static::$VALID_MARKDOWN_EXTENSIONS = array('md', 'markdown'); if (!isset($global_config['valid_markdown_extensions'])) static::$VALID_MARKDOWN_EXTENSIONS = array('md', 'markdown');
@ -335,4 +338,4 @@
} }
?> ?>

12
libs/daux_helper.php
View File

@ -33,7 +33,7 @@
if ($filename[0] == '' || is_numeric($filename[0])) unset($filename[0]); if ($filename[0] == '' || is_numeric($filename[0])) unset($filename[0]);
else { else {
$t = $filename[0]; $t = $filename[0];
if ($t[0] == '-') $filename[0] = substr($t, 1); if ($t[0] == '-') $filename[0] = substr($t, 1);
} }
$filename = implode(' ', $filename); $filename = implode(' ', $filename);
return $filename; return $filename;
@ -49,7 +49,7 @@
if ($filename[0] == '' || is_numeric($filename[0])) unset($filename[0]); if ($filename[0] == '' || is_numeric($filename[0])) unset($filename[0]);
else { else {
$t = $filename[0]; $t = $filename[0];
if ($t[0] == '-') $filename[0] = substr($t, 1); if ($t[0] == '-') $filename[0] = substr($t, 1);
} }
$filename = implode('_', $filename); $filename = implode('_', $filename);
return $filename; return $filename;
@ -97,12 +97,12 @@
} }
else return false; else return false;
$uri = str_replace(array('//', '../'), '/', trim($uri, '/')); $uri = str_replace(array('//', '../'), '/', trim($uri, '/'));
if ($uri == "") $uri = "index"; if ($uri == "") $uri = "first_page";
return $uri; return $uri;
} }
public static function configure_theme($theme, $base_url, $local_base, $theme_url, $mode = Daux::LIVE_MODE) { public static function configure_theme($theme, $base_url, $local_base, $theme_url, $mode = Daux::LIVE_MODE) {
$name = static::pathinfo($theme); $name = static::pathinfo($theme);
if (is_file($theme)) { if (is_file($theme)) {
$theme = file_get_contents($theme); $theme = file_get_contents($theme);
$theme = json_decode($theme, true); $theme = json_decode($theme, true);
@ -230,7 +230,7 @@ EOT;
$entry = new Directory_Entry($path, $new_parents); $entry = new Directory_Entry($path, $new_parents);
if ($mode === Daux::STATIC_MODE) $entry->uri .= '.html'; if ($mode === Daux::STATIC_MODE) $entry->uri .= '.html';
} }
if ($entry instanceof Directory_Entry) $node->value[$entry->uri] = $entry; if ($entry instanceof Directory_Entry) $node->value[$entry->uri] = $entry;
} }
$node->sort(); $node->sort();
$node->first_page = $node->get_first_page(); $node->first_page = $node->get_first_page();
@ -360,4 +360,4 @@ EOT;
} }
?> ?>