remove more legacy zot quirks

Zotlabs/Daemon/Cron.php

@@ -165,11 +165,6 @@ class Cron {
 			}
 		}
 
-
-		// check if any connections transitioned to zot6 and upgrade the connections to zot6 at this hub if so.
-		require_once('include/connections.php');
-		z6trans_connections();
-
 		require_once('include/attach.php');
 		attach_upgrade();
 

Zotlabs/Daemon/Cron_daily.php

@@ -95,8 +95,6 @@ class Cron_daily {
 		remove_obsolete_hublocs();
 		remove_duplicate_singleton_hublocs();
 
-		z6_discover();
-
 		$date = datetime_convert();
 		call_hooks('cron_daily', $date);
 

Zotlabs/Lib/DReport.php

@@ -87,8 +87,7 @@ class DReport {
 
 		// Is the sender one of our channels?
 
-		$c = q("select channel_id from channel where channel_hash = '%s' or channel_portable_id = '%s' limit 1",
+		$c = q("select channel_id from channel where channel_hash = '%s' limit 1",
-			dbesc($dr['sender']),
 			dbesc($dr['sender'])
 		);
 

Zotlabs/Lib/Libzotdir.php

@@ -345,7 +345,7 @@ class Libzotdir {
 
 		logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG);
 
-		$p = q("select channel.channel_hash, channel_address, channel_timezone, channel_portable_id, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
+		$p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
 			intval($uid)
 		);
 
@@ -354,7 +354,6 @@ class Libzotdir {
 
 		if ($p) {
 			$hash = $p[0]['channel_hash'];
-			$legacy_hash = $p[0]['channel_portable_id'];
 
 			$profile['description'] = $p[0]['pdesc'];
 			$profile['birthday']    = $p[0]['dob'];
@@ -393,10 +392,9 @@ class Libzotdir {
 			);
 
 			if(intval($r[0]['xchan_hidden']) != $hidden) {
-				$r = q("update xchan set xchan_hidden = %d where xchan_hash in ('%s', '%s')",
+				$r = q("update xchan set xchan_hidden = %d where xchan_hash = '%s'",
 					intval($hidden),
-					dbesc($hash),
+					dbesc($hash)
-					dbesc($legacy_hash)
 				);
 			}
 
@@ -410,13 +408,11 @@ class Libzotdir {
 			}
 			else {
 				// they may have made it private
-				q("delete from xprof where xprof_hash in ('%s', '%s')",
+				q("delete from xprof where xprof_hash = '%s'",
-					dbesc($hash),
+					dbesc($hash)
-					dbesc($legacy_hash)
 				);
-				q("delete from xtag where xtag_hash in ('%s', '%s')",
+				q("delete from xtag where xtag_hash = '%s'",
-					dbesc($hash),
+					dbesc($hash)
-					dbesc($legacy_hash)
 				);
 			}
 

Zotlabs/Module/Dreport.php

@@ -5,16 +5,16 @@ namespace Zotlabs\Module;
 class Dreport extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied') . EOL);
 			return;
 		}
-	
+
 		$table = 'item';
-	
+
 		$channel = \App::get_channel();
-		
+
 		$mid = ((argc() > 1) ? argv(1) : '');
 		$encoded_mid = '';
 
@@ -31,7 +31,7 @@ class Dreport extends \Zotlabs\Web\Controller {
 				$mid = @base64url_decode(substr($mid,4));
 			}
 
-			if($mid) {	
+			if($mid) {
 				$i = q("select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
 					dbesc($mid),
 					intval($channel['channel_id']),
@@ -53,13 +53,13 @@ class Dreport extends \Zotlabs\Web\Controller {
 				$mid = @base64url_decode(substr($mid,4));
 
 		}
-	
+
-	
+
 		if(! $mid) {
 			notice( t('Invalid message') . EOL);
 			return;
 		}
-	
+
 		switch($table) {
 			case 'item':
 				$i = q("select id from item where mid = '%s' and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
@@ -77,30 +77,29 @@ class Dreport extends \Zotlabs\Web\Controller {
 			default:
 				break;
 		}
-	
+
 		if(! $i) {
 			notice( t('Permission denied') . EOL);
 			return;
 		}
-		
+
-		$r = q("select * from dreport where (dreport_xchan = '%s' or dreport_xchan = '%s') and dreport_mid = '%s'",
+		$r = q("select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'",
-			dbesc($channel['channel_hash']),
+			dbesc($channel['channel_hash'])
-			dbesc($channel['channel_portable_id']),
 			dbesc($mid)
 		);
-	
+
 		if(! $r) {
 			notice( t('no results') . EOL);
 //			return;
 		}
-		
+
 		for($x = 0; $x < count($r); $x++ ) {
-	
+
 			// This has two purposes: 1. make the delivery report strings translateable, and
 			// 2. assign an ordering to item delivery results so we can group them and provide
 			// a readable report with more interesting events listed toward the top and lesser
 			// interesting items towards the bottom
-	
+
 			switch($r[$x]['dreport_result']) {
 				case 'channel sync processed':
 					$r[$x]['gravity'] = 0;
@@ -146,13 +145,13 @@ class Dreport extends \Zotlabs\Web\Controller {
 					break;
 			}
 		}
-	
+
 		usort($r,'self::dreport_gravity_sort');
 
 		$entries = array();
 		foreach($r as $rr) {
-			$entries[] = [ 
+			$entries[] = [
-				'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']),					
+				'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']),
 				'result' => escape_tags($rr['dreport_result']),
 				'time' => escape_tags(datetime_convert('UTC',date_default_timezone_get(),$rr['dreport_time']))
 			];
@@ -167,14 +166,14 @@ class Dreport extends \Zotlabs\Web\Controller {
 			'$push' => t('Redeliver'),
 			'$entries' => $entries
 		));
-	
+
-	
+
 		return $o;
-	
+
-	
+
-	
+
 	}
-	
+
 	private static function dreport_gravity_sort($a,$b) {
 		if($a['gravity'] == $b['gravity']) {
 			if($a['dreport_name'] === $b['dreport_name'])
@@ -183,5 +182,5 @@ class Dreport extends \Zotlabs\Web\Controller {
 		}
 		return (($a['gravity'] > $b['gravity']) ? 1 : (-1));
 	}
-	
+
 }

Zotlabs/Module/Import.php

@@ -253,9 +253,8 @@ class Import extends \Zotlabs\Web\Controller {
 
 			// replace any existing xchan we may have on this site if we're seizing control
 
-			$r = q("delete from xchan where ( xchan_hash = '%s' or xchan_hash = '%s' ) ",
+			$r = q("delete from xchan where xchan_hash = '%s'",
-				dbesc($channel['channel_hash']),
+				dbesc($channel['channel_hash'])
-				dbesc($channel['channel_portable_id'])
 			);
 
 			$r = xchan_store_lowlevel(

Zotlabs/Module/Locs.php

@@ -28,9 +28,8 @@ class Locs extends Controller {
 					return;
 				}
 
-				q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
+				q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND hubloc_hash = '%s'",
-					dbesc($channel['channel_hash']),
+					dbesc($channel['channel_hash'])
-					dbesc($channel['channel_portable_id'])
 				);
 
 				q("UPDATE hubloc SET hubloc_primary = 1 WHERE hubloc_id = %d AND hubloc_hash = '%s'",
@@ -81,10 +80,9 @@ class Locs extends Controller {
 					}
 				}
 
-				q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
+				q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND hubloc_hash = '%s'",
 					dbesc($r[0]['hubloc_id_url']),
-					dbesc($channel['channel_hash']),
+					dbesc($channel['channel_hash'])
-					dbesc($channel['channel_portable_id'])
 				);
 				Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] );
 				return;

include/api_auth.php

@@ -27,7 +27,7 @@ function api_login(&$a){
 		if ($server->verifyResourceRequest($request)) {
 			$token = $server->getAccessTokenData($request);
 			$uid = $token['user_id'];
-			$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1", 
+			$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1",
 				intval($uid)
 			);
 			if (count($r)) {
@@ -41,7 +41,7 @@ function api_login(&$a){
 			$_SESSION['uid'] = $record['channel_id'];
 			$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-			$x = q("select * from account where account_id = %d LIMIT 1", 
+			$x = q("select * from account where account_id = %d LIMIT 1",
 				intval($record['channel_account_id'])
 			);
 			if ($x) {
@@ -102,9 +102,6 @@ function api_login(&$a){
 					);
 					if($r) {
 						$c = channelx_by_hash($r[0]['hubloc_hash']);
-						if (! $c) {
-							$c = channelx_by_portid($r[0]['hubloc_hash']);
-						}
 						if($c) {
 							$a = q("select * from account where account_id = %d limit 1",
 								intval($c['channel_account_id'])
@@ -116,7 +113,7 @@ function api_login(&$a){
 						}
 					}
 
-					if($record) {					
+					if($record) {
 						$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
 						if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
 							$record = null;
@@ -164,4 +161,4 @@ function retry_basic_auth($method = 'Basic') {
 	header('HTTP/1.0 401 Unauthorized');
 	echo('This api requires login');
 	killme();
-}
+}

include/channel.php

@@ -2794,15 +2794,12 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
 
 		logger('deleting hublocs',LOGGER_DEBUG);
 
-		$r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_hash = '%s' OR hubloc_hash = '%s'",
+		$r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_hash = '%s'",
-			dbesc($channel['channel_hash']),
+			dbesc($channel['channel_hash'])
-			dbesc($channel['channel_portable_id'])
-
 		);
 
-		$r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s' OR xchan_hash = '%s'",
+		$r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s'",
-			dbesc($channel['channel_hash']),
+			dbesc($channel['channel_hash'])
-			dbesc($channel['channel_portable_id'])
 		);
 
 		Master::Summon(array('Notifier','purge_all',$channel_id));

include/security.php

@@ -681,12 +681,11 @@ function get_security_ids($channel_id, $ob_hash) {
 	];
 
 	if ($channel_id) {
-		$ch = q("select channel_hash, channel_portable_id from channel where channel_id = %d",
+		$ch = q("select channel_hash from channel where channel_id = %d",
 			intval($channel_id)
 		);
 		if ($ch) {
 			$ret['channel_id'][] = $ch[0]['channel_hash'];
-			$ret['channel_id'][] = $ch[0]['channel_portable_id'];
 		}
 	}