Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

3 files changed, 109 insertions, 169 deletions

diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
index cec55f5cc..2d20de52d 100644
--- a/Zotlabs/Module/Editlayout.php
+++ b/Zotlabs/Module/Editlayout.php
@@ -3,45 +3,45 @@ namespace Zotlabs\Module;
 
 require_once('include/identity.php');
 require_once('include/acl_selectors.php');
-
+require_once('include/conversation.php');
 
 class Editlayout extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) {
 			$sys = get_sys_channel();
 			if($sys && intval($sys['channel_id'])) {
 				\App::$is_sys = true;
 			}
 		}
-	
+
 		if(argc() > 1)
 			$which = argv(1);
 		else
 			return;
-	
+
 		profile_load($a,$which);
-	
+
 	}
-	
-		function get() {
-	
+
+	function get() {
+
 		if(! \App::$profile) {
 			notice( t('Requested profile is not available.') . EOL );
 			\App::$error = 404;
 			return;
 		}
-	
+
 		$which = argv(1);
-	
+
 		$uid = local_channel();
 		$owner = 0;
 		$channel = null;
 		$observer = \App::get_observer();
-	
+
 		$channel = \App::get_channel();
-	
+
 		if(\App::$is_sys && is_site_admin()) {
 			$sys = get_sys_channel();
 			if($sys && intval($sys['channel_id'])) {
@@ -50,7 +50,7 @@ class Editlayout extends \Zotlabs\Web\Controller {
 				$observer = $sys;
 			}
 		}
-	
+
 		if(! $owner) {
 			// Figure out who the page owner is.
 			$r = q("select channel_id from channel where channel_address = '%s'",
@@ -60,136 +60,83 @@ class Editlayout extends \Zotlabs\Web\Controller {
 				$owner = intval($r[0]['channel_id']);
 			}
 		}
-	
+
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		$is_owner = (($uid && $uid == $owner) ? true : false);
-	
+
 		$o = '';
-	
+
 		// Figure out which post we're editing
 		$post_id = ((argc() > 2) ? intval(argv(2)) : 0);
-	
-	
+
 		if(! $post_id) {
 			notice( t('Item not found') . EOL);
 			return;
 		}
-	
+
 		// Now we've got a post and an owner, let's find out if we're allowed to edit it
-	
+
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		$perms = get_all_perms($owner,$ob_hash);
-	
+
 		if(! $perms['write_pages']) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
-	
+
 		$itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
 			intval($post_id),
 			intval($owner)
 		);
-	
+
 		$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
 			intval($itm[0]['id'])
 		);
 		if($item_id)
 			$layout_title = $item_id[0]['sid'];
-	
-		$plaintext = true;
-		
-		\App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
-			'$baseurl'       => z_root(),
-			'$editselect'    =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
-			'$pretext'       => '',
-			'$ispublic'      => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
-			'$geotag'        => $geotag,
-			'$nickname'      => $channel['channel_address'],
-			'$confirmdelete' => t('Delete layout?'),
-			'$bbco_autocomplete'=> 'comanche'
-		));
-	
-	
-		$tpl = get_markup_template("jot.tpl");
-			
-		$jotplugins = '';
-		$jotnets = '';
-	
-		call_hooks('jot_tool', $jotplugins);
-		call_hooks('jot_networks', $jotnets);
-	
-		
-		// FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD
-		// instead of loading a sensible page.  So, send folk to the webpage list.
-	
+
 		$rp = 'layouts/' . $which;
