look for iconfig at the right place, fix mod sharedwithme, comment out unused configs

3 files changed, 31 insertions, 46 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 9dbb15c28..8f4e0444c 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -672,6 +672,7 @@ class Activity {
 				}
 			}
 		}
+
 		return $ret;
 	}
 
@@ -2456,7 +2457,7 @@ class Activity {
 				$s['attach'] = $a;
 			}
 
-			$a = self::decode_iconfig($act->obj);
+			$a = self::decode_iconfig($act->data);
 			if ($a) {
 				$s['iconfig'] = $a;
 			}
@@ -2786,8 +2787,9 @@ class Activity {
 			set_iconfig($s, 'diaspora', 'fields', $diaspora_rawmsg, 1);
 		}
 
-		set_iconfig($s, 'activitypub', 'recips', $act->raw_recips);
-
+		if ($act->raw_recips) {
+			set_iconfig($s, 'activitypub', 'recips', $act->raw_recips);
+		}
 
 		$hookinfo = [
 			'act' => $act,
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index 85f81e344..7e186fe34 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -83,9 +83,9 @@ class Site {
 		$proxyuser         = ((x($_POST,'proxyuser'))        ? notags(trim($_POST['proxyuser']))  : '');
 		$proxy             = ((x($_POST,'proxy'))            ? notags(trim($_POST['proxy']))      : '');
 		$timeout           = ((x($_POST,'timeout'))          ? intval(trim($_POST['timeout']))    : 60);
-		$delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0);
+		//$delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0);
 		$delivery_batch_count = ((x($_POST,'delivery_batch_count') && $_POST['delivery_batch_count'] > 0)? intval(trim($_POST['delivery_batch_count'])) : 1);
-		$poll_interval     = ((x($_POST,'poll_interval'))    ? intval(trim($_POST['poll_interval'])) : 0);
+		//$poll_interval     = ((x($_POST,'poll_interval'))    ? intval(trim($_POST['poll_interval'])) : 0);
 		$maxloadavg        = ((x($_POST,'maxloadavg'))       ? intval(trim($_POST['maxloadavg'])) : 50);
 		$feed_contacts     = ((x($_POST,'feed_contacts'))    ? intval($_POST['feed_contacts'])    : 0);
 		$verify_email      = ((x($_POST,'verify_email'))     ? 1 : 0);
@@ -100,7 +100,7 @@ class Site {
 		$reg_expire 	   = (preg_match('/^[a-z]{1,1}$/', $regexpireu) ? $regexpiren . $regexpireu : '');
 
 		$imagick_path      = ((x($_POST,'imagick_path'))     ? trim($_POST['imagick_path'])   : '');
-		$force_queue       = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue'])   : 3000);
+		//$force_queue       = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue'])   : 3000);
 		$pub_incl = escape_tags(trim($_POST['pub_incl']));
 		$pub_excl = escape_tags(trim($_POST['pub_excl']));
 
@@ -136,9 +136,9 @@ class Site {
 		// <-hilmar]
 
 		set_config('system', 'feed_contacts', $feed_contacts);
-		set_config('system', 'delivery_interval', $delivery_interval);
+		//set_config('system', 'delivery_interval', $delivery_interval);
 		set_config('system', 'delivery_batch_count', $delivery_batch_count);
-		set_config('system', 'poll_interval', $poll_interval);
+		//set_config('system', 'poll_interval', $poll_interval);
 		set_config('system', 'maxloadavg', $maxloadavg);
 		set_config('system', 'frontpage', $frontpage);
 		set_config('system', 'sellpage', $site_sellpage);
@@ -205,7 +205,7 @@ class Site {
 		set_config('system','disable_discover_tab', $disable_discover_tab);
 		set_config('system','site_firehose', $site_firehose);
 		set_config('system','open_pubstream', $open_pubstream);
-		set_config('system','force_queue_threshold', $force_queue);
+		//set_config('system','force_queue_threshold', $force_queue);
 		if ($global_directory == '') {
 			del_config('system', 'directory_submit_url');
 		} else {
@@ -530,10 +530,10 @@ class Site {
 			'$proxyuser'		=> array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
 			'$proxy'			=> array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
 			'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
-			'$delivery_interval'			=> array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
+			//'$delivery_interval'			=> array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
 			'$delivery_batch_count' => array('delivery_batch_count', t('Deliveries per process'),(x(get_config('system','delivery_batch_count'))?get_config('system','delivery_batch_count'):1), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")),
-			'$force_queue'			=> array('force_queue', t("Queue Threshold"), get_config('system','force_queue_threshold',3000), t("Always defer immediate delivery if queue contains more than this number of entries.")),
-			'$poll_interval'			=> array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
+			//'$force_queue'			=> array('force_queue', t("Queue Threshold"), get_config('system','force_queue_threshold',3000), t("Always defer immediate delivery if queue contains more than this number of entries.")),
+			//'$poll_interval'			=> array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
 			'$imagick_path'			=> array('imagick_path', t("Path to ImageMagick convert program"), get_config('system','imagick_convert_path'), t("If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert")),
 			'$maxloadavg'			=> array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
 			'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php
index 4211a3af8..c294079d4 100644
--- a/Zotlabs/Module/Sharedwithme.php
+++ b/Zotlabs/Module/Sharedwithme.php
@@ -19,13 +19,13 @@ class Sharedwithme extends Controller {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-		
+
 		$channel = \App::get_channel();
-	
+
 		$is_owner = (local_channel() && (local_channel() == $channel['channel_id']));
 
 		$item_normal = item_normal();
-	
+
 		//drop single file - localuser
 		if((argc() > 2) && (argv(2) === 'drop')) {
 
@@ -36,7 +36,7 @@ class Sharedwithme extends Controller {
 			goaway(z_root() . '/sharedwithme');
 
 		}
-	
+
 		//drop all files - localuser
 		if((argc() > 1) && (argv(1) === 'dropall')) {
 
@@ -62,33 +62,34 @@ class Sharedwithme extends Controller {
 			dbesc($channel['channel_hash'])
 		);
 
+		$r = fetch_post_tags($r, true);
+
 		$items = [];
 		$ids = [];
 
 		if($r) {
-	
+
 			foreach($r as $rr) {
-				$object = json_decode($rr['obj'],true);
-				$meta = self::get_meta($object);
+				$meta = get_iconfig($rr, 'attach', 'meta');
 
 				$item = [];
 				$item['id'] = $rr['id'];
 				$item['objfiletype'] = $meta['type'];
 				$item['objfiletypeclass'] = getIconFromType($meta['type']);
 				$item['objurl'] = $meta['path'] . '?f=&zid=' . $channel['xchan_addr'];
-				$item['objfilename'] = $object['name'];
+				$item['objfilename'] = $meta['name'];
 				$item['objfilesize'] = userReadableSize($meta['size']);
 				$item['objedited'] = $meta['edited'];
 				$item['unseen'] = $rr['item_unseen'];
-	
+
 				$items[] = $item;
-	
+
 				if($item['unseen']) {
 					$ids[] = $rr['id'];
 				}
-	
+
 			}
-	
+
 		}
 
 		$ids = implode(',', $ids);
@@ -98,9 +99,9 @@ class Sharedwithme extends Controller {
 				intval(local_channel())
 			);
 		}
-	
+
 		$o = '';
-	
+
 		$o .= replace_macros(get_markup_template('sharedwithme.tpl'), array(
 			'$header' => t('Files: shared with me'),
 			'$name' => t('Name'),
@@ -111,27 +112,9 @@ class Sharedwithme extends Controller {
 			'$drop' => t('Remove this file'),
 			'$items' => $items
 		));
-	
-		return $o;
-	
-	}
-	
-	function get_meta($object) {
-
-		$ret = [];
-
-		if(! is_array($object['attachment']))
-			return;
 
-		foreach($object['attachment'] as $a) {
-			if($a['name'] === 'zot.attach.meta') {
-				$ret = $a['value'];
-				break;
-			}
-		}
-
-		return $ret;
+		return $o;
 
 	}
-	
+
 }