Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	mod/impel.php

2 files changed, 84 insertions, 58 deletions

diff --git a/mod/impel.php b/mod/impel.php
index 494a3a5c2..636ef8554 100644
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -25,6 +25,10 @@ function impel_init(&$a) {
 	$channel = $a->get_channel();
 
 	$arr = array();
+	$is_menu = false;
+
+	// a portable menu has its links rewritten with the local baseurl
+	$portable_menu = false;
 
 	switch($j['type']) {
 		case 'webpage':
@@ -42,82 +46,104 @@ function impel_init(&$a) {
 			$namespace = 'PDL';
 			$installed_type = t('layout');
 			break;
+		case 'portable-menu':
+			$portable_menu = true;
+			// fall through
+		case 'menu':
+			$is_menu = true;
+			$installed_type = t('menu');
+			break;			
 		default:
 			logger('mod_impel: unrecognised element type' . print_r($j,true));
 			break;
 	}
-	$arr['uid'] = local_channel();
-	$arr['aid'] = $channel['channel_account_id'];
-	$arr['title'] = $j['title'];
-	$arr['body'] = $j['body'];
-	$arr['term'] = $j['term'];
-	$arr['created'] = datetime_convert('UTC','UTC', $j['created']);
-	$arr['edited'] = datetime_convert('UTC','UTC',$j['edited']);
-	$arr['owner_xchan'] = get_observer_hash();
-	$arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash());
-	$arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/bbcode');
-
-	if(! $j['mid'])
-		$j['mid'] = item_message_id();
-
-	$arr['mid'] = $arr['parent_mid'] = $j['mid'];
-
-
-	if($j['pagetitle']) {
-		require_once('library/urlify/URLify.php');
-		$pagetitle = strtolower(URLify::transliterate($j['pagetitle']));
-	}
+	if($is_menu) {
+
 
 
 
-	// Verify ability to use html or php!!!
 
-    $execflag = false;
 
-	if($arr['mimetype'] === 'application/x-php') {
-		$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
-			intval(local_channel())
-		);
 
-		if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
-			$execflag = true;
-		}
-	}
 
-	$remote_id = 0;
-
-	$z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1",
-		dbesc($pagetitle),
-		dbesc($namespace),
-		intval(local_channel())
-	);
-	$i = q("select id, item_deleted from item where mid = '%s' and uid = %d limit 1",
-		dbesc($arr['mid']),
-		intval(local_channel())
-	);
-
-	if($z && $i) {
-		$remote_id = $z[0]['id'];
-		$arr['id'] = $i[0]['id'];
-		// don't update if it has the same timestamp as the original
-		if($arr['edited'] > $i[0]['edited'])
-			$x = item_store_update($arr,$execflag);
 	}
 	else {
-		if(($i) && intval($i[0]['item_deleted'])) {
-			// was partially deleted already, finish it off
-			q("delete from item where mid = '%s' and uid = %d",
-				dbesc($arr['mid']),
+		$arr['uid'] = local_channel();
+		$arr['aid'] = $channel['channel_account_id'];
+		$arr['title'] = $j['title'];
+		$arr['body'] = $j['body'];
+		$arr['term'] = $j['term'];
+		$arr['created'] = datetime_convert('UTC','UTC', $j['created']);
+		$arr['edited'] = datetime_convert('UTC','UTC',$j['edited']);
+		$arr['owner_xchan'] = get_observer_hash();
+		$arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash());
+		$arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/bbcode');
+
+		if(! $j['mid'])
+			$j['mid'] = item_message_id();
+
+		$arr['mid'] = $arr['parent_mid'] = $j['mid'];
+
+
+		if($j['pagetitle']) {
+			require_once('library/urlify/URLify.php');
+			$pagetitle = strtolower(URLify::transliterate($j['pagetitle']));
+		}
+
+
+
+		// Verify ability to use html or php!!!
+
+	    $execflag = false;
+
+		if($arr['mimetype'] === 'application/x-php') {
+			$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
 				intval(local_channel())
 			);
+
+			if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
+				$execflag = true;
+			}
+		}
+
+		$remote_id = 0;
+
+		$z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1",
+			dbesc($pagetitle),
+			dbesc($namespace),
+			intval(local_channel())
+		);
+		$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
+			dbesc($arr['mid']),
+			intval(local_channel())
+		);
+
+		if($z && $i) {
+			$remote_id = $z[0]['id'];
+			$arr['id'] = $i[0]['id'];
+			// don't update if it has the same timestamp as the original
+			if($arr['edited'] > $i[0]['edited'])
+				$x = item_store_update($arr,$execflag);
+		}
+		else {
+			if(($i) && (intval($i[0]['item_deleted']))) {
+				// was partially deleted already, finish it off
+				q("delete from item where mid = '%s' and uid = %d",
+					dbesc($arr['mid']),
+					intval(local_channel())
+				);
+			}
+			$x = item_store($arr,$execflag);
+		}
+
+		if($x['success']) {
+			$item_id = $x['item_id'];
+			update_remote_id($channel,$item_id,$arr['item_restrict'],$pagetitle,$namespace,$remote_id,$arr['mid']);
 		}
-		$x = item_store($arr,$execflag);
 	}
+
 	if($x['success']) {
-		$item_id = $x['item_id'];
-		update_remote_id($channel,$item_id,$arr['item_restrict'],$pagetitle,$namespace,$remote_id,$arr['mid']);
 		$ret['success'] = true;
-
 		info( sprintf( t('%s element installed'), $installed_type)); 
 	}
 	else {
diff --git a/mod/receive.php b/mod/receive.php
index b7d27d40f..deaf8cb37 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -31,7 +31,7 @@ function receive_post(&$a) {
 
 		// Diaspora sites *may* provide a truncated guid. 
 
-		$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND NOT (channel_pageflags & %d )>0 LIMIT 1",
+		$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND (channel_pageflags & %d ) = 0 LIMIT 1",
 			dbesc($guid . '%'),
 			intval(PAGE_REMOVED)
 		);