-	
-		$editor = replace_macros($tpl,array(
-			'$return_path'         => $rp,
-			'$action'              => 'item',
-			'$webpage'             => ITEM_TYPE_PDL,
-			'$share'               => t('Edit'),
-			'$bold' => t('Bold'),
-			'$italic' => t('Italic'),
-			'$underline' => t('Underline'),
-			'$quote' => t('Quote'),
-			'$code' => t('Code'),
-			'$upload'              => t('Upload photo'),
-			'$attach'              => t('Attach file'),
-			'$weblink'             => t('Insert web link'),
-			'$youtube'             => t('Insert YouTube video'),
-			'$video'               => t('Insert Vorbis [.ogg] video'),
-			'$audio'               => t('Insert Vorbis [.ogg] audio'),
-			'$setloc'              => t('Set your location'),
-			'$noloc'               => t('Clear browser location'),
-			'$wait'                => t('Please wait'),
-			'$permset'             => t('Permission settings'),
-			'$ptyp'                => $itm[0]['type'],
-			'$content'             => undo_post_tagging($itm[0]['body']),
-			'$post_id'             => $post_id,
-			'$baseurl'             => z_root(),
-			'$defloc'              => $channel['channel_location'],
-			'$visitor'             => false,
-			'$public'              => t('Public post'),
-			'$jotnets'             => $jotnets,
-			'$title'               => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
-			'$placeholdertitle'    => t('Layout Description (Optional)'),
-			'$pagetitle'           => $layout_title,
-			'$placeholdpagetitle'  => t('Layout Name'),
-			'$category'            => '',
-			'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
-			'$emtitle'             => t('Example: bob@example.com, mary@example.com'),
-			'$lockstate'           => $lockstate,
-			'$acl'                 => '', 
-			'$bang'                => '',
-			'$profile_uid'         => (intval($owner)),
-			'$jotplugins'          => $jotplugins,
-			'$sourceapp'           => t(\App::$sourcename),
-			'$defexpire'           => '',
-			'$feature_expire'      => false,
-			'$expires'             => t('Set expiration date'),
-		));
-	
-	
+
+		$x = array(
+			'webpage' => ITEM_TYPE_PDL,
+			'nickname' => $channel['channel_address'],
+			'editor_autocomplete'=> true,
+			'bbco_autocomplete'=> 'comanche',
+			'return_path' => $rp,
+			'button' => t('Edit'),
+			'hide_voting' => true,
+			'hide_future' => true,
+			'hide_expire' => true,
+			'hide_preview' => true,
+			'ptyp' => $itm[0]['obj_type'],
+			'body' => undo_post_tagging($itm[0]['body']),
+			'post_id' => $post_id,
+			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+			'pagetitle' => $layout_title,
+			'ptlabel' => t('Layout Name'),
+			'placeholdertitle' => t('Layout Description (Optional)'),
+			'showacl' => false,
+			'profile_uid' => intval($owner),
+		);
+
+		$editor = status_editor($a, $x);
+
 		$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
 			'$title' => t('Edit Layout'),
 			'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
 			'$id' => $itm[0]['id'],
 			'$editor' => $editor
 		));
-	
+
 		return $o;
-	
+
 	}
-	
-	
-	
+
 }
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
index 1c2c2a30b..25ba1a39a 100644
--- a/Zotlabs/Module/Editpost.php
+++ b/Zotlabs/Module/Editpost.php
@@ -10,44 +10,38 @@ require_once('include/conversation.php');
 class Editpost extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		$o = '';
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		$post_id = ((argc() > 1) ? intval(argv(1)) : 0);
-	
+
 		if(! $post_id) {
 			notice( t('Item not found') . EOL);
 			return;
 		}
-	
+
 		$itm = q("SELECT * FROM `item` WHERE `id` = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1",
 			intval($post_id),
 			dbesc(get_observer_hash()),
 			dbesc(get_observer_hash())
 		);
-	
+
 		if(! count($itm)) {
 			notice( t('Item is not editable') . EOL);
 			return;
 		}
-	
+
 		if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
 			goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
 		}
-	
-	
+
 		$owner_uid = $itm[0]['uid'];
-	
-	
-		$plaintext = true;
-	//	if(feature_enabled(local_channel(),'richtext'))
-	//		$plaintext = false;
-	
+
 		$channel = \App::get_channel();
 
 		if(intval($itm[0]['item_obscured'])) {
@@ -57,10 +51,10 @@ class Editpost extends \Zotlabs\Web\Controller {
 			if($itm[0]['body'])
 				$itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key);
 		}
-	
+
 		$category = '';
 		$catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : '');
-	
+
 		if ($catsenabled){
 		        $itm = fetch_post_tags($itm);
 	
@@ -72,7 +66,7 @@ class Editpost extends \Zotlabs\Web\Controller {
 		                $category .= $cat['term'];
 		        }
 		}
-	
+
 		if($itm[0]['attach']) {
 			$j = json_decode($itm[0]['attach'],true);
 			if($j) {
@@ -106,16 +100,14 @@ class Editpost extends \Zotlabs\Web\Controller {
 		);
 
 		$editor = status_editor($a, $x);
-	
+
 		$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
 			'$title' => t('Edit post'),
 			'$editor' => $editor
 		));
-	
+
 		return $o;
-	
+
 	}
-	
-	
-	
+
 }
diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php
index 50cb401bc..aafe4342e 100644
--- a/Zotlabs/Module/Layouts.php
+++ b/Zotlabs/Module/Layouts.php
@@ -5,47 +5,45 @@ require_once('include/identity.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 
-
 class Layouts extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) {
 			$sys = get_sys_channel();
 			if($sys && intval($sys['channel_id'])) {
 				\App::$is_sys = true;
 			}
 		}
-	
+
 		if(argc() > 1)
 			$which = argv(1);
 		else
 			return;
-	
+
 		profile_load($a,$which);
-	
+
 	}
-	
-	
-		function get() {
-	
+
+	function get() {
+
 		if(! \App::$profile) {
 			notice( t('Requested profile is not available.') . EOL );
 			\App::$error = 404;
 			return;
 		}
-	
+
 		$which = argv(1);
-	
+
 		$_SESSION['return_url'] = \App::$query_string;
-	
+
 		$uid = local_channel();
 		$owner = 0;
 		$channel = null;
 		$observer = \App::get_observer();
-	
+
 		$channel = \App::get_channel();
-	
+
 		if(\App::$is_sys && is_site_admin()) {
 			$sys = get_sys_channel();
 			if($sys && intval($sys['channel_id'])) {
@@ -54,7 +52,7 @@ class Layouts extends \Zotlabs\Web\Controller {
 				$observer = $sys;
 			}
 		}
-	
+
 		if(! $owner) {
 			// Figure out who the page owner is.
 			$r = q("select channel_id from channel where channel_address = '%s'",
@@ -64,34 +62,34 @@ class Layouts extends \Zotlabs\Web\Controller {
 				$owner = intval($r[0]['channel_id']);
 			}
 		}
-	
+
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		$perms = get_all_perms($owner,$ob_hash);
-	
+
 		if(! $perms['write_pages']) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		// Block design features from visitors 
-	
+
 		if((! $uid) || ($uid != $owner)) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		// Get the observer, check their permissions
-	
+
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		$perms = get_all_perms($owner,$ob_hash);
-	
+
 		if(! $perms['write_pages']) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		//This feature is not exposed in redbasic ui since it is not clear why one would want to
 		//download a json encoded pdl file - we dont have a possibility to import it.
 		//Use the buildin share/install feature instead.
@@ -109,19 +107,21 @@ class Layouts extends \Zotlabs\Web\Controller {
 				killme();
 			}
 		}
-	
+
 		// 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.
-	
+
 		$x = array(
 			'webpage'     => ITEM_TYPE_PDL,
 			'is_owner'    => true,
 			'nickname'    => \App::$profile['channel_address'],
-			'bang'        => '',
 			'showacl'     => false,
 			'visitor'     => false,
-			'nopreview'   => 1,
+			'hide_voting' => true,
+			'hide_future' => true,
+			'hide_expire' => true,
+			'hide_preview'=> true,
 			'ptlabel'     => t('Layout Name'),
 			'profile_uid' => intval($owner),
 			'expanded'    => true,
@@ -129,24 +129,24 @@ class Layouts extends \Zotlabs\Web\Controller {
 			'novoting' => true,
 			'bbco_autocomplete' => 'comanche'
 		);
-	
+
 		if($_REQUEST['title'])
 			$x['title'] = $_REQUEST['title'];
 		if($_REQUEST['body'])
 			$x['body'] = $_REQUEST['body'];
 		if($_REQUEST['pagetitle'])
 			$x['pagetitle'] = $_REQUEST['pagetitle'];
-	
+
 		$editor = status_editor($a,$x);
-	
+
 		$r = q("select iid, sid, mid, title, body, mimetype, created, edited, item_type from item_id left join item on item_id.iid = item.id
 			where item_id.uid = %d and service = 'PDL' and item_type = %d order by item.created desc",
 			intval($owner),
 			intval(ITEM_TYPE_PDL)
 		);
-	
+
 		$pages = null;
-	
+
 		if($r) {
 			$pages = array();
 			foreach($r as $rr) {
@@ -171,10 +171,10 @@ class Layouts extends \Zotlabs\Web\Controller {
 				);
 			}
 		}
-	
+
 		//Build the base URL for edit links
 		$url = z_root() . '/editlayout/' . $which; 
-	
+
 		$o .= replace_macros(get_markup_template('layoutlist.tpl'), array(
 			'$title'   => t('Layouts'),
 			'$create'  => t('Create'),
@@ -192,8 +192,9 @@ class Layouts extends \Zotlabs\Web\Controller {
 			'$channel' => $which,
 			'$view'    => t('View'),
 		));
-	
+
 		return $o;
+
 	}
-	
+
 }