From f8b3f032a95ccc9b1730a532e7b9fe185f7db910 Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Thu, 27 Feb 2014 18:50:14 +0100
Subject: change page title for bbcode help files

---
 mod/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/help.php b/mod/help.php
index bbfeb9a6c..484104124 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -46,7 +46,7 @@ function help_content(&$a) {
 		$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:') . ' ' . str_replace('_',' ',ucfirst(notags(argv(1))));
 	}
 	if(! $text) {
 		$text = load_doc_file('doc/' . $a->argv[1] . '.html');
-- 
cgit v1.2.3


From d2304cf1682b498f88c5b221c5ce200d779462bb Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Fri, 28 Feb 2014 08:22:23 +0100
Subject: trying to get back to upstream state

---
 mod/help.php | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 mod/help.php

diff --git a/mod/help.php b/mod/help.php
new file mode 100644
index 000000000..aa0ee8ae6
--- /dev/null
+++ b/mod/help.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * You can create local site resources in doc/Site.md and either link to doc/Home.md for the standard resources
+ * or use our include mechanism to include it on your local page.
+ *
+ * #include doc/Home.md;
+ *
+ * The syntax is somewhat strict. 
+ *
+ */
+
+
+if(! function_exists('load_doc_file')) {
+function load_doc_file($s) {
+	$lang = get_app()->language;
+	if(! isset($lang))
+		$lang = 'en';
+	$b = basename($s);
+	$d = dirname($s);
+	if(file_exists("$d/$lang/$b"))
+		return file_get_contents("$d/$lang/$b");
+	if(file_exists($s))
+		return file_get_contents($s);
+	return '';
+}}
+
+
+
+function help_content(&$a) {
+	nav_set_selected('help');
+
+	global $lang;
+
+	$doctype = 'markdown';
+
+	require_once('library/markdown.php');
+
+	$text = '';
+
+	if(argc() > 1) {
+		$text = load_doc_file('doc/' . $a->argv[1] . '.md');
+		$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:') . ' ' . 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:') . ' ' . ucwords(str_replace('-',' ',notags(argv(1))));
+	}
+
+	if(! $text) {
+		$text = load_doc_file('doc/Site.md');
+		$a->page['title'] = t('Help');
+	}
+	if(! $text) {
+		$doctype = 'bbcode';
+		$text = load_doc_file('doc/main.bb');
+		$a->page['title'] = t('Help');
+	}
+	
+	if(! strlen($text)) {
+		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
+		$tpl = get_markup_template("404.tpl");
+		return replace_macros($tpl, array(
+			'$message' =>  t('Page not found.' )
+		));
+	}
+
+	$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
+
+	if($doctype === 'html')
+		return $text;
+	if($doctype === 'markdown')	
+		return Markdown($text);
+	if($doctype === 'bbcode') {
+		require_once('include/bbcode.php');
+		return bbcode($text);
+	} 
+
+}
+
+
+function preg_callback_help_include($matches) {
+
+	if($matches[1])
+		return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]);
+
+}
+
-- 
cgit v1.2.3


From 8ae986b9c6104778efb05ce400a89e64300c8b3e Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Fri, 28 Feb 2014 14:00:50 +0100
Subject: correct bbcode link in German docs

---
 doc/de/main.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/de/main.bb b/doc/de/main.bb
index e94b2b781..e6fa0eee0 100644
--- a/doc/de/main.bb
+++ b/doc/de/main.bb
@@ -20,7 +20,7 @@
 [zrl=[baseurl]/help/tags_and_mentions]Tags and Mentions[/zrl]
 [zrl=[baseurl]/help/webpages]Web Pages[/zrl]
 [zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
-[zrl=[baseurl]/help/extra_features]BBcode reference for posts and comments[/zrl]
+[zrl=[baseurl]/help/bbcode]BBcode reference for posts and comments[/zrl]
 [zrl=[baseurl]/help/checking_account_quota_usage]Checking Account Quota Usage[/zrl]
 [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl]
 
-- 
cgit v1.2.3