Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/help.php

2 files changed, 48 insertions, 149 deletions

diff --git a/mod/help.php b/mod/help.php
deleted file mode 100644
index 484104124..000000000
--- a/mod/help.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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:') . ' ' . 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('_',' ',ucfirst(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');
-	}
-	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]);
-
-}
-
diff --git a/mod/layouts.php b/mod/layouts.php
index 9ed349850..cbbef4fea 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -28,76 +28,71 @@ function layouts_content(&$a) {
 		return;
 	}
 
+	// Get the observer, check their permissions
 
+	$observer = $a->get_observer();
+	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
 
+	$perms = get_all_perms($owner,$ob_hash);
 
-// Get the observer, check their permissions
-
-        $observer = $a->get_observer();
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+	if(! $perms['write_pages']) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
 
-        $perms = get_all_perms($owner,$ob_hash);
+	$tabs = array(
+		array(
+		'label' => t('Layout Help'),
+		'url'   => 'help/Comanche',
+		'sel'   => '',
+		'title' => t('Help with this feature'),
+		'id'    => 'layout-help-tab',
+	));
 
-        if(! $perms['write_pages']) {
-                notice( t('Permission denied.') . EOL);
-                return;
-        }
 
-//        if(local_user() && local_user() == $owner) {
-  //          $a->set_widget('design',design_tools());
-    //    }
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
 
-		$tabs = array(
-			array(
-			'label' => t('Layout Help'),
-			'url'   => 'help/Comanche',
-			'sel'   => '',
-			'title' => t('Help with this feature'),
-			'id'    => 'layout-help-tab',
-		));
 
+	// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
+	// Nickname is set to the observers xchan, and profile_uid to the owners.  This lets you post pages at other people's channels.
 
-		$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
+	require_once ('include/conversation.php');
 
+	$x = array(
+		'webpage' => ITEM_PDL,
+		'is_owner' => true,
+		'nickname' => $a->profile['channel_address'],
+		'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+		'bang' => (($group || $cid) ? '!' : ''),
+		'visitor' => 'none',
+		'nopreview' => 1,
+		'ptlabel' => t('Layout Name'),
+		'profile_uid' => intval($owner),
+	);
 
-// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-// Nickname is set to the observers xchan, and profile_uid to the owners.  This lets you post pages at other people's channels.
-require_once ('include/conversation.php');
-		$x = array(
-			'webpage' => ITEM_PDL,
-			'is_owner' => true,
-			'nickname' => $a->profile['channel_address'],
-			'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-			'bang' => (($group || $cid) ? '!' : ''),
-			'visitor' => 'none',
-			'nopreview' => 1,
-			'ptlabel' => t('Layout Name'),
-			'profile_uid' => intval($owner),
-		);
+	$o .= status_editor($a,$x);
 
-		$o .= status_editor($a,$x);
+	// Get a list of blocks.  We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
+	// TODO - this should be replaced with pagelist_widget
 
-	//Get a list of blocks.  We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
-//TODO - this should be replaced with pagelist_widget
+	$r = q("select * from item_id where uid = %d and service = 'PDL' order by sid asc",
+		intval($owner)
+	);
 
-$r = q("select * from item_id where uid = %d and service = 'PDL' order by sid asc",
-	intval($owner)
-);
+	$pages = null;
 
-		$pages = null;
+	if($r) {
+		$pages = array();
+		foreach($r as $rr) {
+			$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
+		} 
+	}
 
-		if($r) {
-			$pages = array();
-			foreach($r as $rr) {
-				$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
-			} 
-		}
 
+	//Build the base URL for edit links
+	$url = z_root() . "/editlayout/" . $which; 
 
-//Build the base URL for edit links
-		$url = z_root() . "/editlayout/" . $which; 
-// This isn't pretty, but it works.  Until I figure out what to do with the UI, it's Good Enough(TM).
-       return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
+	return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
 		'$baseurl' => $url,
 		'$edit' => t('Edit'),
 		'$pages' => $pages,
@@ -105,7 +100,7 @@ $r = q("select * from item_id where uid = %d and service = 'PDL' order by sid as
 		'$view' => t('View'),
 		'$preview' => '1',
 	
-        ));
+	));
     
 
 }