convert ITEM_WALL from bitfield to standalone

14 files changed, 54 insertions, 49 deletions

diff --git a/include/Import/refimport.php b/include/Import/refimport.php
index d248fb7df..b95411c81 100644
--- a/include/Import/refimport.php
+++ b/include/Import/refimport.php
@@ -88,7 +88,8 @@ function refimport_content(&$a) {
 		$arr['author_xchan'] = $channel['channel_hash'];
 		$arr['owner_xchan'] = $channel['channel_hash'];
 		$arr['app'] = REFLECT_BLOGNAME;
-		$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
+		$arr['item_flags'] = ITEM_ORIGIN|ITEM_THREAD_TOP;
+		$arr['item_wall'] = 1;
 		$arr['verb'] = ACTIVITY_POST;
 
 		// this is an assumption
@@ -256,7 +257,8 @@ function reflect_comment_store($channel,$post,$comment,$user) {
 	$arr['edited'] = $comment['created'];
 	$arr['author_xchan'] = $hash;
 	$arr['owner_xchan'] = $channel['channel_hash'];
-	$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL;
+	$arr['item_flags'] = ITEM_ORIGIN;
+	$arr['item_wall'] = 1;
 	$arr['verb'] = ACTIVITY_POST;
 	$arr['comment_policy'] = 'contacts';
 
diff --git a/include/activities.php b/include/activities.php
index ca8863e51..7d007e05b 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -21,7 +21,8 @@ function profile_activity($changed, $value) {
 	$arr['uid']         = local_channel();
 	$arr['aid']         = $self['channel_account_id'];
 	$arr['owner_xchan'] = $arr['author_xchan'] = $self['xchan_hash'];
-	$arr['item_flags']  = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
+	$arr['item_flags']  = ITEM_ORIGIN|ITEM_THREAD_TOP;
+	$arr['item_wall']   = 1;
 	$arr['verb']        = ACTIVITY_UPDATE;
 	$arr['obj_type']    = ACTIVITY_OBJ_PROFILE;
 
diff --git a/include/api.php b/include/api.php
index 2491e500b..7fea00d81 100644
--- a/include/api.php
+++ b/include/api.php
@@ -344,10 +344,9 @@ require_once('include/items.php');
 			// count public wall messages
 			$r = q("SELECT COUNT(`id`) as `count` FROM `item`
 					WHERE `uid` = %d
-					AND ( item_flags & %d )>0 and item_restrict = 0 
+					AND item_wall = 1 and item_restrict = 0 
 					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
-					intval($usr[0]['channel_id']),
-					intval(ITEM_WALL)
+					intval($usr[0]['channel_id'])
 			);
 			$countitms = $r[0]['count'];
 		}
diff --git a/include/attach.php b/include/attach.php
index e6d6e5f24..cd51f8153 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1031,7 +1031,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 
 	$objtype = ACTIVITY_OBJ_FILE;
 
-	$item_flags = ITEM_WALL|ITEM_ORIGIN;
+	$item_flags = ITEM_ORIGIN;
 
 	$private = (($arr_allow_cid[0] || $arr_allow_gid[0] || $arr_deny_cid[0] || $arr_deny_gid[0]) ? 1 : 0);
 
@@ -1078,6 +1078,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 		$arr['parent_mid']    = $u_mid;
 		$arr['item_flags']    = $item_flags;
 		$arr['item_unseen']   = 1;
+		$arr['item_wall']     = 1;
 		$arr['author_xchan']  = $poster['xchan_hash'];
 		$arr['owner_xchan']   = $poster['xchan_hash'];
 		$arr['title']         = '';
diff --git a/include/enotify.php b/include/enotify.php
index 08ab8175d..3f54c6915 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -171,7 +171,7 @@ function notification($params) {
 				$item_post_type);
 		
 		// "your post"
-		if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && ($p[0]['item_flags'] & ITEM_WALL))
+		if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall']))
 			$dest_str = sprintf(t('%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]'),
 				$recip['channel_name'],
 				'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
diff --git a/include/event.php b/include/event.php
index 5926b50f7..485379673 100644
--- a/include/event.php
+++ b/include/event.php
@@ -479,7 +479,7 @@ function event_store_item($arr, $event) {
 
 			$item_flags = ITEM_THREAD_TOP;
 			if($wall) {
-				$item_flags |= ITEM_WALL;
+				$item_arr['item_wall'] = 1;
 				$item_flags |= ITEM_ORIGIN;
 			}
 			$item_arr['item_flags'] = $item_flags;
diff --git a/include/externals.php b/include/externals.php
index b0f853dc6..779d060e7 100644
--- a/include/externals.php
+++ b/include/externals.php
@@ -99,14 +99,14 @@ function externals_run($argv, $argc){
 //						);
 $z = null;
 						if($z) {
-							$flag_bits = ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK;
+							$flag_bits = ITEM_ORIGIN|ITEM_UPLINK;
 							// preserve the source
 
 							$r = q("update item set source_xchan = owner_xchan where id = %d",
 								intval($z[0]['id'])
 							);
 
-    						$r = q("update item set item_flags = ( item_flags | %d ), owner_xchan = '%s' 
+    						$r = q("update item set item_flags = ( item_flags | %d ), item_wall = 1, owner_xchan = '%s' 
 								where id = %d",
 								intval($flag_bits),
 								dbesc($sys['xchan_hash']),
diff --git a/include/identity.php b/include/identity.php
index fa2e27355..0b614a00e 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -583,8 +583,7 @@ function identity_basic_export($channel_id, $items = false) {
 
 	/** @warning this may run into memory limits on smaller systems */
 
-	$r = q("select * from item where (item_flags & %d)>0 and not (item_restrict & %d)>0 and uid = %d",
-		intval(ITEM_WALL),
+	$r = q("select * from item where item_wall = 1 and (item_restrict & %d) = 0 and uid = %d",
 		intval(ITEM_DELETED),
 		intval($channel_id)
 	);
diff --git a/include/items.php b/include/items.php
index 42ff3cb8b..88f110959 100755
--- a/include/items.php
+++ b/include/items.php
@@ -385,8 +385,10 @@ function post_activity_item($arr) {
 	if(! x($arr,'item_flags')) {
 		if($is_comment)
 			$arr['item_flags'] = ITEM_ORIGIN;
-		else
-			$arr['item_flags'] = ITEM_ORIGIN | ITEM_WALL | ITEM_THREAD_TOP;
+		else {
+			$arr['item_wall'] = 1;
+			$arr['item_flags'] = ITEM_ORIGIN | ITEM_THREAD_TOP;
+		}
 	}
 
 	$channel  = get_app()->get_channel();
@@ -2016,6 +2018,7 @@ function item_store($arr, $allow_exec = false) {
 	$arr['deny_gid']      = ((x($arr,'deny_gid'))      ? trim($arr['deny_gid'])              : '');
 	$arr['item_private']  = ((x($arr,'item_private'))  ? intval($arr['item_private'])        : 0 );
 	$arr['item_flags']    = ((x($arr,'item_flags'))    ? intval($arr['item_flags'])          : 0 );
+	$arr['item_wall']     = ((x($arr,'item_wall'))     ? intval($arr['item_wall'])           : 0 );
 
 	// only detect language if we have text content, and if the post is private but not yet
 	// obscured, make it so.
@@ -2178,8 +2181,8 @@ function item_store($arr, $allow_exec = false) {
 			$public_policy   = $r[0]['public_policy'];
 			$comments_closed = $r[0]['comments_closed'];
 
-			if($r[0]['item_flags'] & ITEM_WALL)
-				$arr['item_flags'] = $arr['item_flags'] | ITEM_WALL;
+			if(intval($r[0]['item_wall']))
+				$arr['item_wall'] = 1;
 
 			// An uplinked comment might arrive with a downstream owner.
 			// Fix it.
@@ -2607,11 +2610,10 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id,
 
 	$x = array('signer' => $diaspora_handle, 'body' => $signed_body, 'signed_text' => $signed_text, 'signature' => base64_encode($authorsig));
 
-	$key = get_config('system','pubkey');
-	$y = crypto_encapsulate(json_encode($x),$key);
+	$y = json_encode($x);
 
 	$r = q("update item set diaspora_meta = '%s' where id = %d",
-		dbesc(json_encode($y)),
+		dbesc($y),
 		intval($post_id)
 	);
 
@@ -2966,7 +2968,7 @@ function tag_deliver($uid, $item_id) {
 	// prevent delivery looping - only proceed
 	// if the message originated elsewhere and is a top-level post
 
-	if(($item['item_flags'] & ITEM_WALL)
+	if((intval($item['item_wall']))
 		|| ($item['item_flags'] & ITEM_ORIGIN)
 		|| (!($item['item_flags'] & ITEM_THREAD_TOP))
 		|| ($item['id'] != $item['parent'])) {
@@ -3106,7 +3108,8 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 	if((! $private) && $new_public_policy)
 		$private = 1;
 
-	$flag_bits = $item['item_flags'] | ITEM_WALL;
+	
+	$flag_bits = $item['item_flags'];
 
 	// The message didn't necessarily originate on this site, (we'll honour it if it did),
 	// but the parent post of this thread will be reset as a local post, as it is the top of
@@ -3152,7 +3155,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 	}
 
 	$r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
-		deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s'  where id = %d",
+		deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s', item_wall = 1 where id = %d",
 		intval($flag_bits),
 		dbesc($channel['channel_hash']),
 		dbesc($channel['channel_allow_cid']),
@@ -3909,7 +3912,7 @@ function item_expire($uid,$days) {
 	if(! intval($expire_limit))
 		$expire_limit = 5000;
 
-	$sql_extra = ((intval($expire_network_only)) ? " AND (item_flags & " . intval(ITEM_WALL) . ") = 0 " : "");
+	$sql_extra = ((intval($expire_network_only)) ? " AND item_wall = 0 " : "");
 
 	$r = q("SELECT * FROM `item`
 		WHERE `uid` = %d
@@ -4070,7 +4073,7 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
 		// We'll rely on the undocumented behaviour that DROPITEM_PHASE1 is (hopefully) only
 		// set if we know we're going to send delete notifications out to others.
 
-		if((($item['item_flags'] & ITEM_WALL) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1))
+		if((intval($item['item_wall']) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1))
 			proc_run('php','include/notifier.php','drop',$notify_id);
 
 		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
@@ -4178,7 +4181,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
 
 function first_post_date($uid,$wall = false) {
 
-	$wall_sql = (($wall) ? sprintf(" and (item_flags & %d)>0 ", ITEM_WALL) : "" );
+	$wall_sql = (($wall) ? " and item_wall = 1 " : "" );
 
 	$r = q("select id, created from item
 		where item_restrict = %d and uid = %d and id = parent $wall_sql
@@ -4386,19 +4389,17 @@ function zot_feed($uid,$observer_xchan,$arr) {
 		$r = q("SELECT parent, created, postopts from item
 			WHERE uid != %d
 			AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
-			AND (item_flags &  %d) > 0
+			AND item_wall = 1
 			$sql_extra GROUP BY parent ORDER BY created ASC $limit",
-			intval($uid),
-			intval(ITEM_WALL)
+			intval($uid)
 		);
 	}
 	else {
 		$r = q("SELECT parent, created, postopts from item
 			WHERE uid = %d AND item_restrict = 0
-			AND (item_flags &  %d) > 0
+			AND item_wall = 1
 			$sql_extra GROUP BY parent ORDER BY created ASC $limit",
-			intval($uid),
-			intval(ITEM_WALL)
+			intval($uid)
 		);
 	}
 
@@ -4465,7 +4466,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 		$sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ")>0 ";
 
 	if($arr['wall'])
-		$sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ")>0 ";
+		$sql_options .= " and item_wall = 1 ";
 
 	$sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ")>0 $sql_options ) ";
 
diff --git a/include/notifier.php b/include/notifier.php
index b82fb41cc..7bda433a9 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -228,10 +228,9 @@ function notifier_run($argv, $argc){
 
 		$normal_mode = false;
 		$expire = true;
-		$items = q("SELECT * FROM item WHERE uid = %d AND ( item_flags & %d )>0
+		$items = q("SELECT * FROM item WHERE uid = %d AND item_wall = 1
 			AND ( item_restrict & %d )>0 AND `changed` > %s - INTERVAL %s",
 			intval($item_id),
-			intval(ITEM_WALL),
 			intval(ITEM_DELETED),
 			db_utcnow(), db_quoteinterval('10 MINUTE')
 		);
@@ -457,7 +456,7 @@ function notifier_run($argv, $argc){
 			// don't send deletions onward for other people's stuff
 			// TODO verify this is needed - copied logic from same place in old code
 
-			if(($target_item['item_restrict'] & ITEM_DELETED) && (!($target_item['item_flags'] & ITEM_WALL))) {
+			if(($target_item['item_restrict'] & ITEM_DELETED) && (! intval($target_item['item_wall']))) {
 				logger('notifier: ignoring delete notification for non-wall item');
 				return;
 			}
diff --git a/include/photos.php b/include/photos.php
index 1672e310a..e12637882 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -219,7 +219,7 @@ function photo_upload($channel, $observer, $args) {
 		}
 	}
 
-	$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
+	$item_flags = ITEM_ORIGIN|ITEM_THREAD_TOP;
 	$item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN);
 	$title = '';
 	$mid = item_message_id();
@@ -234,6 +234,7 @@ function photo_upload($channel, $observer, $args) {
 	$arr['mid']           = $mid;
 	$arr['parent_mid']    = $mid; 
 	$arr['item_flags']    = $item_flags;
+	$arr['item_wall']     = 1;
 	$arr['item_restrict'] = $item_restrict;
 	$arr['resource_type'] = 'photo';
 	$arr['resource_id']   = $photo_hash;
@@ -488,7 +489,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
 
 	// Create item container
 
-	$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
+	$item_flags = ITEM_ORIGIN|ITEM_THREAD_TOP;
 	$item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN);
 
 	$mid = item_message_id();
@@ -500,6 +501,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
 	$arr['mid']           = $mid;
 	$arr['parent_mid']    = $mid; 
 	$arr['item_flags']    = $item_flags;
+	$arr['item_wall']     = 1;
 	$arr['item_restrict'] = $item_restrict;
 	$arr['resource_type'] = 'photo';
 	$arr['resource_id']   = $photo['resource_id'];
diff --git a/include/statistics_fns.php b/include/statistics_fns.php
index 288925a2c..ce2eee5e7 100644
--- a/include/statistics_fns.php
+++ b/include/statistics_fns.php
@@ -23,8 +23,7 @@ function update_channels_active_halfyear_stat() {
 				$s .= ',';
 			$s .= intval($rr['channel_id']);
 		}
-		$x = q("select uid from item where uid in ( $s ) and (item_flags & %d)>0 and created > %s - INTERVAL %s group by uid",
-			intval(ITEM_WALL),
+		$x = q("select uid from item where uid in ( $s ) and item_wall = 1 and created > %s - INTERVAL %s group by uid",
 			db_utcnow(), db_quoteinterval('6 MONTH')
 		);
 		if($x) {
@@ -50,8 +49,7 @@ function update_channels_active_monthly_stat() {
 				$s .= ',';
 			$s .= intval($rr['channel_id']);
 		}
-		$x = q("select uid from item where uid in ( $s ) and ( item_flags & %d )>0 and created > %s - INTERVAL %s group by uid",
-			intval(ITEM_WALL),
+		$x = q("select uid from item where uid in ( $s ) and item_wall = 1 and created > %s - INTERVAL %s group by uid",
 			db_utcnow(), db_quoteinterval('1 MONTH')
 		);
 		if($x) {
@@ -66,8 +64,7 @@ function update_channels_active_monthly_stat() {
 }
 
 function update_local_posts_stat() {
-	$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE (item_flags & %d)>0 ",
-			intval(ITEM_WALL) );
+	$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE item_wall = 1 ");
 	if (is_array($posts)) {
 		$local_posts_stat = intval($posts[0]["local_posts"]);
 		set_config('system','local_posts_stat',$local_posts_stat);
diff --git a/include/taxonomy.php b/include/taxonomy.php
index fa540ac56..95b6ae1af 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -111,8 +111,12 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $
 	$sql_options = item_permissions_sql($uid);
 	$count = intval($count);
 
-	if($flags)
-		$sql_options .= " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") ";
+	if($flags) {
+		if($flags == ITEM_WALL)
+			$sql_options .= " and item_wall = 1 ";
+		else
+			$sql_options .= " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") ";
+	}
 
 	if($authors) {
 		if(! is_array($authors))
diff --git a/include/zot.php b/include/zot.php
index 53d3376dc..15d724026 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1559,12 +1559,12 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 		// This is our own post, possibly coming from a channel clone
 
 		if($arr['owner_xchan'] == $d['hash']) {
-			$arr['item_flags'] = $arr['item_flags'] | ITEM_WALL;
+			$arr['item_wall'] = 1;
 		}
 		else {
 			// clear the wall flag if it is set
-			if($arr['item_flags'] & ITEM_WALL) {
-				$arr['item_flags'] = ($arr['item_flags'] ^ ITEM_WALL);
+			if(intval($arr['item_wall'])) {
+				$arr['item_wall'] = 0;
 			}
 		}