help - make use of subfolders

diff --git a/boot.php b/boot.php
index bd2bee3ab8ece34587c855d1b5c010602ec9ade6..a51b7a42bdedf2e5f62469e9510651ac87b2f58e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1960,3 +1960,15 @@ function current_load() {
 
        return max($load_arr);
 }
+
+// much better way of dealing with c-style args
+function argc() {
+       return get_app()->argc;
+}
+
+function argv($x) {
+       if(array_key_exists($x,get_app()->argv))
+               return get_app()->argv[$x];
+
+       return '';
+}

diff --git a/mod/help.php b/mod/help.php
index 6d8fbb1842295fd67814de01657ecd310c6d5936..ebade07ea77e4cff7f6615a9cf9e198f591e75fe 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -27,8 +27,16 @@ function help_content(&$a) {
        $text = '';
 
        if ($a->argc > 1) {
-               $text = load_doc_file('doc/' . $a->argv[1] . '.md');
-               $a->page['title'] = t('Help:') . ' ' . str_replace('-', ' ', notags($a->argv[1]));
+               $path = '';
+               for($x = 1; $x < argc(); $x ++) {
+                       if(strlen($path))
+                               $path .= '/';
+                       $path .= argv($x);
+               }
+               $title = basename($path);
+
+               $text = load_doc_file('doc/' . $path . '.md');
+               $a->page['title'] = t('Help:') . ' ' . str_replace('-', ' ', notags($title));
        }
        $home = load_doc_file('doc/Home.md');
        if (!$text) {