From 7ecf1626371f9eb55d05c160f5748ecb0b1ba091 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 04:48:14 -0700 Subject: fix location of language variable in help module --- mod/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index af05bd47c..770a0a8af 100644 --- a/mod/help.php +++ b/mod/help.php @@ -2,7 +2,7 @@ if(! function_exists('load_doc_file')) { function load_doc_file($s) { - global $lang; + $lang = get_app()->language; if(! isset($lang)) $lang = 'en'; $b = basename($s); -- cgit v1.2.3 From 6ddb57e0da54b291504638247a77889f5b631caa Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 14:19:31 -0800 Subject: mod/help - load Site.md (if it exists) before Home.md. Site.md will typically provide local resources. Site.md can either include the complete contents of Help.md or link to it, as you choose. --- mod/help.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index 770a0a8af..10061b851 100644 --- a/mod/help.php +++ b/mod/help.php @@ -25,9 +25,13 @@ function help_content(&$a) { $text = ''; - if($a->argc > 1) { + if(argc() > 1) { $text = load_doc_file('doc/' . $a->argv[1] . '.md'); - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags($a->argv[1])); + $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + } + if(! $text) { + $text = load_doc_file('doc/Site.md'); + $a->page['title'] = t('Help'); } if(! $text) { $text = load_doc_file('doc/Home.md'); -- cgit v1.2.3 From 7f4e4ab688be440a3efae2e0b0af7b9bbc6b7053 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 14:41:31 -0800 Subject: Add #include mechanism for help pages - see the top of mod/help.php for details --- mod/help.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index 10061b851..e78f9e61c 100644 --- a/mod/help.php +++ b/mod/help.php @@ -1,5 +1,16 @@ language; @@ -45,7 +56,20 @@ function help_content(&$a) { '$message' => t('Page not found.' ) )); } + + $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); + return Markdown($text); } + + +function preg_callback_help_include($matches) { + print_r($matches); + + if($matches[1]) + return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); + +} + -- cgit v1.2.3 From 6c2ea59cde5ddce4f26fedccb99c2ea2a40ff451 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 17:44:30 -0800 Subject: give doc/help alternate mimetype support --- mod/help.php | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index e78f9e61c..cd2dfd87e 100644 --- a/mod/help.php +++ b/mod/help.php @@ -32,6 +32,8 @@ function help_content(&$a) { global $lang; + $doctype = 'markdown'; + require_once('library/markdown.php'); $text = ''; @@ -40,6 +42,19 @@ function help_content(&$a) { $text = load_doc_file('doc/' . $a->argv[1] . '.md'); $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); } + if(! $text) { + $text = load_doc_file('doc/' . $a->argv[1] . '.bb'); + if($text) + $doctype = 'bbcode'; + $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + } + if(! $text) { + $text = load_doc_file('doc/' . $a->argv[1] . '.html'); + if($text) + $doctype = 'html'; + $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + } + if(! $text) { $text = load_doc_file('doc/Site.md'); $a->page['title'] = t('Help'); @@ -58,9 +73,15 @@ function help_content(&$a) { } $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); - - - return Markdown($text); + + if($doctype === 'html') + return $text; + if($doctype === 'markdown') + return Markdown($text); + if($doctype === 'bbcode') { + require_once('include/bbcode.php'); + return bbcode($text); + } } -- cgit v1.2.3 From dcc58dec0037f41cc89c42ced5c1968517eb34c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 19:56:22 -0800 Subject: Provide Terms of Service placeholder page (includes doc/SiteTOS.md) --- mod/help.php | 1 - 1 file changed, 1 deletion(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index cd2dfd87e..a4ccd1cfe 100644 --- a/mod/help.php +++ b/mod/help.php @@ -87,7 +87,6 @@ function help_content(&$a) { function preg_callback_help_include($matches) { - print_r($matches); if($matches[1]) return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); -- cgit v1.2.3 From 8284901f9eda97457da1d4d5a74a0e24ee9249b3 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 24 Feb 2014 05:11:56 +0000 Subject: Make bbcode the default doco ready for the next commit --- mod/help.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index a4ccd1cfe..bbfeb9a6c 100644 --- a/mod/help.php +++ b/mod/help.php @@ -60,7 +60,8 @@ function help_content(&$a) { $a->page['title'] = t('Help'); } if(! $text) { - $text = load_doc_file('doc/Home.md'); + $doctype = 'bbcode'; + $text = load_doc_file('doc/main.bb'); $a->page['title'] = t('Help'); } -- cgit v1.2.3 From 5cf0e74501f4e72b29f8f486e8d6aac769d0ed24 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 27 Feb 2014 17:50:36 +0000 Subject: Capitalise $a->page['title'] in doco pages. --- mod/help.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index bbfeb9a6c..aa0ee8ae6 100644 --- a/mod/help.php +++ b/mod/help.php @@ -40,19 +40,19 @@ function help_content(&$a) { if(argc() > 1) { $text = load_doc_file('doc/' . $a->argv[1] . '.md'); - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + $a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags(argv(1)))); } if(! $text) { $text = load_doc_file('doc/' . $a->argv[1] . '.bb'); if($text) $doctype = 'bbcode'; - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + $a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('_',' ',notags(argv(1)))); } if(! $text) { $text = load_doc_file('doc/' . $a->argv[1] . '.html'); if($text) $doctype = 'html'; - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + $a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags(argv(1)))); } if(! $text) { -- cgit v1.2.3 From 031b888e2c447048b5459e5e8f1a2afd34f695cf Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 12 Mar 2014 17:13:58 +0000 Subject: Stick help in a template --- mod/help.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mod/help.php') diff --git a/mod/help.php b/mod/help.php index aa0ee8ae6..81ecd6ba9 100644 --- a/mod/help.php +++ b/mod/help.php @@ -76,14 +76,18 @@ function help_content(&$a) { $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); if($doctype === 'html') - return $text; + $content = $text; if($doctype === 'markdown') - return Markdown($text); + $content = Markdown($text); if($doctype === 'bbcode') { require_once('include/bbcode.php'); - return bbcode($text); + $content = bbcode($text); } + return replace_macros(get_markup_template("help.tpl"), array( + '$content' => $content + )); + } -- cgit v1.2.3