Merge branch 'master' of https://github.com/friendica/red

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
+	));
+
 }
 
 

mod/post.php

@@ -265,7 +265,7 @@ function post_init(&$a) {
 		} else {
 			if($test) {
 				$ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
-				json_return_and_dir($ret);
+				json_return_and_die($ret);
 			}
 
 			logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']);
@@ -281,7 +281,7 @@ function post_init(&$a) {
 
 		if($test) {
 			$ret['message'] .= 'auth failure fallthrough ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
-			json_return_and_dir($ret);
+			json_return_and_die($ret);
 		}
 
 		if(strstr($desturl,z_root() . '/rmagic'))

version.inc

@@ -1 +1 @@
-2014-03-11.613
+2014-03-12.614

view/theme/redbasic/css/style.css

@@ -79,6 +79,11 @@ input[type="submit"] {
 	text-decoration: none;
 }
 
+button, input, optgroup, select, textarea {
+	color: #000;
+}
+
+
 pre code {
 	border: none;
 }

view/tpl/help.tpl

@@ -0,0 +1,3 @@
+<div id = "help-content" class="generic-content-wrapper">
+{{$content}}
+</div>