honour the admin censored flag in the directory, and some slow progress on extended likes

5 files changed, 141 insertions, 61 deletions

diff --git a/boot.php b/boot.php
index 3a9f93d5e..4c93cd117 100755
--- a/boot.php
+++ b/boot.php
@@ -47,7 +47,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1113  );
+define ( 'DB_UPDATE_VERSION',       1114  );
 
 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/install/database.sql b/install/database.sql
index 388bfdfd2..cb4846b52 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -575,13 +575,15 @@ CREATE TABLE IF NOT EXISTS `item_id` (
 
 CREATE TABLE IF NOT EXISTS `likes` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `channel_id` int(11) unsigned NOT NULL DEFAULT '0', 
   `liker` char(128) NOT NULL DEFAULT '',
   `likee` char(128) NOT NULL DEFAULT '',
-  `iid` int(11) NOT NULL DEFAULT '0',
+  `iid` int(10) unsigned NOT NULL DEFAULT '0',
   `verb` char(255) NOT NULL DEFAULT '',
   `target_type` char(255) NOT NULL DEFAULT '',
   `target` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
+  KEY `channel_id` (`channel_id`),
   KEY `liker` (`liker`),
   KEY `likee` (`likee`),
   KEY `iid` (`iid`),
diff --git a/install/update.php b/install/update.php
index 4981acc5d..b6bcfa237 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1113 );
+define( 'UPDATE_VERSION' , 1114 );
 
 /**
  *
@@ -1273,3 +1273,13 @@ function update_r1112() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 }
+
+function update_r1113() {
+	$r = q("ALTER TABLE `likes` ADD `channel_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `id` ,
+CHANGE `iid` `iid` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',
+ADD INDEX ( `channel_id` )");
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
diff --git a/mod/like.php b/mod/like.php
index a76867422..4cc125a79 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -16,7 +16,6 @@ function like_content(&$a) {
 	if(! $verb)
 		$verb = 'like';
 
-
 	switch($verb) {
 		case 'like':
 		case 'unlike':
@@ -31,80 +30,148 @@ function like_content(&$a) {
 			break;
 	}
 
+	$extended_like = false;
 
-	$item_id = ((argc() > 1) ? notags(trim(argv(1))) : 0);
+	if(argc() == 3) {
 
-	logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG);
+		$observer = $a->get_observer();
 
+		if(! $observer)
+			killme();
 
-	$r = q("SELECT * FROM item WHERE id = %d and item_restrict = 0 LIMIT 1",
-		dbesc($item_id)
-	);
+		$extended_like = true;
+		$obj_type = argv(1);
+		$obj_id = argv(2);
+		$public = true;
+
+		if($obj_type == 'profile') {
+			$r = q("select * from profile where profile_guid = '%s' limit 1",
+				dbesc(argv(2))
+			);
+			if(! $r)
+				killme();			
+			$owner_id = $r[0]['uid'];
+			if($r[0]['is_default'])
+				$public = true;
+			if(! $public) {
+				$d = q("select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d",
+					dbesc($r[0]['profile_guid']),
+					intval($owner_id)
+				);
+				if(! $d) {
+					// forgery - illegal
+					killme();
+				}
+				// $d now contains a list of those who can see this profile - only send the status notification
+				// to them.
+				$allow_cid = $allow_gid = $deny_cid = $deny_gid = '';
+				foreach($d as $dd) {
+					$allow_gid .= '<' . $dd['abook_xchan'] . '>';
+				}
+
+			}
+
+
+		}
+		elseif($obj_type == 'thing') {
+			$r = q("select * from obj where obj_id = %d limit 1",
+				intval(argv(2))
+			);
+			if(! $r)
+				killme();		
+
+			$owner_id = $r[0]['obj_channel'];
+
+			$allow_cid = $r[0]['allow_cid'];
+			$allow_gid = $r[0]['allow_gid'];
+			$deny_cid = $r[0]['deny_cid'];
+			$deny_gid = $r[0]['deny_gid'];
+			if($allow_cid || $allow_gid || $deny_cid || $deny_gid)			
+				$public = false;
+
+
+		}
+		else
+			killme();
 
-	if(! $item_id || (! $r)) {
-		logger('like: no item ' . $item_id);
-		killme();
 	}
+	else {
+
+		$item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0);
+
+		logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG);
+
+
+		$r = q("SELECT * FROM item WHERE id = %d and item_restrict = 0 LIMIT 1",
+			dbesc($item_id)
+		);
+
+		if(! $item_id || (! $r)) {
+			logger('like: no item ' . $item_id);
+			killme();
+		}
+
+
+		$item = $r[0];
+		$owner_uid = $item['uid'];
+		$owner_aid = $item['aid'];
+
 
-	$item = $r[0];
 
-	$sys = get_sys_channel();
+		$sys = get_sys_channel();
 
-	$owner_uid = $item['uid'];
-	$owner_aid = $item['aid'];
 
-	// if this is a "discover" item, (item['uid'] is the sys channel),
-	// fallback to the item comment policy, which should've been
-	// respected when generating the conversation thread.
-	// Even if the activity is rejected by the item owner, it should still get attached
-	// to the local discover conversation on this site. 
+		// if this is a "discover" item, (item['uid'] is the sys channel),
+		// fallback to the item comment policy, which should've been
+		// respected when generating the conversation thread.
+		// Even if the activity is rejected by the item owner, it should still get attached
+		// to the local discover conversation on this site. 
 
-	if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) {
+		if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) {
 			notice( t('Permission denied') . EOL);
 			killme();
-	}
+		}
 
-	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-		dbesc($item['owner_xchan'])
-	);
-	if($r)
-		$thread_owner = $r[0];
-	else
-		killme();
-
-	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-		dbesc($item['author_xchan'])
-	);
-	if($r)
-		$item_author = $r[0];
-	else
-		killme();
-
-
-
-	$r = q("SELECT * FROM item WHERE verb = '%s' AND item_restrict = 0 
-		AND author_xchan = '%s' AND ( parent = %d OR thr_parent = '%s') LIMIT 1",
-		dbesc($activity),
-		dbesc($observer['xchan_hash']),
-		intval($item_id),
-		dbesc($item['mid'])
-	);
-	if($r) {
-		$like_item = $r[0];
-
-		// Already liked/disliked it, delete it
-
-		$r = q("UPDATE item SET item_restrict = ( item_restrict ^ %d ), changed = '%s' WHERE id = %d LIMIT 1",
-			intval(ITEM_DELETED),
-			dbesc(datetime_convert()),
-			intval($like_item['id'])
+		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+			dbesc($item['owner_xchan'])
 		);
+		if($r)
+			$thread_owner = $r[0];
+		else
+			killme();
+
+		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+			dbesc($item['author_xchan'])
+		);
+		if($r)
+			$item_author = $r[0];
+		else
+			killme();
 
-		proc_run('php',"include/notifier.php","like",$like_item['id']);
-		return;
-	}
 
+		$r = q("SELECT * FROM item WHERE verb = '%s' AND item_restrict = 0 
+			AND author_xchan = '%s' AND ( parent = %d OR thr_parent = '%s') LIMIT 1",
+			dbesc($activity),
+			dbesc($observer['xchan_hash']),
+			intval($item_id),
+			dbesc($item['mid'])
+		);
+		if($r) {
+			$like_item = $r[0];
+
+			// Already liked/disliked it, delete it
+
+			$r = q("UPDATE item SET item_restrict = ( item_restrict ^ %d ), changed = '%s' WHERE id = %d LIMIT 1",
+				intval(ITEM_DELETED),
+				dbesc(datetime_convert()),
+				intval($like_item['id'])
+			);
 
+			proc_run('php',"include/notifier.php","like",$like_item['id']);
+			return;
+		}
+
+	}
 
 	$mid = item_message_id();
 
diff --git a/mod/zfinger.php b/mod/zfinger.php
index ddfa37761..d79025885 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -101,10 +101,11 @@ function zfinger_init(&$a) {
 
 	$special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM)  ? true : false);
 	$adult_channel   = (($e['channel_pageflags'] & PAGE_ADULT)    ? true : false);
+	$censored        = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false);
 	$searchable      = (($e['channel_pageflags'] & PAGE_HIDDEN)   ? false : true);
 	$deleted         = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false);
 
-	if(($e['xchan_flags'] & XCHAN_FLAGS_HIDDEN) || $deleted)
+	if(($e['xchan_flags'] & XCHAN_FLAGS_HIDDEN) || $deleted || $censored)
 		$searchable = false;
 	 
 	//  This is for birthdays and keywords, but must check access permissions