a few fixes to webpage editing

5 files changed, 57 insertions, 30 deletions

diff --git a/include/items.php b/include/items.php
index 9824d2434..781956882 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3935,3 +3935,52 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 
 	return $items;
 }
+
+
+function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid) {
+
+	$page_type = '';
+
+	if($webpage & ITEM_WEBPAGE)
+		$page_type = 'WEBPAGE';
+	elseif($webpage & ITEM_BUILDBLOCK)
+		$page_type = 'BUILDBLOCK';
+	elseif($webpage & ITEM_PDL)
+		$page_type = 'PDL';
+	elseif($namespace && $remote_id) {
+		$page_type = $namespace;
+		$pagetitle = $remote_id;
+	}
+
+	if($page_type) {	
+
+		// store page info as an alternate message_id so we can access it via 
+		//    https://sitename/page/$channelname/$pagetitle
+		// if no pagetitle was given or it couldn't be transliterated into a url, use the first 
+		// sixteen bytes of the mid - which makes the link portable and not quite as daunting
+		// as the entire mid. If it were the post_id the link would be less portable.
+
+		$r = q("select * from item_id where iid = %d and uid = %d and service = '%s' limit 1",
+			intval($post_id),
+			intval($channel['channel_id']),
+			dbesc($page_type)
+		);
+		if($r) {
+			q("update item_id set sid = '%s' where id = %d limit 1",
+				dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
+				intval($r[0]['id'])
+			);
+		}
+		else {
+			q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )",
+				intval($post_id),
+				intval($channel['channel_id']),
+				dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
+				dbesc($page_type)
+			);
+		}
+	}
+
+}
+
+
diff --git a/mod/editblock.php b/mod/editblock.php
index 8b5b2d16c..e8f3e90f8 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -111,6 +111,7 @@ function editblock_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $rp,
 		'$action' => 'item',
+		'$webpage' => ITEM_BUILDBLOCK,
 		'$share' => t('Edit'),
 		'$upload' => t('Upload photo'),
 		'$attach' => t('Attach file'),
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 542bb8357..e6be1056f 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -97,6 +97,7 @@ function editlayout_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $rp,
 		'$action' => 'item',
+		'$webpage' => ITEM_PDL,
 		'$share' => t('Edit'),
 		'$upload' => t('Upload photo'),
 		'$attach' => t('Attach file'),
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 00659b4b7..e1de09e37 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -136,7 +136,7 @@ function editwebpage_content(&$a) {
 
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $rp,
-		'$webpage' => true,
+		'$webpage' => ITEM_WEBPAGE,
 		'$placeholdpagetitle' => t('Page link title'),
 		'$pagetitle' => $page_title,
 
diff --git a/mod/item.php b/mod/item.php
index 2c0a36d52..037c24835 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -44,7 +44,7 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_REQUEST);
 
-//	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
 
@@ -571,7 +571,7 @@ function item_post(&$a) {
 	}
 
 	$item_flags |= ITEM_UNSEEN;
-	$item_restrict |= ITEM_VISIBLE;
+//	$item_restrict |= ITEM_VISIBLE;
 	
 	if($post_type === 'wall' || $post_type === 'wall-comment')
 		$item_flags = $item_flags | ITEM_WALL;
@@ -705,6 +705,8 @@ function item_post(&$a) {
 
 		item_store_update($datarray,$execflag);
 
+		update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
+
 		proc_run('php', "include/notifier.php", 'edit_post', $post_id);
 		if((x($_REQUEST,'return')) && strlen($return_path)) {
 			logger('return: ' . $return_path);
@@ -808,34 +810,8 @@ function item_post(&$a) {
 		// NOTREACHED
 	}
 
-	$page_type = '';
-
-	if($webpage & ITEM_WEBPAGE)
-		$page_type = 'WEBPAGE';
-	elseif($webpage & ITEM_BUILDBLOCK)
-		$page_type = 'BUILDBLOCK';
-	elseif($webpage & ITEM_PDL)
-		$page_type = 'PDL';
-	elseif($namespace && $remote_id) {
-		$page_type = $namespace;
-		$pagetitle = $remote_id;
-	}
-
-	if($page_type) {	
 
-		// store page info as an alternate message_id so we can access it via 
-		//    https://sitename/page/$channelname/$pagetitle
-		// if no pagetitle was given or it couldn't be transliterated into a url, use the first 
-		// sixteen bytes of the mid - which makes the link portable and not quite as daunting
-		// as the entire mid. If it were the post_id the link would be less portable.
-
-		q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )",
-			intval($post_id),
-			intval($channel['channel_id']),
-			dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
-			dbesc($page_type)
-		);
-	}
+	update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
 
 	$datarray['id']    = $post_id;
 	$datarray['llink'] = $a->get_baseurl() . '/display/' . $channel['channel_address'] . '/' . $post_id;