Merge pull request #2 from friendica/master

merge from friendica/red

1 files changed, 62 insertions, 52 deletions

diff --git a/mod/layouts.php b/mod/layouts.php
index 9ed349850..0dcaba361 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -28,84 +28,94 @@ 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
+	if(! $perms['write_pages']) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
 
-        $observer = $a->get_observer();
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+	if((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
+		$r = q("select sid, service, mimetype, title, body  from item_id left join item on item.id = item_id.iid where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc",
+			intval($owner),
+			dbesc(argv(3))
+		);
+		if($r) {
+			header('Content-type: application/x-redmatrix-layout');
+			header('Content-disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"');
+			echo json_encode($r);
+			killme();
 
-        $perms = get_all_perms($owner,$ob_hash);
+		}
+	}
 
-        if(! $perms['write_pages']) {
-                notice( t('Permission denied.') . EOL);
-                return;
-        }
+	$tabs = array(
+		array(
+		'label' => t('Layout Help'),
+		'url'   => 'help/Comanche',
+		'sel'   => '',
+		'title' => t('Help with this feature'),
+		'id'    => 'layout-help-tab',
+	));
 
-//        if(local_user() && local_user() == $owner) {
-  //          $a->set_widget('design',design_tools());
-    //    }
 
-		$tabs = array(
-			array(
-			'label' => t('Layout Help'),
-			'url'   => 'help/Comanche',
-			'sel'   => '',
-			'title' => t('Help with this feature'),
-			'id'    => 'layout-help-tab',
-		));
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
 
 
-		$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
+	// 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');
 
-// 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),
-		);
+	$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 iid, sid, mid from item_id left join item on item.id = item_id.iid where item_id.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'], 'mid' => $rr['mid']);
+		} 
+	}
 
-		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("layoutlist.tpl"), array(
 		'$baseurl' => $url,
 		'$edit' => t('Edit'),
+		'$share' => t('Share'),
 		'$pages' => $pages,
 		'$channel' => $which,
 		'$view' => t('View'),
 		'$preview' => '1',
 	
-        ));
+	));
     
 
 }