update include/items.php

(cherry picked from commit 836de7f1a5)

CHANGELOG

@@ -1,3 +1,153 @@
+Hubzilla 5.6 (2021-05-11)
+	- Improve postgres hubloc queries
+	- Implement automatic duplicate singleton hubloc removal
+	- Send author id, id_sig and key fields along with author/owner
+	- Implement custom redis session backend
+	- Improved registration workflow
+	- Complete rewrite of the registration backend with many new features
+	- Complete rewrite of the invite app
+	- Update Spanish, Russian and Polish translations
+	- Improved PHP8 compatibiliy (work in progress)
+
+	Bugfixes
+	- Fix manual fetching of non-ascii domains
+	- Fix revision not compared when importing items
+	- Fix events not transformed to UTC when importing calendar
+	- Fix timezone issue in mod cal
+	- Fix profile photos not revalidated
+	- Fix regression in caldav/carddav discovery
+	- Fix caldav/carddav sync on remote access
+	- Fix info and notice messages not bootstraped when using SSE
+	- Fix URL including an @ treated like a webbie
+	- Fix cover photo image issues on some mobile devices
+
+	Addons
+	- Diaspora: improve performance when delivering public items
+	- Diaspora: make sure to not process same contact more than once
+	- Pubcrawl: make sure to not process same contact more than once
+	- Pubcrawl: do not relay Like and Dislike activity
+	- Pubcrawl: deprecate as_follow() in favour of core Activity::follow()
+	- Pubcrawl: improved compatibility with mobilizon and xwiki
+	- Pubcrawl: do not process follow/unfollw thread in as_create_note()
+	- Diaspora: do not relay comments/likes of strangers if the thread-owner is local and does not allow comments/likes by strangers in the diaspora app settings
+
+
+Hubzilla 5.4.3 (2021-04-20)
+	- Fix regression in mod notifications (only the last was visible)
+	- Set Permissions-Policy: interest-cohort=() header by default
+	- Fix xchans containing a % breaking get_forum_channels()
+	- Fix webfinger if using a reverse proxy
+	- Fix regression finding bookmarks
+	- Fix zot6 hublocs import on channel import
+	- Fix revision not checked in import_items()
+
+
+Hubzilla 5.4.2 (2021-03-15)
+	- Fix translation plural variable
+	- Fix issue with following/unfollowing a thread
+	- Fix rendering of long text in xchan vcard
+	- Fix local link for rss content if rewrite author is sets
+	- Fix regression in mod display
+
+	Addons
+	- Pubcrawl: fix issue with following/unfollowing a thread
+	- Pubcrawl: more robust implementation of mastodon remote reply
+	- Photocache: remove suffix from the cached photo URL
+
+
+Hubzilla 5.4.1 (2021-03-09)
+	- Fix profile not found if not logged in
+	- Fix summary not reset on cancel
+	- Fix summary not saved with aoutosave draft
+	- Fix unexpected trigger of buttons when pressing enter in input fields
+	- Fix spanish plural expression
+	- Fix undefined page-end on non dynamic pages
+
+	Addons
+	- Pubcrawl: fix regression in pubcrawl_follow_mod_init()
+
+
+Hubzilla 5.4 (2021-03-08)
+	- Add new connections to privacy group independend from the default privacy group settings
+	- group_add() return group hash to save a lookup
+	- Do not poll feeds if feed contacts setting is disabled
+	- Deprecate sticky_kit library in favor of CSS position sticky solution
+	- Trigger endless scroll loading at the end of content instead of end of window height
+	- Implement experimental zap export compatibility
+	- Deprecate the [summary] tag in favor of a separate input field for the summary
+	- Adjust error reporting for PHP8
+	- Rely on php.ini default value for pcre.backtrack_limit
+	- PHP8 compatibility (experimental)
+	- Introduce Lib/Crypto (ported from zap)
+	- Introduce Lib/Keyutils which now implements phpseclib v2
+	- Improve profile photo fetching
+	- Introduce fetch_provider hook
+	- Implement ActivityStreams discovery in mod profile
+	- Implement ActivityStreams discovery in mod channel
+	- Streamline OS folder and file permissions
+	- Add polish translations
+	- Implement ThreadListener in mod activity_match
+	- Improve ThreadListener handling
+	- Use mail envelope instead of lock icon for direct messages
+	- Implement ASCollection in Libzot::fetch_conversation()
+	- Invoke channel discovery by hash instead of address in mod channel
+	- Implement manual public item import for zot6, activitypub and diaspora via search
+	- Default photo storage to filesystem instead of DB for new installations
+	- Support filesystem storage for xchan profile photos
+	- Deprecate Daemon/Externals
+	- Implement SQL query background caching
+	- Process channel categories list in background
+	- Port util/connect to Lib/Connect
+
+	Bugfixes
+	- Fix visible/empty notifications for blocked contacts items
+	- Fix issue where URL fragment was turned into hashtag if the hashtag existed elsewhere in the post (issue #1518)
+	- Fix audio and video embeds for media sources without media format extension
+	- Fix issue where zot package was saved in iconf instead of the decoded activity
+	- Fix duplicate id in post preview
+	- Fix display issue of restricted content in mod display
+	- Fix issue where comments were not delivered to the public stream
+	- Fix issue where profile photos were stored multiple times and remove duplicates
+	- Fix pinned items sync between clones
+	- Fix r_preview for list mode in mod channel and mod network
+
+	Addons
+	- Pubcrawl: deal with mastodons remote replies
+	- Diaspora: reduce xchan network confusion in several places
+	- Diaspora: fix mentions if multiple xchan networks exists
+	- Diaspora: fix comments on comments
+	- Pubcrawl: do not re-use broken signed messages
+	- Pubcrawl: fix parsing of images with description (core issue #1519)
+	- Pubcrawl: use the signed message from the attachment (iconfig) when relaying
+	- Diaspora: implement browser to browser encrypted messages as base64 encoded string
+	- Pubcrawl: implement browser to browser encrypted messages as base64 encoded string
+	- Diaspora: support post summary
+	- Pubcrawl: fix summary aka content warning
+	- PHP8 compatibility (experimental)
+	- Tripleaes: removed
+	- Reflect core crypto changes
+	- Photocache: improve mimetype detection
+	- Diaspora: implement mnanual fetch provider
+	- Diaspora: implement send participation
+	- Pubcrawl: deprecate pubcrawl_is_as_request() in favor of the core version in Lib/ActivityStreams
+	- Diaspora: prefer zot identity for inbound comments if available
+	- Pubcrawl: return zotfeed results in mod outbox
+	- Queueworker: improved deduplication by adding a uuid
+	- Superblock: fix syncing with clones regression
+	- Queueworker: improve SQL query in GetWorkerCount()
+	- Queueworker: fix issue in workersleep handling
+
+
+Hubzilla 5.2.2 (2021-02-13)
+	- Fix issue with ping_site()
+
+
+Hubzilla 5.2.1 (2021-01-16)
+	- Fix attach_upgrade() to catch all broken entries in attach
+	- Fix collect_recipients() public policy filter for zot6
+	- Fix leaking of duplicate tasks in queueworker
+
+
 Hubzilla 5.2 (2021-01-13)
 	- Use libzotdir for directory
 	- Streamline usage of channel url for keyId

CHANGELOG.air

@@ -0,0 +1,48 @@
+"air" is a branch name for revision of Account-Invite-Register at the Hubzilla project
+
+Invite:
+* Rewritten and now language template driven
+* Selectable templates for the invite mails
+* Invitor may add personal notes in the mailtext
++ Invite codes are bound to the recipients email address
+* Invite mod never more creates accounts
+* new db scheme for table register
+* existing register table will be migrated to the new schema even when detected at runtime
+* Bugfix: creating invite codes when admin only calls Invite w/o any further action
+* account library revision also together with invite mod
+* Depending on config: Users may send invitations also
+* Invitations expires, controlled by the invitor
+* Changed and new configs:
+* * invitation_only       As usual before
+* * invitation_also       Beside other registration policies, invitations may be used also
+* * invitation_max_per_day	defaults 50, may be changed in adminUI admin>site
+* * invitation_max_per_user defaults 4
+* Requirements:
+* * Addon language has to be installed
+
+Register:
+* Register panel (form) and js interaction changed
+* Unused registrations expire
+* Depending on config, anonymous registrations (w/o email) are supported
+* :... dont't panic, that may let grow security
+* Even anonymous users have to confirm their registration
+* Registrations may be enabled / disabled time driven for each day in the week (dudy)
+* Unsoliced registration floods may be blocked
+* Limited registrations from one single source ip
+* Using one additional log file, to easy interfare with f2b
+
+Account:
+* An user account always becomes created only if all depending conditions are satisfied
+* AdminUI for site configuration, accounts and registrations enhancements
+* Still untouched, but accountUI needs enhanced async control in case for mass delete
+  with deep level of recursion cascade of the dependencies (channels etc). An open TODO
+  since years for instances with many much users and channels.
+
+History:
+2020.03 Hubzilla Prod version 4.6 (master branch) of hubzilla/core was the base for AIR 
+        that was assigned Version 4.6.2 at sn/core
+2021.02 Hubzilla Prod version 5.2.1 (master branch) of hubzilla/core was new base for AIR
+        that was assigned version 5.2.2 at sn/core (air.5)
+        plus adjustment of hubzilla 5.2.2 (master) to sn/core (air.5) version 5.2.9
+
+

SBOM.md

@@ -3,7 +3,7 @@
 |Name|Version|License|Source|
 |----|-------|-------|------|
 |blueimp/jquery-file-upload|10.31.0.0|MIT|https://github.com/vkhramtsov/jQuery-File-Upload.git|
-|brick/math|0.9.1.0|MIT|https://github.com/brick/math.git|
+|brick/math|0.9.2.0|MIT|https://github.com/brick/math.git|
 |bshaffer/oauth2-server-php|1.11.1.0|MIT|https://github.com/bshaffer/oauth2-server-php.git|
 |commerceguys/intl|1.0.7.0|MIT|https://github.com/commerceguys/intl.git|
 |desandro/imagesloaded|4.1.4.0|MIT|https://github.com/desandro/imagesloaded.git|
@@ -12,22 +12,22 @@
 |lukasreschke/id3parser|0.0.3.0|GPL|https://github.com/LukasReschke/ID3Parser.git|
 |michelf/php-markdown|1.9.0.0|BSD-3-Clause|https://github.com/michelf/php-markdown.git|
 |pear/text_languagedetect|1.0.1.0|BSD-2-Clause|https://github.com/pear/Text_LanguageDetect.git|
+|phpseclib/phpseclib|2.0.30.0|MIT|https://github.com/phpseclib/phpseclib.git|
 |psr/log|1.1.3.0|MIT|https://github.com/php-fig/log.git|
-|ramsey/collection|1.1.1.0|MIT|https://github.com/ramsey/collection.git|
+|ramsey/collection|1.1.3.0|MIT|https://github.com/ramsey/collection.git|
 |ramsey/uuid|4.1.1.0|MIT|https://github.com/ramsey/uuid.git|
-|sabre/dav|4.1.3.0|BSD-3-Clause|https://github.com/sabre-io/dav.git|
+|sabre/dav|4.1.5.0|BSD-3-Clause|https://github.com/sabre-io/dav.git|
 |sabre/event|5.1.2.0|BSD-3-Clause|https://github.com/sabre-io/event.git|
 |sabre/http|5.1.1.0|BSD-3-Clause|https://github.com/sabre-io/http.git|
 |sabre/uri|2.2.1.0|BSD-3-Clause|https://github.com/sabre-io/uri.git|
-|sabre/vobject|4.3.3.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git|
+|sabre/vobject|4.3.5.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git|
 |sabre/xml|2.2.3.0|BSD-3-Clause|https://github.com/sabre-io/xml.git|
 |simplepie/simplepie|1.5.6.0|BSD-3-Clause|https://github.com/simplepie/simplepie.git|
-|smarty/smarty|3.1.36.0|LGPL-3.0|https://github.com/smarty-php/smarty.git|
-|symfony/polyfill-ctype|1.20.0.0|MIT|https://github.com/symfony/polyfill-ctype.git|
-|twbs/bootstrap|4.5.3.0|MIT|https://github.com/twbs/bootstrap.git|
+|smarty/smarty|3.1.38.0|LGPL-3.0|https://github.com/smarty-php/smarty.git|
+|symfony/polyfill-ctype|1.22.0.0|MIT|https://github.com/symfony/polyfill-ctype.git|
+|twbs/bootstrap|4.6.0.0|MIT|https://github.com/twbs/bootstrap.git|
 |fullcalendar/fullcalendar|4.4.2.0|MIT|https://github.com/fullcalendar/fullcalendar.git|
 |miromannino/Justified-Gallery|3.8.1.0|MIT|https://github.com/miromannino/Justified-Gallery.git|
 |fengyuanchen/cropperjs|1.5.7.0|MIT|https://github.com/fengyuanchen/cropperjs.git|
 |ForkAwesome/Fork-Awesome|1.1.7.0|MIT,SIL OFL,CC BY 3.0|https://github.com/ForkAwesome/Fork-Awesome.git|
-|leafo/sticky-kit|1.1.2.0|MIT|https://github.com/leafo/sticky-kit.git|
 |jquery/jquery|3.5.1.0|MIT|https://github.com/jquery/jquery.git|

Zotlabs/Access/AccessList.php

@@ -54,7 +54,7 @@ class AccessList {
 	 *   * \e string \b channel_deny_gid => string of denied gids
 	 */
 	function __construct($channel) {
-		if($channel) {
+		if ($channel) {
 			$this->allow_cid = $channel['channel_allow_cid'];
 			$this->allow_gid = $channel['channel_allow_gid'];
 			$this->deny_cid  = $channel['channel_deny_cid'];
@@ -99,7 +99,6 @@ class AccessList {
 		$this->allow_gid = $arr['allow_gid'];
 		$this->deny_cid  = $arr['deny_cid'];
 		$this->deny_gid  = $arr['deny_gid'];
-
 		$this->explicit  = $explicit;
 	}
 

Zotlabs/Access/PermissionLimits.php

@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Access;
 
+use App;
 use Zotlabs\Lib\PConfig;
 
 /**
@@ -39,10 +40,10 @@ class PermissionLimits {
 	 */
 	static public function Std_Limits() {
 		$limits = [];
-		$perms = Permissions::Perms();
+		$perms  = Permissions::Perms();
 
-		foreach($perms as $k => $v) {
-			if(strstr($k, 'view'))
+		foreach ($perms as $k => $v) {
+			if (strstr($k, 'view'))
 				$limits[$k] = PERMS_PUBLIC;
 			else
 				$limits[$k] = PERMS_SPECIFIC;
@@ -77,14 +78,14 @@ class PermissionLimits {
 	 *   * \b array with all permission limits, if $perm is not set
 	 */
 	static public function Get($channel_id, $perm = '') {
-		if($perm) {
+		if ($perm) {
 			return intval(PConfig::Get($channel_id, 'perm_limits', $perm));
 		}
 
 		PConfig::Load($channel_id);
-		if(array_key_exists($channel_id, \App::$config)
-				&& array_key_exists('perm_limits', \App::$config[$channel_id]))
-			return \App::$config[$channel_id]['perm_limits'];
+		if (array_key_exists($channel_id, App::$config)
+			&& array_key_exists('perm_limits', App::$config[$channel_id]))
+			return App::$config[$channel_id]['perm_limits'];
 
 		return false;
 	}

Zotlabs/Access/PermissionRoles.php

@@ -218,13 +218,13 @@ class PermissionRoles {
 		// set permissionlimits for this permission here, for example:
 
 		// if($perm === 'mynewperm')
-		//     \Zotlabs\Access\PermissionLimits::Set($uid,$perm,1);
+		// 		PermissionLimits::Set($uid,$perm,1);
 
 		if($perm === 'view_wiki')
-			\Zotlabs\Access\PermissionLimits::Set($uid, $perm, PERMS_PUBLIC);
+			PermissionLimits::Set($uid, $perm, PERMS_PUBLIC);
 
 		if($perm === 'write_wiki')
-			\Zotlabs\Access\PermissionLimits::Set($uid, $perm, PERMS_SPECIFIC);
+			PermissionLimits::Set($uid, $perm, PERMS_SPECIFIC);
 
 
 		// set autoperms here if applicable
@@ -262,11 +262,11 @@ class PermissionRoles {
 					case 'view_wiki':
 						set_abconfig($uid,$ab['abook_xchan'],'my_perms',$perm,
 							intval(get_abconfig($uid,$ab['abook_xchan'],'my_perms','view_pages')));
-
+						break;
 					case 'write_wiki':
 						set_abconfig($uid,$ab['abook_xchan'],'my_perms',$perm,
 							intval(get_abconfig($uid,$ab['abook_xchan'],'my_perms','write_pages')));
-
+						break;
 					default:
 						break;
 				}
@@ -317,4 +317,4 @@ class PermissionRoles {
 		return $roles;
 	}
 
-}
+}

Zotlabs/Access/Permissions.php

@@ -75,7 +75,7 @@ class Permissions {
 
 		$x = [
 			'permissions' => $perms,
-			'filter' => $filter
+			'filter'      => $filter
 		];
 		/**
 		 * @hooks permissions_list
@@ -84,7 +84,7 @@ class Permissions {
 		 */
 		call_hooks('permissions_list', $x);
 
-		return($x['permissions']);
+		return ($x['permissions']);
 	}
 
 	/**
@@ -96,10 +96,10 @@ class Permissions {
 	 */
 	static public function BlockedAnonPerms() {
 
-		$res = [];
+		$res   = [];
 		$perms = PermissionLimits::Std_limits();
-		foreach($perms as $perm => $limit) {
-			if($limit != PERMS_PUBLIC) {
+		foreach ($perms as $perm => $limit) {
+			if ($limit != PERMS_PUBLIC) {
 				$res[] = $perm;
 			}
 		}
@@ -111,7 +111,7 @@ class Permissions {
 		 */
 		call_hooks('write_perms', $x);
 
-		return($x['permissions']);
+		return ($x['permissions']);
 	}
 
 	/**
@@ -120,20 +120,20 @@ class Permissions {
 	 * Converts [ 0 => 'view_stream', ... ]
 	 * to [ 'view_stream' => 1 ] for any permissions in $arr;
 	 * Undeclared permissions which exist in Perms() are added and set to 0.
- 	 *
+	 *
 	 * @param array $arr
 	 * @return array
 	 */
 	static public function FilledPerms($arr) {
-		if(is_null($arr)) {
+		if (is_null($arr)) {
 			btlogger('FilledPerms: null');
 			$arr = [];
 		}
 
 		$everything = self::Perms();
-		$ret = [];
-		foreach($everything as $k => $v) {
-			if(in_array($k, $arr))
+		$ret        = [];
+		foreach ($everything as $k => $v) {
+			if (in_array($k, $arr))
 				$ret[$k] = 1;
 			else
 				$ret[$k] = 0;
@@ -155,9 +155,9 @@ class Permissions {
 	 */
 	static public function OPerms($arr) {
 		$ret = [];
-		if($arr) {
-			foreach($arr as $k => $v) {
-				$ret[] = [ 'name' => $k, 'value' => $v ];
+		if ($arr) {
+			foreach ($arr as $k => $v) {
+				$ret[] = ['name' => $k, 'value' => $v];
 			}
 		}
 		return $ret;
@@ -170,15 +170,16 @@ class Permissions {
 	 * @return boolean|array
 	 */
 	static public function FilledAutoperms($channel_id) {
-		if(! intval(get_pconfig($channel_id,'system','autoperms')))
+		if (!intval(get_pconfig($channel_id, 'system', 'autoperms')))
 			return false;
 
 		$arr = [];
+
 		$r = q("select * from pconfig where uid = %d and cat = 'autoperms'",
 			intval($channel_id)
 		);
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				$arr[$rr['k']] = intval($rr['v']);
 			}
 		}
@@ -193,11 +194,11 @@ class Permissions {
 	 * @return boolean true if all perms from $p1 exist also in $p2
 	 */
 	static public function PermsCompare($p1, $p2) {
-		foreach($p1 as $k => $v) {
-			if(! array_key_exists($k, $p2))
+		foreach ($p1 as $k => $v) {
+			if (!array_key_exists($k, $p2))
 				return false;
 
-			if($p1[$k] != $p2[$k])
+			if ($p1[$k] != $p2[$k])
 				return false;
 		}
 
@@ -214,18 +215,18 @@ class Permissions {
 	 */
 	static public function connect_perms($channel_id) {
 
-		$my_perms = [];
-		$permcat = null;
+		$my_perms  = [];
+		$permcat   = null;
 		$automatic = 0;
 
 		// If a default permcat exists, use that
 
-		$pc = ((feature_enabled($channel_id,'permcats')) ? get_pconfig($channel_id,'system','default_permcat') : 'default');
-		if(! in_array($pc, [ '','default' ])) {
-			$pcp = new Zlib\Permcat($channel_id);
+		$pc = ((feature_enabled($channel_id, 'permcats')) ? get_pconfig($channel_id, 'system', 'default_permcat') : 'default');
+		if (!in_array($pc, ['', 'default'])) {
+			$pcp     = new Zlib\Permcat($channel_id);
 			$permcat = $pcp->fetch($pc);
-			if($permcat && $permcat['perms']) {
-				foreach($permcat['perms'] as $p) {
+			if ($permcat && $permcat['perms']) {
+				foreach ($permcat['perms'] as $p) {
 					$my_perms[$p['name']] = $p['value'];
 				}
 			}
@@ -235,15 +236,15 @@ class Permissions {
 		// and if there was no permcat or a default permcat, set the perms
 		// from the role
 
-		$role = get_pconfig($channel_id,'system','permissions_role');
-		if($role) {
+		$role = get_pconfig($channel_id, 'system', 'permissions_role');
+		if ($role) {
 			$xx = PermissionRoles::role_perms($role);
-			if($xx['perms_auto'])
+			if ($xx['perms_auto'])
 				$automatic = 1;
 
-			if((! $my_perms) && ($xx['perms_connect'])) {
+			if ((!$my_perms) && ($xx['perms_connect'])) {
 				$default_perms = $xx['perms_connect'];
-				$my_perms = Permissions::FilledPerms($default_perms);
+				$my_perms      = Permissions::FilledPerms($default_perms);
 			}
 		}
 
@@ -251,11 +252,11 @@ class Permissions {
 		// it is likely a custom permissions role. First see if there are any
 		// automatic permissions.
 
-		if(! $my_perms) {
+		if (!$my_perms) {
 			$m = Permissions::FilledAutoperms($channel_id);
-			if($m) {
+			if ($m) {
 				$automatic = 1;
-				$my_perms = $m;
+				$my_perms  = $m;
 			}
 		}
 
@@ -263,35 +264,35 @@ class Permissions {
 		// custom perms but they are not automatic. They will be stored in abconfig with
 		// the channel's channel_hash (the 'self' connection).
 
-		if(! $my_perms) {
+		if (!$my_perms) {
 			$r = q("select channel_hash from channel where channel_id = %d",
 				intval($channel_id)
 			);
-			if($r) {
+			if ($r) {
 				$x = q("select * from abconfig where chan = %d and xchan = '%s' and cat = 'my_perms'",
 					intval($channel_id),
 					dbesc($r[0]['channel_hash'])
 				);
-				if($x) {
-					foreach($x as $xv) {
+				if ($x) {
+					foreach ($x as $xv) {
 						$my_perms[$xv['k']] = intval($xv['v']);
 					}
 				}
 			}
 		}
 
-		return ( [ 'perms' => $my_perms, 'automatic' => $automatic ] );
+		return (['perms' => $my_perms, 'automatic' => $automatic]);
 	}
 
 	static public function serialise($p) {
 		$n = [];
-		if($p) {
-			foreach($p as $k => $v) {
-				if(intval($v)) {
+		if ($p) {
+			foreach ($p as $k => $v) {
+				if (intval($v)) {
 					$n[] = $k;
 				}
 			}
 		}
-		return implode(',',$n);
+		return implode(',', $n);
 	}
 }

Zotlabs/Daemon/Addon.php

@@ -2,13 +2,12 @@
 
 namespace Zotlabs\Daemon;
 
-require_once('include/zot.php');
-
 class Addon {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		call_hooks('daemon_addon',$argv);
+		call_hooks('daemon_addon', $argv);
 
 	}
+
 }

Zotlabs/Daemon/Cache_embeds.php

@@ -2,7 +2,6 @@
 
 namespace Zotlabs\Daemon;
 
-
 class Cache_embeds {
 
 	static public function run($argc,$argv) {

Zotlabs/Daemon/Cache_query.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+use Zotlabs\Lib\Cache;
+
+class Cache_query {
+
+	static public function run($argc, $argv) {
+
+		if(! $argc == 3)
+			return;
+
+		$key = $argv[1];
+
+		$pid = get_config('procid', $key, false);
+		if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) {
+			logger($key . ': procedure already run with pid ' . $pid, LOGGER_DEBUG);
+			return;
+		}
+
+		$pid = getmypid();
+		set_config('procid', $key, $pid);
+
+		array_shift($argv);
+		array_shift($argv);
+		
+		$arr = json_decode(base64_decode($argv[0]), true);
+
+		$r = call_user_func_array('q', $arr);
+		if($r)
+			Cache::set($key, serialize($r));
+
+		del_config('procid', $key);
+	}
+}

Zotlabs/Daemon/Checksites.php

@@ -6,34 +6,35 @@ require_once('include/hubloc.php');
 
 class Checksites {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
 		logger('checksites: start');
-	
-		if(($argc > 1) && ($argv[1]))
+
+		if (($argc > 1) && ($argv[1]))
 			$site_id = $argv[1];
 
-		if($site_id)
+		if ($site_id)
 			$sql_options = " and site_url = '" . dbesc($argv[1]) . "' ";
 
-		$days = intval(get_config('system','sitecheckdays'));
-		if($days < 1)
+		$days = intval(get_config('system', 'sitecheckdays'));
+		if ($days < 1)
 			$days = 30;
 
 		$r = q("select * from site where site_dead = 0 and site_update < %s - INTERVAL %s and site_type = %d $sql_options ",
-			db_utcnow(), db_quoteinterval($days . ' DAY'),
+			db_utcnow(),
+			db_quoteinterval($days . ' DAY'),
 			intval(SITE_TYPE_ZOT)
 		);
 
-		if(! $r)
+		if (!$r)
 			return;
 
-		foreach($r as $rr) {
-			if(! strcasecmp($rr['site_url'],z_root()))
+		foreach ($r as $rr) {
+			if (!strcasecmp($rr['site_url'], z_root()))
 				continue;
 
 			$x = ping_site($rr['site_url']);
-			if($x['success']) {
+			if ($x['success']) {
 				logger('checksites: ' . $rr['site_url']);
 				q("update site set site_update = '%s' where site_url = '%s' ",
 					dbesc(datetime_convert()),

Zotlabs/Daemon/Convo.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+use Zotlabs\Lib\Activity;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\ASCollection;
+
+class Convo {
+
+	static public function run($argc, $argv) {
+
+		logger('convo invoked: ' . print_r($argv, true));
+
+		if ($argc != 4) {
+			return;
+		}
+
+		$id           = $argv[1];
+		$channel_id   = intval($argv[2]);
+		$contact_hash = $argv[3];
+
+		$channel = channelx_by_n($channel_id);
+		if (!$channel) {
+			return;
+		}
+
+		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
+			WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
+			intval($channel_id),
+			dbesc($contact_hash)
+		);
+		if (!$r) {
+			return;
+		}
+
+		$contact = array_shift($r);
+
+		$obj = new ASCollection($id, $channel);
+
+		$messages = $obj->get();
+
+		if ($messages) {
+			foreach ($messages as $message) {
+				if (is_string($message)) {
+					$message = Activity::fetch($message, $channel);
+				}
+				// set client flag because comments will probably just be objects and not full blown activities
+				// and that lets us use implied_create
+				$AS = new ActivityStreams($message);
+				if ($AS->is_valid() && is_array($AS->obj)) {
+					$item = Activity::decode_note($AS);
+					Activity::store($channel, $contact['abook_xchan'], $AS, $item);
+				}
+			}
+		}
+	}
+}

Zotlabs/Daemon/Cron.php

@@ -6,14 +6,14 @@ use Zotlabs\Lib\Libsync;
 
 class Cron {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		$maxsysload = intval(get_config('system','maxloadavg'));
-		if($maxsysload < 1)
+		$maxsysload = intval(get_config('system', 'maxloadavg'));
+		if ($maxsysload < 1)
 			$maxsysload = 50;
-		if(function_exists('sys_getloadavg')) {
+		if (function_exists('sys_getloadavg')) {
 			$load = sys_getloadavg();
-			if(intval($load[0]) > $maxsysload) {
+			if (intval($load[0]) > $maxsysload) {
 				logger('system: load ' . $load . ' too high. Cron deferred to next scheduled run.');
 				return;
 			}
@@ -21,17 +21,18 @@ class Cron {
 
 		// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
 		$lockfile = 'store/[data]/cron';
-		if((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) 
-			&& (! get_config('system','override_cron_lockfile'))) {
+		if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))
+			&& (!get_config('system', 'override_cron_lockfile'))) {
 			logger("cron: Already running");
 			return;
 		}
-	
+
 		// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
+		$x = '';
 		file_put_contents($lockfile, $x);
 
 		logger('cron: start');
-	
+
 		// run queue delivery process in the background
 
 		Master::Summon(array('Queue'));
@@ -46,7 +47,7 @@ class Cron {
 			db_utcnow(),
 			db_quoteinterval('3 MINUTE')
 		);
-	
+
 		// expire any expired mail
 
 		q("delete from mail where expires > '%s' and expires < %s ",
@@ -54,19 +55,25 @@ class Cron {
 			db_utcnow()
 		);
 
+		remove_expired_registrations();
+
+		$interval = get_config('system', 'delivery_interval', 3);
+
 		// expire any expired items
 
-		$r = q("select id,item_wall from item where expires > '2001-01-01 00:00:00' and expires < %s 
+		$r = q("select id,item_wall from item where expires > '2001-01-01 00:00:00' and expires < %s
 			and item_deleted = 0 ",
 			db_utcnow()
 		);
-		if($r) {
+		if ($r) {
 			require_once('include/items.php');
-			foreach($r as $rr) {
-				drop_item($rr['id'],false,(($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL));
-				if($rr['item_wall']) {
+			foreach ($r as $rr) {
+				drop_item($rr['id'], false, (($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL));
+				if ($rr['item_wall']) {
 					// The notifier isn't normally invoked unless item_drop is interactive.
-					Master::Summon( [ 'Notifier', 'drop', $rr['id'] ] );
+					Master::Summon(['Notifier', 'drop', $rr['id']]);
+					if ($interval)
+						@time_sleep_until(microtime(true) + (float)$interval);
 				}
 			}
 		}
@@ -78,9 +85,9 @@ class Cron {
 			dbesc(NULL_DATE),
 			db_utcnow()
 		);
-		if($r) {
+		if ($r) {
 			require_once('include/security.php');
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				atoken_delete($rr['atoken_id']);
 			}
 		}
@@ -90,33 +97,33 @@ class Cron {
 		// or dead entries.
 
 		$r = q("select channel_id from channel where channel_dirdate < %s - INTERVAL %s and channel_removed = 0",
-			db_utcnow(), 
+			db_utcnow(),
 			db_quoteinterval('30 DAY')
 		);
-		if($r) {
-			foreach($r as $rr) {
-				Master::Summon(array('Directory',$rr['channel_id'],'force'));
-				if($interval)
-					@time_sleep_until(microtime(true) + (float) $interval);
+		if ($r) {
+			foreach ($r as $rr) {
+				Master::Summon(array('Directory', $rr['channel_id'], 'force'));
+				if ($interval)
+					@time_sleep_until(microtime(true) + (float)$interval);
 			}
 		}
-		
+
 		// Clean expired photos from cache
-		
+
 		$r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
 			intval(PHOTO_CACHE),
 			db_utcnow(),
-			db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
+			db_quoteinterval(get_config('system', 'active_expire_days', '30') . ' DAY')
 		);
-		if($r) {
+		if ($r) {
 			q("DELETE FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
 				intval(PHOTO_CACHE),
 				db_utcnow(),
-				db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
+				db_quoteinterval(get_config('system', 'active_expire_days', '30') . ' DAY')
 			);
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$file = dbunescbin($rr['content']);
-				if(is_file($file)) {
+				if (is_file($file)) {
 					@unlink($file);
 					@rmdir(dirname($file));
 					logger('info: deleted cached photo file ' . $file, LOGGER_DEBUG);
@@ -126,31 +133,33 @@ class Cron {
 
 		// publish any applicable items that were set to be published in the future
 		// (time travel posts). Restrict to items that have come of age in the last
-		// couple of days to limit the query to something reasonable. 
+		// couple of days to limit the query to something reasonable.
 
 		$r = q("select id from item where item_delayed = 1 and created <= %s  and created > '%s' ",
 			db_utcnow(),
-			dbesc(datetime_convert('UTC','UTC','now - 2 days'))
+			dbesc(datetime_convert('UTC', 'UTC', 'now - 2 days'))
 		);
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				$x = q("update item set item_delayed = 0 where id = %d",
 					intval($rr['id'])
 				);
-				if($x) {
+				if ($x) {
 					$z = q("select * from item where id = %d",
-						intval($message_id)
+						intval($rr['id'])
 					);
-					if($z) {
+					if ($z) {
 						xchan_query($z);
 						$sync_item = fetch_post_tags($z);
 						Libsync::build_sync_packet($sync_item[0]['uid'],
-							[ 
-								'item' => [ encode_item($sync_item[0],true) ]
+							[
+								'item' => [encode_item($sync_item[0], true)]
 							]
 						);
 					}
-					Master::Summon(array('Notifier','wall-new',$rr['id']));
+					Master::Summon(array('Notifier', 'wall-new', $rr['id']));
+					if ($interval)
+						@time_sleep_until(microtime(true) + (float)$interval);
 				}
 			}
 		}
@@ -163,43 +172,38 @@ class Cron {
 		require_once('include/attach.php');
 		attach_upgrade();
 
-		$abandon_days = intval(get_config('system','account_abandon_days'));
-		if($abandon_days < 1)
-			$abandon_days = 0;
-
-	
 		// once daily run birthday_updates and then expire in background
 
 		// FIXME: add birthday updates, both locally and for xprof for use
 		// by directory servers
 
-		$d1 = intval(get_config('system','last_expire_day'));
-		$d2 = intval(datetime_convert('UTC','UTC','now','d'));
+		$d1 = intval(get_config('system', 'last_expire_day'));
+		$d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd'));
 
 		// Allow somebody to staggger daily activities if they have more than one site on their server,
 		// or if it happens at an inconvenient (busy) hour.
 
-		$h1 = intval(get_config('system','cron_hour'));
-		$h2 = intval(datetime_convert('UTC','UTC','now','G'));
+		$h1 = intval(get_config('system', 'cron_hour'));
+		$h2 = intval(datetime_convert('UTC', 'UTC', 'now', 'G'));
 
 
-		if(($d2 != $d1) && ($h1 == $h2)) {
+		if (($d2 != $d1) && ($h1 == $h2)) {
 			Master::Summon(array('Cron_daily'));
 		}
 
 		// update any photos which didn't get imported properly
 		// This should be rare
 
-		$r = q("select xchan_photo_l, xchan_hash from xchan where xchan_photo_l != '' and xchan_photo_m = '' 
+		$r = q("select xchan_photo_l, xchan_hash from xchan where xchan_photo_l != '' and xchan_photo_m = ''
 			and xchan_photo_date < %s - INTERVAL %s",
-			db_utcnow(), 
+			db_utcnow(),
 			db_quoteinterval('1 DAY')
 		);
-		if($r) {
+		if ($r) {
 			require_once('include/photo/photo_driver.php');
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$photos = import_xchan_photo($rr['xchan_photo_l'], $rr['xchan_hash'], false, true);
-				$x = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
+				q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
 					where xchan_hash = '%s'",
 					dbesc($photos[0]),
 					dbesc($photos[1]),
@@ -213,33 +217,30 @@ class Cron {
 
 		// pull in some public posts
 
-		$disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false;
-		if(! $disable_discover_tab)
+/*		$disable_discover_tab = get_config('system', 'disable_discover_tab') || get_config('system', 'disable_discover_tab') === false;
+		if (!$disable_discover_tab)
 			Master::Summon(array('Externals'));
+*/
 
-		$generation = 0;
+		$restart = false;
 
-		$restart    = false;
-
-		if(($argc > 1) && ($argv[1] == 'restart')) {
-			$restart = true;
+		if (($argc > 1) && ($argv[1] == 'restart')) {
+			$restart    = true;
 			$generation = intval($argv[2]);
-			if(! $generation)
+			if (!$generation)
 				return;
 		}
 
 		reload_plugins();
 
-		$d = datetime_convert();
-
 		// TODO check to see if there are any cronhooks before wasting a process
 
-		if(! $restart)
+		if (!$restart)
 			Master::Summon(array('Cronhooks'));
 
-		set_config('system','lastcron',datetime_convert());
+		set_config('system', 'lastcron', datetime_convert());
 
-		//All done - clear the lockfile	
+		//All done - clear the lockfile
 		@unlink($lockfile);
 
 		return;

Zotlabs/Daemon/Cron_daily.php

@@ -6,7 +6,7 @@ use Zotlabs\Lib\Libzotdir;
 
 class Cron_daily {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
 		logger('cron_daily: start');
 
@@ -15,14 +15,12 @@ class Cron_daily {
 		 *
 		 */
 
-
 		Libzotdir::check_upstream_directory();
 
-
 		// Fire off the Cron_weekly process if it's the correct day.
 
-		$d3 = intval(datetime_convert('UTC','UTC','now','N'));
-		if($d3 == 7) {
+		$d3 = intval(datetime_convert('UTC', 'UTC', 'now', 'N'));
+		if ($d3 == 7) {
 			Master::Summon(array('Cron_weekly'));
 		}
 
@@ -53,8 +51,8 @@ class Cron_daily {
 
 		// Clean up emdedded content cache
 		q("DELETE FROM cache WHERE updated < %s - INTERVAL %s",
-		    db_utcnow(),
-		    db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
+			db_utcnow(),
+			db_quoteinterval(get_config('system', 'active_expire_days', '30') . ' DAY')
 		);
 
 		//update statistics in config
@@ -68,8 +66,8 @@ class Cron_daily {
 
 		// expire old delivery reports
 
-		$keep_reports = intval(get_config('system','expire_delivery_reports'));
-		if($keep_reports === 0)
+		$keep_reports = intval(get_config('system', 'expire_delivery_reports'));
+		if ($keep_reports === 0)
 			$keep_reports = 10;
 
 		q("delete from dreport where dreport_time < %s - INTERVAL %s",
@@ -85,23 +83,24 @@ class Cron_daily {
 		// Pull remote changes and push local changes.
 		// potential issue: how do we keep from creating an endless update loop?
 
-		$dirmode = get_config('system','directory_mode');
+		$dirmode = get_config('system', 'directory_mode');
 
-		if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
+		if ($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
 			Libzotdir::sync_directories($dirmode);
 		}
 
-
 		Master::Summon(array('Expire'));
 		Master::Summon(array('Cli_suggest'));
 
 		remove_obsolete_hublocs();
+		remove_duplicate_singleton_hublocs();
 
 		z6_discover();
 
-		call_hooks('cron_daily',datetime_convert());
+		$date = datetime_convert();
+		call_hooks('cron_daily', $date);
 
-		set_config('system','last_expire_day',intval(datetime_convert('UTC','UTC','now','d')));
+		set_config('system', 'last_expire_day', intval(datetime_convert('UTC', 'UTC', 'now', 'd')));
 
 		/**
 		 * End Cron Daily

Zotlabs/Daemon/Cron_weekly.php

@@ -4,21 +4,22 @@ namespace Zotlabs\Daemon;
 
 class Cron_weekly {
 
-	static public function run($argc,$argv) {		
+	static public function run($argc, $argv) {
 
 		/**
 		 * Cron Weekly
-		 * 
+		 *
 		 * Actions in the following block are executed once per day only on Sunday (once per week).
 		 *
 		 */
 
-		call_hooks('cron_weekly',datetime_convert());
+		$date = datetime_convert();
+		call_hooks('cron_weekly', $date);
 
 		z_check_cert();
 
 		prune_hub_reinstalls();
-	
+
 		mark_orphan_hubsxchans();
 
 		// Find channels that were removed in the last three weeks, but 
@@ -31,8 +32,8 @@ class Cron_weekly {
 			db_utcnow(), db_quoteinterval('21 DAY'),
 			db_utcnow(), db_quoteinterval('10 DAY')
 		);
-		if($r) {
-			foreach($r as $rv) {
+		if ($r) {
+			foreach ($r as $rv) {
 				channel_remove_final($rv['channel_id']);
 			}
 		}
@@ -43,14 +44,14 @@ class Cron_weekly {
 			db_utcnow(), db_quoteinterval('14 DAY')
 		);
 
-		$dirmode = intval(get_config('system','directory_mode'));
-		if($dirmode === DIRECTORY_MODE_SECONDARY || $dirmode === DIRECTORY_MODE_PRIMARY) {
-			logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . urlencode(z_root()) . '&realm=' . urlencode(get_directory_realm())),true));
+		$dirmode = intval(get_config('system', 'directory_mode'));
+		if ($dirmode === DIRECTORY_MODE_SECONDARY || $dirmode === DIRECTORY_MODE_PRIMARY) {
+			logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . urlencode(z_root()) . '&realm=' . urlencode(get_directory_realm())), true));
 		}
 
 		// Check for dead sites
 		Master::Summon(array('Checksites'));
-			
+
 		// update searchable doc indexes
 		Master::Summon(array('Importdoc'));
 

Zotlabs/Daemon/CurlAuth.php

@@ -2,6 +2,8 @@
 
 namespace Zotlabs\Daemon;
 
+use App;
+
 // generate a curl compatible cookie file with an authenticated session for the given channel_id. 
 // If this file is then used with curl and the destination url is sent through zid() or manually 
 // manipulated to add a zid, it should allow curl to provide zot magic-auth across domains.
@@ -10,15 +12,15 @@ namespace Zotlabs\Daemon;
 
 class CurlAuth {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		if($argc != 2)
+		if ($argc != 2)
 			return;
 
-		\App::$session->start();
+		App::$session->start();
 
 		$_SESSION['authenticated'] = 1;
-		$_SESSION['uid'] = $argv[1];
+		$_SESSION['uid']           = $argv[1];
 
 		$x = session_id();
 
@@ -29,14 +31,14 @@ class CurlAuth {
 
 		$output = '';
 
-		if($e) {
+		if ($e) {
 			$lines = file($f);
-			if($lines) {
-				foreach($lines as $line) {
-					if(strlen($line) > 0 && $line[0] != '#' && substr_count($line, "\t") == 6) {
+			if ($lines) {
+				foreach ($lines as $line) {
+					if (strlen($line) > 0 && $line[0] != '#' && substr_count($line, "\t") == 6) {
 						$tokens = explode("\t", $line);
 						$tokens = array_map('trim', $tokens);
-						if($tokens[4] > time()) {
+						if ($tokens[4] > time()) {
 							$output .= $line . "\n";
 						}
 					}
@@ -46,9 +48,9 @@ class CurlAuth {
 			}
 		}
 		$t = time() + (24 * 3600);
-		file_put_contents($f, $output . 'HttpOnly_' . \App::get_hostname() . "\tFALSE\t/\tTRUE\t$t\tPHPSESSID\t" . $x, (($e) ? FILE_APPEND : 0));
+		file_put_contents($f, $output . 'HttpOnly_' . App::get_hostname() . "\tFALSE\t/\tTRUE\t$t\tPHPSESSID\t" . $x, (($e) ? FILE_APPEND : 0));
 
-		file_put_contents($c,$x);
+		file_put_contents($c, $x);
 
 		return;
 	}

Zotlabs/Daemon/Deliver.php

@@ -5,25 +5,25 @@ namespace Zotlabs\Daemon;
 require_once('include/queue_fn.php');
 
 class Deliver {
-	
-	static public function run($argc,$argv) {
 
-		if($argc < 2)
+	static public function run($argc, $argv) {
+
+		if ($argc < 2)
 			return;
 
-		logger('deliver: invoked: ' . print_r($argv,true), LOGGER_DATA);
+		logger('deliver: invoked: ' . print_r($argv, true), LOGGER_DATA);
 
-		for($x = 1; $x < $argc; $x ++) {
+		for ($x = 1; $x < $argc; $x++) {
 
-			if(! $argv[$x])
+			if (!$argv[$x])
 				continue;
 
 			$r = q("select * from outq where outq_hash = '%s'",
 				dbesc($argv[$x])
 			);
 
-			if($r) {
-				queue_deliver($r[0],true);
+			if ($r) {
+				queue_deliver($r[0], true);
 			}
 
 		}

Zotlabs/Daemon/Deliver_hooks.php

@@ -2,21 +2,18 @@
 
 namespace Zotlabs\Daemon;
 
-require_once('include/zot.php');
-
 class Deliver_hooks {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		if($argc < 2)
+		if ($argc < 2)
 			return;
 
-
 		$r = q("select * from item where id = '%d'",
 			intval($argv[1])
 		);
-		if($r)
-			call_hooks('notifier_normal',$r[0]);
+		if ($r)
+			call_hooks('notifier_normal', $r[0]);
 
 	}
 }

Zotlabs/Daemon/Directory.php

@@ -8,40 +8,40 @@ use Zotlabs\Lib\Queue;
 
 class Directory {
 
-	static public function run($argc,$argv){
+	static public function run($argc, $argv) {
 
-		if($argc < 2)
+		if ($argc < 2)
 			return;
 
-		$force = false;
+		$force   = false;
 		$pushall = true;
 
-		if($argc > 2) {
-			if($argv[2] === 'force')
+		if ($argc > 2) {
+			if ($argv[2] === 'force')
 				$force = true;
-			if($argv[2] === 'nopush')
+			if ($argv[2] === 'nopush')
 				$pushall = false;
-		}	
+		}
 
 		logger('directory update', LOGGER_DEBUG);
 
-		$dirmode = get_config('system','directory_mode');
-		if($dirmode === false)
+		$dirmode = get_config('system', 'directory_mode');
+		if ($dirmode === false)
 			$dirmode = DIRECTORY_MODE_NORMAL;
 
 		$x = q("select * from channel where channel_id = %d limit 1",
 			intval($argv[1])
 		);
-		if(! $x)
+		if (!$x)
 			return;
 
 		$channel = $x[0];
 
-		if($dirmode != DIRECTORY_MODE_NORMAL) {
+		if ($dirmode != DIRECTORY_MODE_NORMAL) {
 
 			// this is an in-memory update and we don't need to send a network packet.
 
-			Libzotdir::local_dir_update($argv[1],$force);
+			Libzotdir::local_dir_update($argv[1], $force);
 
 			q("update channel set channel_dirdate = '%s' where channel_id = %d",
 				dbesc(datetime_convert()),
@@ -49,8 +49,8 @@ class Directory {
 			);
 
 			// Now update all the connections
-			if($pushall) 
-				Master::Summon(array('Notifier','refresh_all',$channel['channel_id']));
+			if ($pushall)
+				Master::Summon(array('Notifier', 'refresh_all', $channel['channel_id']));
 
 			return;
 		}
@@ -63,14 +63,12 @@ class Directory {
 
 		// ensure the upstream directory is updated
 
-
-		$packet = Libzot::build_packet($channel,(($force) ? 'force_refresh' : 'refresh'));
-		$z = Libzot::zot($url,$packet,$channel);
-
+		$packet = Libzot::build_packet($channel, (($force) ? 'force_refresh' : 'refresh'));
+		$z      = Libzot::zot($url, $packet, $channel);
 
 		// re-queue if unsuccessful
 
-		if(! $z['success']) {
+		if (!$z['success']) {
 
 			/** @FIXME we aren't updating channel_dirdate if we have to queue
 			 * the directory packet. That means we'll try again on the next poll run.
@@ -95,8 +93,8 @@ class Directory {
 		}
 
 		// Now update all the connections
-		if($pushall)
-			Master::Summon(array('Notifier','refresh_all',$channel['channel_id']));
+		if ($pushall)
+			Master::Summon(array('Notifier', 'refresh_all', $channel['channel_id']));
 
 	}
 }

Zotlabs/Daemon/Expire.php

@@ -5,23 +5,24 @@ namespace Zotlabs\Daemon;
 
 class Expire {
 
-	static public function run($argc,$argv){
+	static public function run($argc, $argv) {
 
 		cli_startup();
-		
-		$pid = get_config('expire', 'procid', false);
+
+		$pid = get_config('procid', 'expire', false);
 		if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) {
-		    logger('Expire: procedure already run with pid ' . $pid, LOGGER_DEBUG);
-		    return;
+			logger('procedure already run with pid ' . $pid, LOGGER_DEBUG);
+			return;
 		}
-		
+
 		$pid = getmypid();
-		set_config('expire', 'procid', $pid);
+		set_config('procid', 'expire', $pid);
 
 		// perform final cleanup on previously delete items
 
 		$r = q("select id from item where item_deleted = 1 and item_pending_remove = 0 and changed < %s - INTERVAL %s",
-			db_utcnow(), db_quoteinterval('10 DAY')
+			db_utcnow(),
+			db_quoteinterval('10 DAY')
 		);
 		if ($r) {
 			foreach ($r as $rr) {
@@ -32,23 +33,22 @@ class Expire {
 		// physically remove anything that has been deleted for more than two months
 		/** @FIXME - this is a wretchedly inefficient query */
 
-		$r = q("delete from item where item_pending_remove = 1 and changed < %s - INTERVAL %s",
-			db_utcnow(), db_quoteinterval('36 DAY')
+		q("delete from item where item_pending_remove = 1 and changed < %s - INTERVAL %s",
+			db_utcnow(),
+			db_quoteinterval('36 DAY')
 		);
 
-		/** @FIXME make this optional as it could have a performance impact on large sites */
-
 		if (intval(get_config('system', 'optimize_items')))
 			q("optimize table item");
 
 		logger('expire: start with pid ' . $pid, LOGGER_DEBUG);
 
-		$site_expire = intval(get_config('system', 'default_expire_days'));
-		$commented_days = intval(get_config('system','active_expire_days'));
+		$site_expire    = intval(get_config('system', 'default_expire_days'));
+		$commented_days = intval(get_config('system', 'active_expire_days'));
 
 		logger('site_expire: ' . $site_expire);
 
-		$r = q("SELECT channel_id, channel_system, channel_address, channel_expire_days from channel where true");
+		$r = dbq("SELECT channel_id, channel_system, channel_address, channel_expire_days from channel where true");
 
 		if ($r) {
 			foreach ($r as $rr) {
@@ -64,11 +64,12 @@ class Expire {
 					$channel_expire = $service_class_expire;
 				else
 					$channel_expire = $site_expire;
-	
+
 				if (intval($channel_expire) && (intval($channel_expire) < intval($rr['channel_expire_days'])) ||
 					intval($rr['channel_expire_days'] == 0)) {
 					$expire_days = $channel_expire;
-				} else {
+				}
+				else {
 					$expire_days = $rr['channel_expire_days'];
 				}
 
@@ -93,13 +94,13 @@ class Expire {
 			}
 
 			logger('Expire: sys interval: ' . $expire_days, LOGGER_DEBUG);
-	
+
 			if ($expire_days)
 				item_expire($x['channel_id'], $expire_days, $commented_days);
 
 			logger('Expire: sys: done', LOGGER_DEBUG);
 		}
-		
-		del_config('expire', 'procid');
+
+		del_config('procid', 'expire');
 	}
 }

Zotlabs/Daemon/Externals.php

@@ -2,97 +2,180 @@
 
 namespace Zotlabs\Daemon;
 
-require_once('include/zot.php');
+use Zotlabs\Lib\Activity;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\ASCollection;
+
 require_once('include/channel.php');
 
 
 class Externals {
 
-	static public function run($argc,$argv){
+	static public function run($argc, $argv) {
 
-		$total = 0;
+		logger('externals: start');
+
+		$importer = get_sys_channel();
+		$total    = 0;
 		$attempts = 0;
 
 		logger('externals: startup', LOGGER_DEBUG);
 
 		// pull in some public posts
 
+		while ($total == 0 && $attempts < 3) {
+			$arr = ['url' => ''];
+			call_hooks('externals_url_select', $arr);
 
-		while($total == 0 && $attempts < 3) {
-			$arr = array('url' => '');
-			call_hooks('externals_url_select',$arr);
-
-			if($arr['url']) {
+			if ($arr['url']) {
 				$url = $arr['url'];
-			} 
+			}
 			else {
 				$randfunc = db_getfunc('RAND');
 
-				// fixme this query does not deal with directory realms. 
+				// fixme this query does not deal with directory realms.
 
-				$r = q("select site_url, site_pull from site where site_url != '%s' and site_flags != %d and site_type = %d and site_dead = 0 order by $randfunc limit 1",
+				$r = q("select site_url, site_pull from site where site_url != '%s'
+						and site_flags != %d and site_type = %d
+						and site_dead = 0 and site_project like '%s' and site_version > '5.3.1' order by $randfunc limit 1",
 					dbesc(z_root()),
 					intval(DIRECTORY_MODE_STANDALONE),
-					intval(SITE_TYPE_ZOT)
+					intval(SITE_TYPE_ZOT),
+					dbesc('hubzilla%')
 				);
-				if($r)
+				if ($r)
 					$url = $r[0]['site_url'];
 			}
 
 			$blacklisted = false;
 
-			if(! check_siteallowed($url)) {
+			if (!check_siteallowed($url)) {
 				logger('blacklisted site: ' . $url);
 				$blacklisted = true;
 			}
 
-			$attempts ++;
+			$attempts++;
 
 			// make sure we can eventually break out if somebody blacklists all known sites
 
-			if($blacklisted) {
-				if($attempts > 20)
+			if ($blacklisted) {
+				if ($attempts > 20)
 					break;
-				$attempts --;
+				$attempts--;
 				continue;
 			}
 
-			if($url) {
-				if($r[0]['site_pull'] > NULL_DATE)
-					$mindate = urlencode(datetime_convert('','',$r[0]['site_pull'] . ' - 1 day'));
-				else {
-					$days = get_config('externals','since_days');
-					if($days === false)
-						$days = 15;
-					$mindate = urlencode(datetime_convert('','','now - ' . intval($days) . ' days'));
-				}
+			if ($url) {
 
-				$feedurl = $url . '/zotfeed?f=&mindate=' . $mindate;
+				$max = intval(get_config('system', 'max_imported_posts', 30));
+				if (intval($max)) {
+					logger('externals: fetching outbox');
 
-				logger('externals: pulling public content from ' . $feedurl, LOGGER_DEBUG);
+					$feed_url = $url . '/zotfeed';
+					$obj      = new ASCollection($feed_url, $importer, 0, $max);
+					$messages = $obj->get();
 
-				$x = z_fetch_url($feedurl);
-				if(($x) && ($x['success'])) {
-
-					q("update site set site_pull = '%s' where site_url = '%s'",
-						dbesc(datetime_convert()),
-						dbesc($url)
-					);
-
-					$j = json_decode($x['body'],true);
-					if($j['success'] && $j['messages']) {
-						$sys = get_sys_channel();
-						foreach($j['messages'] as $message) {
-							// on these posts, clear any route info. 
-							$message['route'] = '';
-							$results = process_delivery(array('hash' => 'undefined'), get_item_elements($message),
-								array(array('hash' => $sys['xchan_hash'])), false, true);
-							$total ++;
+					if ($messages) {
+						foreach ($messages as $message) {
+							if (is_string($message)) {
+								$message = Activity::fetch($message, $importer);
+							}
+							$AS = new ActivityStreams($message);
+							if ($AS->is_valid() && is_array($AS->obj)) {
+								$item = Activity::decode_note($AS);
+								Activity::store($importer, $importer['xchan_hash'], $AS, $item, true);
+								$total++;
+							}
 						}
-						logger('externals: import_public_posts: ' . $total . ' messages imported', LOGGER_DEBUG);
 					}
+					logger('externals: import_public_posts: ' . $total . ' messages imported', LOGGER_DEBUG);
 				}
 			}
 		}
+		return;
+
+		/*		$total    = 0;
+				$attempts = 0;
+
+				logger('externals: startup', LOGGER_DEBUG);
+
+				// pull in some public posts
+
+				while ($total == 0 && $attempts < 3) {
+					$arr = ['url' => ''];
+					call_hooks('externals_url_select', $arr);
+
+					if ($arr['url']) {
+						$url = $arr['url'];
+					}
+					else {
+						$randfunc = db_getfunc('RAND');
+
+						// fixme this query does not deal with directory realms.
+
+						$r = q("select site_url, site_pull from site where site_url != '%s' and site_flags != %d and site_type = %d and site_dead = 0 order by $randfunc limit 1",
+							dbesc(z_root()),
+							intval(DIRECTORY_MODE_STANDALONE),
+							intval(SITE_TYPE_ZOT)
+						);
+						if ($r)
+							$url = $r[0]['site_url'];
+					}
+
+					$blacklisted = false;
+
+					if (!check_siteallowed($url)) {
+						logger('blacklisted site: ' . $url);
+						$blacklisted = true;
+					}
+
+					$attempts++;
+
+					// make sure we can eventually break out if somebody blacklists all known sites
+
+					if ($blacklisted) {
+						if ($attempts > 20)
+							break;
+						$attempts--;
+						continue;
+					}
+
+					if ($url) {
+						if ($r[0]['site_pull'] > NULL_DATE)
+							$mindate = urlencode(datetime_convert('', '', $r[0]['site_pull'] . ' - 1 day'));
+						else {
+							$days = get_config('externals', 'since_days');
+							if ($days === false)
+								$days = 15;
+							$mindate = urlencode(datetime_convert('', '', 'now - ' . intval($days) . ' days'));
+						}
+
+						$feedurl = $url . '/zotfeed?f=&mindate=' . $mindate;
+
+						logger('externals: pulling public content from ' . $feedurl, LOGGER_DEBUG);
+
+						$x = z_fetch_url($feedurl);
+						if (($x) && ($x['success'])) {
+
+							q("update site set site_pull = '%s' where site_url = '%s'",
+								dbesc(datetime_convert()),
+								dbesc($url)
+							);
+
+							$j = json_decode($x['body'], true);
+							if ($j['success'] && $j['messages']) {
+								$sys = get_sys_channel();
+								foreach ($j['messages'] as $message) {
+									// on these posts, clear any route info.
+									$message['route'] = '';
+									process_delivery(['hash' => 'undefined'], get_item_elements($message),
+										[['hash' => $sys['xchan_hash']]], false, true);
+									$total++;
+								}
+								logger('externals: import_public_posts: ' . $total . ' messages imported', LOGGER_DEBUG);
+							}
+						}
+					}
+				}*/
 	}
 }

Zotlabs/Daemon/Gprobe.php

@@ -9,27 +9,27 @@ use Zotlabs\Lib\Zotfinger;
 // performs zot_finger on $argv[1], which is a hex_encoded webbie/reddress
 
 class Gprobe {
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		if($argc != 2)
+		if ($argc != 2)
 			return;
 
 		$url = hex2bin($argv[1]);
 
-		if(! strpos($url,'@'))
+		if (!strpos($url, '@'))
 			return;
 
 		$r = q("select * from hubloc where hubloc_addr = '%s' and hubloc_network = 'zot6' limit 1",
 			dbesc($url)
 		);
 
-		if(! $r) {
+		if (!$r) {
 			$href = Webfinger::zot_url(punify($url));
-			if($href) {
+			if ($href) {
 				$zf = Zotfinger::exec($href, null);
 			}
-			if(is_array($zf) && array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
-				$xc = Libzot::import_xchan($zf['data']);
+			if (is_array($zf) && array_path_exists('signature/signer', $zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
+				Libzot::import_xchan($zf['data']);
 			}
 		}
 

Zotlabs/Daemon/Importdoc.php

@@ -5,7 +5,7 @@ namespace Zotlabs\Daemon;
 
 class Importdoc {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
 		require_once('include/help.php');
 
@@ -16,20 +16,20 @@ class Importdoc {
 	static public function update_docs_dir($s) {
 		$f = basename($s);
 		$d = dirname($s);
-		if($s === 'doc/html')
+		if ($s === 'doc/html')
 			return;
 		$files = glob("$d/$f");
-		if($files) {
-			foreach($files as $fi) {
-				if($fi === 'doc/html') {
+		if ($files) {
+			foreach ($files as $fi) {
+				if ($fi === 'doc/html') {
 					continue;
 				}
-				if(is_dir($fi)) {
+				if (is_dir($fi)) {
 					self::update_docs_dir("$fi/*");
 				}
 				else {
 					// don't update media content
-					if(strpos(z_mime_content_type($fi),'text') === 0) {
+					if (strpos(z_mime_content_type($fi), 'text') === 0) {
 						store_doc_file($fi);
 					}
 				}

Zotlabs/Daemon/Importfile.php

@@ -6,22 +6,21 @@ use Zotlabs\Lib\Libsync;
 
 class Importfile {
 
-	static public function run($argc,$argv){
+	static public function run($argc, $argv) {
 
-		logger('Importfile: ' . print_r($argv,true));
+		logger('Importfile: ' . print_r($argv, true));
 
-		if($argc < 3)
+		if ($argc < 3)
 			return;
 
 		$channel = channelx_by_n($argv[1]);
-		if(! $channel)
+		if (!$channel)
 			return;
 
 		$srcfile = $argv[2];
 		$folder  = (($argc > 3) ? $argv[3] : '');
 		$dstname = (($argc > 4) ? $argv[4] : '');
-
-		$hash = random_string();
+		$hash    = random_string();
 
 		$arr = [
 			'src'               => $srcfile,
@@ -35,15 +34,15 @@ class Importfile {
 			'replace'           => true
 		];
 
-		if($folder)
+		if ($folder)
 			$arr['folder'] = $folder;
 
-		attach_store($channel,$channel['channel_hash'],'import',$arr);
+		attach_store($channel, $channel['channel_hash'], 'import', $arr);
+
+		$sync = attach_export_data($channel, $hash);
+		if ($sync)
+			Libsync::build_sync_packet($channel['channel_id'], ['file' => [$sync]]);
 
-		$sync = attach_export_data($channel,$hash);
-		if($sync)
-			Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync)));
-	
 		return;
 	}
 }

Zotlabs/Daemon/Master.php

@@ -2,58 +2,57 @@
 
 namespace Zotlabs\Daemon;
 
-if(array_search( __file__ , get_included_files()) === 0) {
+if (array_search(__file__, get_included_files()) === 0) {
 	require_once('include/cli_startup.php');
 	array_shift($argv);
 	$argc = count($argv);
 
-	if($argc)
-		Master::Release($argc,$argv);
+	if ($argc)
+		Master::Release($argc, $argv);
 	return;
 }
 
 
-
 class Master {
 
 	static public function Summon($arr) {
 		$hookinfo = [
-			'argv'=>$arr
+			'argv' => $arr
 		];
 
-		call_hooks ('daemon_master_summon',$hookinfo);
+		call_hooks('daemon_master_summon', $hookinfo);
 
-		$arr = $hookinfo['argv'];
+		$arr  = $hookinfo['argv'];
 		$argc = count($arr);
 
-		if ((!is_array($arr) || (count($arr) < 1))) {
-			logger("Summon handled by hook.",LOGGER_DEBUG);
+		if ((!is_array($arr) || ($argc < 1))) {
+			logger("Summon handled by hook.", LOGGER_DEBUG);
 			return;
 		}
 
-		$phpbin = get_config('system','phpbin','php');
-		proc_run($phpbin,'Zotlabs/Daemon/Master.php',$arr);
+		$phpbin = get_config('system', 'phpbin', 'php');
+		proc_run($phpbin, 'Zotlabs/Daemon/Master.php', $arr);
 	}
 
-	static public function Release($argc,$argv) {
+	static public function Release($argc, $argv) {
 		cli_startup();
 
 		$hookinfo = [
-			'argv'=>$argv
+			'argv' => $argv
 		];
 
-		call_hooks ('daemon_master_release',$hookinfo);
+		call_hooks('daemon_master_release', $hookinfo);
 
 		$argv = $hookinfo['argv'];
 		$argc = count($argv);
 
-		if ((!is_array($argv) || (count($argv) < 1))) {
-			logger("Release handled by hook.",LOGGER_DEBUG);
+		if ((!is_array($argv) || ($argc < 1))) {
+			logger("Release handled by hook.", LOGGER_DEBUG);
 			return;
 		}
 
-		logger('Master: release: ' . json_encode($argv), LOGGER_ALL,LOG_DEBUG);
-                $cls = '\\Zotlabs\\Daemon\\' . $argv[0];
-                $cls::run($argc,$argv);
+		logger('Master: release: ' . json_encode($argv), LOGGER_ALL, LOG_DEBUG);
+		$cls = '\\Zotlabs\\Daemon\\' . $argv[0];
+		$cls::run($argc, $argv);
 	}
 }

Zotlabs/Daemon/Notifier.php

@@ -14,7 +14,6 @@ require_once('include/items.php');
 require_once('include/bbcode.php');
 
 
-
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
  * big problems on shared hosting systems, where the process might get killed by the
@@ -81,198 +80,198 @@ require_once('include/bbcode.php');
  */
 
 
-
 class Notifier {
 
-	static public function run($argc,$argv){
+	static public function run($argc, $argv) {
 
-		if($argc < 3)
+		if ($argc < 3)
 			return;
 
-		logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
+		logger('notifier: invoked: ' . print_r($argv, true), LOGGER_DEBUG);
 
 		$cmd = $argv[1];
 
 		$item_id = $argv[2];
 
-		if(! $item_id)
+		if (!$item_id)
 			return;
 
 		$sys = get_sys_channel();
 
-		$deliveries = array();
+		$deliveries = [];
 
-		$request = false;
-		$mail = false;
-		$top_level = false;
-		$location  = false;
-		$recipients = array();
-		$url_recipients = array();
-		$normal_mode = true;
-		$packet_type = 'undefined';
+		$request        = false;
+		$mail           = false;
+		$location       = false;
+		$recipients     = [];
+		$normal_mode    = true;
+		$packet_type    = 'undefined';
 
-		if($cmd === 'mail' || $cmd === 'single_mail') {
+		if ($cmd === 'mail' || $cmd === 'single_mail') {
 			$normal_mode = false;
-			$mail = true;
-			$private = true;
-			$message = q("SELECT * FROM mail WHERE id = %d LIMIT 1",
-					intval($item_id)
+			$mail        = true;
+			$private     = true;
+			$message     = q("SELECT * FROM mail WHERE id = %d LIMIT 1",
+				intval($item_id)
 			);
-			if(! $message) {
+			if (!$message) {
 				return;
 			}
 			xchan_mail_query($message[0]);
-			$uid = $message[0]['channel_id'];
+			$uid          = $message[0]['channel_id'];
 			$recipients[] = $message[0]['from_xchan']; // include clones
 			$recipients[] = $message[0]['to_xchan'];
-			$item = $message[0];
-
+			$item         = $message[0];
 			$encoded_item = encode_mail($item);
 
 			$s = q("select * from channel where channel_id = %d limit 1",
-				intval($item['channel_id'])
+				intval($uid)
 			);
-			if($s)
+			if ($s)
 				$channel = $s[0];
 
 		}
-		elseif($cmd === 'request') {
-			$channel_id = $item_id;
-			$xchan = $argv[3];
+		elseif ($cmd === 'request') {
+			$channel_id         = $item_id;
+			$xchan              = $argv[3];
 			$request_message_id = $argv[4];
 
 			$s = q("select * from channel where channel_id = %d limit 1",
 				intval($channel_id)
 			);
-			if($s)
+			if ($s)
 				$channel = $s[0];
 
-			$private = true;
+			$private      = true;
 			$recipients[] = $xchan;
-			$packet_type = 'request';
-			$normal_mode = false;
+			$packet_type  = 'request';
+			$normal_mode  = false;
 		}
-		elseif($cmd === 'keychange') {
+		elseif ($cmd === 'keychange') {
 			$channel = channelx_by_n($item_id);
-			$r = q("select abook_xchan from abook where abook_channel = %d",
+
+			$r       = q("select abook_xchan from abook where abook_channel = %d",
 				intval($item_id)
 			);
-			if($r) {
-				foreach($r as $rr) {
+			if ($r) {
+				foreach ($r as $rr) {
 					$recipients[] = $rr['abook_xchan'];
 				}
 			}
-			$private = false;
+			$private     = false;
 			$packet_type = 'keychange';
 			$normal_mode = false;
 		}
-		elseif(in_array($cmd, [ 'permission_update', 'permission_reject', 'permission_accept', 'permission_create' ])) {
+		elseif (in_array($cmd, ['permission_update', 'permission_reject', 'permission_accept', 'permission_create'])) {
 			// Get the (single) recipient
 			$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0",
 				intval($item_id)
 			);
-			if($r) {
+			if ($r) {
 				$uid = $r[0]['abook_channel'];
 				// Get the sender
 				$channel = channelx_by_n($uid);
-				if($channel) {
-					$perm_update = array('sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => '');
+				if ($channel) {
+					$perm_update = ['sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => ''];
 
-					if($cmd === 'permission_create')
-						call_hooks('permissions_create',$perm_update);
-					elseif($cmd === 'permission_accept')
-						call_hooks('permissions_accept',$perm_update);
-					elseif($cmd === 'permission_reject')
-						call_hooks('permissions_reject',$perm_update);
+					if ($cmd === 'permission_create')
+						call_hooks('permissions_create', $perm_update);
+					elseif ($cmd === 'permission_accept')
+						call_hooks('permissions_accept', $perm_update);
+					elseif ($cmd === 'permission_reject')
+						call_hooks('permissions_reject', $perm_update);
 					else
-						call_hooks('permissions_update',$perm_update);
+						call_hooks('permissions_update', $perm_update);
 
-					if($perm_update['success']) {
-						if($perm_update['deliveries']) {
+					if ($perm_update['success']) {
+						if ($perm_update['deliveries']) {
 							$deliveries[] = $perm_update['deliveries'];
 							do_delivery($deliveries);
 						}
 						return;
 					}
 					else {
-						$recipients[] = $r[0]['abook_xchan'];
-						$private = false;
-						$packet_type = 'refresh';
-						$packet_recips = array(array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig'],'hash' => $r[0]['xchan_hash']));
+						$recipients[]  = $r[0]['abook_xchan'];
+						$private       = false;
+						$packet_type   = 'refresh';
+						$packet_recips = [['guid' => $r[0]['xchan_guid'], 'guid_sig' => $r[0]['xchan_guid_sig'], 'hash' => $r[0]['xchan_hash']]];
 					}
 				}
 			}
 		}
-		elseif($cmd === 'refresh_all') {
+		elseif ($cmd === 'refresh_all') {
 			logger('notifier: refresh_all: ' . $item_id);
-			$uid = $item_id;
+			$uid     = $item_id;
 			$channel = channelx_by_n($item_id);
-			$r = q("select abook_xchan from abook where abook_channel = %d",
-				intval($item_id)
+
+			$r       = q("select abook_xchan from abook where abook_channel = %d",
+				intval($uid)
 			);
-			if($r) {
-				foreach($r as $rr) {
+			if ($r) {
+				foreach ($r as $rr) {
 					$recipients[] = $rr['abook_xchan'];
 				}
 			}
-			$private = false;
+			$private     = false;
 			$packet_type = 'refresh';
 		}
-		elseif($cmd === 'location') {
+		elseif ($cmd === 'location') {
 			logger('notifier: location: ' . $item_id);
 			$s = q("select * from channel where channel_id = %d limit 1",
 				intval($item_id)
 			);
-			if($s)
+			if ($s)
 				$channel = $s[0];
-			$uid = $item_id;
-			$recipients = array();
-			$r = q("select abook_xchan from abook where abook_channel = %d",
-				intval($item_id)
+
+			$uid        = $item_id;
+			$recipients = [];
+
+			$r          = q("select abook_xchan from abook where abook_channel = %d",
+				intval($uid)
 			);
-			if($r) {
-				foreach($r as $rr) {
+			if ($r) {
+				foreach ($r as $rr) {
 					$recipients[] = $rr['abook_xchan'];
 				}
 			}
 
-			$encoded_item = array('locations' => Libzot::encode_locations($channel),'type' => 'location', 'encoding' => 'zot');
-			$target_item = array('aid' => $channel['channel_account_id'],'uid' => $channel['channel_id']);
-			$private = false;
-			$packet_type = 'location';
-			$location = true;
+			$encoded_item = ['locations' => Libzot::encode_locations($channel), 'type' => 'location', 'encoding' => 'zot'];
+			$target_item  = ['aid' => $channel['channel_account_id'], 'uid' => $channel['channel_id']];
+			$private      = false;
+			$packet_type  = 'location';
+			$location     = true;
 		}
-		elseif($cmd === 'purge') {
+		elseif ($cmd === 'purge') {
 			$xchan = $argv[3];
 			logger('notifier: purge: ' . $item_id . ' => ' . $xchan);
-			if (! $xchan) {
+			if (!$xchan) {
 				return;
 			}
 
-			$channel     = channelx_by_n($item_id);
-			$recipients[]  = $xchan;
-			$private     = true;
-			$packet_type = 'purge';
+			$channel         = channelx_by_n($item_id);
+			$recipients[]    = $xchan;
+			$private         = true;
+			$packet_type     = 'purge';
 			$packet_recips[] = ['hash' => $xchan];
 		}
-		elseif($cmd === 'purge_all') {
+		elseif ($cmd === 'purge_all') {
 
 			logger('notifier: purge_all: ' . $item_id);
 			$channel = channelx_by_n($item_id);
 
 			$recipients = [];
-			$r = q("select abook_xchan from abook where abook_channel = %d and abook_self = 0",
+			$r          = q("select abook_xchan from abook where abook_channel = %d and abook_self = 0",
 				intval($item_id)
 			);
-			if (! $r) {
+			if (!$r) {
 				return;
 			}
 			foreach ($r as $rr) {
-				$recipients[] = $rr['abook_xchan'];
+				$recipients[]    = $rr['abook_xchan'];
 				$packet_recips[] = ['hash' => $rr['abook_xchan']];
 			}
 
-			$private = false;
+			$private     = false;
 			$packet_type = 'purge';
 
 
@@ -287,7 +286,7 @@ class Notifier {
 				intval($item_id)
 			);
 
-			if(! $r)
+			if (!$r)
 				return;
 
 			xchan_query($r);
@@ -296,25 +295,22 @@ class Notifier {
 
 			$target_item = $r[0];
 
-			if(in_array($target_item['author']['xchan_network'], ['rss', 'anon'])) {
+			if (in_array($target_item['author']['xchan_network'], ['rss', 'anon'])) {
 				logger('notifier: target item author is not a fetchable actor', LOGGER_DEBUG);
 				return;
 			}
 
-			$deleted_item = false;
-
-			if(intval($target_item['item_deleted'])) {
+			if (intval($target_item['item_deleted'])) {
 				logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
-				$deleted_item = true;
 			}
 
-			if(! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST ] )) {
-				$hookinfo=[
-					'targetitem'=>$target_item,
-					'deliver'=>false
+			if (!in_array(intval($target_item['item_type']), [ITEM_TYPE_POST])) {
+				$hookinfo = [
+					'targetitem' => $target_item,
+					'deliver'    => false
 				];
 				if (intval($target_item['item_type'] == ITEM_TYPE_CUSTOM)) {
-					call_hooks('customitem_deliver',$hookinfo);
+					call_hooks('customitem_deliver', $hookinfo);
 				}
 
 				if (!$hookinfo['deliver']) {
@@ -328,14 +324,20 @@ class Notifier {
 
 			// Check for non published items, but allow an exclusion for transmitting hidden file activities
 
-			if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) ||
+			if (intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) ||
 				intval($target_item['item_blocked']) ||
-				( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) {
+				(intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) {
 				logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
 				return;
 			}
 
-			if(strpos($target_item['postopts'],'nodeliver') !== false) {
+			// follow/unfollow is for internal use only
+			if (in_array($target_item['verb'], [ACTIVITY_FOLLOW, ACTIVITY_UNFOLLOW])) {
+				logger('not fowarding follow/unfollow note activity');
+				return;
+			}
+
+			if (strpos($target_item['postopts'], 'nodeliver') !== false) {
 				logger('notifier: target item is undeliverable', LOGGER_DEBUG);
 				return;
 			}
@@ -343,17 +345,16 @@ class Notifier {
 			$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			if($s)
+			if ($s)
 				$channel = $s[0];
 
-			if($channel['channel_hash'] !== $target_item['author_xchan'] && $channel['channel_hash'] !== $target_item['owner_xchan']) {
+			if ($channel['channel_hash'] !== $target_item['author_xchan'] && $channel['channel_hash'] !== $target_item['owner_xchan']) {
 				logger("notifier: Sending channel {$channel['channel_hash']} is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING);
 				return;
 			}
 
-
-			if($target_item['mid'] === $target_item['parent_mid']) {
-				$parent_item = $target_item;
+			if ($target_item['mid'] === $target_item['parent_mid']) {
+				$parent_item    = $target_item;
 				$top_level_post = true;
 			}
 			else {
@@ -362,10 +363,10 @@ class Notifier {
 					intval($target_item['parent'])
 				);
 
-				if(! $r)
+				if (!$r)
 					return;
 
-				if(strpos($r[0]['postopts'],'nodeliver') !== false) {
+				if (strpos($r[0]['postopts'], 'nodeliver') !== false) {
 					logger('notifier: target item is undeliverable', LOGGER_DEBUG, LOG_NOTICE);
 					return;
 				}
@@ -373,34 +374,34 @@ class Notifier {
 				xchan_query($r);
 				$r = fetch_post_tags($r);
 
-				$parent_item = $r[0];
+				$parent_item    = $r[0];
 				$top_level_post = false;
 			}
 
 			// avoid looping of discover items 12/4/2014
 
-			if($sys && $parent_item['uid'] == $sys['channel_id'])
+			if ($sys && $parent_item['uid'] == $sys['channel_id'])
 				return;
 
 			$encoded_item = encode_item($target_item);
 
 			// Re-use existing signature unless the activity type changed to a Tombstone, which won't verify.
-			$m = ((intval($target_item['item_deleted'])) ? '' : get_iconfig($target_item,'activitystreams','signed_data'));
+			$m = ((intval($target_item['item_deleted'])) ? '' : get_iconfig($target_item, 'activitypub', 'signed_data'));
 
-			if($m) {
-				$activity = json_decode($m,true);
+			if ($m) {
+				$activity = json_decode($m, true);
 			}
 			else {
 				$activity = array_merge(['@context' => [
 					ACTIVITYSTREAMS_JSONLD_REV,
 					'https://w3id.org/security/v1',
 					z_root() . ZOT_APSCHEMA_REV
-					]], Activity::encode_activity($target_item)
+				]], Activity::encode_activity($target_item)
 				);
 			}
 
-			logger('target_item: ' . print_r($target_item,true), LOGGER_DEBUG);
-			logger('encoded: ' . print_r($activity,true), LOGGER_DEBUG);
+			logger('target_item: ' . print_r($target_item, true), LOGGER_DEBUG);
+			logger('encoded: ' . print_r($activity, true), LOGGER_DEBUG);
 
 			// Send comments to the owner to re-deliver to everybody in the conversation
 			// We only do this if the item in question originated on this site. This prevents looping.
@@ -411,9 +412,7 @@ class Notifier {
 			// flag on comments for an extended period. So we'll also call comment_local_origin() which looks at
 			// the hostname in the message_id and provides a second (fallback) opinion.
 
-			$relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item)) ? true : false);
-
-
+			$relay_to_owner = (((!$top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item)) ? true : false);
 
 			$uplink = false;
 
@@ -425,43 +424,42 @@ class Notifier {
 
 			// tag_deliver'd post which needs to be sent back to the original author
 
-			if(($cmd === 'uplink') && intval($parent_item['item_uplink']) && (! $top_level_post)) {
+			if (($cmd === 'uplink') && intval($parent_item['item_uplink']) && (!$top_level_post)) {
 				logger('notifier: uplink');
 				$uplink = true;
 			}
 
-			if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
+			if (($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
 				logger('notifier: followup relay', LOGGER_DEBUG);
-				$recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']);
-				$private = true;
-				if(! $encoded_item['flags'])
-					$encoded_item['flags'] = array();
+				$recipients = [($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']];
+				$private    = true;
+				if (!$encoded_item['flags'])
+					$encoded_item['flags'] = [];
 				$encoded_item['flags'][] = 'relay';
-				$upstream = true;
+				$upstream                = true;
 			}
 			else {
 				logger('notifier: normal distribution', LOGGER_DEBUG);
-				if($cmd === 'relay')
+				if ($cmd === 'relay')
 					logger('notifier: owner relay');
 				$upstream = false;
 				// if our parent is a tag_delivery recipient, uplink to the original author causing
 				// a delivery fork.
 
-				if(($parent_item) && intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) {
+				if (($parent_item) && intval($parent_item['item_uplink']) && (!$top_level_post) && ($cmd !== 'uplink')) {
 					// don't uplink a relayed post to the relay owner
-					if($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
+					if ($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
 						logger('notifier: uplinking this item');
-						Master::Summon(array('Notifier','uplink',$item_id));
+						Master::Summon(['Notifier', 'uplink', $item_id]);
 					}
 				}
 
-				$private = false;
-				$recipients = collect_recipients($parent_item,$private);
-
+				$private    = false;
+				$recipients = collect_recipients($parent_item, $private);
 
 				if ($top_level_post) {
 					// remove clones who will receive the post via sync
-					$recipients = array_diff($recipients, [ $target_item['owner_xchan'] ]);
+					$recipients = array_diff($recipients, [$target_item['owner_xchan']]);
 				}
 
 				// FIXME add any additional recipients such as mentions, etc.
@@ -474,32 +472,31 @@ class Notifier {
 		// Generic delivery section, we have an encoded item and recipients
 		// Now start the delivery process
 
-		$x = $encoded_item;
+		$x          = $encoded_item;
 		$x['title'] = 'private';
-		$x['body'] = 'private';
-		logger('notifier: encoded item: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG);
+		$x['body']  = 'private';
+		logger('notifier: encoded item: ' . print_r($x, true), LOGGER_DATA, LOG_DEBUG);
 
 		//logger('notifier: encoded activity: ' . print_r($activity,true), LOGGER_DATA, LOG_DEBUG);
 
 		stringify_array_elms($recipients);
-		if(! $recipients) {
+		if (!$recipients) {
 			logger('no recipients');
 			return;
 		}
 
 		//	logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
 
-		$env_recips = (($private) ? array() : null);
+		$env_recips = (($private) ? [] : null);
 
-		$details = q("select xchan_hash, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . protect_sprintf(implode(',',$recipients)) . ")");
+		$details = q("select xchan_hash, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . protect_sprintf(implode(',', $recipients)) . ")");
 
-		$recip_list = array();
-
-		if($details) {
-			foreach($details as $d) {
+		$recip_list = [];
 
+		if ($details) {
+			foreach ($details as $d) {
 				$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
-				if($private) {
+				if ($private) {
 					$env_recips[] = [
 						'guid'     => $d['xchan_guid'],
 						'guid_sig' => $d['xchan_guid_sig'],
@@ -535,8 +532,8 @@ class Notifier {
 		];
 
 		call_hooks('notifier_process', $narr);
-		if($narr['queued']) {
-			foreach($narr['queued'] as $pq)
+		if ($narr['queued']) {
+			foreach ($narr['queued'] as $pq)
 				$deliveries[] = $pq;
 		}
 
@@ -546,26 +543,26 @@ class Notifier {
 		$env_recips    = $narr['env_recips'];
 		$packet_recips = $narr['packet_recips'];
 
-		if(($private) && (! $env_recips)) {
+		if (($private) && (!$env_recips)) {
 			// shouldn't happen
-			logger('notifier: private message with no envelope recipients.' . print_r($argv,true), LOGGER_NORMAL, LOG_NOTICE);
+			logger('notifier: private message with no envelope recipients.' . print_r($argv, true), LOGGER_NORMAL, LOG_NOTICE);
 		}
 
-		logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list,true), LOGGER_DEBUG);
+		logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list, true), LOGGER_DEBUG);
 
 
 		// Now we have collected recipients (except for external mentions, FIXME)
 		// Let's reduce this to a set of hubs; checking that the site is not dead.
 
 		$hubs = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project, site.site_dead from hubloc left join site on site_url = hubloc_url
-			where hubloc_hash in (" . protect_sprintf(implode(',',$recipients)) . ")
+			where hubloc_hash in (" . protect_sprintf(implode(',', $recipients)) . ")
 			and hubloc_error = 0 and hubloc_deleted = 0"
 		);
 
 		// public posts won't make it to the local public stream unless there's a recipient on this site.
 		// This code block sees if it's a public post and localhost is missing, and if so adds an entry for the local sys channel to the $hubs list
 
-		if (! $private) {
+		if (!$private) {
 			$found_localhost = false;
 			if ($hubs) {
 				foreach ($hubs as $h) {
@@ -575,7 +572,7 @@ class Notifier {
 					}
 				}
 			}
-			if (! $found_localhost) {
+			if (!$found_localhost) {
 				$localhub = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project, site.site_dead from hubloc
 					left join site on site_url = hubloc_url where hubloc_id_url = '%s' and hubloc_error = 0 and hubloc_deleted = 0",
 					dbesc(z_root() . '/channel/sys')
@@ -586,7 +583,7 @@ class Notifier {
 			}
 		}
 
-		if(! $hubs) {
+		if (!$hubs) {
 			logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE);
 			return;
 		}
@@ -605,17 +602,17 @@ class Notifier {
 		$hub_env = []; // per-hub envelope so we don't broadcast the entire envelope to all
 		$dead    = []; // known dead hubs - report them as undeliverable
 
-		foreach($hubs as $hub) {
+		foreach ($hubs as $hub) {
 
 			if (intval($hub['site_dead'])) {
 				$dead[] = $hub;
 				continue;
 			}
 
-			if($env_recips) {
-				foreach($env_recips as $er) {
-					if($hub['hubloc_hash'] === $er['hash']) {
-						if(! array_key_exists($hub['hubloc_host'] . $hub['hubloc_sitekey'], $hub_env)) {
+			if ($env_recips) {
+				foreach ($env_recips as $er) {
+					if ($hub['hubloc_hash'] === $er['hash']) {
+						if (!array_key_exists($hub['hubloc_host'] . $hub['hubloc_sitekey'], $hub_env)) {
 							$hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] = [];
 						}
 						$hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']][] = $er;
@@ -624,36 +621,36 @@ class Notifier {
 			}
 
 
-			if($hub['hubloc_network'] == 'zot') {
-				if(! in_array($hub['hubloc_sitekey'],$keys)) {
+			if ($hub['hubloc_network'] == 'zot') {
+				if (!in_array($hub['hubloc_sitekey'], $keys)) {
 					$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
 					$dhubs[]   = $hub;
 					$keys[]    = $hub['hubloc_sitekey'];
 				}
 			}
 			else {
-				if(! in_array($hub['hubloc_url'],$urls)) {
-					if($hub['hubloc_url'] === z_root()) {
+				if (!in_array($hub['hubloc_url'], $urls)) {
+					if ($hub['hubloc_url'] === z_root()) {
 						//deliver to local hub first
 						array_unshift($hublist, $hub['hubloc_host'] . ' ' . $hub['hubloc_network']);
 						array_unshift($dhubs, $hub);
 					}
 					else {
 						$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
-						$dhubs[] = $hub;
+						$dhubs[]   = $hub;
 					}
 					$urls[] = $hub['hubloc_url'];
 				}
 			}
 		}
 
-		logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG, LOG_DEBUG);
+		logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist, true), LOGGER_DEBUG, LOG_DEBUG);
 
-		foreach($dhubs as $hub) {
+		foreach ($dhubs as $hub) {
 
-			logger('notifier_hub: ' . $hub['hubloc_url'],LOGGER_DEBUG);
+			logger('notifier_hub: ' . $hub['hubloc_url'], LOGGER_DEBUG);
 
-			if(! in_array($hub['hubloc_network'], [ 'zot','zot6' ])) {
+			if (!in_array($hub['hubloc_network'], ['zot', 'zot6'])) {
 				$narr = [
 					'channel'        => $channel,
 					'upstream'       => $upstream,
@@ -680,9 +677,9 @@ class Notifier {
 				];
 
 
-				call_hooks('notifier_hub',$narr);
-				if($narr['queued']) {
-					foreach($narr['queued'] as $pq)
+				call_hooks('notifier_hub', $narr);
+				if ($narr['queued']) {
+					foreach ($narr['queued'] as $pq)
 						$deliveries[] = $pq;
 				}
 				continue;
@@ -698,11 +695,11 @@ class Notifier {
 			// will invoke a delivery to those connections which are connected to just that
 			// hub instance.
 
-			if($cmd === 'single_mail' || $cmd === 'single_activity') {
+			if ($cmd === 'single_mail' || $cmd === 'single_activity') {
 				continue;
 			}
 
-			if(! in_array($hub['hubloc_network'], [ 'zot','zot6' ])) {
+			if (!in_array($hub['hubloc_network'], ['zot', 'zot6'])) {
 				continue;
 			}
 
@@ -710,31 +707,31 @@ class Notifier {
 			// in the loop. The signature verification step can't handle dashes in the
 			// hashes.
 
-			$hash   = random_string(48);
+			$hash = random_string(48);
 
 			$packet = null;
 			$pmsg   = '';
 
-			if($packet_type === 'refresh' || $packet_type === 'purge') {
-				if($hub['hubloc_network'] === 'zot6') {
-					$packet = Libzot::build_packet($channel, $packet_type, ids_to_array($packet_recips,'hash'));
+			if ($packet_type === 'refresh' || $packet_type === 'purge') {
+				if ($hub['hubloc_network'] === 'zot6') {
+					$packet = Libzot::build_packet($channel, $packet_type, ids_to_array($packet_recips, 'hash'));
 				}
 				else {
-					$packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null));
+					$packet = zot_build_packet($channel, $packet_type, (($packet_recips) ? $packet_recips : null));
 				}
 			}
-			if($packet_type === 'keychange' && $hub['hubloc_network'] === 'zot') {
-				$pmsg = get_pconfig($channel['channel_id'],'system','keychange');
-				$packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null));
+			if ($packet_type === 'keychange' && $hub['hubloc_network'] === 'zot') {
+				$pmsg   = get_pconfig($channel['channel_id'], 'system', 'keychange');
+				$packet = zot_build_packet($channel, $packet_type, (($packet_recips) ? $packet_recips : null));
 			}
-			elseif($packet_type === 'request' && $hub['hubloc_network'] === 'zot') {
-				$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
-				$packet = zot_build_packet($channel,$packet_type,$env,$hub['hubloc_sitekey'],$hub['site_crypto'],
-					$hash, array('message_id' => $request_message_id)
+			elseif ($packet_type === 'request' && $hub['hubloc_network'] === 'zot') {
+				$env    = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
+				$packet = zot_build_packet($channel, $packet_type, $env, $hub['hubloc_sitekey'], $hub['site_crypto'],
+					$hash, ['message_id' => $request_message_id]
 				);
 			}
 
-			if($packet) {
+			if ($packet) {
 				Queue::insert(
 					[
 						'hash'       => $hash,
@@ -750,11 +747,10 @@ class Notifier {
 			else {
 				$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
 
-
-				if($hub['hubloc_network'] === 'zot6') {
+				if ($hub['hubloc_network'] === 'zot6') {
 					$zenv = [];
-					if($env) {
-						foreach($env as $e) {
+					if ($env) {
+						foreach ($env as $e) {
 							$zenv[] = $e['hash'];
 						}
 					}
@@ -767,11 +763,11 @@ class Notifier {
 					// For public reshares, some comments to the reshare on the zot fork will not make it to zot6
 					// due to these different message models. This cannot be prevented at this time.
 
-					if($packet_type === 'activity' && $activity['type'] === 'Announce' && intval($target_item['item_private'])) {
+					if ($packet_type === 'activity' && $activity['type'] === 'Announce' && intval($target_item['item_private'])) {
 						continue;
 					}
 
-					$packet = Libzot::build_packet($channel,$packet_type,$zenv,$activity,'activitystreams',(($private) ? $hub['hubloc_sitekey'] : null),$hub['site_crypto']);
+					$packet = Libzot::build_packet($channel, $packet_type, $zenv, $activity, 'activitystreams', (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto']);
 				}
 				else {
 					// currently zot6 delivery is only performed on normal items and not sync items or mail or anything else
@@ -779,28 +775,28 @@ class Notifier {
 					// with before switching to zot6 as the primary zot6 handler checks for the existence of a message delivery report
 					// to trigger dequeue'ing
 
-					$z6 = (($encoded_item && $encoded_item['type'] === 'activity' && (! array_key_exists('allow_cid',$encoded_item))) ? true : false);
-					if($z6) {
-						$packet = zot6_build_packet($channel,'notify',$env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
+					$z6 = (($encoded_item && $encoded_item['type'] === 'activity' && (!array_key_exists('allow_cid', $encoded_item))) ? true : false);
+					if ($z6) {
+						$packet = zot6_build_packet($channel, 'notify', $env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'], $hash);
 					}
 					else {
-						$packet = zot_build_packet($channel,'notify',$env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
+						$packet = zot_build_packet($channel, 'notify', $env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'], $hash);
 
 					}
 				}
 
 
 				// remove this after most hubs have updated to version 5.0
-				if(stripos($hub['site_project'], 'hubzilla') !== false && version_compare($hub['site_version'], '4.7.3', '<=')) {
-					if($encoded_item['type'] === 'mail') {
-						$encoded_item['from']['network'] = 'zot';
+				if (stripos($hub['site_project'], 'hubzilla') !== false && version_compare($hub['site_version'], '4.7.3', '<=')) {
+					if ($encoded_item['type'] === 'mail') {
+						$encoded_item['from']['network']  = 'zot';
 						$encoded_item['from']['guid_sig'] = str_replace('sha256.', '', $encoded_item['from']['guid_sig']);
 					}
 					else {
-						$encoded_item['owner']['network'] = 'zot';
+						$encoded_item['owner']['network']  = 'zot';
 						$encoded_item['owner']['guid_sig'] = str_replace('sha256.', '', $encoded_item['owner']['guid_sig']);
-						if(strpos($encoded_item['author']['url'], z_root()) === 0) {
-							$encoded_item['author']['network'] = 'zot';
+						if (strpos($encoded_item['author']['url'], z_root()) === 0) {
+							$encoded_item['author']['network']  = 'zot';
 							$encoded_item['author']['guid_sig'] = str_replace('sha256.', '', $encoded_item['author']['guid_sig']);
 						}
 					}
@@ -819,7 +815,7 @@ class Notifier {
 				);
 
 				// only create delivery reports for normal undeleted items
-				if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
+				if (is_array($target_item) && array_key_exists('postopts', $target_item) && (!$target_item['item_deleted']) && (!get_config('system', 'disable_dreport'))) {
 					q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ",
 						dbesc($target_item['mid']),
 						dbesc($hub['hubloc_host']),
@@ -835,21 +831,21 @@ class Notifier {
 			$deliveries[] = $hash;
 		}
 
-		if($normal_mode) {
+		if ($normal_mode) {
 			$x = q("select * from hook where hook = 'notifier_normal'");
-			if($x) {
-				Master::Summon( [ 'Deliver_hooks', $target_item['id'] ] );
+			if ($x) {
+				Master::Summon(['Deliver_hooks', $target_item['id']]);
 			}
 		}
 
-		if($deliveries)
+		if ($deliveries)
 			do_delivery($deliveries);
 
 		logger('notifier: basic loop complete.', LOGGER_DEBUG);
 
 		if ($dead) {
 			foreach ($dead as $deceased) {
-				if (is_array($target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
+				if (is_array($target_item) && (!$target_item['item_deleted']) && (!get_config('system', 'disable_dreport'))) {
 					q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue )
 						values ( '%s', '%s','%s','%s','%s','%s','%s','%s' ) ",
 						dbesc($target_item['mid']),
@@ -865,7 +861,7 @@ class Notifier {
 			}
 		}
 
-		call_hooks('notifier_end',$target_item);
+		call_hooks('notifier_end', $target_item);
 
 		logger('notifer: complete.');
 		return;

Zotlabs/Daemon/Onedirsync.php

@@ -11,14 +11,14 @@ require_once('include/dir_fns.php');
 
 class Onedirsync {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
 		logger('onedirsync: start ' . intval($argv[1]));
 
-		if(($argc > 1) && (intval($argv[1])))
+		if (($argc > 1) && (intval($argv[1])))
 			$update_id = intval($argv[1]);
 
-		if(! $update_id) {
+		if (!$update_id) {
 			logger('onedirsync: no update');
 			return;
 		}
@@ -27,9 +27,9 @@ class Onedirsync {
 			intval($update_id)
 		);
 
-		if(! $r)
+		if (!$r)
 			return;
-		if(($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr']))
+		if (($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (!$r[0]['ud_addr']))
 			return;
 
 		// Have we probed this channel more recently than the other directory server
@@ -41,8 +41,8 @@ class Onedirsync {
 			dbesc($r[0]['ud_date']),
 			intval(UPDATE_FLAGS_UPDATED)
 		);
-		if($x) {
-			$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date != '%s'",
+		if ($x) {
+			q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date != '%s'",
 				intval(UPDATE_FLAGS_UPDATED),
 				dbesc($r[0]['ud_addr']),
 				intval(UPDATE_FLAGS_UPDATED),
@@ -59,8 +59,8 @@ class Onedirsync {
 
 		$h = Libzot::zot_record_preferred($h);
 
-		if(($h) && ($h['hubloc_status'] & HUBLOC_OFFLINE)) {
-			$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
+		if (($h) && ($h['hubloc_status'] & HUBLOC_OFFLINE)) {
+			q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
 				intval(UPDATE_FLAGS_UPDATED),
 				dbesc($r[0]['ud_addr']),
 				intval(UPDATE_FLAGS_UPDATED)
@@ -72,7 +72,7 @@ class Onedirsync {
 		// we might have to pull this out some day, but for now update_directory_entry()
 		// runs zot_finger() and is kind of zot specific
 
-		if($h && ! in_array($h['hubloc_network'], ['zot6', 'zot']))
+		if ($h && !in_array($h['hubloc_network'], ['zot6', 'zot']))
 			return;
 
 		Libzotdir::update_directory_entry($r[0]);

Zotlabs/Daemon/Onepoll.php

@@ -2,68 +2,70 @@
 
 namespace Zotlabs\Daemon;
 
+use Zotlabs\Lib\Activity;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\ASCollection;
 use Zotlabs\Lib\Libzot;
 
-require_once('include/zot.php');
 require_once('include/socgraph.php');
 
-
 class Onepoll {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
 		logger('onepoll: start');
-	
-		if(($argc > 1) && (intval($argv[1])))
+
+		if (($argc > 1) && (intval($argv[1])))
 			$contact_id = intval($argv[1]);
 
-		if(! $contact_id) {
+		if (!$contact_id) {
 			logger('onepoll: no contact');
 			return;
 		}
 
-		$d = datetime_convert();
+		$sql_extra = '';
+		$allow_feeds = get_config('system', 'feed_contacts');
+		if(!$allow_feeds) {
+			$sql_extra = ' and abook_feed = 0 ';
+		}
 
 		$contacts = q("SELECT abook.*, xchan.*, account.*
-			FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan 
-			where abook_id = %d
+			FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan
+			where abook_id = %d $sql_extra
 			and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0
 			AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1",
 			intval($contact_id),
 			intval(ACCOUNT_OK),
 			intval(ACCOUNT_UNVERIFIED)
-		);	
+		);
 
-		if(! $contacts) {
+		if (!$contacts) {
 			logger('onepoll: abook_id not found: ' . $contact_id);
 			return;
 		}
 
-		$contact = $contacts[0];
-
-		$t = $contact['abook_updated'];
-
+		$contact      = array_shift($contacts);
 		$importer_uid = $contact['abook_channel'];
-		
+
 		$r = q("SELECT * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
 			intval($importer_uid)
 		);
 
-		if(! $r)
+		if (!$r)
 			return;
 
 		$importer = $r[0];
 
 		logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}");
 
-		$last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE))	
-			? datetime_convert('UTC','UTC','now - 7 days')
-			: datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days')
+		$last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE))
+			? datetime_convert('UTC', 'UTC', 'now - 7 days')
+			: datetime_convert('UTC', 'UTC', $contact['abook_updated'] . ' - 2 days')
 		);
 
-		if($contact['xchan_network'] === 'rss') {
+		if ($contact['xchan_network'] === 'rss') {
 			logger('onepoll: processing feed ' . $contact['xchan_name'], LOGGER_DEBUG);
-			$alive = handle_feed($importer['channel_id'],$contact_id,$contact['xchan_hash']);
+			$alive = handle_feed($importer['channel_id'], $contact_id, $contact['xchan_hash']);
 			if ($alive) {
 				q("update abook set abook_connected = '%s' where abook_id = %d",
 					dbesc(datetime_convert()),
@@ -72,22 +74,22 @@ class Onepoll {
 			}
 			return;
 		}
-	
-		if(! in_array($contact['xchan_network'],['zot','zot6']))
+
+		if (!in_array($contact['xchan_network'], ['zot', 'zot6']))
 			return;
 
 		// update permissions
 
-		if($contact['xchan_network'] === 'zot6')
-			$x = Libzot::refresh($contact,$importer);
+		if ($contact['xchan_network'] === 'zot6')
+			$x = Libzot::refresh($contact, $importer);
 
-		if($contact['xchan_network'] === 'zot')
-			$x = zot_refresh($contact,$importer);
+		if ($contact['xchan_network'] === 'zot')
+			$x = zot_refresh($contact, $importer);
 
 		$responded = false;
 		$updated   = datetime_convert();
 		$connected = datetime_convert();
-		if(! $x) {
+		if (!$x) {
 			// mark for death by not updating abook_connected, this is caught in include/poller.php
 			q("update abook set abook_updated = '%s' where abook_id = %d",
 				dbesc($updated),
@@ -103,83 +105,68 @@ class Onepoll {
 			$responded = true;
 		}
 
-		if(! $responded)
+		if (!$responded)
 			return;
 
-		if($contact['xchan_connurl']) {
-			$fetch_feed = true;
-			$x = null;
+		$fetch_feed = true;
+		$x          = null;
 
-			// They haven't given us permission to see their stream
+		// They haven't given us permission to see their stream
 
-			$can_view_stream = intval(get_abconfig($importer_uid,$contact['abook_xchan'],'their_perms','view_stream'));
+		$can_view_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'their_perms', 'view_stream'));
 
-			if(! $can_view_stream)
-				$fetch_feed = false;
+		if (!$can_view_stream)
+			$fetch_feed = false;
 
-			// we haven't given them permission to send us their stream
+		// we haven't given them permission to send us their stream
 
-			$can_send_stream = intval(get_abconfig($importer_uid,$contact['abook_xchan'],'my_perms','send_stream'));
-			
-			if(! $can_send_stream)
-				$fetch_feed = false;
+		$can_send_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'my_perms', 'send_stream'));
 
-			if($fetch_feed) {
+		if (!$can_send_stream)
+			$fetch_feed = false;
 
-				if(strpos($contact['xchan_connurl'],z_root()) === 0) {
-					// local channel - save a network fetch
-					$c = channelx_by_hash($contact['xchan_hash']);
-					if($c) {
-						$x = [ 
-							'success' => true, 
-							'body' => json_encode( [ 
-								'success' => true,
-								'messages' => zot_feed($c['channel_id'], $importer['xchan_hash'], [ 'mindate' => $last_update ])
-							])
-						];
-					}
+		if ($fetch_feed && $contact['xchan_network'] !== 'zot') {
+
+			$max = intval(get_config('system', 'max_imported_posts', 30));
+
+			if (intval($max)) {
+				$cl = get_xconfig($contact['abook_xchan'], 'activitypub', 'collections');
+
+				if (is_array($cl) && $cl) {
+					$url = ((array_key_exists('outbox', $cl)) ? $cl['outbox'] : '');
 				}
 				else {
-					// remote fetch	
-
-					$feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']);		
-					$feedurl .= '?f=&mindate=' . urlencode($last_update) . '&zid=' . $importer['channel_address'] . '@' . \App::get_hostname();
-					$recurse = 0;
-					$x = z_fetch_url($feedurl, false, $recurse, [ 'session' => true ]);
+					$url = str_replace('/poco/', '/zotfeed/', $contact['xchan_connurl']);
 				}
 
-				logger('feed_update: ' . print_r($x,true), LOGGER_DATA);
-			}
-
-			if(($x) && ($x['success'])) {
-				$total = 0;
-				logger('onepoll: feed update ' . $contact['xchan_name'] . ' ' . $feedurl);
-
-				$j = json_decode($x['body'],true);
-				if($j['success'] && $j['messages']) {
-					foreach($j['messages'] as $message) {
-						$results = process_delivery(array('hash' => $contact['xchan_hash']), get_item_elements($message),
-							array(array('hash' => $importer['xchan_hash'])), false);
-						logger('onepoll: feed_update: process_delivery: ' . print_r($results,true), LOGGER_DATA);
-						$total ++;
+				if ($url) {
+					logger('fetching outbox');
+					$url      = $url . '?date_begin=' .  urlencode($last_update);
+					$obj      = new ASCollection($url, $importer, 0, $max);
+					$messages = $obj->get();
+					if ($messages) {
+						foreach ($messages as $message) {
+							if (is_string($message)) {
+								$message = Activity::fetch($message, $importer);
+							}
+							$AS = new ActivityStreams($message);
+							if ($AS->is_valid() && is_array($AS->obj)) {
+								$item = Activity::decode_note($AS);
+								Activity::store($importer, $contact['abook_xchan'], $AS, $item);
+							}
+						}
 					}
-					logger("onepoll: $total messages processed");
 				}
 			}
 		}
-			
 
 		// update the poco details for this connection
-
-		if($contact['xchan_connurl']) {	
-			$r = q("SELECT xlink_id from xlink 
-				where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1",
-				intval($contact['xchan_hash']),
-				db_utcnow(), db_quoteinterval('1 DAY')
-			);
-			if(! $r) {
-				poco_load($contact['xchan_hash'],$contact['xchan_connurl']);
-			}
+		$r = q("SELECT xlink_id from xlink where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1",
+			intval($contact['xchan_hash']),
+			db_utcnow(), db_quoteinterval('1 DAY')
+		);
+		if (!$r) {
+			poco_load($contact['xchan_hash'], $contact['xchan_connurl']);
 		}
 
 		return;

Zotlabs/Daemon/Poller.php

@@ -4,53 +4,50 @@ namespace Zotlabs\Daemon;
 
 class Poller {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		$maxsysload = intval(get_config('system','maxloadavg'));
-		if($maxsysload < 1)
+		$maxsysload = intval(get_config('system', 'maxloadavg'));
+		if ($maxsysload < 1)
 			$maxsysload = 50;
-		if(function_exists('sys_getloadavg')) {
+		if (function_exists('sys_getloadavg')) {
 			$load = sys_getloadavg();
-			if(intval($load[0]) > $maxsysload) {
+			if (intval($load[0]) > $maxsysload) {
 				logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
 				return;
 			}
 		}
 
-		$interval = intval(get_config('system','poll_interval'));
-		if(! $interval) 
-			$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
+		$interval = intval(get_config('system', 'poll_interval'));
+		if (!$interval)
+			$interval = ((get_config('system', 'delivery_interval') === false) ? 3 : intval(get_config('system', 'delivery_interval')));
 
 		// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
 		$lockfile = 'store/[data]/poller';
-		if((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) 
-			&& (! get_config('system','override_poll_lockfile'))) {
+		if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))
+			&& (!get_config('system', 'override_poll_lockfile'))) {
 			logger("poller: Already running");
 			return;
 		}
-	
+
 		// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
+		$x = '';
 		file_put_contents($lockfile, $x);
 
 		logger('poller: start');
-	
+
 		$manual_id  = 0;
-		$generation = 0;
+		$force   = false;
 
-		$force      = false;
-		$restart    = false;
-
-		if(($argc > 1) && ($argv[1] == 'force'))
+		if (($argc > 1) && ($argv[1] == 'force'))
 			$force = true;
 
-		if(($argc > 1) && ($argv[1] == 'restart')) {
-			$restart = true;
+		if (($argc > 1) && ($argv[1] == 'restart')) {
 			$generation = intval($argv[2]);
-			if(! $generation)
+			if (!$generation)
 				return;
 		}
 
-		if(($argc > 1) && intval($argv[1])) {
+		if (($argc > 1) && intval($argv[1])) {
 			$manual_id = intval($argv[1]);
 			$force     = true;
 		}
@@ -59,17 +56,15 @@ class Poller {
 
 		reload_plugins();
 
-		$d = datetime_convert();
-
 		// Only poll from those with suitable relationships
-
-		$abandon_sql = (($abandon_days) 
-			? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days).' DAY')) 
-			: '' 
+		$abandon_days = intval(get_config('system', 'account_abandon_days', 0));
+		$abandon_sql = (($abandon_days)
+			? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days) . ' DAY'))
+			: ''
 		);
 
 		$randfunc = db_getfunc('RAND');
-	
+
 		$contacts = q("SELECT abook.abook_updated, abook.abook_connected, abook.abook_feed,
 			abook.abook_channel, abook.abook_id, abook.abook_archived, abook.abook_pending,
 			abook.abook_ignored, abook.abook_blocked,
@@ -84,119 +79,117 @@ class Poller {
 			intval(ACCOUNT_UNVERIFIED)     // FIXME
 		);
 
-		if($contacts) {
-			foreach($contacts as $contact) {
+		if ($contacts) {
+			foreach ($contacts as $contact) {
 
-				$update  = false;
+				$update = false;
 
 				$t = $contact['abook_updated'];
 				$c = $contact['abook_connected'];
 
-				if(intval($contact['abook_feed'])) {
-					$min = service_class_fetch($contact['abook_channel'],'minimum_feedcheck_minutes');
-					if(! $min)
-						$min = intval(get_config('system','minimum_feedcheck_minutes'));
-					if(! $min)
+				if (intval($contact['abook_feed'])) {
+					$min = service_class_fetch($contact['abook_channel'], 'minimum_feedcheck_minutes');
+					if (!$min)
+						$min = intval(get_config('system', 'minimum_feedcheck_minutes'));
+					if (!$min)
 						$min = 60;
-					$x = datetime_convert('UTC','UTC',"now - $min minutes");
-					if($c < $x) {
-						Master::Summon(array('Onepoll',$contact['abook_id']));
-						if($interval)
-							@time_sleep_until(microtime(true) + (float) $interval);
+					$x = datetime_convert('UTC', 'UTC', "now - $min minutes");
+					if ($c < $x) {
+						Master::Summon(['Onepoll', $contact['abook_id']]);
+						if ($interval)
+							@time_sleep_until(microtime(true) + (float)$interval);
 					}
 					continue;
 				}
 
 
-				if(! in_array($contact['xchan_network'],['zot','zot6']))
+				if (!in_array($contact['xchan_network'], ['zot', 'zot6']))
 					continue;
 
-				if($c == $t) {
-					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+				if ($c == $t) {
+					if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day"))
 						$update = true;
 				}
 				else {
-	
+
 					// if we've never connected with them, start the mark for death countdown from now
-	
-					if($c <= NULL_DATE) {
-						$r = q("update abook set abook_connected = '%s'  where abook_id = %d",
+
+					if ($c <= NULL_DATE) {
+						q("update abook set abook_connected = '%s'  where abook_id = %d",
 							dbesc(datetime_convert()),
 							intval($contact['abook_id'])
 						);
-						$c = datetime_convert();
+						$c      = datetime_convert();
 						$update = true;
 					}
 
 					// He's dead, Jim
 
-					if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 30 day")) > 0) {	
-						$r = q("update abook set abook_archived = 1 where abook_id = %d",
+					if (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $c . " + 30 day")) > 0) {
+						q("update abook set abook_archived = 1 where abook_id = %d",
 							intval($contact['abook_id'])
 						);
-						$update = false;
 						continue;
 					}
 
-					if(intval($contact['abook_archived'])) {
-						$update = false;
+					if (intval($contact['abook_archived'])) {
 						continue;
 					}
 
 					// might be dead, so maybe don't poll quite so often
-	
+
 					// recently deceased, so keep up the regular schedule for 3 days
- 
-					if((strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 3 day")) > 0)
-					 && (strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 1 day")) > 0))
+
+					if ((strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $c . " + 3 day")) > 0)
+						&& (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $t . " + 1 day")) > 0))
 						$update = true;
 
 					// After that back off and put them on a morphine drip
 
-					if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 2 day")) > 0) {	
+					if (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $t . " + 2 day")) > 0) {
 						$update = true;
 					}
 
 				}
 
-				if(intval($contact['abook_pending']) || intval($contact['abook_archived']) || intval($contact['abook_ignored']) || intval($contact['abook_blocked']))
+				if (intval($contact['abook_pending']) || intval($contact['abook_archived']) || intval($contact['abook_ignored']) || intval($contact['abook_blocked']))
 					continue;
 
-				if((! $update) && (! $force))
-						continue;
+				if ((!$update) && (!$force))
+					continue;
 
-				Master::Summon(array('Onepoll',$contact['abook_id']));
-				if($interval)
-					@time_sleep_until(microtime(true) + (float) $interval);
+				Master::Summon(['Onepoll', $contact['abook_id']]);
+				if ($interval)
+					@time_sleep_until(microtime(true) + (float)$interval);
 
 			}
 		}
 
 		$dirmode = intval(get_config('system', 'directory_mode'));
 
-		if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
+		if ($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
 			$r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_id) AS ud_id FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last <= '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_id = u.ud_id ",
 				intval(UPDATE_FLAGS_UPDATED),
 				dbesc(NULL_DATE),
 				db_utcnow(), db_quoteinterval('7 DAY')
 			);
-			if($r) {
-				foreach($r as $rr) {
+			if ($r) {
+				foreach ($r as $rr) {
 
 					// If they didn't respond when we attempted before, back off to once a day
 					// After 7 days we won't bother anymore
 
-					if($rr['ud_last'] > NULL_DATE)
-						if($rr['ud_last'] > datetime_convert('UTC','UTC', 'now - 1 day'))
+					if ($rr['ud_last'] > NULL_DATE)
+						if ($rr['ud_last'] > datetime_convert('UTC', 'UTC', 'now - 1 day'))
 							continue;
-					Master::Summon(array('Onedirsync',$rr['ud_id']));
-					if($interval)
-						@time_sleep_until(microtime(true) + (float) $interval);
+					Master::Summon(['Onedirsync', $rr['ud_id']]);
+					if ($interval)
+						@time_sleep_until(microtime(true) + (float)$interval);
 				}
 			}
-		}	
+		}
 
-		set_config('system','lastpoll',datetime_convert());
+		set_config('system', 'lastpoll', datetime_convert());
 
 		//All done - clear the lockfile	
 

Zotlabs/Daemon/Queue.php

@@ -7,12 +7,12 @@ require_once('include/zot.php');
 
 class Queue {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
 		require_once('include/items.php');
 		require_once('include/bbcode.php');
 
-		if($argc > 1)
+		if ($argc > 1)
 			$queue_id = $argv[1];
 		else
 			$queue_id = EMPTY_STR;
@@ -25,11 +25,10 @@ class Queue {
 		$r = q("select outq_posturl from outq where outq_created < %s - INTERVAL %s",
 			db_utcnow(), db_quoteinterval('3 DAY')
 		);
-		if($r) {
-			foreach($r as $rr) {
-				$site_url = '';
-				$h = parse_url($rr['outq_posturl']);
-				$desturl = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
+		if ($r) {
+			foreach ($r as $rr) {
+				$h       = parse_url($rr['outq_posturl']);
+				$desturl = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : '');
 				q("update site set site_dead = 1 where site_dead = 0 and site_url = '%s' and site_update < %s - INTERVAL %s",
 					dbesc($desturl),
 					db_utcnow(), db_quoteinterval('1 MONTH')
@@ -37,11 +36,11 @@ class Queue {
 			}
 		}
 
-		$r = q("DELETE FROM outq WHERE outq_created < %s - INTERVAL %s",
+		q("DELETE FROM outq WHERE outq_created < %s - INTERVAL %s",
 			db_utcnow(), db_quoteinterval('3 DAY')
 		);
 
-		if($queue_id) {
+		if ($queue_id) {
 			$r = q("SELECT * FROM outq WHERE outq_hash = '%s' LIMIT 1",
 				dbesc($queue_id)
 			);
@@ -54,7 +53,7 @@ class Queue {
 			// so that we don't start off a thousand deliveries for a couple of dead hubs.
 			// The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made).
 			// Other drivers will have to do something different here and may need their own query.
-	
+
 			// Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the 
 			// "every 15 minutes" category. We probably need to prioritise them when inserted into the queue
 			// or just prior to this query based on recent and long-term delivery history. If we have good reason to believe
@@ -67,7 +66,7 @@ class Queue {
 				db_utcnow()
 			);
 			while ($r) {
-				foreach($r as $rv) {
+				foreach ($r as $rv) {
 					queue_deliver($rv);
 				}
 				$r = q("SELECT *,$sqlrandfunc as rn FROM outq WHERE outq_delivered = 0 and outq_scheduled < %s order by rn limit 1",
@@ -75,10 +74,10 @@ class Queue {
 				);
 			}
 		}
-		if(! $r)
+		if (!$r)
 			return;
 
-		foreach($r as $rv) {
+		foreach ($r as $rv) {
 			queue_deliver($rv);
 		}
 	}

Zotlabs/Daemon/Thumbnail.php

@@ -5,30 +5,30 @@ namespace Zotlabs\Daemon;
 
 class Thumbnail {
 
-	static public function run($argc,$argv) {
+	static public function run($argc, $argv) {
 
-		if(! $argc == 2)
+		if (!$argc == 2)
 			return;
 
 		$c = q("select * from attach where hash = '%s' ",
 			dbesc($argv[1])
 		);
 
-		if(! $c)
+		if (!$c)
 			return;
 
 		$attach = $c[0];
 
-		$preview_style   = intval(get_config('system','thumbnail_security',0));
-		$preview_width   = intval(get_config('system','thumbnail_width',300));
-		$preview_height  = intval(get_config('system','thumbnail_height',300));
+		$preview_style  = intval(get_config('system', 'thumbnail_security', 0));
+		$preview_width  = intval(get_config('system', 'thumbnail_width', 300));
+		$preview_height = intval(get_config('system', 'thumbnail_height', 300));
 
 		$p = [
 			'attach'         => $attach,
 			'preview_style'  => $preview_style,
 			'preview_width'  => $preview_width,
 			'preview_height' => $preview_height,
-			'thumbnail' => null
+			'thumbnail'      => null
 		];
 
 		/**
@@ -40,39 +40,39 @@ class Thumbnail {
 		 *  * \e string \b thumbnail
 		 */
 
-		call_hooks('thumbnail',$p);
-		if($p['thumbnail']) {
+		call_hooks('thumbnail', $p);
+		if ($p['thumbnail']) {
 			return;
 		}
 
 
 		$default_controller = null;
-		
+
 		$files = glob('Zotlabs/Thumbs/*.php');
-		if($files) {
-			foreach($files as $f) {
-				$clsname = '\\Zotlabs\\Thumbs\\' . ucfirst(basename($f,'.php'));
-				if(class_exists($clsname)) {
+		if ($files) {
+			foreach ($files as $f) {
+				$clsname = '\\Zotlabs\\Thumbs\\' . ucfirst(basename($f, '.php'));
+				if (class_exists($clsname)) {
 					$x = new $clsname();
-					if(method_exists($x,'Match')) {
+					if (method_exists($x, 'Match')) {
 						$matched = $x->Match($attach['filetype']);
-						if($matched) {
-							$x->Thumb($attach,$preview_style,$preview_width,$preview_height);
+						if ($matched) {
+							$x->Thumb($attach, $preview_style, $preview_width, $preview_height);
 						}
 					}
-					if(method_exists($x,'MatchDefault')) {
-						$default_matched = $x->MatchDefault(substr($attach['filetype'],0,strpos($attach['filetype'],'/')));
-						if($default_matched) {
+					if (method_exists($x, 'MatchDefault')) {
+						$default_matched = $x->MatchDefault(substr($attach['filetype'], 0, strpos($attach['filetype'], '/')));
+						if ($default_matched) {
 							$default_controller = $x;
 						}
 					}
 				}
 			}
 		}
-		if(($default_controller) 
-			&& ((! file_exists(dbunescbin($attach['content']) . '.thumb')) 
+		if (($default_controller)
+			&& ((!file_exists(dbunescbin($attach['content']) . '.thumb'))
 				|| (filectime(dbunescbin($attach['content']) . 'thumb') < (time() - 60)))) {
-			$default_controller->Thumb($attach,$preview_style,$preview_width,$preview_height);
+			$default_controller->Thumb($attach, $preview_style, $preview_width, $preview_height);
 		}
 	}
 }

Zotlabs/Lib/ASCollection.php

@@ -0,0 +1,150 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+/**
+ * Class for dealing with fetching ActivityStreams collections (ordered or unordered, normal or paged).
+ * Construct with either an existing object or url and an optional channel to sign requests.
+ * $direction is 0 (default) to fetch from the beginning, and 1 to fetch from the end and reverse order the resultant array.
+ * An optional limit to the number of records returned may also be specified.
+ * Use $class->get() to return an array of collection members.
+ */
+class ASCollection {
+
+	private $channel = null;
+	private $nextpage = null;
+	private $limit = 0;
+	private $direction = 0;  // 0 = forward, 1 = reverse
+	private $data = [];
+	private $history = [];
+
+	function __construct($obj, $channel = null, $direction = 0, $limit = 0) {
+
+		$this->channel   = $channel;
+		$this->direction = $direction;
+		$this->limit     = $limit;
+
+		if (is_array($obj)) {
+			$data = $obj;
+		}
+
+		if (is_string($obj)) {
+			$data            = Activity::fetch($obj, $channel);
+			$this->history[] = $obj;
+		}
+
+		if (!is_array($data)) {
+			return;
+		}
+
+		if (!in_array($data['type'], ['Collection', 'OrderedCollection', 'OrderedCollectionPage'])) {
+			return false;
+		}
+
+		if ($this->direction) {
+			if (array_key_exists('last', $data) && $data['last']) {
+				$this->nextpage = $data['last'];
+			}
+		}
+		else {
+			if (array_key_exists('first', $data) && $data['first']) {
+				$this->nextpage = $data['first'];
+			}
+		}
+
+		if (isset($data['items']) && is_array($data['items'])) {
+			$this->data = (($this->direction) ? array_reverse($data['items']) : $data['items']);
+		}
+		elseif (isset($data['orderedItems']) && is_array($data['orderedItems'])) {
+			$this->data = (($this->direction) ? array_reverse($data['orderedItems']) : $data['orderedItems']);
+		}
+
+		if ($this->limit) {
+			if (count($this->data) > $limit) {
+				$this->data = array_slice($this->data, 0, $limit);
+				return;
+			}
+		}
+
+		do {
+			$x = $this->next();
+		} while ($x);
+	}
+
+	function get() {
+		return $this->data;
+	}
+
+	function next() {
+
+		if (!$this->nextpage) {
+			return false;
+		}
+
+		if (is_array($this->nextpage)) {
+			$data = $this->nextpage;
+		}
+
+		if (is_string($this->nextpage)) {
+			if (in_array($this->nextpage, $this->history)) {
+				// recursion detected
+				return false;
+			}
+			$data            = Activity::fetch($this->nextpage, $this->channel);
+			$this->history[] = $this->nextpage;
+		}
+
+		if (!is_array($data)) {
+			return false;
+		}
+
+		if (!in_array($data['type'], ['CollectionPage', 'OrderedCollectionPage'])) {
+			return false;
+		}
+
+		$this->setnext($data);
+
+		if (isset($data['items']) && is_array($data['items'])) {
+			$this->data = array_merge($this->data, (($this->direction) ? array_reverse($data['items']) : $data['items']));
+		}
+		elseif (isset($data['orderedItems']) && is_array($data['orderedItems'])) {
+			$this->data = array_merge($this->data, (($this->direction) ? array_reverse($data['orderedItems']) : $data['orderedItems']));
+		}
+
+		if ($this->limit) {
+			if (count($this->data) > $this->limit) {
+				$this->data     = array_slice($this->data, 0, $this->limit);
+				$this->nextpage = false;
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	function setnext($data) {
+		if ($this->direction) {
+			if (array_key_exists('prev', $data) && $data['prev']) {
+				$this->nextpage = $data['prev'];
+			}
+			elseif (array_key_exists('first', $data) && $data['first']) {
+				$this->nextpage = $data['first'];
+			}
+			else {
+				$this->nextpage = false;
+			}
+		}
+		else {
+			if (array_key_exists('next', $data) && $data['next']) {
+				$this->nextpage = $data['next'];
+			}
+			elseif (array_key_exists('last', $data) && $data['last']) {
+				$this->nextpage = $data['last'];
+			}
+			else {
+				$this->nextpage = false;
+			}
+		}
+		logger('nextpage: ' . $this->nextpage, LOGGER_DEBUG);
+	}
+}

Zotlabs/Lib/ActivityStreams.php

@@ -7,25 +7,24 @@ namespace Zotlabs\Lib;
  *
  * Parses an ActivityStream JSON string.
  */
-
 class ActivityStreams {
 
-	public $raw        = null;
-	public $data       = null;
-	public $valid      = false;
-	public $deleted    = false;
-	public $id         = '';
-	public $parent_id  = '';
-	public $type       = '';
-	public $actor      = null;
-	public $obj        = null;
-	public $tgt        = null;
-	public $origin     = null;
-	public $owner      = null;
-	public $signer     = null;
-	public $ldsig      = null;
-	public $sigok      = false;
-	public $recips     = null;
+	public $raw = null;
+	public $data = null;
+	public $valid = false;
+	public $deleted = false;
+	public $id = '';
+	public $parent_id = '';
+	public $type = '';
+	public $actor = null;
+	public $obj = null;
+	public $tgt = null;
+	public $origin = null;
+	public $owner = null;
+	public $signer = null;
+	public $ldsig = null;
+	public $sigok = false;
+	public $recips = null;
 	public $raw_recips = null;
 
 	/**
@@ -37,29 +36,29 @@ class ActivityStreams {
 	 */
 	function __construct($string) {
 
-		$this->raw  = $string;
+		$this->raw = $string;
 
-		if(is_array($string)) {
+		if (is_array($string)) {
 			$this->data = $string;
 		}
 		else {
 			$this->data = json_decode($string, true);
 		}
 
-		if($this->data) {
+		if ($this->data) {
 
 			// verify and unpack JSalmon signature if present
 
-			if(is_array($this->data) && array_key_exists('signed',$this->data)) {
+			if (is_array($this->data) && array_key_exists('signed', $this->data)) {
 				$ret = JSalmon::verify($this->data);
 				$tmp = JSalmon::unpack($this->data['data']);
-				if($ret && $ret['success']) {
-					if($ret['signer']) {
-						$saved = json_encode($this->data,JSON_UNESCAPED_SLASHES);
-						$this->data = $tmp;
-						$this->data['signer'] = $ret['signer'];
+				if ($ret && $ret['success']) {
+					if ($ret['signer']) {
+						$saved                     = json_encode($this->data, JSON_UNESCAPED_SLASHES);
+						$this->data                = $tmp;
+						$this->data['signer']      = $ret['signer'];
 						$this->data['signed_data'] = $saved;
-						if($ret['hubloc']) {
+						if ($ret['hubloc']) {
 							$this->data['hubloc'] = $ret['hubloc'];
 						}
 					}
@@ -68,57 +67,57 @@ class ActivityStreams {
 
 			$this->valid = true;
 
-			if(array_key_exists('type',$this->data) && array_key_exists('actor',$this->data) && array_key_exists('object',$this->data)) {
-				if($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) {
+			if (array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) {
+				if ($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) {
 					$this->deleted = $this->data['actor'];
-					$this->valid = false;
+					$this->valid   = false;
 				}
 			}
 
 		}
 
-		if($this->is_valid()) {
+		if ($this->is_valid()) {
 			$this->id     = $this->get_property_obj('id');
 			$this->type   = $this->get_primary_type();
-			$this->actor  = $this->get_actor('actor','','');
+			$this->actor  = $this->get_actor('actor', '', '');
 			$this->obj    = $this->get_compound_property('object');
 			$this->tgt    = $this->get_compound_property('target');
 			$this->origin = $this->get_compound_property('origin');
 			$this->recips = $this->collect_recips();
 
 			$this->ldsig = $this->get_compound_property('signature');
-			if($this->ldsig) {
-				$this->signer = $this->get_compound_property('creator',$this->ldsig);
-				if($this->signer && is_array($this->signer) && array_key_exists('publicKey',$this->signer) && is_array($this->signer['publicKey']) && $this->signer['publicKey']['publicKeyPem']) {
-					$this->sigok = LDSignatures::verify($this->data,$this->signer['publicKey']['publicKeyPem']);
+			if ($this->ldsig) {
+				$this->signer = $this->get_compound_property('creator', $this->ldsig);
+				if ($this->signer && is_array($this->signer) && array_key_exists('publicKey', $this->signer) && is_array($this->signer['publicKey']) && $this->signer['publicKey']['publicKeyPem']) {
+					$this->sigok = LDSignatures::verify($this->data, $this->signer['publicKey']['publicKeyPem']);
 				}
 			}
 
-			if(! $this->obj) {
-				$this->obj = $this->data;
+			if (!$this->obj) {
+				$this->obj  = $this->data;
 				$this->type = 'Create';
-				if(! $this->actor) {
-					$this->actor = $this->get_actor('attributedTo',$this->obj);
+				if (!$this->actor) {
+					$this->actor = $this->get_actor('attributedTo', $this->obj);
 				}
 			}
 
 			// fetch recursive or embedded activities
 
-			if ($this->obj && is_array($this->obj) && array_key_exists('object',$this->obj)) {
+			if ($this->obj && is_array($this->obj) && array_key_exists('object', $this->obj)) {
 				$this->obj['object'] = $this->get_compound_property($this->obj['object']);
 			}
 
-			if($this->obj && is_array($this->obj) && $this->obj['actor'])
-				$this->obj['actor'] = $this->get_actor('actor',$this->obj);
-			if($this->tgt && is_array($this->tgt) && $this->tgt['actor'])
-				$this->tgt['actor'] = $this->get_actor('actor',$this->tgt);
+			if ($this->obj && is_array($this->obj) && $this->obj['actor'])
+				$this->obj['actor'] = $this->get_actor('actor', $this->obj);
+			if ($this->tgt && is_array($this->tgt) && $this->tgt['actor'])
+				$this->tgt['actor'] = $this->get_actor('actor', $this->tgt);
 
 			$this->parent_id = $this->get_property_obj('inReplyTo');
 
-			if((! $this->parent_id) && is_array($this->obj)) {
+			if ((!$this->parent_id) && is_array($this->obj)) {
 				$this->parent_id = $this->obj['inReplyTo'];
 			}
-			if((! $this->parent_id) && is_array($this->obj)) {
+			if ((!$this->parent_id) && is_array($this->obj)) {
 				$this->parent_id = $this->obj['id'];
 			}
 		}
@@ -147,19 +146,19 @@ class ActivityStreams {
 	function collect_recips($base = '', $namespace = '') {
 		$x = [];
 
-		$fields = [ 'to', 'cc', 'bto', 'bcc', 'audience'];
-		foreach($fields as $f) {
+		$fields = ['to', 'cc', 'bto', 'bcc', 'audience'];
+		foreach ($fields as $f) {
 			$y = $this->get_compound_property($f, $base, $namespace);
-			if($y) {
-				if (! is_array($this->raw_recips)) {
+			if ($y) {
+				if (!is_array($this->raw_recips)) {
 					$this->raw_recips = [];
 				}
 
-				if (! is_array($y)) {
-					$y = [ $y ];
+				if (!is_array($y)) {
+					$y = [$y];
 				}
 				$this->raw_recips[$f] = $y;
-				$x = array_merge($x, $y);
+				$x                    = array_merge($x, $y);
 			}
 		}
 // not yet ready for prime time
@@ -167,21 +166,21 @@ class ActivityStreams {
 		return $x;
 	}
 
-	function expand($arr,$base = '',$namespace = '') {
+	function expand($arr, $base = '', $namespace = '') {
 		$ret = [];
 
 		// right now use a hardwired recursion depth of 5
 
-		for($z = 0; $z < 5; $z ++) {
-			if(is_array($arr) && $arr) {
-				foreach($arr as $a) {
-					if(is_array($a)) {
+		for ($z = 0; $z < 5; $z++) {
+			if (is_array($arr) && $arr) {
+				foreach ($arr as $a) {
+					if (is_array($a)) {
 						$ret[] = $a;
 					}
 					else {
-						$x = $this->get_compound_property($a,$base,$namespace);
-						if($x) {
-							$ret = array_merge($ret,$x);
+						$x = $this->get_compound_property($a, $base, $namespace);
+						if ($x) {
+							$ret = array_merge($ret, $x);
 						}
 					}
 				}
@@ -202,33 +201,33 @@ class ActivityStreams {
 	 */
 	function get_namespace($base, $namespace) {
 
-		if(! $namespace)
+		if (!$namespace)
 			return '';
 
 		$key = null;
 
-		foreach( [ $this->data, $base ] as $b ) {
-			if(! $b)
+		foreach ([$this->data, $base] as $b) {
+			if (!$b)
 				continue;
 
-			if(array_key_exists('@context', $b)) {
-				if(is_array($b['@context'])) {
-					foreach($b['@context'] as $ns) {
-						if(is_array($ns)) {
-							foreach($ns as $k => $v) {
-								if($namespace === $v)
+			if (array_key_exists('@context', $b)) {
+				if (is_array($b['@context'])) {
+					foreach ($b['@context'] as $ns) {
+						if (is_array($ns)) {
+							foreach ($ns as $k => $v) {
+								if ($namespace === $v)
 									$key = $k;
 							}
 						}
 						else {
-							if($namespace === $ns) {
+							if ($namespace === $ns) {
 								$key = '';
 							}
 						}
 					}
 				}
 				else {
-					if($namespace === $b['@context']) {
+					if ($namespace === $b['@context']) {
 						$key = '';
 					}
 				}
@@ -248,14 +247,14 @@ class ActivityStreams {
 	 */
 	function get_property_obj($property, $base = '', $namespace = '') {
 		$prefix = $this->get_namespace($base, $namespace);
-		if($prefix === null)
+		if ($prefix === null)
 			return null;
 
-		$base = (($base) ? $base : $this->data);
+		$base     = (($base) ? $base : $this->data);
 		$propname = (($prefix) ? $prefix . ':' : '') . $property;
 
-		if(! is_array($base)) {
-			btlogger('not an array: ' . print_r($base,true));
+		if (!is_array($base)) {
+			btlogger('not an array: ' . print_r($base, true));
 			return null;
 		}
 
@@ -279,14 +278,14 @@ class ActivityStreams {
 	}
 
 	static function is_an_actor($s) {
-		return (in_array($s, [ 'Application','Group','Organization','Person','Service' ]));
+		return (in_array($s, ['Application', 'Group', 'Organization', 'Person', 'Service']));
 	}
 
 	static function is_response_activity($s) {
-		if (! $s) {
+		if (!$s) {
 			return false;
 		}
-		return (in_array($s, [ 'Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact' ]));
+		return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
 	}
 
 	/**
@@ -298,9 +297,9 @@ class ActivityStreams {
 	 * @return NULL|mixed
 	 */
 
-	function get_actor($property,$base='',$namespace = '') {
+	function get_actor($property, $base = '', $namespace = '') {
 		$x = $this->get_property_obj($property, $base, $namespace);
-		if($this->is_url($x)) {
+		if ($this->is_url($x)) {
 
 			// SECURITY: If we have already stored the actor profile, re-generate it
 			// from cached data - don't refetch it from the network
@@ -308,15 +307,15 @@ class ActivityStreams {
 			$r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' limit 1",
 				dbesc($x)
 			);
-			if($r) {
-				$y = Activity::encode_person($r[0]);
+			if ($r) {
+				$y           = Activity::encode_person($r[0]);
 				$y['cached'] = true;
 				return $y;
 			}
 		}
-		$actor = $this->get_compound_property($property,$base,$namespace,true);
-		if(is_array($actor) && self::is_an_actor($actor['type'])) {
-			if(array_key_exists('id',$actor) && (! array_key_exists('inbox',$actor))) {
+		$actor = $this->get_compound_property($property, $base, $namespace, true);
+		if (is_array($actor) && self::is_an_actor($actor['type'])) {
+			if (array_key_exists('id', $actor) && (!array_key_exists('inbox', $actor))) {
 				$actor = $this->fetch_property($actor['id']);
 			}
 			return $actor;
@@ -336,7 +335,7 @@ class ActivityStreams {
 	 */
 	function get_compound_property($property, $base = '', $namespace = '', $first = false) {
 		$x = $this->get_property_obj($property, $base, $namespace);
-		if($this->is_url($x)) {
+		if ($this->is_url($x)) {
 			$y = $this->fetch_property($x);
 			if (is_array($y)) {
 				$x = $y;
@@ -345,22 +344,22 @@ class ActivityStreams {
 
 		// verify and unpack JSalmon signature if present
 
-		if(is_array($x) && array_key_exists('signed',$x)) {
+		if (is_array($x) && array_key_exists('signed', $x)) {
 			$ret = JSalmon::verify($x);
 			$tmp = JSalmon::unpack($x['data']);
-			if($ret && $ret['success']) {
-				if($ret['signer']) {
-					$saved = json_encode($x,JSON_UNESCAPED_SLASHES);
-					$x = $tmp;
-					$x['signer'] = $ret['signer'];
+			if ($ret && $ret['success']) {
+				if ($ret['signer']) {
+					$saved            = json_encode($x, JSON_UNESCAPED_SLASHES);
+					$x                = $tmp;
+					$x['signer']      = $ret['signer'];
 					$x['signed_data'] = $saved;
-					if($ret['hubloc']) {
+					if ($ret['hubloc']) {
 						$x['hubloc'] = $ret['hubloc'];
 					}
 				}
 			}
 		}
-		if($first && is_array($x) && array_key_exists(0,$x)) {
+		if ($first && is_array($x) && array_key_exists(0, $x)) {
 			return $x[0];
 		}
 
@@ -374,7 +373,7 @@ class ActivityStreams {
 	 * @return boolean
 	 */
 	function is_url($url) {
-		if(($url) && (! is_array($url)) && (strpos($url, 'http') === 0)) {
+		if (($url) && (!is_array($url)) && (strpos($url, 'http') === 0)) {
 			return true;
 		}
 
@@ -389,13 +388,13 @@ class ActivityStreams {
 	 * @return NULL|mixed
 	 */
 	function get_primary_type($base = '', $namespace = '') {
-		if(! $base)
+		if (!$base)
 			$base = $this->data;
 
 		$x = $this->get_property_obj('type', $base, $namespace);
-		if(is_array($x)) {
-			foreach($x as $y) {
-				if(strpos($y, ':') === false) {
+		if (is_array($x)) {
+			foreach ($x as $y) {
+				if (strpos($y, ':') === false) {
 					return $y;
 				}
 			}
@@ -409,15 +408,32 @@ class ActivityStreams {
 		return $x;
 	}
 
-	static function is_as_request() {
+	static function is_as_request($channel = null) {
 
-		$x = getBestSupportedMimeType([
-			'application/ld+json;profile="https://www.w3.org/ns/activitystreams"',
-			'application/activity+json',
-			'application/ld+json;profile="http://www.w3.org/ns/activitystreams"'
-		]);
+		$hookdata = [];
+		if ($channel)
+			$hookdata['channel'] = $channel;
 
-		return(($x) ? true : false);
+		$hookdata['data'] = ['application/x-zot-activity+json'];
+
+		call_hooks('is_as_request', $hookdata);
+
+		$x = getBestSupportedMimeType($hookdata['data']);
+		return (($x) ? true : false);
+
+	}
+
+	static function get_accept_header_string($channel = null) {
+
+		$hookdata = [];
+		if ($channel)
+			$hookdata['channel'] = $channel;
+
+		$hookdata['data'] = 'application/x-zot-activity+json';
+
+		call_hooks('get_accept_header_string', $hookdata);
+
+		return $hookdata['data'];
 
 	}
 

Zotlabs/Lib/Apps.php

@@ -307,7 +307,7 @@ class Apps {
 				}
 			}
 		}
-		if($ret) {
+		if(isset($ret)) {
 			if($translate)
 				self::translate_system_apps($ret);
 
@@ -524,7 +524,7 @@ class Apps {
 		}
 		elseif(remote_channel()) {
 			$observer = \App::get_observer();
-			if($observer && $observer['xchan_network'] === 'zot') {
+			if($observer && in_array($observer['xchan_network'], ['zot6', 'zot'])) {
 				// some folks might have xchan_url redirected offsite, use the connurl
 				$x = parse_url($observer['xchan_connurl']);
 				if($x) {
@@ -551,7 +551,7 @@ class Apps {
 			'$app' => $papp,
 			'$icon' => $icon,
 			'$hosturl' => $hosturl,
-			'$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''),
+			'$purchase' => ((isset($papp['page']) && (! $installed)) ? t('Purchase') : ''),
 			'$installed' => $installed,
 			'$action_label' => (($hosturl && in_array($mode, ['view','install'])) ? $install_action : ''),
 			'$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''),
@@ -559,8 +559,8 @@ class Apps {
 			'$undelete' => ((local_channel() && $mode == 'edit') ? t('Undelete') : ''),
 			'$settings_url' => ((local_channel() && $installed && $mode == 'list') ? $papp['settings_url'] : ''),
 			'$deleted' => $papp['deleted'],
-			'$feature' => (($papp['embed'] || $mode == 'edit') ? false : true),
-			'$pin' => (($papp['embed'] || $mode == 'edit') ? false : true),
+			'$feature' => ((isset($papp['embed']) || $mode == 'edit') ? false : true),
+			'$pin' => ((isset($papp['embed']) || $mode == 'edit') ? false : true),
 			'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
 			'$pinned' => ((strpos($papp['categories'], 'nav_pinned_app') === false) ? false : true),
 			'$navapps' => (($mode == 'nav') ? true : false),
@@ -1276,58 +1276,58 @@ class Apps {
 
 		$ret['type'] = 'personal';
 
-		if($app['app_id'])
+		if(!empty($app['app_id']))
 			$ret['guid'] = $app['app_id'];
 
-		if($app['app_sig'])
+		if(!empty($app['app_sig']))
 			$ret['sig'] = $app['app_sig'];
 
-		if($app['app_author'])
+		if(!empty($app['app_author']))
 			$ret['author'] = $app['app_author'];
 
-		if($app['app_name'])
+		if(!empty($app['app_name']))
 			$ret['name'] = $app['app_name'];
 
-		if($app['app_desc'])
+		if(!empty($app['app_desc']))
 			$ret['desc'] = $app['app_desc'];
 
-		if($app['app_url'])
+		if(!empty($app['app_url']))
 			$ret['url'] = $app['app_url'];
 
-		if($app['app_photo'])
+		if(!empty($app['app_photo']))
 			$ret['photo'] = $app['app_photo'];
 
-		if($app['app_icon'])
+		if(!empty($app['app_icon']))
 			$ret['icon'] = $app['app_icon'];
 
-		if($app['app_version'])
+		if(!empty($app['app_version']))
 			$ret['version'] = $app['app_version'];
 
-		if($app['app_addr'])
+		if(!empty($app['app_addr']))
 			$ret['addr'] = $app['app_addr'];
 
-		if($app['app_price'])
+		if(!empty($app['app_price']))
 			$ret['price'] = $app['app_price'];
 
-		if($app['app_page'])
+		if(!empty($app['app_page']))
 			$ret['page'] = $app['app_page'];
 
-		if($app['app_requires'])
+		if(!empty($app['app_requires']))
 			$ret['requires'] = $app['app_requires'];
 
-		if($app['app_system'])
+		if(!empty($app['app_system']))
 			$ret['system'] = $app['app_system'];
 
-		if($app['app_options'])
+		if(!empty($app['app_options']))
 			$ret['options'] = $app['app_options'];
 
-		if($app['app_plugin'])
+		if(!empty($app['app_plugin']))
 			$ret['plugin'] = trim($app['app_plugin']);
 
-		if($app['app_deleted'])
+		if(!empty($app['app_deleted']))
 			$ret['deleted'] = $app['app_deleted'];
 
-		if($app['term']) {
+		if(!empty($app['term']) && is_array($app['term'])) {
 			$s = '';
 			foreach($app['term'] as $t) {
 				if($s)

Zotlabs/Lib/Connect.php

@@ -207,13 +207,13 @@ class Connect {
 		}
 
 		$my_perms = $p['perms'];
-		
+
 		$profile_assign = get_pconfig($uid,'system','profile_assign','');
 
 
 		// See if we are already connected by virtue of having an abook record
 
-		$r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook 
+		$r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook
 			where abook_xchan = '%s' and abook_channel = %d limit 1",
 			dbesc($xchan_hash),
 			intval($uid)
@@ -282,7 +282,7 @@ class Connect {
 
 		// fetch the entire record
 
-		$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash 
+		$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash
 			where abook_xchan = '%s' and abook_channel = %d limit 1",
 			dbesc($xchan_hash),
 			intval($uid)

Zotlabs/Lib/Crypto.php

@@ -0,0 +1,206 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+use Exception;
+
+class Crypto {
+
+	public static $openssl_algorithms = [
+
+		// zot6 nickname,   opensslname,   keylength, ivlength
+
+		['aes256ctr', 'aes-256-ctr', 32, 16],
+		['camellia256cfb', 'camellia-256-cfb', 32, 16],
+		['cast5cfb', 'cast5-cfb', 16, 8],
+		['aes256cbc', 'aes-256-cbc', 32, 16] // remove after legacy zot has been sunset
+
+	];
+
+	public static function methods() {
+		$ret = [];
+
+		foreach (self::$openssl_algorithms as $ossl) {
+			$ret[] = $ossl[0] . '.oaep';
+		}
+
+		call_hooks('crypto_methods', $ret);
+		return $ret;
+	}
+
+	public static function signing_methods() {
+
+		$ret = ['sha256'];
+		call_hooks('signing_methods', $ret);
+		return $ret;
+
+	}
+
+	public static function new_keypair($bits) {
+
+		$openssl_options = [
+			'digest_alg'       => 'sha1',
+			'private_key_bits' => $bits,
+			'encrypt_key'      => false
+		];
+
+		$conf = get_config('system', 'openssl_conf_file');
+
+		if ($conf) {
+			$openssl_options['config'] = $conf;
+		}
+
+		$result = openssl_pkey_new($openssl_options);
+
+		if (empty($result)) {
+			return false;
+		}
+
+		// Get private key
+
+		$response = ['prvkey' => '', 'pubkey' => ''];
+
+		openssl_pkey_export($result, $response['prvkey']);
+
+		// Get public key
+		$pkey               = openssl_pkey_get_details($result);
+		$response['pubkey'] = $pkey["key"];
+
+		return $response;
+
+	}
+
+	public static function sign($data, $key, $alg = 'sha256') {
+
+		if (!$key) {
+			return false;
+		}
+
+		$sig = '';
+		openssl_sign($data, $sig, $key, $alg);
+		return $sig;
+	}
+
+	public static function verify($data, $sig, $key, $alg = 'sha256') {
+
+		if (!$key) {
+			return false;
+		}
+
+		try {
+			$verify = openssl_verify($data, $sig, $key, $alg);
+		} catch (Exception $e) {
+			$verify = (-1);
+		}
+
+		if ($verify === (-1)) {
+			while ($msg = openssl_error_string()) {
+				logger('openssl_verify: ' . $msg, LOGGER_NORMAL, LOG_ERR);
+			}
+			btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR);
+		}
+
+		return (($verify > 0) ? true : false);
+	}
+
+	public static function encapsulate($data, $pubkey, $alg) {
+
+		if (!($alg && $pubkey)) {
+			return $data;
+		}
+
+		$alg_base = $alg;
+		$padding  = OPENSSL_PKCS1_PADDING;
+
+		$exts = explode('.', $alg);
+		if (count($exts) > 1) {
+			switch ($exts[1]) {
+				case 'oaep':
+					$padding = OPENSSL_PKCS1_OAEP_PADDING;
+					break;
+				default:
+					break;
+			}
+			$alg_base = $exts[0];
+		}
+
+		$method = null;
+
+		foreach (self::$openssl_algorithms as $ossl) {
+			if ($ossl[0] === $alg_base) {
+				$method = $ossl;
+				break;
+			}
+		}
+
+		if ($method) {
+			$result = ['encrypted' => true];
+
+			$key = openssl_random_pseudo_bytes(256);
+			$iv  = openssl_random_pseudo_bytes(256);
+
+			$key1 = substr($key, 0, $method[2]);
+			$iv1  = substr($iv, 0, $method[3]);
+
+			$result['data'] = base64url_encode(openssl_encrypt($data, $method[1], $key1, OPENSSL_RAW_DATA, $iv1), true);
+
+			openssl_public_encrypt($key, $k, $pubkey, $padding);
+			openssl_public_encrypt($iv, $i, $pubkey, $padding);
+
+			$result['alg'] = $alg;
+			$result['key'] = base64url_encode($k, true);
+			$result['iv']  = base64url_encode($i, true);
+			return $result;
+
+		}
+		else {
+			$x = ['data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data];
+			call_hooks('crypto_encapsulate', $x);
+			return $x['result'];
+		}
+	}
+
+	public static function unencapsulate($data, $prvkey) {
+
+		if (!(is_array($data) && array_key_exists('encrypted', $data) && array_key_exists('alg', $data) && $data['alg'])) {
+			logger('not encrypted');
+
+			return $data;
+		}
+
+		$alg_base = $data['alg'];
+		$padding  = OPENSSL_PKCS1_PADDING;
+
+		$exts = explode('.', $data['alg']);
+		if (count($exts) > 1) {
+			switch ($exts[1]) {
+				case 'oaep':
+					$padding = OPENSSL_PKCS1_OAEP_PADDING;
+					break;
+				default:
+					break;
+			}
+			$alg_base = $exts[0];
+		}
+
+		$method = null;
+
+		foreach (self::$openssl_algorithms as $ossl) {
+			if ($ossl[0] === $alg_base) {
+				$method = $ossl;
+				break;
+			}
+		}
+
+		if ($method) {
+			openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey, $padding);
+			openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey, $padding);
+			return openssl_decrypt(base64url_decode($data['data']), $method[1], substr($k, 0, $method[2]), OPENSSL_RAW_DATA, substr($i, 0, $method[3]));
+		}
+		else {
+			$x = ['data' => $data, 'prvkey' => $prvkey, 'alg' => $data['alg'], 'result' => $data];
+			call_hooks('crypto_unencapsulate', $x);
+			return $x['result'];
+		}
+	}
+}

Zotlabs/Lib/Enotify.php

@@ -43,7 +43,7 @@ class Enotify {
 				dbesc($params['to_xchan'])
 			);
 		}
-		if ($x & $y) {
+		if ($x && $y) {
 			$sender = $x[0];
 			$recip = $y[0];
 		} else {
@@ -978,12 +978,12 @@ class Enotify {
 
 		$x = [
 			'notify_link' => z_root() . '/admin/accounts',
-			'name' => $rr['account_email'],
-			//'addr' => $rr['account_email'],
+			'name' => $rr['reg_did2'],
+			//'addr' => '',
 			'photo' => z_root() . '/' . get_default_profile_photo(48),
-			'when' => datetime_convert('UTC', date_default_timezone_get(),$rr['account_created']),
+			'when' => datetime_convert('UTC', date_default_timezone_get(),$rr['reg_created']),
 			'hclass' => ('notify-unseen'),
-			'message' => t('requires approval')
+			'message' => t('status verified')
 		];
 
 		return $x;

Zotlabs/Lib/Hashpath.php

@@ -0,0 +1,55 @@
+<?php
+namespace Zotlabs\Lib;
+
+/*
+ * Zotlabs\Lib\Hashpath
+ *
+ * Creates hashed directory structures for fast access and resistance to overloading any single directory with files.
+ *
+ * Takes a $hash which could be any string
+ * a $prefix which is where to place the hash directory in the filesystem, default is current directory
+ * use an empty string for $prefix to place hash directories directly off the root directory
+ * an optional $depth and $slice (default is 2) to indicate the hash level
+ * $depth = 1, 256 directories, suitable for < 384K records/files
+ * $depth = 2, 65536 directories, suitable for < 98M records/files
+ * $depth = 3, 16777216 directories, suitable for < 2.5B records/files
+ * ...
+ * The total number of records anticipated divided by the number of hash directories should generally be kept to
+ * less than 1500 entries for optimum performance though this varies by operating system and filesystem type.
+ * ext4 uses 32 bit inode numbers (~4B record limit) so use caution or alternative filesystem types with $depth above 3. 
+ * an optional $mkdir (boolean) to recursively create the directory (ignoring errors) before returning
+ *
+ * examples: for a $hash of 'abcdefg' and prefix of 'path' the following paths are returned for $depth = 1 and $depth = 3
+ *    path/7d/7d1a54127b222502f5b79b5fb0803061152a44f92b37e23c6527baf665d4da9a
+ *    path/7d/1a/54/7d1a54127b222502f5b79b5fb0803061152a44f92b37e23c6527baf665d4da9a
+ *
+ * see also: boot.php:os_mkdir() - here we provide the equivalent of mkdir -p with permissions of 770. 
+ *
+ */
+ 
+class Hashpath {
+
+	static function path($hash, $prefix = '.', $depth = 1, $slice = 2, $mkdir = true, $alg = false) {
+
+		if ($alg)
+			$hash = hash($alg, $hash);
+
+		$start = 0;
+		if ($depth < 1)
+			$depth = 1;
+		$sluglen = $depth * $slice;
+
+		do {
+			$slug	  = substr($hash, $start, $slice);
+			$prefix  .= '/' . $slug;
+			$start	 += $slice;
+			$sluglen -= $slice;
+		}
+		while ($sluglen);
+
+		if ($mkdir)
+			os_mkdir($prefix, STORAGE_DEFAULT_PERMISSIONS, true);
+		
+		return $prefix . '/' . $hash;
+	}
+}

Zotlabs/Lib/JSalmon.php

@@ -18,7 +18,7 @@ class JSalmon {
 
 		$precomputed = '.' . base64url_encode($data_type,true) . '.YmFzZTY0dXJs.UlNBLVNIQTI1Ng';
 
-		$signature  = base64url_encode(rsa_sign($data . $precomputed, $key), true);
+		$signature  = base64url_encode(Crypto::sign($data . $precomputed, $key), true);
 
 		return ([
 			'signed'    => true,
@@ -54,7 +54,7 @@ class JSalmon {
 		$key = HTTPSig::get_key(EMPTY_STR,'zot6',base64url_decode($x['sigs']['key_id']));
 		 logger('key: ' . print_r($key,true));
 		if($key['portable_id'] && $key['public_key']) {
-			if(rsa_verify($signed_data,base64url_decode($x['sigs']['value']),$key['public_key'])) {
+			if(Crypto::verify($signed_data,base64url_decode($x['sigs']['value']),$key['public_key'])) {
 				logger('verified');
 				$ret = [ 'success' => true, 'signer' => $key['portable_id'], 'hubloc' => $key['hubloc'] ];
 			}

Zotlabs/Lib/Keyutils.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+use phpseclib\Crypt\RSA;
+use phpseclib\Math\BigInteger;
+
+/**
+ * Keyutils
+ * Convert RSA keys between various formats
+ */
+class Keyutils {
+
+	/**
+	 * @param string $m modulo
+	 * @param string $e exponent
+	 * @return string
+	 */
+	public static function meToPem($m, $e) {
+
+		$rsa = new RSA();
+		$rsa->loadKey([
+			'e' => new BigInteger($e, 256),
+			'n' => new BigInteger($m, 256)
+		]);
+		return $rsa->getPublicKey();
+
+	}
+
+	/**
+	 * @param string key
+	 * @return string
+	 */
+	public static function rsaToPem($key) {
+
+		$rsa = new RSA();
+		$rsa->setPublicKey($key);
+
+		return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
+
+	}
+
+	/**
+	 * @param string key
+	 * @return string
+	 */
+	public static function pemToRsa($key) {
+
+		$rsa = new RSA();
+		$rsa->setPublicKey($key);
+
+		return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1);
+
+	}
+
+	/**
+	 * @param string $key key
+	 * @param string $m reference modulo
+	 * @param string $e reference exponent
+	 */
+	public static function pemToMe($key, &$m, &$e) {
+
+		$rsa = new RSA();
+		$rsa->loadKey($key);
+		$rsa->setPublicKey();
+
+		$m = $rsa->modulus->toBytes();
+		$e = $rsa->exponent->toBytes();
+
+	}
+
+	/**
+	 * @param string $pubkey
+	 * @return string
+	 */
+	public static function salmonKey($pubkey) {
+		self::pemToMe($pubkey, $m, $e);
+		return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true);
+	}
+
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	public static function convertSalmonKey($key) {
+		if (strstr($key, ','))
+			$rawkey = substr($key, strpos($key, ',') + 1);
+		else
+			$rawkey = substr($key, 5);
+
+		$key_info = explode('.', $rawkey);
+
+		$m = base64url_decode($key_info[1]);
+		$e = base64url_decode($key_info[2]);
+
+		return self::meToPem($m, $e);
+	}
+
+}

Zotlabs/Lib/LDSignatures.php

@@ -12,7 +12,7 @@ class LDSignatures {
 		$ohash = self::hash(self::signable_options($data['signature']));
 		$dhash = self::hash(self::signable_data($data));
 
-		$x = rsa_verify($ohash . $dhash,base64_decode($data['signature']['signatureValue']), $pubkey);
+		$x = Crypto::verify($ohash . $dhash,base64_decode($data['signature']['signatureValue']), $pubkey);
 		logger('LD-verify: ' . intval($x));
 
 		return $x;
@@ -35,11 +35,11 @@ class LDSignatures {
 
 		$ohash = self::hash(self::signable_options($options));
 		$dhash = self::hash(self::signable_data($data));
-		$options['signatureValue'] = base64_encode(rsa_sign($ohash . $dhash,$channel['channel_prvkey']));
+		$options['signatureValue'] = base64_encode(Crypto::sign($ohash . $dhash,$channel['channel_prvkey']));
 
 		$signed = array_merge([
-			'@context' => [ 
-				ACTIVITYSTREAMS_JSONLD_REV, 
+			'@context' => [
+				ACTIVITYSTREAMS_JSONLD_REV,
 				'https://w3id.org/security/v1' ],
 			],$options);
 
@@ -88,7 +88,7 @@ class LDSignatures {
 			return '';
 
 		jsonld_set_document_loader('jsonld_document_loader');
-	
+
 		try {
 			$d = jsonld_normalize($data,[ 'algorithm' => 'URDNA2015', 'format' => 'application/nquads' ]);
 		}
@@ -117,7 +117,7 @@ class LDSignatures {
 
 		$precomputed = '.' . base64url_encode($data_type,false) . '.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
 
-		$signature  = base64url_encode(rsa_sign($data . $precomputed,$channel['channel_prvkey']));
+		$signature  = base64url_encode(Crypto::sign($data . $precomputed,$channel['channel_prvkey']));
 
 		return ([
 			'id'          => $arr['id'],

Zotlabs/Lib/Libzotdir.php

@@ -311,12 +311,13 @@ class Libzotdir {
 
 		if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) {
 			$success = false;
+			$zf = [];
 
 			$href = Webfinger::zot_url(punify($ud['ud_addr']));
 			if($href) {
 				$zf = Zotfinger::exec($href);
 			}
-			if(is_array($zf) && array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
+			if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
 				$xc = Libzot::import_xchan($zf['data'], 0, $ud);
 			}
 			else {

Zotlabs/Lib/NativeWiki.php

@@ -101,6 +101,7 @@ class NativeWiki {
 		}
 	}
 
+
 	public static function update_wiki($channel_id, $observer_hash, $arr, $acl) {
 
 		$w = self::get_wiki($channel_id, $observer_hash, $arr['resource_id']);
@@ -156,8 +157,8 @@ class NativeWiki {
 		}
 	}
 
-	public static function sync_a_wiki_item($uid,$id,$resource_id) {
 
+	public static function sync_a_wiki_item($uid,$id,$resource_id) {
 
 		$r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ",
 			intval($uid),
@@ -165,8 +166,8 @@ class NativeWiki {
 			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
 			dbesc($resource_id)
 		);
-
 		if($r) {
+
 			$q = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s'",
 				dbesc($r[0]['resource_id'])
 			);
@@ -185,20 +186,27 @@ class NativeWiki {
 		}
 	}
 
+
 	public static function delete_wiki($channel_id,$observer_hash,$resource_id) {
 
 		$w = self::get_wiki($channel_id,$observer_hash,$resource_id);
-		$item = $w['wiki'];
-		if(! $item) {
-			return array('item' => null, 'success' => false);
-		} 
-		else {
-			$drop = drop_item($item['id'], false, DROPITEM_NORMAL);
+		if(! $w['wiki']) {
+			return [ 'success' => false ];
 		}
+		else {
 
-		info( t('Wiki files deleted successfully'));
+			$r = q("SELECT id FROM item WHERE uid = %s AND resource_id = '%s'",
+				intval($channel_id),
+				dbesc($resource_id)
+			);
 
-		return array('item' => $item, 'item_id' => $item['id'], 'success' => (($drop === 1) ? true : false));
+			$ids = array_column($r, 'id');
+			drop_items($ids, true, DROPITEM_PHASE1);
+
+			info(t('Wiki files deleted successfully'));
+
+			return [ 'success' => true ];
+		}
 	}
 
 
@@ -207,13 +215,13 @@ class NativeWiki {
 		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
 
 		$item = q("SELECT * FROM item WHERE uid = %d AND resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0 
-			$sql_extra limit 1",
+			$sql_extra ORDER BY id LIMIT 1",
 			intval($channel_id), 
 			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
 			dbesc($resource_id)
 		);
 		if(! $item) {
-			return array('wiki' => null);
+			return [ 'wiki' => null ];
 		}
 		else {
 		
@@ -259,6 +267,7 @@ class NativeWiki {
 
 
 	public static function get_permissions($resource_id, $owner_id, $observer_hash) {
+
 		// TODO: For now, only the owner can edit
 		$sql_extra = item_permissions_sql($owner_id, $observer_hash);
 
@@ -283,6 +292,7 @@ class NativeWiki {
 		}
 	}
 
+
 	public static function name_encode ($string) {
 
 		$string = html_entity_decode($string);
@@ -298,6 +308,7 @@ class NativeWiki {
 		return $ret;
 	}
 
+
 	public static function name_decode ($string) {
 
 		$encoding = mb_internal_encoding();

Zotlabs/Lib/NativeWikiPage.php

@@ -109,6 +109,7 @@ class NativeWikiPage {
 		return [ 'success' => false, 'message' => t('Wiki page create failed.') ];
 	}
 
+
 	static public function rename_page($arr) {
 
 		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
@@ -163,11 +164,13 @@ class NativeWikiPage {
 			return [ 'success' => true, 'page' => $page ];
 		}
 
-		return [ 'success' => false, 'item_id' => $c['item_id'], 'message' => t('Page not found') ];
+		return [ 'success' => false, 'message' => t('Page not found') ];
 	
 	}
 
+
 	static public function get_page_content($arr) {
+
 		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']        : '');
 		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']        : '');
 		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash']      : '');
@@ -198,7 +201,9 @@ class NativeWikiPage {
 
 	}
 
+
 	static public function page_history($arr) {
+
 		$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
 		$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
 		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
@@ -290,6 +295,7 @@ class NativeWikiPage {
 		return null;
 	}
 
+
 	static public function load_page_history($arr) {
 
 		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']     : '');
@@ -338,8 +344,8 @@ class NativeWikiPage {
 		return null;
 	}
 
-	static public function save_page($arr) {
 
+	static public function save_page($arr) {
 		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
 		$content       = ((array_key_exists('content',$arr))       ? $arr['content']       : '');
 		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']   : '');
@@ -385,19 +391,20 @@ class NativeWikiPage {
 		$ret = item_store($item, false, false);
 
 		if($ret['item_id'])
-			return array('message' => '', 'item_id' => $ret['item_id'], 'filename' => $filename, 'success' => true);
+			return array('message' => '', 'item_id' => $ret['item_id'], 'filename' => $pageUrlName, 'success' => true);
 		else
 			return array('message' => t('Page update failed.'), 'success' => false);
 	}	
 
+
 	static public function delete_page($arr) {
-		$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
-		$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
+
+		$pageUrlName   = (array_key_exists('pageUrlName',$arr) ? $arr['pageUrlName'] : '');
+		$resource_id   = (array_key_exists('resource_id',$arr) ? $arr['resource_id'] : '');
+		$observer_hash = (array_key_exists('observer_hash',$arr) ? $arr['observer_hash'] : '');
+		$channel_id    = (array_key_exists('channel_id',$arr) ? $arr['channel_id'] : 0);
 
 		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-
 		if(! $w['wiki']) {
 			return [ 'success' => false, 'message' => t('Error reading wiki') ];
 		}
@@ -417,14 +424,16 @@ class NativeWikiPage {
 		}
 
 		if($ids) {
-			drop_items($ids);
+			drop_items($ids, true, DROPITEM_PHASE1);
 			return [ 'success' => true ];
 		}
 
 		return [ 'success' => false, 'message' => t('Nothing deleted') ];	
 	}
 	
+
 	static public function revert_page($arr) {
+
 		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
 		$resource_id   = ((array_key_exists('resource_id',$arr))   ? $arr['resource_id']   : '');
 		$commitHash    = ((array_key_exists('commitHash',$arr))    ? $arr['commitHash']    : null);
@@ -432,12 +441,12 @@ class NativeWikiPage {
 		$channel_id    = ((array_key_exists('channel_id',$arr))    ? $arr['channel_id']    : 0);
 
 		if (! $commitHash) {
-			return array('content' => $content, 'message' => 'No commit was provided', 'success' => false);
+			return array('message' => 'No commit was provided', 'success' => false);
 		}
 
 		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 		if (!$w['wiki']) {
-			return array('content' => $content, 'message' => 'Error reading wiki', 'success' => false);
+			return array('message' => 'Error reading wiki', 'success' => false);
 		}
 
 		$x = $arr;
@@ -451,11 +460,13 @@ class NativeWikiPage {
 				$content = $loaded['body'];
 				return [ 'content' => $content, 'success' => true ];
 			}
-			return [ 'content' => $content, 'success' => false ]; 
+			return [ 'success' => false ];
 		}
 	}
 	
+
 	static public function compare_page($arr) {
+
 		$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
 		$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
 		$currentCommit = ((array_key_exists('currentCommit',$arr)) ? $arr['currentCommit'] : (-1));
@@ -491,6 +502,7 @@ class NativeWikiPage {
 
 	}
 	
+
 	static public function commit($arr) {
 
 		$commit_msg    = ((array_key_exists('commit_msg', $arr))   ? $arr['commit_msg']    : t('Page updated'));
@@ -571,7 +583,6 @@ class NativeWikiPage {
 	}
 
 
-	
 	/**
 	 * Replace the instances of the string [toc] with a list element that will be populated by
 	 * a table of contents by the JavaScript library
@@ -587,6 +598,7 @@ class NativeWikiPage {
 		return $s;
 	}
 	
+
 	/**
 	 *  Converts a select set of bbcode tags. Much of the code is copied from include/bbcode.php
 	 * @param string $s
@@ -626,7 +638,9 @@ class NativeWikiPage {
 		return $s;
 	}
 	
+
 	static public function get_file_ext($arr) {
+
 		if($arr['mimetype'] === 'text/bbcode')
 			return '.bb';
 		elseif($arr['mimetype'] === 'text/markdown')

Zotlabs/Lib/PConfig.php

@@ -132,6 +132,7 @@ class PConfig {
 		// manage array value
 		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+		$new = false;
 
 		$now = datetime_convert();
 		if (! $updated) {

Zotlabs/Lib/Queue.php

@@ -2,9 +2,6 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Lib\Libzot;
-
-
 class Queue {
 
 	static function update($id, $add_priority = 0) {
@@ -39,7 +36,7 @@ class Queue {
 		// queue item is less than 12 hours old, we'll schedule for fifteen
 		// minutes. 
 
-		$r = q("UPDATE outq SET outq_scheduled = '%s' WHERE outq_posturl = '%s'",
+		q("UPDATE outq SET outq_scheduled = '%s' WHERE outq_posturl = '%s'",
 			dbesc(datetime_convert('UTC','UTC','now + 5 days')),
 			dbesc($x[0]['outq_posturl'])
 		);
@@ -88,7 +85,7 @@ class Queue {
 
 	static function set_delivered($id,$channel = 0) {
 		logger('queue: set delivered ' . $id,LOGGER_DEBUG);
-		$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
+		$sql_extra = (($channel['channel_id']) ? " and outq_channel = " . intval($channel['channel_id']) . " " : '');
 
 		// Set the next scheduled run date so far in the future that it will be expired
 		// long before it ever makes it back into the delivery chain. 
@@ -119,7 +116,7 @@ class Queue {
 			dbesc(($arr['driver']) ? $arr['driver'] : 'zot6'),
 			dbesc($arr['posturl']),
 			intval(1),
-			intval(($arr['priority']) ? $arr['priority'] : 0),
+			intval(isset($arr['priority']) ? $arr['priority'] : 0),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
@@ -137,7 +134,7 @@ class Queue {
 		$base = null;
 		$h = parse_url($outq['outq_posturl']);
 		if($h !== false) 
-			$base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
+			$base = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : '');
 
 		if(($base) && ($base !== z_root()) && ($immediate)) {
 			$y = q("select site_update, site_dead from site where site_url = '%s' ",
@@ -230,11 +227,10 @@ class Queue {
 
 		logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
 
-
 		if($outq['outq_posturl'] === z_root() . '/zot') {
 			// local delivery
 			$zot = new \Zotlabs\Zot6\Receiver(new \Zotlabs\Zot6\Zot6Handler(),$outq['outq_notify']);
-			$result = $zot->run(true);
+			$result = $zot->run();
 			logger('returned_json: ' . json_encode($result,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DATA);
 			logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']);
 			Libzot::process_response($outq['outq_posturl'],[ 'success' => true, 'body' => json_encode($result) ], $outq);

Zotlabs/Lib/Share.php

@@ -2,8 +2,6 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Lib\Activity;
-
 class Share {
 
 	private $item = null;

Zotlabs/Lib/ThreadItem.php

@@ -35,7 +35,7 @@ class ThreadItem {
 
 
 	public function __construct($data) {
-				
+
 		$this->data = $data;
 		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
 		$this->threaded = get_config('system','thread_allow');
@@ -43,7 +43,7 @@ class ThreadItem {
 		$observer = \App::get_observer();
 
 		// Prepare the children
-		if($data['children']) {
+		if(isset($data['children'])) {
 			foreach($data['children'] as $item) {
 
 				/*
@@ -98,10 +98,11 @@ class ThreadItem {
  		$conv = $this->get_conversation();
 		$observer = $conv->get_observer();
 
-		$lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+		$lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
 			: false);
+		$locktype = $item['item_private'];
 
 		$shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && ($item['item_private'] != 1)) ? true : false);
 
@@ -151,9 +152,9 @@ class ThreadItem {
 
 
 		if($observer && $observer['xchan_hash']
-			&& ($observer['xchan_hash'] == $this->get_data_value('author_xchan') 
-			|| $observer['xchan_hash'] == $this->get_data_value('owner_xchan') 
-			|| $observer['xchan_hash'] == $this->get_data_value('source_xchan') 
+			&& ($observer['xchan_hash'] == $this->get_data_value('author_xchan')
+			|| $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
+			|| $observer['xchan_hash'] == $this->get_data_value('source_xchan')
 			|| $this->get_data_value('uid') == local_channel()))
 			$dropping = true;
 
@@ -169,15 +170,15 @@ class ThreadItem {
 				'dropping' => $dropping,
 				'delete' => t('Delete'),
 			);
-		}		
+		}
 		elseif(is_site_admin()) {
 			$drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ];
 		}
 
 // FIXME
-		if($observer_is_pageowner) {		
+		if($observer_is_pageowner) {
 			$multidrop = array(
-				'select' => t('Select'), 
+				'select' => t('Select'),
 			);
 		}
 
@@ -223,7 +224,7 @@ class ThreadItem {
 
 		if(! feature_enabled($conv->get_profile_owner(),'dislike'))
 			unset($conv_responses['dislike']);
-  
+
 		$responses = get_responses($conv_responses,$response_verbs,$this,$item);
 
 		$my_responses = [];
@@ -254,7 +255,7 @@ class ThreadItem {
 		}
 
 		$showlike    = ((x($conv_responses['like'],$item['mid'])) ? format_like($conv_responses['like'][$item['mid']],$conv_responses['like'][$item['mid'] . '-l'],'like',$item['mid']) : '');
-		$showdislike = ((x($conv_responses['dislike'],$item['mid']) && feature_enabled($conv->get_profile_owner(),'dislike'))  
+		$showdislike = ((x($conv_responses['dislike'],$item['mid']) && feature_enabled($conv->get_profile_owner(),'dislike'))
 				? format_like($conv_responses['dislike'][$item['mid']],$conv_responses['dislike'][$item['mid'] . '-l'],'dislike',$item['mid']) : '');
 
 		/*
@@ -264,7 +265,7 @@ class ThreadItem {
 		 */
 
 		$this->check_wall_to_wall();
-		
+
 		if($this->is_toplevel()) {
 			// FIXME check this permission
 			if(($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) {
@@ -275,7 +276,7 @@ class ThreadItem {
 				);
 
 			}
-		} 
+		}
 		else {
 			$is_comment = true;
 		}
@@ -349,7 +350,7 @@ class ThreadItem {
 
 		// $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
 		// since we can't depend on llink or plink pointing to the right local location.
- 
+
 		$owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@'));
 		$viewthread = $item['llink'];
 		if($conv->get_mode() === 'channel')
@@ -357,7 +358,7 @@ class ThreadItem {
 
 		$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
 		$list_unseen_txt = (($unseen_comments) ? sprintf( t('%d unseen'),$unseen_comments) : '');
-		
+
 		$children = $this->get_children();
 
 		$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
@@ -386,7 +387,7 @@ class ThreadItem {
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			'mode' => $mode,
-			'item_type' => intval($item['item_type']),			
+			'item_type' => intval($item['item_type']),
 			//'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 			'body' => $body['html'],
 			'tags' => $body['tags'],
@@ -432,6 +433,7 @@ class ThreadItem {
 			'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
 			'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''),
 			'lock' => $lock,
+			'locktype' => $locktype,
 			'delayed' => $item['item_delayed'],
 			'privacy_warning' => $privacy_warning,
 			'verified' => $verified,
@@ -518,8 +520,8 @@ class ThreadItem {
 
 //		needed for scroll to comment from notification but needs more work
 //		as we do not want to open all comments unless there is actually an #item_xx anchor
-//		and the url fragment is not sent to the server. 
-//		if(in_array(\App::$module,['display','update_display'])) 
+//		and the url fragment is not sent to the server.
+//		if(in_array(\App::$module,['display','update_display']))
 //			$visible_comments = 99999;
 
 		if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
@@ -539,7 +541,7 @@ class ThreadItem {
 				}
 			}
 		}
-		
+
 		$result['private'] = $item['item_private'];
 		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
 
@@ -554,7 +556,7 @@ class ThreadItem {
 
 		return $result;
 	}
-	
+
 	public function get_id() {
 		return $this->get_data_value('id');
 	}
@@ -609,7 +611,7 @@ class ThreadItem {
 		if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
 			return false;
 		}
-		
+
 		$item->set_parent($this);
 		$this->children[] = $item;
 		return end($this->children);
@@ -683,7 +685,7 @@ class ThreadItem {
 	 */
 	public function set_conversation($conv) {
 		$previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
-		
+
 		$this->conversation = $conv;
 
 		// Set it on our children too
@@ -792,7 +794,7 @@ class ThreadItem {
 		if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
 			return '';
 		}
-		
+
 		$comment_box = '';
 		$conv = $this->get_conversation();
 
@@ -808,7 +810,7 @@ class ThreadItem {
 		$arr = array('comment_buttons' => '','id' => $this->get_id());
 		call_hooks('comment_buttons',$arr);
 		$comment_buttons = $arr['comment_buttons'];
-		
+
 		$comment_box = replace_macros($template,array(
 			'$return_path' => '',
 			'$threaded' => $this->is_threaded(),
@@ -865,7 +867,7 @@ class ThreadItem {
 
 		if($conv->get_mode() === 'channel')
 			return;
-		
+
 		if($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) {
 			$this->owner_url = chanlink_hash($this->data['owner']['xchan_hash']);
 			$this->owner_photo = $this->data['owner']['xchan_photo_m'];

Zotlabs/Lib/Verify.php

@@ -5,7 +5,7 @@ namespace Zotlabs\Lib;
 
 class Verify {
 
-	function create($type,$channel_id,$token,$meta) {
+	public static function create($type,$channel_id,$token,$meta) {
 		return q("insert into verify ( vtype, channel, token, meta, created ) values ( '%s', %d, '%s', '%s', '%s' )",
 			dbesc($type),
 			intval($channel_id),
@@ -15,7 +15,7 @@ class Verify {
 		);
 	}
 
-	function match($type,$channel_id,$token,$meta) {
+	public static function match($type,$channel_id,$token,$meta) {
 		$r = q("select id from verify where vtype = '%s' and channel = %d and token = '%s' and meta = '%s' limit 1",
 			dbesc($type),
 			intval($channel_id),
@@ -31,7 +31,7 @@ class Verify {
 		return false;
 	}
 
-	function get_meta($type,$channel_id,$token) {
+	public static function get_meta($type,$channel_id,$token) {
 		$r = q("select id, meta from verify where vtype = '%s' and channel = %d and token = '%s' limit 1",
 			dbesc($type),
 			intval($channel_id),
@@ -52,7 +52,7 @@ class Verify {
 	 * @param string $type Verify type
 	 * @param string $interval SQL compatible time interval
 	 */
-	function purge($type, $interval) {
+	public static function purge($type, $interval) {
 		q("delete from verify where vtype = '%s' and created < %s - INTERVAL %s",
 			dbesc($type),
 			db_utcnow(),

Zotlabs/Lib/ZotURL.php

@@ -21,9 +21,8 @@ class ZotURL {
 		}
 
 		$portable_url = substr($url,6);
-		$u = explode('/',$portable_url);		
+		$u = explode('/',$portable_url);
 		$portable_id = $u[0];
-
 		$hosts = self::lookup($portable_id);
 
 		if(! $hosts) {
@@ -39,8 +38,8 @@ class ZotURL {
 
 			if($channel && $m) {
 
-				$headers = [ 
-					'Accept'           => 'application/x-zot+json', 
+				$headers = [
+					'Accept'           => 'application/x-zot+json',
 					'Content-Type'     => 'application/x-zot+json',
 					'X-Zot-Token'      => random_string(),
 					'Digest'           => HTTPSig::generate_digest_header($data),
@@ -50,9 +49,9 @@ class ZotURL {
 				$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),false);
 			}
 			else {
-				$h = [ 'Accept: application/x-zot+json' ]; 
+				$h = [ 'Accept: application/x-zot+json' ];
 			}
-				
+
 			$result = [];
 
 			$redirects = 0;

Zotlabs/Lib/Zotfinger.php

@@ -18,8 +18,8 @@ class Zotfinger {
 
 		if($channel && $m) {
 
-			$headers = [ 
-				'Accept'           => 'application/x-zot+json', 
+			$headers = [
+				'Accept'           => 'application/x-zot+json',
 				'Content-Type'     => 'application/x-zot+json',
 				'X-Zot-Token'      => random_string(),
 				'Digest'           => HTTPSig::generate_digest_header($data),
@@ -29,11 +29,10 @@ class Zotfinger {
 			$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),false);
 		}
 		else {
-			$h = [ 'Accept: application/x-zot+json' ]; 
+			$h = [ 'Accept: application/x-zot+json' ];
 		}
-				
-		$result = [];
 
+		$result = [];
 
 		$redirects = 0;
 		$x = z_post_url($resource,$data,$redirects, [ 'headers' => $h  ] );
@@ -44,11 +43,11 @@ class Zotfinger {
 			if ($verify) {
 				$result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
 			}
-    
+
 			$result['data'] = json_decode($x['body'],true);
 
 			if($result['data'] && is_array($result['data']) && array_key_exists('encrypted',$result['data']) && $result['data']['encrypted']) {
-				$result['data'] = json_decode(crypto_unencapsulate($result['data'],get_config('system','prvkey')),true);
+				$result['data'] = json_decode(Crypto::unencapsulate($result['data'],get_config('system','prvkey')),true);
 			}
 
 			logger('decrypted: ' . print_r($result,true));

Zotlabs/Module/Activity.php

@@ -26,7 +26,12 @@ class Activity extends Controller {
 
 			$portable_id = EMPTY_STR;
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$i = null;
 
@@ -86,7 +91,7 @@ class Activity extends Controller {
 			}
 
 			$parents_str = ids_to_querystr($i,'item_id');
-	
+
 			$items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal ",
 				dbesc($parents_str)
 			);
@@ -143,8 +148,8 @@ class Activity extends Controller {
 				http_status_exit(403, 'Forbidden');
 
 			$i = ZlibActivity::encode_item_collection($nitems,'conversation/' . $item_id,'OrderedCollection');
-			if($portable_id) {
-				ThreadListener::store(z_root() . '/activity/' . $item_id,$portable_id);
+			if($portable_id && (! intval($items[0]['item_private']))) {
+				ThreadListener::store(z_root() . '/activity/' . $item_id, $portable_id);
 			}
 
 			if(! $i)
@@ -197,8 +202,12 @@ class Activity extends Controller {
 				}
 			}
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 
-				and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$sigdata = HTTPSig::verify(EMPTY_STR);
 			if ($sigdata['portable_id'] && $sigdata['header_valid']) {
@@ -239,6 +248,16 @@ class Activity extends Controller {
 			xchan_query($r,true);
 			$items = fetch_post_tags($r,false);
 
+			if ($portable_id && (! intval($items[0]['item_private']))) {
+				$c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s'",
+					intval($items[0]['uid']),
+					dbesc($portable_id)
+				);
+				if (! $c) {
+					ThreadListener::store(z_root() . '/activity/' . $item_id, $portable_id);
+				}
+			}
+
 			$channel = channelx_by_n($items[0]['uid']);
 
 			$x = array_merge( ['@context' => [

Zotlabs/Module/Admin.php

@@ -101,11 +101,14 @@ class Admin extends \Zotlabs\Web\Controller {
 
 		// pending registrations
 
-		$pdg = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ",
-			intval(ACCOUNT_PENDING)
+		// $pdg = q("SELECT account.*, register.reg_hash from account left join register on account_id = register.reg_uid // where (account_flags & %d ) > 0 ",
+		//		intval(ACCOUNT_PENDING)
+		// );
+		$pdg = q("SELECT COUNT(*) AS pdg FROM register WHERE reg_vital = 1 AND reg_expires > '%s' ",
+			dbesc(date('Y-m-d H:i:s'))
 		);
 
-		$pending = (($pdg) ? count($pdg) : 0);
+		$pending = ($pdg ? $pdg[0]['pdg'] : 0);
 
 		// available channels, primary and clones
 		$channels = array();

Zotlabs/Module/Admin/Accounts.php

@@ -5,7 +5,7 @@ namespace Zotlabs\Module\Admin;
 
 
 class Accounts {
-	
+
 	/**
 	 * @brief Handle POST actions on accounts admin page.
 	 *
@@ -15,14 +15,105 @@ class Accounts {
 	 *
 	 */
 
+	const MYP = 	'ZAR';			// ZAR2x
+	const VERSION =	'2.0.0';
+
 	function post() {
 
 		$pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() );
 		$users   = ( x($_POST, 'user')    ? $_POST['user']    : array() );
 		$blocked = ( x($_POST, 'blocked') ? $_POST['blocked'] : array() );
-	
+
 		check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts');
-	
+
+		$isajax = is_ajax();
+		$rc = 0;
+
+		If (!is_site_admin()) {
+			if ($isajax) {
+				killme();
+				exit;
+			}
+			goaway(z_root() . '/');
+		}
+
+		if ($isajax) {
+			//$debug = print_r($_SESSION[self::MYP],true);
+			$zarop = (x($_POST['zardo']) && preg_match('/^[ad]{1,1}$/', $_POST['zardo']) )
+					 ? $_POST['zardo'] : '';
+			// zarat arrives with leading underscore _n
+			$zarat = (x($_POST['zarat']) && preg_match('/^_{1,1}[0-9]{1,6}$/', $_POST['zarat']) )
+					 ? substr($_POST['zarat'],1) : '';
+			$zarse = (x($_POST['zarse']) && preg_match('/^[0-9a-f]{8,8}$/', $_POST['zarse']) )
+					 ? hex2bin($_POST['zarse']) : '';
+
+			if ($zarop && $zarat >= 0 && $zarse && $zarse == $_SESSION[self::MYP]['h'][$zarat]) {
+
+				//
+				if ($zarop == 'd') {
+					$rd = q("UPDATE register SET reg_vital = 0 WHERE reg_id = %d AND SUBSTR(reg_hash,1,4) = '%s' ",
+						intval($_SESSION[self::MYP]['i'][$zarat]),
+						dbesc($_SESSION[self::MYP]['h'][$zarat])
+					);
+					$rc = '×';
+				}
+				elseif ($zarop == 'a') {
+					// approval, REGISTER_DENIED by user 0x0040, REGISTER_AGREED by user 0x0020 @Regate
+					$rd = q("UPDATE register SET reg_flags = (reg_flags & ~ 16), "
+						.	" reg_vital = (CASE (reg_flags & ~ 48) WHEN 0 THEN 0 ELSE 1 END) "
+						.	" WHERE reg_vital = 1 AND reg_id = %d AND SUBSTR(reg_hash,1,4) = '%s' ",
+						intval($_SESSION[self::MYP]['i'][$zarat]),
+						dbesc($_SESSION[self::MYP]['h'][$zarat])
+					);
+					$rc = 0;
+					$rs = q("SELECT * from register WHERE reg_id = %d ",
+							intval($_SESSION[self::MYP]['i'][$zarat])
+					);
+					if ($rs && ($rs[0]['reg_flags'] & ~ 48) == 0) {
+						// create account
+						$rc = 'ok'.$rs[0]['reg_id'];
+						$ac = create_account_from_register($rs[0]);
+						if ( $ac['success'] ) {
+							$rc .= '✔';
+
+							$auto_create  = get_config('system','auto_channel_create',1);
+
+							if($auto_create) {
+								$reonar = json_decode($rs[0]['reg_stuff'], true);
+								// prepare channel creation
+								if($reonar['chan.name'])
+									set_aconfig($ac['account']['account_id'], 'register', 'channel_name', $reonar['chan.name']);
+
+								if($reonar['chan.did1'])
+									set_aconfig($ac['account']['account_id'], 'register', 'channel_address', $reonar['chan.did1']);
+
+								$permissions_role  = get_config('system','default_permissions_role');
+								if($permissions_role)
+									set_aconfig($ac['account']['account_id'], 'register', 'permissions_role', $permissions_role);
+
+								// create channel
+								$new_channel = auto_channel_create($ac['account']['account_id']);
+
+								if($new_channel['success']) {
+									$rc .= ' c,ok' . $new_channel['channel']['channel_id'] . '✔';
+								}
+								else {
+									$rc .= ' c ×';
+								}
+							}
+
+
+						}
+					} else {
+						$rc='oh ×';
+					}
+				}
+				echo json_encode(array('re' => $zarop, 'at' => '_' . $zarat, 'rc' => $rc));
+			}
+			killme();
+			exit;
+		}
+
 		// change to switch structure?
 		// account block/unblock button was submitted
 		if (x($_POST, 'page_accounts_block')) {
@@ -55,7 +146,7 @@ class Accounts {
 				account_deny($hash);
 			}
 		}
-	
+
 		goaway(z_root() . '/admin/accounts' );
 	}
 
@@ -75,19 +166,21 @@ class Accounts {
 			$account = q("SELECT * FROM account WHERE account_id = %d",
 				intval($uid)
 			);
-	
+
 			if (! $account) {
 				notice( t('Account not found') . EOL);
 				goaway(z_root() . '/admin/accounts' );
 			}
-	
+
 			check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts', 't');
-	
+
+			$debug = '';
+
 			switch (argv(2)){
 				case 'delete':
 					// delete user
 					account_remove($uid,true,false);
-	
+
 					notice( sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL);
 					break;
 				case 'block':
@@ -95,7 +188,7 @@ class Accounts {
 						intval(ACCOUNT_BLOCKED),
 						intval($uid)
 					);
-	
+
 					notice( sprintf( t("Account '%s' blocked") , $account[0]['account_email']) . EOL);
 					break;
 				case 'unblock':
@@ -103,27 +196,74 @@ class Accounts {
 							intval(ACCOUNT_BLOCKED),
 							intval($uid)
 					);
-	
+
 					notice( sprintf( t("Account '%s' unblocked"), $account[0]['account_email']) . EOL);
 					break;
 			}
-	
+
 			goaway(z_root() . '/admin/accounts' );
 		}
-	
-		/* get pending */
-		$pending = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d )>0 ",
-			intval(ACCOUNT_PENDING)
-		);
-	
+
+		$tao = 'tao.zar.zarax = ' . "'" . '<img src="' . z_root() . '/images/zapax16.gif">' . "';\n";
+
+
+		// by default we will only return verified results. if reg_all is set we will return everything''
+		$get_all = isset($_REQUEST['get_all']);
+		$pending = get_pending_accounts($get_all);
+
+		unset($_SESSION[self::MYP]);
+
+		if ($pending) {
+			// collect and group all ip
+			$atips = dbq("SELECT reg_atip AS atip, COUNT(reg_atip) AS atips FROM register
+				WHERE reg_vital = 1 GROUP BY reg_atip"
+			);
+
+			(($atips) ? $atipn = array_column($atips, 'atips', 'atip') : $atipn = ['' => 0]);
+
+			$tao .= 'tao.zar.zarar = {';
+			foreach ($pending as $n => $v) {
+
+				$stuff = json_decode($v['reg_stuff'], true);
+
+				if(isset($stuff['msg'])) {
+					$pending[$n]['msg'] = $stuff['msg'];
+				}
+
+				if (array_key_exists($v['reg_atip'], $atipn)) {
+					$pending[$n]['reg_atip'] = $v['reg_atip'];
+					$pending[$n]['reg_atip_n'] = $atipn[$v['reg_atip']];
+				}
+
+				$pending[$n]['status'] = '';
+				if($pending[$n]['reg_flags'] & ACCOUNT_UNVERIFIED > 0)
+					$pending[$n]['status'] = [t('Unverified'), 'bg-warning'];
+
+				if($pending[$n]['status'] && $pending[$n]['reg_expires'] < datetime_convert())
+					$pending[$n]['status'] = [t('Expired'), 'bg-danger text-white'];
+
+				// timezone adjust date_time for display
+				$pending[$n]['reg_created'] = datetime_convert('UTC', date_default_timezone_get(), $pending[$n]['reg_created']);
+				$pending[$n]['reg_startup'] = datetime_convert('UTC', date_default_timezone_get(), $pending[$n]['reg_startup']);
+				$pending[$n]['reg_expires'] = datetime_convert('UTC', date_default_timezone_get(), $pending[$n]['reg_expires']);
+
+				// better secure
+				$tao .= $n . ": '" . substr(bin2hex($v['reg_hash']),0,8) . "',";
+				$_SESSION[self::MYP]['h'][] = substr($v['reg_hash'],0,4);
+				$_SESSION[self::MYP]['i'][] = $v['reg_id'];
+			}
+			$tao = rtrim($tao,',') . '};' . "\n";
+		}
+		// <- hilmar]
+
 		/* get accounts */
-	
+
 		$total = q("SELECT count(*) as total FROM account");
 		if (count($total)) {
 			\App::set_pager_total($total[0]['total']);
 			\App::set_pager_itemspage(100);
 		}
-	
+
 		$serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : '');
 
 		$key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'account_id');
@@ -134,8 +274,8 @@ class Accounts {
 		$base = z_root() . '/admin/accounts?f=';
 		$odir = (($dir === 'asc') ? '0' : '1');
 
-		$users = q("SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked, 
-			(SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac 
+		$users = q("SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked,
+			(SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac
 			where true $serviceclass and account_flags != %d order by $key $dir limit %d offset %d ",
 			intval(ACCOUNT_BLOCKED),
 			db_concat('ch.channel_address', ' '),
@@ -143,15 +283,15 @@ class Accounts {
 			intval(\App::$pager['itemspage']),
 			intval(\App::$pager['start'])
 		);
-	
+
 	//	function _setup_users($e){
 	//		$accounts = Array(
-	//			t('Normal Account'), 
+	//			t('Normal Account'),
 	//			t('Soapbox Account'),
 	//			t('Community/Celebrity Account'),
 	//			t('Automatic Friend Account')
 	//		);
-	
+
 	//		$e['page_flags'] = $accounts[$e['page-flags']];
 	//		$e['register_date'] = relative_date($e['register_date']);
 	//		$e['login_date'] = relative_date($e['login_date']);
@@ -159,49 +299,57 @@ class Accounts {
 	//		return $e;
 	//	}
 	//	$users = array_map("_setup_users", $users);
-	
+
 		$t = get_markup_template('admin_accounts.tpl');
 		$o = replace_macros($t, array(
 			// strings //
+			'$debug' => $debug,
 			'$title' => t('Administration'),
 			'$page' => t('Accounts'),
 			'$submit' => t('Submit'),
-			'$select_all' => t('select all'),
-			'$h_pending' => t('Registrations waiting for confirm'),
-			'$th_pending' => array( t('Request date'), t('Email') ),
-			'$no_pending' =>  t('No registrations.'),
+			'$get_all' => (($get_all) ? t('Show verified registrations') : t('Show all registrations')),
+			'$get_all_link' => (($get_all) ? z_root() .'/admin/accounts' : z_root() .'/admin/accounts?get_all'),
+			'$sel_tall' => t('Select toggle'),
+			'$sel_deny' => t('Deny selected'),
+			'$sel_aprv' => t('Approve selected'),
+			'$h_pending' => (($get_all) ? t('All registrations') : t('Verified registrations waiting for approval')),
+			'$th_pending' => array(t('Request date'), 'dId2', t('Email'), 'IP', t('Requests')),
+			'$no_pending' => (($get_all) ? t('No registrations available') : t('No verified registrations available')),
 			'$approve' => t('Approve'),
 			'$deny' => t('Deny'),
 			'$delete' => t('Delete'),
 			'$block' => t('Block'),
 			'$unblock' => t('Unblock'),
+			'$verified' => t('Verified'),
+			'$not_verified' => t('Not yet verified'),
 			'$odir' => $odir,
 			'$base' => $base,
 			'$h_users' => t('Accounts'),
-			'$th_users' => array( 
+			'$th_users' => array(
 				[ t('ID'), 'account_id' ],
 				[ t('Email'), 'account_email' ],
-				[ t('All Channels'), 'channels' ],
+				[ t('All channels'), 'channels' ],
 				[ t('Register date'), 'account_created' ],
 				[ t('Last login'), 'account_lastlog' ],
 				[ t('Expires'), 'account_expires' ],
-				[ t('Service Class'), 'account_service_class'] ),
-	
-			'$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'),
-			'$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'),
-	
+				[ t('Service class'), 'account_service_class'] ),
+
+			'$confirm_delete_multi' => p2j(t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?')),
+			'$confirm_delete' => p2j(t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?')),
+
 			'$form_security_token' => get_form_security_token("admin_accounts"),
-	
+
 			// values //
-			'$baseurl' => z_root(),
-	
-			'$pending' => $pending,
-			'$users' => $users,
+			'$baseurl' 	=> z_root(),
+			'$tao'		=> $tao,
+			'$pending' 	=> $pending,
+			'$users' 	=> $users,
+			'$msg'      => t('Message')
 		));
 		$o .= paginate($a);
-	
+
 		return $o;
 	}
-	
 
 }
+

Zotlabs/Module/Admin/Channels.php

@@ -173,4 +173,4 @@ class Channels {
 		return $o;
 	}
 
-}
+}

Zotlabs/Module/Admin/Site.php

@@ -5,14 +5,25 @@ namespace Zotlabs\Module\Admin;
 
 class Site {
 
+
 	/**
 	 * @brief POST handler for Admin Site Page.
 	 *
 	 */
 	function post(){
+		// [hilmar->
+		$this->isajax = is_ajax();
+		$this->eol = $this->isajax ? "\n" : EOL;
+		// ]
 		if (!x($_POST, 'page_site')) {
-			return;
+		// [
+			if (!$this->isajax)
+		// ]
+				return;
 		}
+		// [
+		$this->msgbg = '';
+		// <-hilmar]
 
 		check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
 
@@ -24,14 +35,17 @@ class Site {
 		$siteinfo			=	((x($_POST,'siteinfo'))		    ? trim($_POST['siteinfo'])				: '');
 		$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
 		$theme				=	((x($_POST,'theme'))			? notags(trim($_POST['theme']))				: '');
-//		$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
-//		$site_channel			=	((x($_POST,'site_channel'))	? notags(trim($_POST['site_channel']))				: '');
+		//		$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
+		//		$site_channel			=	((x($_POST,'site_channel'))	? notags(trim($_POST['site_channel']))				: '');
 		$maximagesize		=	((x($_POST,'maximagesize'))		? intval(trim($_POST['maximagesize']))				:  0);
 
 		$register_policy	=	((x($_POST,'register_policy'))	? intval(trim($_POST['register_policy']))	:  0);
+		$register_wo_email	=	((x($_POST,'register_wo_email'))	? intval(trim($_POST['register_wo_email']))	:  0);
 		$minimum_age           = ((x($_POST,'minimum_age'))          ? intval(trim($_POST['minimum_age']))    : 13);
 		$access_policy	=	((x($_POST,'access_policy'))	? intval(trim($_POST['access_policy']))	:  0);
-		$invite_only	= ((x($_POST,'invite_only'))		? True	: False);
+		$reg_autochannel	= ((x($_POST,'auto_channel_create'))		? True	: False);
+		$invitation_only	= ((x($_POST,'invitation_only'))		? True	: False);
+		$invitation_also	= ((x($_POST,'invitation_also'))		? True	: False);
 		$abandon_days	=	((x($_POST,'abandon_days'))	    ? intval(trim($_POST['abandon_days']))	    :  0);
 
 		$register_text		=	((x($_POST,'register_text'))	? notags(trim($_POST['register_text']))		: '');
@@ -75,6 +89,16 @@ class Site {
 		$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);
+		$register_perday   = ((x($_POST,'register_perday'))	 ? intval(trim($_POST['register_perday'])) : 50);
+		$register_sameip   = ((x($_POST,'register_sameip'))	 ? intval(trim($_POST['register_sameip'])) : 3);
+
+		$regdelayn 		   = ((x($_POST,'zardelayn'))	 	? intval(trim($_POST['zardelayn'])) : 0);
+		$regdelayu 		   = ((x($_POST,'zardelay'))	 	? notags(trim($_POST['zardelay'])) : '');
+		$reg_delay 		   = (preg_match('/^[a-z]{1,1}$/', $regdelayu) ? $regdelayn . $regdelayu : '');
+		$regexpiren 	   = ((x($_POST,'zarexpiren'))	 	? intval(trim($_POST['zarexpiren'])) : 0);
+		$regexpireu 	   = ((x($_POST,'zarexpire'))	 	? notags(trim($_POST['zarexpire'])) : '');
+		$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);
 		$pub_incl = escape_tags(trim($_POST['pub_incl']));
@@ -82,6 +106,35 @@ class Site {
 
 		$permissions_role = escape_tags(trim($_POST['permissions_role']));
 
+		// [hilmar->
+		$this->register_duty = ((x($_POST,'register_duty')) ? notags(trim($_POST['register_duty']))  : '');
+		if (! preg_match('/^[0-9 .,:\-]{0,191}$/', $this->register_duty)) {
+			$this->msgbg .= 'ZAR0131E,' . t('Invalid input') . $this->eol;
+			$this->error++;
+		} else {
+
+			$this->duty();
+
+			if ($this->isajax) {
+				echo json_encode(array('msgbg' => $this->msgbg, 'me' => 'zar'));
+				// that mission is complete
+				killme();
+				exit;
+
+			} else {
+
+				//logger( print_r( $this->msgbg, true) );
+				//logger( print_r( $this->joo, true) );
+				if ($this->error === 0) {
+					set_config('system', 'register_duty', $this->register_duty);
+					set_config('system', 'register_duty_jso', $this->joo);
+				} else {
+					notice('ZAR0130E,'.t('Errors') . ': ' . $this->error) . EOL . $this->msgfg;
+				}
+			}
+		}
+		// <-hilmar]
+
 		set_config('system', 'feed_contacts', $feed_contacts);
 		set_config('system', 'delivery_interval', $delivery_interval);
 		set_config('system', 'delivery_batch_count', $delivery_batch_count);
@@ -96,6 +149,10 @@ class Site {
 		set_config('system', 'login_on_homepage', $login_on_homepage);
 		set_config('system', 'enable_context_help', $enable_context_help);
 		set_config('system', 'verify_email', $verify_email);
+		set_config('system', 'max_daily_registrations', $register_perday);
+		set_config('system', 'register_sameip', $register_sameip);
+		set_config('system', 'register_delay', $reg_delay);
+		set_config('system', 'register_expire', $reg_expire);
 		set_config('system', 'default_expire_days', $default_expire_days);
 		set_config('system', 'active_expire_days', $active_expire_days);
 		set_config('system', 'reply_address', $reply_address);
@@ -126,17 +183,20 @@ class Site {
 		set_config('system','siteinfo',$siteinfo);
 		set_config('system', 'language', $language);
 		set_config('system', 'theme', $theme);
-//		if ( $theme_mobile === '---' ) {
-//			del_config('system', 'mobile_theme');
-//		} else {
-//			set_config('system', 'mobile_theme', $theme_mobile);
-//		}
-	//	set_config('system','site_channel', $site_channel);
+		//		if ( $theme_mobile === '---' ) {
+		//			del_config('system', 'mobile_theme');
+		//		} else {
+		//			set_config('system', 'mobile_theme', $theme_mobile);
+		//		}
+		//	set_config('system','site_channel', $site_channel);
 		set_config('system','maximagesize', $maximagesize);
 
 		set_config('system','register_policy', $register_policy);
+		set_config('system','register_wo_email', $register_wo_email);
 		set_config('system','minimum_age', $minimum_age);
-		set_config('system','invitation_only', $invite_only);
+		set_config('system','auto_channel_create', $reg_autochannel);
+		set_config('system', 'invitation_only', $invitation_only);
+		set_config('system', 'invitation_also', $invitation_also);
 		set_config('system','access_policy', $access_policy);
 		set_config('system','account_abandon_days', $abandon_days);
 		set_config('system','register_text', $register_text);
@@ -260,6 +320,8 @@ class Site {
 			REGISTER_APPROVE => t("Yes - with approval"),
 			REGISTER_OPEN    => t("Yes")
 		);
+		$this->register_duty = get_config('system', 'register_duty', '-:-');
+		$register_perday = get_config('system','max_daily_registrations', 50);
 
 		/* Acess policy */
 		$access_choices = Array(
@@ -286,9 +348,66 @@ class Site {
 		$homelogin = get_config('system','login_on_homepage');
 		$enable_context_help = get_config('system','enable_context_help');
 
+		// for reuse reg_delay and reg_expire
+		$reg_rabots = array(
+ 					'i'	=> t('Minute(s)'),
+ 					'h' => t('Hour(s)')  ,
+ 					'd' => t('Day(s)')   ,
+ 					'w' => t('Week(s)')  ,
+ 					'm' => t('Month(s)') ,
+ 					'y' => t('Year(s)')
+		);
+		$regdelay_n = $regdelay_u = false;
+		$regdelay = get_config('system','register_delay');
+		if ($regdelay)
+			list($regdelay_n, $regdelay_u) = array(substr($regdelay,0,-1),substr($regdelay,-1));
+		$reg_delay = replace_macros(get_markup_template('field_duration.qmc.tpl'),
+			 array(
+			 	'label'  	=> t('Register verification delay'),
+			 	'qmc'	 	=> 'zar',
+				'qmcid'		=> '',
+				'help'		=> t('Time to wait before a registration can be verified'),
+			 	'field' => 	array(
+			 		'name'  => 'delay',
+			 		'title' => t('duration up from now'),
+			 		'value' => ($regdelay_n === false ? 0 : $regdelay_n),
+			 		'min'   => '0',
+			 		'max'   => '99',
+			 		'size'  => '2',
+					'default' => ($regdelay_u === false ? 'i' : $regdelay_u)
+			 	),
+			 	'rabot'	=> 	$reg_rabots
+ 			)
+		);
+		$regexpire_n = $regexpire_u = false;
+		$regexpire = get_config('system','register_expire');
+		if ($regexpire)
+			list($regexpire_n, $regexpire_u) = array(substr($regexpire,0,-1),substr($regexpire,-1));
+		$reg_expire = replace_macros(get_markup_template('field_duration.qmc.tpl'),
+			 array(
+			 	'label'  	=> t('Register verification expiration time'),
+			 	'qmc'	 	=> 'zar',
+				'qmcid'		=> '',
+			 	'help'		=> t('Time before an unverified registration will expire'),
+			 	'field' => 	array(
+			 		'name'  => 'expire',
+			 		'title' => t('duration up from now'),
+			 		'value' => ($regexpire_n === false ? 3 : $regexpire_n),
+			 		'min'  => '0',
+			 		'max'  => '99',
+			 		'size' => '2',
+					'default' => ($regexpire_u === false ? 'd' : $regexpire_u)
+			 	),
+			 	'rabot'	=> 	$reg_rabots
+			 )
+		);
+
+		$tao = '';
 		$t = get_markup_template("admin_site.tpl");
 		return replace_macros($t, array(
 			'$title' => t('Administration'),
+			// interfacing js vars
+			'$tao' => $tao,
 			'$page' => t('Site'),
 			'$submit' => t('Submit'),
 			'$registration' => t('Registration'),
@@ -305,21 +424,87 @@ class Site {
 			'$siteinfo'		=> array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site.  Displayed on siteinfo page.  BBCode can be used here")),
 			'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
 			'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
-//			'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
-//			'$site_channel' 	=> array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")),
+		//			'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
+		//			'$site_channel' 	=> array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")),
 			'$feed_contacts'    => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')),
 			'$maximagesize'		=> array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
-			'$register_policy'	=> array('register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices),
-			'$invite_only'		=> array('invite_only', t("Invitation only"), get_config('system','invitation_only'), t("Only allow new member registrations with an invitation code. Above register policy must be set to Yes.")),
 			'$minimum_age'		=> array('minimum_age', t("Minimum age"), (x(get_config('system','minimum_age'))?get_config('system','minimum_age'):13), t("Minimum age (in years) for who may register on this site.")),
 			'$access_policy'	=> array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), t("This is displayed on the public server site list."), $access_choices),
-			'$register_text'	=> array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
+
+			// Register
+			// [hilmar->
+			'$register_text'	=> [
+				'register_text',
+				t("Register text"),
+				htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'),
+				t("This text will be displayed prominently at the registration page")
+			],
+			'$register_policy'	=> [
+				'register_policy',
+				t("Does this site allow new member registration?"),
+				get_config('system','register_policy'),
+				"",
+				$register_choices,
+			],
+			'$register_duty' => [
+				'register_duty',
+				t('Configure the registration open days/hours'),
+				get_config('system', 'register_duty', '-:-'),
+				t('Empty or \'-:-\' value will keep registration open 24/7 (default)') . EOL .
+				t('Weekdays and hours must be separated by colon \':\', From-To ranges with a dash `-` example: 1:800-1200') . EOL .
+				t('Weekday:Hour pairs must be separated by space \' \' example: 1:900-1700 2:900-1700') . EOL .
+				t('From-To ranges must be separated by comma \',\' example: 1:800-1200,1300-1700 or 1-2,4-5:900-1700') . EOL .
+				t('Advanced examples:') . ' 1-5:0900-1200,1300-1700 6:900-1230 ' . t('or') . ' 1-2,4-5:800-1800<br>' . EOL .
+				'<a id="zar083a" class="btn btn-sm btn-outline-secondary zuia">' . t('Check your configuration') . '</a>'. EOL
+			],
+			'$register_perday' => [
+				'register_perday',
+				t('Max account registrations per day'),
+				get_config('system', 'max_daily_registrations', 50),
+				t('Unlimited if zero or no value - default 50')
+			],
+			'$register_sameip' => [
+				'register_sameip',
+				t('Max account registrations from same IP'),
+				get_config('system', 'register_sameip', 3),
+				t('Unlimited if zero or no value - default 3')
+			],
+			'$reg_delay' => $reg_delay,
+			'$reg_expire' => $reg_expire,
+			'$reg_autochannel'		=> [
+				'auto_channel_create',
+				t("Auto channel create"),
+				get_config('system','auto_channel_create', 1),
+				t("If disabled the channel will be created in a separate step during the registration process")
+			],
+			'$invitation_only' => [
+				'invitation_only',
+				t("Require invite code"),
+				$invitation_only
+			],
+			'$invitation_also' => [
+				'invitation_also',
+				t("Allow invite code"),
+				$invitation_also
+			],
+			'$verify_email'		=> [
+				'verify_email',
+				t("Require email address"),
+				get_config('system','verify_email'),
+				t("The provided email address will be verified (recommended)")
+			],
+			'$abandon_days' => [
+				'abandon_days',
+				t('Abandon account after x days'),
+				get_config('system','account_abandon_days'),
+				t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')
+			],
+			// <-hilmar]
+
 			'$role'         => $role,
 			'$frontpage'	=> array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")),
 			'$mirror_frontpage'	=> array('mirror_frontpage', t("Preserve site homepage URL"), get_config('system','mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')),
-			'$abandon_days'     => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
 			'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
-			'$verify_email'		=> array('verify_email', t("Verify Email Addresses"), get_config('system','verify_email'), t("Check to verify email addresses used in account registration (recommended).")),
 			'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
 			'$disable_discover_tab'	=> array('disable_discover_tab', t('Import Public Streams'), $discover_tab, t('Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.')),
 			'$site_firehose'	=> array('site_firehose', t('Site only Public Streams'), get_config('system','site_firehose'), t('Allow access to public content originating only from this site if Imported Public Streams are disabled.')),
@@ -350,15 +535,184 @@ class Site {
 			'$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')),
 			'$active_expire_days' => array('active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system','active_expire_days',7)), ''),
-
 			'$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())),
 			'$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Default: profiles')),
-
 			'$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')),
-
-
 			'$form_security_token' => get_form_security_token("admin_site"),
 		));
 	}
 
+	/**
+	 * @brief Admin page site common post submit and ajax interaction
+	 * @author hilmar runge
+	 * @since  2020-02-04
+	 * Configure register office duty weekdays and hours
+	 * Syntax: weekdays:hours [weekdays:hours]
+	 *         [.d[,d-d.]]]:hhmm-hhmm[,hhmm-hhmm...]
+	 *		   ranges are between blanks, days are 1-7, where 1 = Monday
+	 *		   hours are [h]hmm 3-4digit 24 clock values
+	 *      ie 0900-1200,1300-1800 for hours
+	 *      ie 1-2,4,5 for weekdays
+	 *		ie 1-2:900-1800		monday and tuesday open from 9 to 18h
+	 *
+	 * @var $register_duty is the input field from the admin -> site page
+	 * @return the results are in the class vars $error, $msgbg and $jsoo
+	 *		$jsoo is
+	 */
+
+	// 3-4 digit 24h clock regex
+	const regxTime34 = '/^(?:2[0-3]|[01][0-9]|[0-9])[0-5][0-9]$/';
+	var $wdconst = array('','mo','tu','we','th','fr','sa','so');
+
+	// in
+	var $register_duty;
+	// intermediate
+	var $isajax;
+	// return
+	var $jsoo;
+	var $msgbg;
+	var $error = 0;
+	var $msgfg = '';
+
+	private function duty() {
+
+		$aro=array_fill(1, 7, 0);
+
+		if ($this->isajax) {
+			$op = (preg_match('/[a-z]{2,4}/', $_REQUEST['zarop'])) ? $_REQUEST['zarop'] : '';
+			if ($op == 'zar083') {
+				$this->msgbg = 'Testmode:' . $this->eol . $this->msgbg;
+			} else {
+				killme();
+				exit;
+			}
+		}
+
+		$ranges = preg_split('/\s+/', $this->register_duty);
+		$this->msgbg .= '..ranges: ' . print_r(count($ranges),true) . $this->eol;
+
+		foreach ($ranges as $rn => $range) {
+			list($ws,$hs,) = explode(':', $range);
+
+			$ws ? $arw = explode( ',', $ws) : $arw=array();
+			$this->msgbg .= ($rn+1).'.weekday ranges: ' . count($arw) . $this->eol;
+			// $this->msgbg .= print_r($arw,true);
+			$hs ? $arh = explode( ',', $hs) : $arh=array();
+			$this->msgbg .= ($rn+1).'.hour ranges: ' . count($arh) . $this->eol;
+
+			$this->msgbg .= ($rn+1).'.wdays: ' . ( $ws ? print_r($ws,true) : 'none') . ' : '
+					.  ' hours: ' . print_r($hs,true) . $this->eol;
+
+			// several hs may belog to one wd
+			// aro[0] is tmp store
+			foreach ($arh as $hs) {
+				list($ho,$hc,) = explode( '-', $hs );
+
+				// no value forces open very early, and be sure having valid hhmm values
+				!$ho ? $ho = "0000" : '';
+				!$hc ? $hc = "0000" : ''; // pseudo
+				if (preg_match(self::regxTime34, $ho)
+				 && preg_match(self::regxTime34, $hc)) {
+
+					// fix pseudo, allow no reverse range
+					$hc == "0000" || $ho > $hc ? $hc = "2400" : '';
+
+					$aro[0][$ho] = 0;
+					$aro[0][$hc] = 1;
+
+					$this->msgbg .= ($ho ? ' .open:' . $ho : '') . ($hc ? ' close:' . $hc : '') .$this->eol;
+				} else {
+					$this->msgbg .= ' .' . t('Invalid 24h time value (hhmm/hmm)') . $this->eol;
+					$this->msgfg  .= ' .ZAR0132E,' . t('Invalid 24h time value (hhmm/hmm)') . $this->eol;
+					$this->error++;
+				}
+			}
+
+			// the weekday(s) values or ranges
+			foreach ($arw as $ds) {
+				$wd=explode('-', $ds);
+				array_key_exists("1", $wd) && $wd[1]=="" ? $wd[1] = "7" : '';	 // a case 3-
+				array_key_exists("1", $wd) && $wd[0]=="" ? $wd[0] = "1" : '';	 // a case -3
+				!array_key_exists("1", $wd)				 ? $wd[1] = $wd[0] : ''; // a case 3
+				if ($wd[0] > $wd[1]) continue; //  reverse order will be ignored // a case 5-3
+				if (preg_match('/^[1-7]{1}$/', $wd[0])) {
+					if (preg_match('/^[1-7]{1}$/', $wd[1])) {
+						// $this->msgbg .= print_r($wd,true);
+						for ($i=$wd[0]; $i<=$wd[1]; $i++) {
+							// take the tmp store for the selected day(s)
+							$aro[$i]=$aro[0];
+						}
+					}
+				}
+			}
+			//$this->msgbg .= 'aro0: ' . print_r($aro,true) . $this->eol; // 4devels
+			// clear the tmp store
+			$aro[0]=array();
+		}
+		// discart the tmp store
+		unset($aro[0]);
+		// not configured days close at the beginning 0000h
+		for ($i=1;$i<=7;$i++) { is_array($aro[$i]) ? '' : $aro[$i] = array("0000" => 1); }
+		// $this->msgbg .= 'aro: ' . print_r($aro,true) . $this->eol; // 4devels
+
+		if ($this->isajax) {
+			// tell what we have
+			// $this->msgbg .= 'aro0: ' . print_r($aro,true) . $this->eol; // 4devels
+			$this->msgbg .= 'Duty time table:' . $this->eol;
+			foreach ($aro as $dow => $hrs) {
+				$this->msgbg .= ' ' . $this->wdconst[$dow] . ' ';
+				// $this->msgbg .= '**' . print_r($hrs,true);
+				foreach ($hrs as $h => $o) {
+					$this->msgbg .= ((!$o) ? $h . ':open' : $h . ':close') . ', ';
+				}
+				$this->msgbg = rtrim($this->msgbg, ', ') . $this->eol;
+			}
+
+			$this->msgbg .= 'Generating 6 random times to check duty hours: ' . $this->eol;
+			// we only need some random dates from anyway in past or future
+			// because only the weekday and the clock is to test
+			for ($i=0; $i<6; $i++) {
+				$adow = rand(1, 7); // 1 to 7 (days)
+				$cdow = $this->wdconst[$adow];
+				// below is the essential algo to verify a date (of format Hi) meets an open or closed condition
+				$t = date('Hi', ( rand(time(), 60*60*24+time()) ) );
+				$how='close';
+				foreach ($aro[$adow] as $o => $v) {
+					// $this->msgbg .= 'debug: ' . $o . ' gt ' . $t . ' / ' . $v . $this->eol; // 4devels
+					if ($o > $t) {
+						$how = ($v ? 'open' : 'close');
+						break;
+					}
+				}
+				// now we know
+				$this->msgbg .= ' ' . $cdow . '.' . $t . '=' . $how . ', ';
+			}
+			$this->msgbg = rtrim($this->msgbg, ', ') . $this->eol;
+		}
+
+		/*
+		//$jov1 = array( 'view1' => $aro, 'view2' => '');
+		$jov2=array();
+		foreach ($aro as $d => $ts) {
+			foreach ($ts as $t => $ft) {
+				$jov2['view2'][$ft][] = $d.$t;
+				//$ft=="1" && $t=="0000" ? $jov2['view2']["0"][] = $d."2400" : '';
+			}
+		}
+		 $this->msgbg .= print_r($jov2, true) . $this->eol; // 4devels
+		*/
+
+		$this->joo = json_encode($aro);
+		// $this->msgbg .= $this->joo . $this->eol; // 4devels
+		// $this->msgbg .= print_r($aro, true) . $this->eol; // 4devels
+		$okko = (json_decode($this->joo, true) ? true : false);
+		if (!$okko) {
+			$this->msgbg .= 'ZAR0139D,json 4 duty KO crash' . $this->eol;
+			$this->msgfg .= 'ZAR0139D,json 4 duty KO crash' . $this->eol;
+			$this->error++;
+		}
+		return ;
+	}
+
+
 }

Zotlabs/Module/Article_edit.php

@@ -63,9 +63,9 @@ class Article_edit extends \Zotlabs\Web\Controller {
 
 		if ($catsenabled){
 		        $itm = fetch_post_tags($itm);
-	
+
 	                $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-	
+
 		        foreach ($cats as $cat) {
 		                if (strlen($category))
 		                        $category .= ', ';
@@ -113,6 +113,7 @@ class Article_edit extends \Zotlabs\Web\Controller {
 			'post_id' => $post_id,
 			'visitor' => true,
 			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+			'summary' => htmlspecialchars($itm[0]['summary'],ENT_COMPAT,'UTF-8'),
 			'placeholdertitle' => t('Title (optional)'),
 			'pagetitle' => $card_title,
 			'profile_uid' => (intval($channel['channel_id'])),

Zotlabs/Module/Articles.php

@@ -15,7 +15,7 @@ require_once('include/opengraph.php');
 class Articles extends Controller {
 
 	function init() {
-	
+
 		if(argc() > 1)
 			$which = argv(1);
 
@@ -28,13 +28,13 @@ class Articles extends Controller {
 				return;
 			}
                 }
-	
+
 		profile_load($which);
-	
+
 	}
-	
+
 	function get($update = 0, $load = false) {
-	
+
 		if(observer_prohibited(true)) {
 			return login();
 		}
@@ -56,7 +56,7 @@ class Articles extends Controller {
 
 		nav_set_selected('Articles');
 
-		head_add_link([ 
+		head_add_link([
 			'rel'   => 'alternate',
 			'type'  => 'application/json+oembed',
 			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
@@ -65,7 +65,7 @@ class Articles extends Controller {
 
 
 		$category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : '');
-					
+
 		if($category) {
 			$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $category, TERM_CATEGORY));
 		}
@@ -74,24 +74,24 @@ class Articles extends Controller {
 		$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
 
 		$which = argv(1);
-		
+
 		$selected_card = ((argc() > 2) ? argv(2) : '');
 
 		$_SESSION['return_url'] = App::$query_string;
-	
+
 		$uid      = local_channel();
 		$owner    = App::$profile_uid;
 		$observer = App::get_observer();
-	
+
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-		
+
 		if(! perm_is_allowed($owner,$ob_hash,'view_pages')) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-		
+
 		$is_owner = ($uid && $uid == $owner);
-	
+
 		$channel = channelx_by_n($owner);
 
 		if($channel) {
@@ -105,7 +105,7 @@ class Articles extends Controller {
 		else {
 			$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
 		}
-	
+
 
 
 		if(perm_is_allowed($owner,$ob_hash,'write_pages')) {
@@ -114,16 +114,15 @@ class Articles extends Controller {
 				'webpage'           => ITEM_TYPE_ARTICLE,
 				'is_owner'          => true,
 				'content_label'     => t('Add Article'),
-				'button'            => t('Create'),
+				'button'            => t('Save'),
 				'nickname'          => $channel['channel_address'],
-				'lockstate'         => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] 
+				'lockstate'         => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
 					|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-				'acl'               => (($is_owner) ? populate_acl($channel_acl, false, 
+				'acl'               => (($is_owner) ? populate_acl($channel_acl, false,
 					PermissionDescription::fromGlobalPermission('view_pages')) : ''),
 				'permissions'       => $channel_acl,
 				'showacl'           => (($is_owner) ? true : false),
 				'visitor'           => true,
-				'body'              => '[summary][/summary]',
 				'hide_location'     => false,
 				'hide_voting'       => false,
 				'profile_uid'       => intval($owner),
@@ -147,12 +146,12 @@ class Articles extends Controller {
 		else {
 			$editor = '';
 		}
-		
+
 		$itemspage = get_pconfig(local_channel(),'system','itemspage');
 		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 
-		
+
 		$sql_extra = item_permissions_sql($owner);
 		$sql_item = '';
 
@@ -176,8 +175,8 @@ class Articles extends Controller {
 			$sql_extra2 .= " and item.item_thread_top != 0 ";
 		}
 
-		$r = q("select * from item 
-			where item.uid = %d and item_type = %d 
+		$r = q("select * from item
+			where item.uid = %d and item_type = %d
 			$sql_extra $sql_extra2 $sql_item order by item.created desc $pager_sql",
 			intval($owner),
 			intval(ITEM_TYPE_ARTICLE)
@@ -214,7 +213,7 @@ class Articles extends Controller {
 		opengraph_add_meta((! empty($items) ? $r[0] : []), $channel);
 
 		$mode = 'articles';
-			
+
 		if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))
             $page_mode = 'pager_list';
         else

Zotlabs/Module/Attach.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Zotlabs\Module;
 
 use ZipArchive;
@@ -12,24 +13,24 @@ class Attach extends Controller {
 
 	function post() {
 
-		$attach_ids = ((x($_REQUEST, 'attach_ids')) ? $_REQUEST['attach_ids'] : []);
+		$attach_ids  = ((x($_REQUEST, 'attach_ids')) ? $_REQUEST['attach_ids'] : []);
 		$attach_path = ((x($_REQUEST, 'attach_path')) ? $_REQUEST['attach_path'] : '');
-		$channel_id = ((x($_REQUEST, 'channel_id')) ? intval($_REQUEST['channel_id']) : 0);
-		$channel = channelx_by_n($channel_id);
+		$channel_id  = ((x($_REQUEST, 'channel_id')) ? intval($_REQUEST['channel_id']) : 0);
+		$channel     = channelx_by_n($channel_id);
 
-		if (! $channel) {
+		if (!$channel) {
 			notice(t('Channel not found.') . EOL);
 			return;
 		}
 
-		$strip_str = '/cloud/' . $channel['channel_address'] . '/';
-		$count   = strlen($strip_str);
+		$strip_str   = '/cloud/' . $channel['channel_address'] . '/';
+		$count       = strlen($strip_str);
 		$attach_path = substr($attach_path, $count);
 
 		if ($attach_ids) {
 
 			$zip_dir = 'store/[data]/' . $channel['channel_address'] . '/tmp';
-			if (! is_dir($zip_dir))
+			if (!is_dir($zip_dir))
 				mkdir($zip_dir, STORAGE_DEFAULT_PERMISSIONS, true);
 
 			$token = random_string(32);
@@ -47,14 +48,14 @@ class Attach extends Controller {
 
 				$meta = [
 					'zip_filename' => $zip_filename,
-					'zip_path' => $zip_path
+					'zip_path'     => $zip_path
 				];
 
 				Verify::create('zip_token', 0, $token, json_encode($meta));
 
 				json_return_and_die([
 					'success' => true,
-					'token' => $token
+					'token'   => $token
 				]);
 
 			}
@@ -63,28 +64,28 @@ class Attach extends Controller {
 
 	function get() {
 
-		if(argc() < 2) {
-			notice( t('Item not available.') . EOL);
+		if (argc() < 2) {
+			notice(t('Item not available.') . EOL);
 			return;
 		}
 
 		$token = ((x($_REQUEST, 'token')) ? $_REQUEST['token'] : '');
 
-		if(argv(1) === 'download') {
+		if (argv(1) === 'download') {
 			$meta = Verify::get_meta('zip_token', 0, $token);
 
-			if(! $meta)
+			if (!$meta)
 				killme();
 
 			$meta = json_decode($meta, true);
 
 			header('Content-Type: application/zip');
-			header('Content-Disposition: attachment; filename="'. $meta['zip_filename'] . '"');
+			header('Content-Disposition: attachment; filename="' . $meta['zip_filename'] . '"');
 			header('Content-Length: ' . filesize($meta['zip_path']));
 
 			$istream = fopen($meta['zip_path'], 'rb');
 			$ostream = fopen('php://output', 'wb');
-			if($istream && $ostream) {
+			if ($istream && $ostream) {
 				pipe_streams($istream, $ostream);
 				fclose($istream);
 				fclose($ostream);
@@ -94,10 +95,10 @@ class Attach extends Controller {
 			killme();
 		}
 
-		$r = attach_by_hash(argv(1),get_observer_hash(),((argc() > 2) ? intval(argv(2)) : 0));
+		$r = attach_by_hash(argv(1), get_observer_hash(), ((argc() > 2) ? intval(argv(2)) : 0));
 
-		if(! $r['success']) {
-			notice( $r['message'] . EOL);
+		if (!$r['success']) {
+			notice($r['message'] . EOL);
 			return;
 		}
 
@@ -105,27 +106,27 @@ class Attach extends Controller {
 			intval($r['data']['uid'])
 		);
 
-		if(! $c)
+		if (!$c)
 			return;
 
-		$unsafe_types = array('text/html','text/css','application/javascript');
+		$unsafe_types = array('text/html', 'text/css', 'application/javascript');
 
-		if(in_array($r['data']['filetype'],$unsafe_types) && (! channel_codeallowed($r['data']['uid']))) {
-				header('Content-Type: text/plain');
+		if (in_array($r['data']['filetype'], $unsafe_types) && (!channel_codeallowed($r['data']['uid']))) {
+			header('Content-Type: text/plain');
 		}
 		else {
 			header('Content-Type: ' . $r['data']['filetype']);
 		}
 
 		header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"');
-		if(intval($r['data']['os_storage'])) {
+		if (intval($r['data']['os_storage'])) {
 			$fname = $r['data']['content'];
-			if(strpos($fname,'store') !== false)
-				$istream = fopen($fname,'rb');
+			if (strpos($fname, 'store') !== false)
+				$istream = fopen($fname, 'rb');
 			else
-				$istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname,'rb');
-			$ostream = fopen('php://output','wb');
-			if($istream && $ostream) {
+				$istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname, 'rb');
+			$ostream = fopen('php://output', 'wb');
+			if ($istream && $ostream) {
 				pipe_streams($istream, $ostream);
 				fclose($istream);
 				fclose($ostream);
@@ -140,14 +141,14 @@ class Attach extends Controller {
 	public function zip_archive_handler($zip, $attach_ids, $attach_path, $pass = 1) {
 
 		$observer_hash = get_observer_hash();
-		$single = ((count($attach_ids) == 1) ? true : false);
+		$single        = ((count($attach_ids) == 1) ? true : false);
 		$download_name = 'download.zip';
 
-		foreach($attach_ids as $attach_id) {
+		foreach ($attach_ids as $attach_id) {
 
 			$r = attach_by_id($attach_id, $observer_hash);
 
-			if (! $r['success']) {
+			if (!$r['success']) {
 				continue;
 			}
 
@@ -158,8 +159,8 @@ class Attach extends Controller {
 
 			if ($attach_path) {
 				$strip_str = $attach_path . '/';
-				$count   = strlen($strip_str);
-				$zip_path = substr($r['data']['display_path'], $count);
+				$count     = strlen($strip_str);
+				$zip_path  = substr($r['data']['display_path'], $count);
 			}
 
 			if ($r['data']['is_dir']) {

Zotlabs/Module/Bookmarks.php

@@ -16,8 +16,8 @@ class Bookmarks extends \Zotlabs\Web\Controller {
 
 		nav_set_selected('Bookmarks');
 
-		$item_id = intval($_REQUEST['item']);
-		$burl = trim($_REQUEST['burl']);
+		$item_id = (isset($_REQUEST['item']) ? $_REQUEST['item'] : false);
+		$burl    = (isset($_REQUEST['burl']) ? trim($_REQUEST['burl']) : '');
 	
 		if(! $item_id)
 			return;
@@ -38,7 +38,7 @@ class Bookmarks extends \Zotlabs\Web\Controller {
 	
 		$item = $i[0];
 	
-		$terms = get_terms_oftype($item['term'],TERM_BOOKMARK);
+		$terms = (x($item, 'term') ? get_terms_oftype($item['term'],TERM_BOOKMARK) : false);
 	
 		if($terms) {
 			require_once('include/bookmarks.php');

Zotlabs/Module/Cal.php

@@ -19,47 +19,45 @@ class Cal extends Controller {
 		if(observer_prohibited()) {
 			return;
 		}
-	
+
 		if(argc() > 1) {
 			$nick = argv(1);
-	
+
 			profile_load($nick);
-	
+
 			$channelx = channelx_by_nick($nick);
-	
+
 			if(! $channelx) {
 				notice( t('Channel not found.') . EOL);
 				return;
 			}
-	
+
 			App::$data['channel'] = $channelx;
-	
+
 			$observer = App::get_observer();
 			App::$data['observer'] = $observer;
-	
-			$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 			head_set_icon(App::$data['channel']['xchan_photo_s']);
-	
+
 			App::$page['htmlhead'] .= "<script> var profile_uid = " . ((App::$data['channel']) ? App::$data['channel']['channel_id'] : 0) . "; </script>" ;
-	
+
 		}
-	
+
 		return;
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
+
 		if(observer_prohibited()) {
 			return;
 		}
-		
+
 		$channel = App::$data['channel'];
 
 		// since we don't currently have an event permission - use the stream permission
-	
+
 		if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) {
 			notice( t('Permissions denied.') . EOL);
 			return;
@@ -78,10 +76,10 @@ class Cal extends Controller {
 
 		if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts') || App::$profile['hide_friends'])
 			$sql_extra .= " and etype != 'birthday' ";
-	
+
 		$first_day = feature_enabled($channel['channel_id'], 'cal_first_day');
 		$first_day = (($first_day) ? $first_day : 0);
-	
+
 		$start = '';
 		$finish = '';
 
@@ -89,7 +87,7 @@ class Cal extends Controller {
 			if (x($_GET,'start'))	$start = $_GET['start'];
 			if (x($_GET,'end'))	$finish = $_GET['end'];
 		}
-	
+
 		$start  = datetime_convert('UTC','UTC',$start);
 		$finish = datetime_convert('UTC','UTC',$finish);
 		$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
@@ -109,10 +107,10 @@ class Cal extends Controller {
 			// Noting this for now - it will need to be fixed here and in Friendica.
 			// Ultimately the finish date shouldn't be involved in the query.
 			$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-				from event left join item on event.event_hash = item.resource_id 
-				where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid 
-				AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
-				OR (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) 
+				from event left join item on event.event_hash = item.resource_id
+				where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid
+				AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )
+				OR (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ))
 				$sql_extra",
 				intval($channel['channel_id']),
 				dbesc($start),
@@ -121,7 +119,7 @@ class Cal extends Controller {
 				dbesc($adjust_finish)
 			);
 		}
-	
+
 		if($r) {
 			xchan_query($r);
 			$r = fetch_post_tags($r,true);
@@ -129,20 +127,16 @@ class Cal extends Controller {
 		}
 
 		$events = [];
-	
+
 		if($r) {
 
 			foreach($r as $rr) {
 
-				$tz = get_iconfig($rr, 'event', 'timezone');
-				if(! $tz)
-					$tz = 'UTC';
-
-				$start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
+				$start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
 				if ($rr['nofinish']){
 					$end = null;
 				} else {
-					$end = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
+					$end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
 				}
 
 				$html = '';
@@ -151,6 +145,10 @@ class Cal extends Controller {
 					$html = format_event_html($rr);
 				}
 
+				$tz = get_iconfig($rr, 'event', 'timezone');
+				if(! $tz)
+					$tz = 'UTC';
+
 				$events[] = array(
 					'calendar_id' => 'channel_calendar',
 					'rw' => true,
@@ -159,10 +157,10 @@ class Cal extends Controller {
 					'timezone' => $tz,
 					'start'=> $start,
 					'end' => $end,
-					'drop' => $drop,
+					'drop' => false,
 					'allDay' => (($rr['adjust']) ? 0 : 1),
 					'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
-					'editable' => $edit ? true : false,
+					'editable' => false,
 					'item' => $rr,
 					'plink' => [$rr['plink'], t('Link to source')],
 					'description' => html_entity_decode($rr['description'], ENT_COMPAT, 'UTF-8'),
@@ -180,7 +178,7 @@ class Cal extends Controller {
 			echo json_encode($events);
 			killme();
 		}
-			
+
 		if (x($_GET,'id')) {
 			$o = replace_macros(get_markup_template("cal_event.tpl"), [
 				'$events' => $events
@@ -205,14 +203,14 @@ class Cal extends Controller {
 			'$prev'	=> t('Previous'),
 			'$next'	=> t('Next'),
 			'$today' => t('Today'),
-			'$title' => $title,
-			'$dtstart' => $dtstart,
-			'$dtend' => $dtend,
+			'$title' => '',
+			'$dtstart' => '',
+			'$dtend' => '',
 			'$nick' => $nick
 		]);
 
 		return $o;
-	
+
 	}
-	
+
 }

Zotlabs/Module/Card_edit.php

@@ -63,9 +63,9 @@ class Card_edit extends \Zotlabs\Web\Controller {
 
 		if ($catsenabled){
 		        $itm = fetch_post_tags($itm);
-	
+
 	                $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-	
+
 		        foreach ($cats as $cat) {
 		                if (strlen($category))
 		                        $category .= ', ';
@@ -114,6 +114,7 @@ class Card_edit extends \Zotlabs\Web\Controller {
 			'post_id' => $post_id,
 			'visitor' => true,
 			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+			'summary' => htmlspecialchars($itm[0]['summary'],ENT_COMPAT,'UTF-8'),
 			'placeholdertitle' => t('Title (optional)'),
 			'pagetitle' => $card_title,
 			'profile_uid' => (intval($channel['channel_id'])),

Zotlabs/Module/Cards.php

@@ -110,7 +110,7 @@ class Cards extends Controller {
 				'webpage'           => ITEM_TYPE_CARD,
 				'is_owner'          => true,
 				'content_label'     => t('Add Card'),
-				'button'            => t('Create'),
+				'button'            => t('Save'),
 				'nickname'          => $channel['channel_address'],
 				'lockstate'         => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
 					|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),

Zotlabs/Module/Cdav.php

@@ -135,7 +135,7 @@ class Cdav extends Controller {
 			$auth = new \Zotlabs\Storage\BasicAuth();
 			$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'CalDAV/CardDAV');
 
-			if (local_channel()) {
+			if(local_channel()) {
 
 				logger('loggedin');
 
@@ -153,9 +153,9 @@ class Cdav extends Controller {
 				$auth->observer = $channel['channel_hash'];
 
 				$principalUri = 'principals/' . $channel['channel_address'];
-				if(!cdav_principal($principalUri)) {
+				if(! cdav_principal($principalUri)) {
 					$this->activate($pdo, $channel);
-					if(!cdav_principal($principalUri)) {
+					if(! cdav_principal($principalUri)) {
 						return;
 					}
 				}
@@ -168,21 +168,24 @@ class Cdav extends Controller {
 
 			if($httpmethod === 'PUT' || $httpmethod === 'DELETE') {
 
+				$channel = channelx_by_nick(argv(2));
+				$principalUri = 'principals/' . $channel['channel_address'];
 				$httpuri = $_SERVER['REQUEST_URI'];
 
 				logger("debug: method: " . $httpmethod, LOGGER_DEBUG);
 				logger("debug: uri: " . $httpuri, LOGGER_DEBUG);
 
-				if(strpos($httpuri, 'cdav/addressbooks')) {
+				if(strpos($httpuri, 'cdav/addressbooks') !== false) {
 					$sync = 'addressbook';
 					$cdavtable = 'addressbooks';
 				}
-				elseif(strpos($httpuri, 'cdav/calendars')) {
+				elseif(strpos($httpuri, 'cdav/calendars') !== false) {
 					$sync = 'calendar';
 					$cdavtable = 'calendarinstances';
 				}
-				else
+				else {
 					$sync = false;
+				}
 
 				if($sync) {
 
@@ -191,14 +194,13 @@ class Cdav extends Controller {
 
 					logger("debug: body: " . $httpbody, LOGGER_DEBUG);
 
-					if($x = get_cdav_id($principalUri, explode("/", $httpuri)[4], $cdavtable)) {
+					if($x = get_cdav_id($principalUri, argv(3), $cdavtable)) {
 
 						$cdavdata = $this->get_cdav_data($x['id'], $cdavtable);
-
 						$etag = (isset($_SERVER['HTTP_IF_MATCH']) ? $_SERVER['HTTP_IF_MATCH'] : false);
 
 						// delete
-						if($httpmethod === 'DELETE' && $cdavdata['etag'] == $etag)
+						if($httpmethod === 'DELETE' && $cdavdata['etag'] == $etag) {
 							Libsync::build_sync_packet($channel['channel_id'], [
 								$sync => [
 									'action' => 'delete_card',
@@ -206,18 +208,18 @@ class Cdav extends Controller {
 									'carduri' => $uri
 								]
 							]);
+						}
 						else {
-							if($etag) {
+							if($etag && $cdavdata['etag'] !== $etag) {
 								// update
-								if($cdavdata['etag'] !== $etag)
-								    Libsync::build_sync_packet($channel['channel_id'], [
-									    $sync => [
-										    'action' => 'update_card',
-										    'uri' => $cdavdata['uri'],
-										    'carduri' => $uri,
-										    'card' => $httpbody
-									    ]
-								    ]);
+								Libsync::build_sync_packet($channel['channel_id'], [
+									$sync => [
+										'action' => 'update_card',
+										'uri' => $cdavdata['uri'],
+										'carduri' => $uri,
+										'card' => $httpbody
+									]
+								]);
 							}
 							else {
 								// new
@@ -235,7 +237,6 @@ class Cdav extends Controller {
 				}
 			}
 
-
 			$principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo);
 			$carddavBackend   = new \Sabre\CardDAV\Backend\PDO($pdo);
 			$caldavBackend    = new \Sabre\CalDAV\Backend\PDO($pdo);
@@ -268,7 +269,7 @@ class Cdav extends Controller {
 
 			// Plugins
 			$server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth));
-			//$server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+			// $server->addPlugin(new \Sabre\DAV\Browser\Plugin());
 			$server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 			$server->addPlugin(new \Sabre\DAV\Sharing\Plugin());
 			$server->addPlugin(new \Sabre\DAVACL\Plugin());
@@ -276,7 +277,7 @@ class Cdav extends Controller {
 			// CalDAV plugins
 			$server->addPlugin(new \Sabre\CalDAV\Plugin());
 			$server->addPlugin(new \Sabre\CalDAV\SharingPlugin());
-			//$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
+			// $server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
 			$server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
 
 			// CardDAV plugins
@@ -284,7 +285,7 @@ class Cdav extends Controller {
 			$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
 
 			// And off we go!
-			$server->exec();
+			$server->start();
 
 			killme();
 

Zotlabs/Module/Channel.php

@@ -4,10 +4,13 @@ namespace Zotlabs\Module;
 
 
 use App;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\PermissionDescription;
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Lib\Activity;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\Crypto;
 use Zotlabs\Lib\Libzot;
+use Zotlabs\Lib\PermissionDescription;
+use Zotlabs\Web\Controller;
+use Zotlabs\Web\HTTPSig;
 
 require_once('include/items.php');
 require_once('include/security.php');
@@ -20,88 +23,117 @@ require_once('include/opengraph.php');
  * @brief Channel Controller
  *
  */
-
 class Channel extends Controller {
 
 	function init() {
 
-		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))	
-			goaway('search' . '?f=&search=' . $_GET['search']);
+		if (array_key_exists('search', $_GET) && (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0))
+			goaway(z_root() . '/search?f=&search=' . $_GET['search']);
 
 		$which = null;
-		if(argc() > 1)
+		if (argc() > 1)
 			$which = argv(1);
-		if(! $which) {
-			if(local_channel()) {
+		if (!$which) {
+			if (local_channel()) {
 				$channel = App::get_channel();
-				if($channel && $channel['channel_address'])
-				$which = $channel['channel_address'];
+				if ($channel && $channel['channel_address'])
+					$which = $channel['channel_address'];
 			}
 		}
-		if(! $which) {
-			notice( t('You must be logged in to see this page.') . EOL );
+		if (!$which) {
+			notice(t('You must be logged in to see this page.') . EOL);
 			return;
 		}
 
 		$profile = 0;
 		$channel = App::get_channel();
 
-		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-			$which = $channel['channel_address'];
+		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$which   = $channel['channel_address'];
 			$profile = argv(1);
 		}
 
 		$channel = channelx_by_nick($which);
-		if(! $channel) {
+		if (!$channel) {
 			http_status_exit(404, 'Not found');
 		}
 
-		// handle zot6 channel discovery 
+		// handle zot6 channel discovery
+
+		if (Libzot::is_zot_request()) {
 
-		if(Libzot::is_zot_request()) {
-	
 			$sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
 
-			if($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
-				$data = json_encode(Libzot::zotinfo([ 'address' => $channel['channel_address'], 'target_url' => $sigdata['signer'] ]));
-				$s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
+			if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
+				$data = json_encode(Libzot::zotinfo(['address' => $channel['channel_address'], 'target_url' => $sigdata['signer']]));
+				$s    = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
 					dbesc($sigdata['signer'])
 				);
 
-				if($s) {
-					$data = json_encode(crypto_encapsulate($data,$s[0]['hubloc_sitekey'],Libzot::best_algorithm($s[0]['site_crypto'])));
+				if ($s) {
+					$data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto'])));
 				}
 			}
 			else {
-				$data = json_encode(Libzot::zotinfo([ 'address' => $channel['channel_address'] ]));
+				$data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']]));
 			}
 
-			$headers = [ 
-				'Content-Type'     => 'application/x-zot+json', 
+			$headers = [
+				'Content-Type'     => 'application/x-zot+json',
 				'Digest'           => HTTPSig::generate_digest_header($data),
 				'(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
-			 ];
-			$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel));
+			];
+			$h       = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel));
 			HTTPSig::set_headers($h);
 			echo $data;
 			killme();
 		}
 
+		if (ActivityStreams::is_as_request($channel)) {
 
-		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-			$which = $channel['channel_address'];
+			// Somebody may attempt an ActivityStreams fetch on one of our message permalinks
+			// Make it do the right thing.
+
+			$mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
+			if ($mid && strpos($mid, 'b64.') === 0) {
+				$decoded = @base64url_decode(substr($mid, 4));
+				if ($decoded) {
+					$mid = $decoded;
+				}
+			}
+			if ($mid) {
+				$obj = null;
+				if (strpos($mid, z_root() . '/item/') === 0) {
+					App::$argc = 2;
+					App::$argv = ['item', basename($mid)];
+					$obj       = new Item();
+				}
+				if (strpos($mid, z_root() . '/activity/') === 0) {
+					App::$argc = 2;
+					App::$argv = ['activity', basename($mid)];
+					$obj       = new Activity();
+				}
+				if ($obj) {
+					$obj->init();
+				}
+			}
+			as_return_and_die(Activity::encode_person($channel, true), $channel);
+		}
+
+		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$which   = $channel['channel_address'];
 			$profile = argv(1);
 		}
 
-		head_add_link( [ 
-			'rel'   => 'alternate', 
+		head_add_link([
+			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Posts and comments'),
 			'href'  => z_root() . '/feed/' . $which
 		]);
 
-		head_add_link( [ 
-			'rel'   => 'alternate', 
+		head_add_link([
+			'rel'   => 'alternate',
 			'type'  => 'application/atom+xml',
 			'title' => t('Only posts'),
 			'href'  => z_root() . '/feed/' . $which . '?f=&top=1'
@@ -110,20 +142,20 @@ class Channel extends Controller {
 
 		// Run profile_load() here to make sure the theme is set before
 		// we start loading content
-		profile_load($which,$profile);
-		
+		profile_load($which, $profile);
+
 		// Add Opengraph markup
-		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
-		if(strpos($mid,'b64.') === 0)
-		    $mid = @base64url_decode(substr($mid,4));
-		    
-		if($mid)
-		    $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
-		        dbesc($mid),
-		        intval($channel['channel_id'])
-		    );
-		    
-		opengraph_add_meta($r ? $r[0] : [], $channel);
+		$mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
+		if (strpos($mid, 'b64.') === 0)
+			$mid = @base64url_decode(substr($mid, 4));
+
+		if ($mid)
+			$r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
+				dbesc($mid),
+				intval($channel['channel_id'])
+			);
+
+		opengraph_add_meta((isset($r) && count($r) ? $r[0] : []), $channel);
 	}
 
 	function get($update = 0, $load = false) {
@@ -132,99 +164,99 @@ class Channel extends Controller {
 
 		$category = $datequery = $datequery2 = '';
 
-		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
+		$mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
 
-		if(strpos($mid,'b64.') === 0)
-			$decoded = @base64url_decode(substr($mid,4));
-		if($decoded)
+		if (strpos($mid, 'b64.') === 0)
+			$decoded = @base64url_decode(substr($mid, 4));
+		if (isset($decoded))
 			$mid = $decoded;
 
-		$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
-		$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
+		$datequery  = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
+		$datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
 
-		if(observer_prohibited(true)) {
+		if (observer_prohibited(true)) {
 			return login();
 		}
 
-		$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
-		$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
-		$order    = ((x($_GET,'order')) ? notags($_GET['order']) : 'post');
-		$search   = ((x($_GET,'search')) ? $_GET['search'] : EMPTY_STR);
+		$category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : '');
+		$hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : '');
+		$order    = ((x($_GET, 'order')) ? notags($_GET['order']) : 'post');
+		$search   = ((x($_GET, 'search')) ? $_GET['search'] : EMPTY_STR);
 
-		$groups = array();
+		$groups = [];
 
 		$o = '';
 
-		if($update) {
+		if ($update) {
 			// Ensure we've got a profile owner if updating.
 			App::$profile['profile_uid'] = App::$profile_uid = $update;
 		}
 
 		$is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
 
-		$channel = App::get_channel();
+		$channel  = App::get_channel();
 		$observer = App::get_observer();
-		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+		$ob_hash  = (($observer) ? $observer['xchan_hash'] : '');
 
-		$perms = get_all_perms(App::$profile['profile_uid'],$ob_hash);
+		$perms = get_all_perms(App::$profile['profile_uid'], $ob_hash);
 
-		if(! $perms['view_stream']) {
+		if (!$perms['view_stream']) {
 			// We may want to make the target of this redirect configurable
-			if($perms['view_profile']) {
-				notice( t('Insufficient permissions.  Request redirected to profile page.') . EOL);
-				goaway (z_root() . "/profile/" . App::$profile['channel_address']);
+			if ($perms['view_profile']) {
+				notice(t('Insufficient permissions.  Request redirected to profile page.') . EOL);
+				goaway(z_root() . "/profile/" . App::$profile['channel_address']);
 			}
-			notice( t('Permission denied.') . EOL);
+			notice(t('Permission denied.') . EOL);
 			return;
 		}
 
 
-		if(! $update) {
+		if (!$update) {
 
 			nav_set_selected('Channel Home');
 
 			// search terms header
-			if($search) {
-				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-					'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8')
-				));
+			if ($search) {
+				$o .= replace_macros(get_markup_template("section_title.tpl"), [
+					'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')
+				]);
 			}
 
-			if($channel && $is_owner) {
-				$channel_acl = array(
+			if ($channel && $is_owner) {
+				$channel_acl = [
 					'allow_cid' => $channel['channel_allow_cid'],
 					'allow_gid' => $channel['channel_allow_gid'],
-					'deny_cid' => $channel['channel_deny_cid'],
-					'deny_gid' => $channel['channel_deny_gid']
-				);
+					'deny_cid'  => $channel['channel_deny_cid'],
+					'deny_gid'  => $channel['channel_deny_gid']
+				];
 			}
 			else {
-				$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
+				$channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
 			}
 
 
-			if($perms['post_wall']) {
+			if ($perms['post_wall']) {
 
-				$x = array(
-					'is_owner' => $is_owner,
-					'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
-					'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''),
-					'nickname' => App::$profile['channel_address'],
-					'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-					'acl' => (($is_owner) ? populate_acl($channel_acl,true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
-					'permissions' => $channel_acl,
-					'showacl' => (($is_owner) ? 'yes' : ''),
-					'bang' => '',
-					'visitor' => (($is_owner || $observer) ? true : false),
-					'profile_uid' => App::$profile['profile_uid'],
+				$x = [
+					'is_owner'            => $is_owner,
+					'allow_location'      => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'], 'system', 'use_browser_location')))) ? true : false),
+					'default_location'    => (($is_owner) ? App::$profile['channel_location'] : ''),
+					'nickname'            => App::$profile['channel_address'],
+					'lockstate'           => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
+					'acl'                 => (($is_owner) ? populate_acl($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
+					'permissions'         => $channel_acl,
+					'showacl'             => (($is_owner) ? 'yes' : ''),
+					'bang'                => '',
+					'visitor'             => (($is_owner || $observer) ? true : false),
+					'profile_uid'         => App::$profile['profile_uid'],
 					'editor_autocomplete' => true,
-					'bbco_autocomplete' => 'bbcode',
-					'bbcode' => true,
-					'jotnets' => true,
-					'reset' => t('Reset form')
-				);
+					'bbco_autocomplete'   => 'bbcode',
+					'bbcode'              => true,
+					'jotnets'             => true,
+					'reset'               => t('Reset form')
+				];
 
-				$o .= status_editor($a,$x,false,'Channel');
+				$o .= status_editor($a, $x, false, 'Channel');
 			}
 
 		}
@@ -233,16 +265,16 @@ class Channel extends Controller {
 		/**
 		 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 		 */
-		 
-		 $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
+
+		$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
 		    and item.item_unpublished = 0 and item.item_pending_remove = 0
 		    and item.item_blocked = 0 ";
-		 if (! $is_owner)
-		    $item_normal .= "and item.item_delayed = 0 ";
+		if (!$is_owner)
+			$item_normal .= "and item.item_delayed = 0 ";
 		$item_normal_update = item_normal_update();
-		$sql_extra = item_permissions_sql(App::$profile['profile_uid']);
+		$sql_extra          = item_permissions_sql(App::$profile['profile_uid']);
 
-		if(feature_enabled(App::$profile['profile_uid'], 'channel_list_mode') && (! $mid))
+		if (feature_enabled(App::$profile['profile_uid'], 'channel_list_mode') && (!$mid))
 			$page_mode = 'list';
 		else
 			$page_mode = 'client';
@@ -250,13 +282,13 @@ class Channel extends Controller {
 		$abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
 
 		$simple_update = '';
-		if($update && $_SESSION['loadtime'])
-			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
+		if ($update && $_SESSION['loadtime'])
+			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime']) . "' ) ";
 
-		if($search) {
+		if ($search) {
 			$search = escape_tags($search);
-			if(strpos($search,'#') === 0) {
-				$sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG);
+			if (strpos($search, '#') === 0) {
+				$sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
 			}
 			else {
 				$sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ",
@@ -266,19 +298,19 @@ class Channel extends Controller {
 			}
 		}
 
-		head_add_link([ 
+		head_add_link([
 			'rel'   => 'alternate',
 			'type'  => 'application/json+oembed',
 			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
 			'title' => 'oembed'
 		]);
 
-		if(($update) && (! $load)) {
+		if (($update) && (!$load)) {
 
-			if($mid) {
-				$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal_update
+			if ($mid) {
+				$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $item_normal_update
 					AND item_wall = 1 $simple_update $sql_extra limit 1",
-					dbesc($mid . '%'),
+					dbesc($mid),
 					intval(App::$profile['profile_uid'])
 				);
 			}
@@ -296,61 +328,62 @@ class Channel extends Controller {
 		}
 		else {
 
-			if(x($category)) {
-				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $category, TERM_CATEGORY));
+			$sql_extra2 = '';
+			if (x($category)) {
+				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
 			}
-			if(x($hashtags)) {
-				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+			if (x($hashtags)) {
+				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
 			}
 
-			if($datequery) {
-				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-				$order = 'post';
+			if ($datequery) {
+				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
+				$order      = 'post';
 			}
-			if($datequery2) {
-				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+			if ($datequery2) {
+				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
 			}
 
-			if($order === 'post')
+			if ($order === 'post')
 				$ordering = "created";
 			else
 				$ordering = "commented";
 
 
-			$itemspage = get_pconfig(local_channel(),'system','itemspage');
+			$itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
 			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 
-			if($noscript_content || $load) {
-				if($mid) {
-					$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
+			if ($noscript_content || $load) {
+				if ($mid) {
+					$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $item_normal
 						AND item_wall = 1 $sql_extra limit 1",
-						dbesc($mid . '%'),
+						dbesc($mid),
 						intval(App::$profile['profile_uid'])
 					);
-					if (! $r) {
-						notice( t('Permission denied.') . EOL);
+					if (!$r) {
+						notice(t('Permission denied.') . EOL);
 					}
 				}
 				else {
-					$r = q("SELECT DISTINCT item.parent AS item_id, $ordering FROM item 
+					$r = q("SELECT DISTINCT item.parent AS item_id, $ordering FROM item
 						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
 						WHERE true and item.uid = %d $item_normal
 						AND (abook.abook_blocked = 0 or abook.abook_flags is null)
 						AND item.item_wall = 1 AND item.item_thread_top = 1
-						$sql_extra $sql_extra2 
+						$sql_extra $sql_extra2
 						ORDER BY $ordering DESC, item_id $pager_sql ",
 						intval(App::$profile['profile_uid'])
 					);
 				}
 			}
 			else {
-				$r = array();
+				$r = [];
 			}
 		}
-		if($r) {
+		if ($r) {
 
-			$parents_str = ids_to_querystr($r,'item_id');
+			$parents_str = ids_to_querystr($r, 'item_id');
 
 			$r = q("SELECT item.*, item.id AS item_id
 				FROM item
@@ -363,28 +396,38 @@ class Channel extends Controller {
 
 			xchan_query($r);
 			$items = fetch_post_tags($r, true);
-			$items = conv_sort($items,$ordering);
+			$items = conv_sort($items, $ordering);
 
-			if($load && $mid && (! count($items))) {
+			if ($load && $mid && (!count($items))) {
 				// This will happen if we don't have sufficient permissions
 				// to view the parent item (or the item itself if it is toplevel)
-				notice( t('Permission denied.') . EOL);
+				notice(t('Permission denied.') . EOL);
 			}
 
-		} else {
-			$items = array();
+		}
+		else {
+			$items = [];
 		}
 
-		if((! $update) && (! $load)) {
+		// Add pinned content
+		if (!x($_REQUEST, 'mid') && !$search) {
+			$pinned = new \Zotlabs\Widget\Pinned;
+			$r      = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
+			$o      .= $r['html'];
+		}
 
-			if($decoded)
+		$mode = (($search) ? 'search' : 'channel');
+
+		if ((!$update) && (!$load)) {
+
+			if (isset($decoded))
 				$mid = 'b64.' . base64url_encode($mid);
 
 			// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
 			// because browser prefetching might change it on us. We have to deliver it with the page.
 
-			$maxheight = get_pconfig(App::$profile['profile_uid'],'system','channel_divmore_height');
-			if(! $maxheight)
+			$maxheight = get_pconfig(App::$profile['profile_uid'], 'system', 'channel_divmore_height');
+			if (!$maxheight)
 				$maxheight = 400;
 
 			$o .= '<div id="live-channel"></div>' . "\r\n";
@@ -392,57 +435,48 @@ class Channel extends Controller {
 				. "; var netargs = '?f='; var profile_page = " . App::$pager['page']
 				. "; divmore_height = " . intval($maxheight) . ";</script>\r\n";
 
-			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
-				'$baseurl' => z_root(),
-				'$pgtype' => 'channel',
-				'$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
-				'$gid' => '0',
-				'$cid' => '0',
-				'$cmin' => '(-1)',
-				'$cmax' => '(-1)',
-				'$star' => '0',
-				'$liked' => '0',
-				'$conv' => '0',
-				'$spam' => '0',
-				'$nouveau' => '0',
-				'$wall' => '1',
-				'$fh' => '0',
-				'$dm' => '0',
-				'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-				'$search' => $search,
-				'$xchan' => '',
-				'$order' => (($order) ? urlencode($order) : ''),
-				'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
-				'$file' => '',
-				'$cats' => (($category) ? urlencode($category) : ''),
-				'$tags' => (($hashtags) ? urlencode($hashtags) : ''),
-				'$mid' => (($mid) ? urlencode($mid) : ''),
-				'$verb' => '',
-				'$net' => '',
-				'$dend' => $datequery,
-				'$dbegin' => $datequery2,
-				'$conv_mode' => 'channel'
-			));
-
+			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"), [
+				'$baseurl'   => z_root(),
+				'$pgtype'    => 'channel',
+				'$uid'       => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
+				'$gid'       => '0',
+				'$cid'       => '0',
+				'$cmin'      => '(-1)',
+				'$cmax'      => '(-1)',
+				'$star'      => '0',
+				'$liked'     => '0',
+				'$conv'      => '0',
+				'$spam'      => '0',
+				'$nouveau'   => '0',
+				'$wall'      => '1',
+				'$fh'        => '0',
+				'$dm'        => '0',
+				'$page'      => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+				'$search'    => $search,
+				'$xchan'     => '',
+				'$order'     => (($order) ? urlencode($order) : ''),
+				'$list'      => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+				'$file'      => '',
+				'$cats'      => (($category) ? urlencode($category) : ''),
+				'$tags'      => (($hashtags) ? urlencode($hashtags) : ''),
+				'$mid'       => (($mid) ? urlencode($mid) : ''),
+				'$verb'      => '',
+				'$net'       => '',
+				'$dend'      => $datequery,
+				'$dbegin'    => $datequery2,
+				'$conv_mode' => 'channel',
+				'$page_mode' => $page_mode
+			]);
 		}
 
-		// Add pinned content
-		if(! x($_REQUEST,'mid') && ! $search) {
-			$pinned = new \Zotlabs\Widget\Pinned;
-			$r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
-			$o .= $r['html'];
-		}
-
-		$mode = (($search) ? 'search' : 'channel');
-
-		if($update) {
-			$o .= conversation($items,$mode,$update,$page_mode);
+		if ($update) {
+			$o .= conversation($items, $mode, $update, $page_mode);
 		}
 		else {
 
 			$o .= '<noscript>';
-			if($noscript_content) {
-				$o .= conversation($items,$mode,$update,'traditional');
+			if ($noscript_content) {
+				$o .= conversation($items, $mode, $update, 'traditional');
 				$o .= alt_pager(count($items));
 			}
 			else {
@@ -450,14 +484,14 @@ class Channel extends Controller {
 			}
 			$o .= '</noscript>';
 
-			$o .= conversation($items,$mode,$update,$page_mode);
+			$o .= conversation($items, $mode, $update, $page_mode);
 
-			if ($mid && $items[0]['title'])
+			if ($mid && count($items) > 0 && isset($items[0]['title']))
 				App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
 
 		}
 
-		if($mid)
+		if ($mid)
 			$o .= '<div id="content-complete"></div>';
 
 		$_SESSION['loadtime'] = datetime_convert();

Zotlabs/Module/Channel_calendar.php

@@ -1,7 +1,12 @@
 <?php
+
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Web\Controller;
 use Zotlabs\Lib\Libsync;
+use Zotlabs\Access\AccessList;
+use Zotlabs\Daemon\Master;
 
 require_once('include/conversation.php');
 require_once('include/bbcode.php');
@@ -10,37 +15,37 @@ require_once('include/event.php');
 require_once('include/items.php');
 require_once('include/html2plain.php');
 
-class Channel_calendar extends \Zotlabs\Web\Controller {
+class Channel_calendar extends Controller {
 
 	function post() {
-	
-		logger('post: ' . print_r($_REQUEST,true), LOGGER_DATA);
-	
-		if(! local_channel())
-			return;
 
-		$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
-		$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
-	
-		$xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : '');
+		logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
+
 		$uid = local_channel();
 
+		if (!$uid)
+			return;
+
+		$event_id = ((x($_POST, 'event_id')) ? intval($_POST['event_id']) : 0);
+
+		$xchan = ((x($_POST, 'xchan')) ? dbesc($_POST['xchan']) : '');
+
 		// only allow editing your own events. 
-		if(($xchan) && ($xchan !== get_observer_hash()))
+		if (($xchan) && ($xchan !== get_observer_hash()))
 			return;
 
 		$categories = escape_tags(trim($_POST['categories']));
-		
+
 		// allday events have adjust = 0, normal events have adjust = 1
 		$adjust = intval($_POST['adjust']);
 
-		$start = datetime_convert((($adjust) ? $tz : 'UTC'), 'UTC', escape_tags($_REQUEST['dtstart']));
+		$timezone = ((x($_POST, 'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
+		$tz       = (($timezone) ? $timezone : date_default_timezone_get());
+
+		$start  = datetime_convert((($adjust) ? $tz : 'UTC'), 'UTC', escape_tags($_REQUEST['dtstart']));
 		$finish = datetime_convert((($adjust) ? $tz : 'UTC'), 'UTC', escape_tags($_REQUEST['dtend']));
 
-		$timezone = ((x($_POST,'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
-		$tz = (($timezone) ? $timezone : date_default_timezone_get());
-
-		if(! $adjust)
+		if (!$adjust)
 			$tz = 'UTC';
 
 		$summary  = escape_tags(trim($_POST['summary']));
@@ -52,88 +57,86 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 		// It won't hurt anything, but somebody will file a bug report
 		// and we'll waste a bunch of time responding to it. Time that 
 		// could've been spent doing something else. 
-	
-		if(strcmp($finish,$start) < 0 && !$nofinish) {
-			notice( t('Event can not end before it has started.') . EOL);
-			if(intval($_REQUEST['preview'])) {
-				echo( t('Unable to generate preview.'));
-			}
-			killme();
-		}
-	
-		if((! $summary) || (! $start)) {
-			notice( t('Event title and start time are required.') . EOL);
-			if(intval($_REQUEST['preview'])) {
-				echo( t('Unable to generate preview.'));
+
+		if (strcmp($finish, $start) < 0) {
+			notice(t('Event can not end before it has started.') . EOL);
+			if (intval($_REQUEST['preview'])) {
+				echo(t('Unable to generate preview.'));
 			}
 			killme();
 		}
 
-		$channel = \App::get_channel();
-	
-		$acl = new \Zotlabs\Access\AccessList(false);
-	
-		if($event_id) {
+		if ((!$summary) || (!$start)) {
+			notice(t('Event title and start time are required.') . EOL);
+			if (intval($_REQUEST['preview'])) {
+				echo(t('Unable to generate preview.'));
+			}
+			killme();
+		}
+
+		$acl = new AccessList([]);
+
+		if ($event_id) {
 			$x = q("select * from event where id = %d and uid = %d limit 1",
 				intval($event_id),
-				intval(local_channel())
+				intval($uid)
 			);
-			if(! $x) {
-				notice( t('Event not found.') . EOL);
-				if(intval($_REQUEST['preview'])) {
-					echo( t('Unable to generate preview.'));
+			if (!$x) {
+				notice(t('Event not found.') . EOL);
+				if (intval($_REQUEST['preview'])) {
+					echo(t('Unable to generate preview.'));
 					killme();
 				}
 				return;
 			}
-	
+
 			$acl->set($x[0]);
-	
+
 			$created = $x[0]['created'];
-			$edited = datetime_convert();
+			$edited  = datetime_convert();
 		}
 		else {
 			$created = $edited = datetime_convert();
 			$acl->set_from_array($_POST);
 		}
-	
+
 		$post_tags = array();
-		$channel = \App::get_channel();
-		$ac = $acl->get();
+		$channel   = App::get_channel();
+		$ac        = $acl->get();
 
 		$str_contact_allow = $ac['allow_cid'];
 		$str_group_allow   = $ac['allow_gid'];
-		$str_contact_deny = $ac['deny_cid'];
-		$str_group_deny = $ac['deny_gid'];
+		$str_contact_deny  = $ac['deny_cid'];
+		$str_group_deny    = $ac['deny_gid'];
 
 		$private = $acl->is_private();
 
 		require_once('include/text.php');
-		$results = linkify_tags($desc, local_channel());
+		$results = linkify_tags($desc, $uid);
 
-		if($results) {
+		if ($results) {
 			// Set permissions based on tag replacements
-			set_linkified_perms($results, $str_contact_allow, $str_group_allow, local_channel(), false, $private);
+			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, $private);
 
-			foreach($results as $result) {
+			foreach ($results as $result) {
 				$success = $result['success'];
-				if($success['replaced']) {
+				if ($success['replaced']) {
 					$post_tags[] = array(
-						'uid'   => local_channel(),
+						'uid'   => $uid,
 						'ttype' => $success['termtype'],
 						'otype' => TERM_OBJ_POST,
 						'term'  => $success['term'],
 						'url'   => $success['url']
-					);	
+					);
 				}
 			}
 		}
 
-		if(strlen($categories)) {
-			$cats = explode(',',$categories);
-			foreach($cats as $cat) {
+		if (strlen($categories)) {
+			$cats = explode(',', $categories);
+			foreach ($cats as $cat) {
 				$post_tags[] = array(
-					'uid'   => local_channel(),
+					'uid'   => $uid,
 					'ttype' => TERM_CATEGORY,
 					'otype' => TERM_OBJ_POST,
 					'term'  => trim($cat),
@@ -141,175 +144,170 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 				);
 			}
 		}
-	
-		$datarray = array();
-		$datarray['dtstart'] = $start;
-		$datarray['dtend'] = $finish;
-		$datarray['summary'] = $summary;
-		$datarray['description'] = $desc;
-		$datarray['location'] = $location;
-		$datarray['etype'] = $type;
-		$datarray['adjust'] = $adjust;
-		$datarray['nofinish'] = 0;
-		$datarray['uid'] = local_channel();
-		$datarray['account'] = get_account_id();
-		$datarray['event_xchan'] = $channel['channel_hash'];
-		$datarray['allow_cid'] = $str_contact_allow;
-		$datarray['allow_gid'] = $str_group_allow;
-		$datarray['deny_cid'] = $str_contact_deny;
-		$datarray['deny_gid'] = $str_group_deny;
-		$datarray['private'] = intval($private);
-		$datarray['id'] = $event_id;
-		$datarray['created'] = $created;
-		$datarray['edited'] = $edited;
-		$datarray['timezone'] = $tz;
 
-	
-		if(intval($_REQUEST['preview'])) {
+		$datarray                = array();
+		$datarray['dtstart']     = $start;
+		$datarray['dtend']       = $finish;
+		$datarray['summary']     = $summary;
+		$datarray['description'] = $desc;
+		$datarray['location']    = $location;
+		$datarray['etype']       = $type;
+		$datarray['adjust']      = $adjust;
+		$datarray['nofinish']    = 0;
+		$datarray['uid']         = $uid;
+		$datarray['account']     = get_account_id();
+		$datarray['event_xchan'] = $channel['channel_hash'];
+		$datarray['allow_cid']   = $str_contact_allow;
+		$datarray['allow_gid']   = $str_group_allow;
+		$datarray['deny_cid']    = $str_contact_deny;
+		$datarray['deny_gid']    = $str_group_deny;
+		$datarray['private']     = intval($private);
+		$datarray['id']          = $event_id;
+		$datarray['created']     = $created;
+		$datarray['edited']      = $edited;
+		$datarray['timezone']    = $tz;
+
+
+		if (intval($_REQUEST['preview'])) {
 			$html = format_event_html($datarray);
 			echo $html;
 			killme();
 		}
-	
+
 		$event = event_store_event($datarray);
-	
-		if($post_tags)	
+
+		if ($post_tags)
 			$datarray['term'] = $post_tags;
-	
-		$item_id = event_store_item($datarray,$event);
-	
-		if($item_id) {
+
+		$item_id = event_store_item($datarray, $event);
+
+		if ($item_id) {
 			$r = q("select * from item where id = %d",
 				intval($item_id)
 			);
-			if($r) {
+			if ($r) {
 				xchan_query($r);
 				$sync_item = fetch_post_tags($r);
-				$z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
+				$z         = q("select * from event where event_hash = '%s' and uid = %d limit 1",
 					dbesc($r[0]['resource_id']),
 					intval($channel['channel_id'])
 				);
-				if($z) {
-					Libsync::build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
+				if ($z) {
+					Libsync::build_sync_packet($channel['channel_id'], array('event_item' => array(encode_item($sync_item[0], true)), 'event' => $z));
 				}
 			}
 		}
-	
-		\Zotlabs\Daemon\Master::Summon(array('Notifier','event',$item_id));
+
+		Master::Summon(array('Notifier', 'event', $item_id));
 
 		killme();
-	
+
 	}
-	
-	
-	
+
+
 	function get() {
-	
-		if(argc() > 2 && argv(1) == 'ical') {
+
+		if (argc() > 2 && argv(1) == 'ical') {
 			$event_id = argv(2);
-	
+
 			require_once('include/security.php');
 			$sql_extra = permissions_sql(local_channel());
-	
+
 			$r = q("select * from event where event_hash = '%s' $sql_extra limit 1",
 				dbesc($event_id)
 			);
-			if($r) { 
+			if ($r) {
 				header('Content-type: text/calendar');
-				header('content-disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"' );
+				header('content-disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"');
 				echo ical_wrapper($r);
 				killme();
 			}
 			else {
-				notice( t('Event not found.') . EOL );
+				notice(t('Event not found.') . EOL);
 				return;
 			}
 		}
-	
-		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
+
+		if (!local_channel()) {
+			notice(t('Permission denied.') . EOL);
 			return;
 		}
 
-		if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
-			$r = q("update event set dismissed = 1 where id = %d and uid = %d",
-				intval(argv(2)),
-				intval(local_channel())
-			);
-		}
-	
-		if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
-			$r = q("update event set dismissed = 0 where id = %d and uid = %d",
+		if ((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
+			q("update event set dismissed = 1 where id = %d and uid = %d",
 				intval(argv(2)),
 				intval(local_channel())
 			);
 		}
 
-		$channel = \App::get_channel();
-	
-		$mode = 'view';
-		$export = false;
-		$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " "  : '');
+		if ((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
+			q("update event set dismissed = 0 where id = %d and uid = %d",
+				intval(argv(2)),
+				intval(local_channel())
+			);
+		}
 
-		if(argc() > 1) {
-			if(argc() > 2 && argv(1) === 'add') {
-				$mode = 'add';
+		$mode    = 'view';
+		$export  = false;
+		$ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
+
+		if (argc() > 1) {
+			if (argc() > 2 && argv(1) === 'add') {
+				$mode    = 'add';
 				$item_id = intval(argv(2));
 			}
-			if(argc() > 2 && argv(1) === 'drop') {
-				$mode = 'drop';
+			if (argc() > 2 && argv(1) === 'drop') {
+				$mode     = 'drop';
 				$event_id = argv(2);
 			}
-			if(argc() <= 2 && argv(1) === 'export') {
+			if (argc() <= 2 && argv(1) === 'export') {
 				$export = true;
 			}
-			if(argc() > 2 && intval(argv(1)) && intval(argv(2))) {
+			if (argc() > 2 && intval(argv(1)) && intval(argv(2))) {
 				$mode = 'view';
 			}
-			if(argc() <= 2) {
-				$mode = 'view';
+			if (argc() <= 2) {
+				$mode     = 'view';
 				$event_id = argv(1);
 			}
 		}
-	
-		if($mode === 'add') {
-			event_addtocal($item_id,local_channel());
+
+		if ($mode === 'add') {
+			event_addtocal($item_id, local_channel());
 			killme();
 		}
-	
-		if($mode == 'view') {
-	
+
+		if ($mode == 'view') {
+
 			/* edit/create form */
-			if($event_id) {
-				$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+			if ($event_id) {
+				q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
 					dbesc($event_id),
 					intval(local_channel())
 				);
-				if(count($r))
-					$orig_event = $r[0];
 			}
-	
-			$channel = \App::get_channel();
 
-			if (argv(1) === 'json'){
-				if (x($_GET,'start'))	$start = $_GET['start'];
-				if (x($_GET,'end'))	$finish = $_GET['end'];
+			$channel = App::get_channel();
+
+			if (argv(1) === 'json') {
+				if (x($_GET, 'start')) $start = $_GET['start'];
+				if (x($_GET, 'end')) $finish = $_GET['end'];
 			}
-	
-			$start  = datetime_convert('UTC','UTC',$start);
-			$finish = datetime_convert('UTC','UTC',$finish);
-			$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+
+			$start         = datetime_convert('UTC', 'UTC', $start);
+			$finish        = datetime_convert('UTC', 'UTC', $finish);
+			$adjust_start  = datetime_convert('UTC', date_default_timezone_get(), $start);
 			$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
-			if (x($_GET,'id')){
-			  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
+			if (x($_GET, 'id')) {
+				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
 	                                from event left join item on item.resource_id = event.event_hash
 					where item.resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
 					intval(local_channel()),
 					intval($_GET['id'])
 				);
 			}
-			elseif($export) {
+			elseif ($export) {
 				$r = q("SELECT event.*, item.id as item_id
 					from event left join item on item.resource_id = event.event_hash
 					where event.uid = %d and event.dtstart > '%s' and event.dtend > event.dtstart",
@@ -335,104 +333,105 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 					dbesc($adjust_finish)
 				);
 			}
-	
-			if($r && ! $export) {
+
+			if ($r && !$export) {
 				xchan_query($r);
-				$r = fetch_post_tags($r,true);
+				$r = fetch_post_tags($r, true);
 				$r = sort_by_date($r);
 			}
 
 			$events = [];
 
-			if($r) {
-	
-				foreach($r as $rr) {
+			if ($r) {
+
+				foreach ($r as $rr) {
 
 					$start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
-					if ($rr['nofinish']){
+					if ($rr['nofinish']) {
 						$end = null;
-					} else {
+					}
+					else {
 						$end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
 					}
 
-					$catsenabled = feature_enabled(local_channel(),'categories');
-					$categories = '';
-					if($catsenabled){
-						if($rr['term']) {
+					$catsenabled = feature_enabled(local_channel(), 'categories');
+					$categories  = '';
+					if ($catsenabled) {
+						if ($rr['term']) {
 							$cats = get_terms_oftype($rr['term'], TERM_CATEGORY);
 							foreach ($cats as $cat) {
-								if(strlen($categories))
+								if (strlen($categories))
 									$categories .= ', ';
 								$categories .= $cat['term'];
 							}
 						}
 					}
 
-					$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
-	
-					$drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
-	
+					$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root() . '/events/' . $rr['event_hash'] . '?expandform=1', t('Edit event'), '', '') : false);
+
+					$drop = array(z_root() . '/events/drop/' . $rr['event_hash'], t('Delete event'), '', '');
+
 					$tz = get_iconfig($rr, 'event', 'timezone');
 
-					if(! $tz)
+					if (!$tz)
 						$tz = 'UTC';
 
 					$events[] = array(
 						'calendar_id' => 'channel_calendar',
-						'rw' => true,
-						'id'=>$rr['id'],
-						'uri' => $rr['event_hash'],
-						'timezone' => $tz,
-						'start'=> $start,
-						'end' => $end,
-						'drop' => $drop,
-						'allDay' => (($rr['adjust']) ? 0 : 1),
-						'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
-						'editable' => $edit ? true : false,
-						'item' => $rr,
-						'plink' => [$rr['plink'], t('Link to source')],
+						'rw'          => true,
+						'id'          => $rr['id'],
+						'uri'         => $rr['event_hash'],
+						'timezone'    => $tz,
+						'start'       => $start,
+						'end'         => $end,
+						'drop'        => $drop,
+						'allDay'      => (($rr['adjust']) ? 0 : 1),
+						'title'       => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
+						'editable'    => $edit ? true : false,
+						'item'        => $rr,
+						'plink'       => [$rr['plink'], t('Link to source')],
 						'description' => html_entity_decode($rr['description'], ENT_COMPAT, 'UTF-8'),
-						'location' => html_entity_decode($rr['location'], ENT_COMPAT, 'UTF-8'),
-						'allow_cid' => expand_acl($rr['allow_cid']),
-						'allow_gid' => expand_acl($rr['allow_gid']),
-						'deny_cid' => expand_acl($rr['deny_cid']),
-						'deny_gid' => expand_acl($rr['deny_gid']),
-						'categories' => $categories
+						'location'    => html_entity_decode($rr['location'], ENT_COMPAT, 'UTF-8'),
+						'allow_cid'   => expand_acl($rr['allow_cid']),
+						'allow_gid'   => expand_acl($rr['allow_gid']),
+						'deny_cid'    => expand_acl($rr['deny_cid']),
+						'deny_gid'    => expand_acl($rr['deny_gid']),
+						'categories'  => $categories
 					);
 				}
 			}
-			
-			if($export) {
+
+			if ($export) {
 				header('Content-type: text/calendar');
-				header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );
+				header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"');
 				echo ical_wrapper($r);
 				killme();
 			}
 
-			if (\App::$argv[1] === 'json'){
+			if (App::$argv[1] === 'json') {
 				json_return_and_die($events);
 			}
 		}
 
-	
-		if($mode === 'drop' && $event_id) {
+
+		if ($mode === 'drop' && $event_id) {
 			$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
 				dbesc($event_id),
 				intval(local_channel())
 			);
-	
+
 			$sync_event = $r[0];
-	
-			if($r) {
+
+			if ($r) {
 				$r = q("delete from event where event_hash = '%s' and uid = %d",
 					dbesc($event_id),
 					intval(local_channel())
 				);
 
-				if($r) {
+				if ($r) {
 
 					$sync_event['event_deleted'] = 1;
-					Libsync::build_sync_packet(0,array('event' => array($sync_event)));
+					Libsync::build_sync_packet(0, array('event' => array($sync_event)));
 
 					$i = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d",
 						dbesc($event_id),
@@ -441,11 +440,11 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 
 					if ($i) {
 
-						$can_delete = false;
+						$can_delete   = false;
 						$local_delete = true;
 
 						$ob_hash = get_observer_hash();
-						if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
+						if ($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
 							$can_delete = true;
 						}
 
@@ -453,49 +452,49 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						// If the item originated on this site+channel the deletion will propagate downstream. 
 						// Otherwise just the local copy is removed.
 
-						if(is_site_admin()) {
+						if (is_site_admin()) {
 							$local_delete = true;
-							if(intval($i[0]['item_origin']))
+							if (intval($i[0]['item_origin']))
 								$can_delete = true;
 						}
 
-						if($can_delete || $local_delete) {
+						if ($can_delete || $local_delete) {
 
 							// if this is a different page type or it's just a local delete
 							// but not by the item author or owner, do a simple deletion
 
-							$complex = false;	
+							$complex = false;
 
-							if(intval($i[0]['item_type']) || ($local_delete && (! $can_delete))) {
+							if (intval($i[0]['item_type']) || ($local_delete && (!$can_delete))) {
 								drop_item($i[0]['id']);
 							}
 							else {
 								// complex deletion that needs to propagate and be performed in phases
-								drop_item($i[0]['id'],true,DROPITEM_PHASE1);
+								drop_item($i[0]['id'], true, DROPITEM_PHASE1);
 								$complex = true;
 							}
 
 							$ii = q("select * from item where id = %d",
 								intval($i[0]['id'])
 							);
-							if($ii) {
+							if ($ii) {
 								xchan_query($ii);
 								$sync_item = fetch_post_tags($ii);
-								Libsync::build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true))));
+								Libsync::build_sync_packet($i[0]['uid'], array('item' => array(encode_item($sync_item[0], true))));
 							}
 
-							if($complex) {
-								tag_deliver($i[0]['uid'],$i[0]['id']);
+							if ($complex) {
+								tag_deliver($i[0]['uid'], $i[0]['id']);
 							}
 						}
 					}
 					killme();
 				}
-				notice( t('Failed to remove event' ) . EOL);
+				notice(t('Failed to remove event') . EOL);
 				killme();
 			}
 		}
-	
+
 	}
-	
+
 }

Zotlabs/Module/Chanview.php

@@ -70,7 +70,7 @@ class Chanview extends \Zotlabs\Web\Controller {
 				$zf = Zotfinger::exec($_REQUEST['url'], null);
 
 				if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $_REQUEST['url'] && intval($zf['signature']['header_valid'])) {
-					Libzot::import_xchan($j);
+					Libzot::import_xchan($zf['data']);
 					$r = q("select * from xchan where xchan_url = '%s'",
 						dbesc($_REQUEST['url'])
 					);

Zotlabs/Module/Cloud.php

@@ -105,7 +105,7 @@ class Cloud extends Controller {
 
 		// All we need to do now, is to fire up the server
 
-		$server->exec();
+		$server->start();
 
 		if($browser->build_page)
 			construct_page();
@@ -123,7 +123,8 @@ class Cloud extends Controller {
 			notice( t('Permission denied') . EOL);
 		}
 		elseif($err instanceof \Sabre\DAV\Exception\NotImplemented) {
-			notice( t('Please refresh page') . EOL);
+			// notice( t('Please refresh page') . EOL);
+			goaway(z_root() . '/' . \App::$query_string);
 		}
 		else {
 			notice( t('Unknown error') . EOL);

Zotlabs/Module/Connect.php

@@ -18,11 +18,11 @@ class Connect extends Controller {
 			App::$error = 404;
 			return;
 		}
-	
+
 		$r = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($which)
 		);
-	
+
 		if($r)
 			App::$data['channel'] = $r[0];
 
@@ -30,36 +30,36 @@ class Connect extends Controller {
 
 		profile_load($which,'');
 	}
-	
+
 	function post() {
-	
+
 		if(! array_key_exists('channel', App::$data))
 			return;
 
 		$channel_id = App::$data['channel']['channel_id'];
 
 		$edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false);
-	
+
 		if($edit) {
 			$has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0);
 			$premium = (($_POST['premium']) ? intval($_POST['premium']) : 0);
 			$text = escape_tags($_POST['text']);
-			
+
 			if($has_premium != $premium) {
 				$r = q("update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d",
 					db_getfunc('^'),
 					intval(PAGE_PREMIUM),
-					intval(local_channel()) 
+					intval(local_channel())
 				);
-				
+
 				\Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',$channel_id));
 			}
 			set_pconfig($channel_id,'system','selltext',$text);
 			// reload the page completely to get fresh data
 			goaway(z_root() . '/' . App::$query_string);
-	
+
 		}
-	
+
 		$url = '';
 		$observer = App::get_observer();
 		if(($observer) && ($_POST['submit'] === t('Continue'))) {
@@ -70,18 +70,18 @@ class Connect extends Controller {
 					dbesc($observer['xchan_hash'])
 				);
 				if($r)
-					$url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(App::$data['channel']));
+					$url = $r[0]['hubloc_url'] . '/follow?f=&interactive=1&url=' . urlencode(channel_reddress(App::$data['channel']));
 			}
 		}
 		if($url)
 			goaway($url . '&confirm=1');
 		else
 			notice('Unable to connect to your home hub location.');
-	
+
 	}
-	
-	
-	
+
+
+
 	function get() {
 
 		if(! array_key_exists('channel', App::$data))
@@ -90,11 +90,11 @@ class Connect extends Controller {
 		$channel_id = App::$data['channel']['channel_id'];
 
 		$edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false);
-	
+
 		$text = get_pconfig($channel_id,'system','selltext');
-	
+
 		if($edit) {
-	
+
 			$o = replace_macros(get_markup_template('sellpage_edit.tpl'),array(
 				'$header' => t('Premium Channel Setup'),
 				'$address' => App::$data['channel']['channel_address'],
@@ -105,36 +105,36 @@ class Connect extends Controller {
 				'$lbl2' => t('Potential connections will then see the following text before proceeding:'),
 				'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
 				'$submit' => t('Submit'),
-	
-	
+
+
 			));
 			return $o;
 		}
 		else {
 			if(! $text)
 				$text = t('(No specific instructions have been provided by the channel owner.)');
-	
+
 			$submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array(
-				'$continue' => t('Continue'),			
+				'$continue' => t('Continue'),
 				'$address' => App::$data['channel']['channel_address']
 			));
-	
+
 			$o = replace_macros(get_markup_template('sellpage_view.tpl'),array(
 				'$header' => t('Restricted or Premium Channel'),
 				'$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
-				'$text' => prepare_text($text), 
-	
+				'$text' => prepare_text($text),
+
 				'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
 				'$submit' => $submit,
-	
+
 			));
-	
+
 			$arr = array('channel' => App::$data['channel'],'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit);
 			call_hooks('connect_premium', $arr);
 			$o = $arr['sellpage'];
-	
+
 		}
-	
+
 		return $o;
 	}
 }

Zotlabs/Module/Connections.php

@@ -109,6 +109,7 @@ class Connections extends \Zotlabs\Web\Controller {
 	
 				case 'all':
 					$head = t('All');
+					break;
 				default:
 					$search_flags = " and abook_blocked = 0 and abook_ignored = 0 and abook_hidden = 0 and abook_archived = 0 and abook_not_here = 0 ";
 					$active = true;
@@ -238,7 +239,7 @@ class Connections extends \Zotlabs\Web\Controller {
 		}
 	 	
 		$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash 
-			where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ",
+			where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ",
 			intval(local_channel())
 		);
 		if($r) {
@@ -247,7 +248,7 @@ class Connections extends \Zotlabs\Web\Controller {
 		}
 	
 		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
-			WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ORDER BY $sql_order LIMIT %d OFFSET %d ",
+			WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ORDER BY $sql_order LIMIT %d OFFSET %d ",
 			intval(local_channel()),
 			intval(App::$pager['itemspage']),
 			intval(App::$pager['start'])

Zotlabs/Module/Connedit.php

@@ -9,6 +9,7 @@ namespace Zotlabs\Module;
 
 use App;
 use Zotlabs\Lib\Apps;
+use Zotlabs\Lib\Crypto;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\Libsync;
 use Zotlabs\Daemon\Master;
@@ -32,10 +33,10 @@ class Connedit extends Controller {
 	 */
 
 	function init() {
-	
+
 		if(! local_channel())
 			return;
-	
+
 		if((argc() >= 2) && intval(argv(1))) {
 			$r = q("SELECT abook.*, xchan.*
 				FROM abook left join xchan on abook_xchan = xchan_hash
@@ -47,54 +48,54 @@ class Connedit extends Controller {
 				App::$poi = array_shift($r);
 			}
 		}
-	
+
 
 		$channel = App::get_channel();
 		if($channel)
 			head_set_icon($channel['xchan_photo_s']);
-	
+
 	}
 
-	
+
 	/* @brief Evaluate posted values and set changes
 	 *
 	 */
-	
+
 	function post() {
-	
+
 		if(! local_channel())
 			return;
-	
+
 		$contact_id = intval(argv(1));
 		if(! $contact_id)
 			return;
-	
+
 		$channel = App::get_channel();
-	
+
 		// TODO if configured for hassle-free permissions, we'll post the form with ajax as soon as the
 		// connection enable is toggled to a special autopost url and set permissions immediately, leaving
 		// the other form elements alone pending a manual submit of the form. The downside is that there
 		// will be a window of opportunity when the permissions have been set but before you've had a chance
 		// to review and possibly restrict them. The upside is we won't have to warn you that your connection
 		// can't do anything until you save the bloody form.
-	
+
 		$autopost = (((argc() > 2) && (argv(2) === 'auto')) ? true : false);
-	
+
 		$orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
 			intval($contact_id),
 			intval(local_channel())
 		);
-	
+
 		if(! $orig_record) {
 			notice( t('Could not access contact record.') . EOL);
 			goaway(z_root() . '/connections');
 			return; // NOTREACHED
 		}
-	
+
 		call_hooks('contact_edit_post', $_POST);
-	
+
 		$vc = get_abconfig(local_channel(),$orig_record['abook_xchan'],'system','vcard');
-		$vcard = (($vc) ? \Sabre\VObject\Reader::read($vc) : null); 
+		$vcard = (($vc) ? \Sabre\VObject\Reader::read($vc) : null);
 		$serialised_vcard = update_vcard($_REQUEST,$vcard);
 		if($serialised_vcard)
 			set_abconfig(local_channel(),$orig_record[0]['abook_xchan'],'system','vcard',$serialised_vcard);
@@ -107,8 +108,8 @@ class Connedit extends Controller {
 			$autoperms = null;
 			$is_self = false;
 		}
-	
-	
+
+
 		$profile_id = ((array_key_exists('profile_assign',$_POST)) ? $_POST['profile_assign'] : $orig_record[0]['abook_profile']);
 
 		if($profile_id) {
@@ -121,17 +122,17 @@ class Connedit extends Controller {
 				return;
 			}
 		}
-	
+
 		$abook_incl = ((array_key_exists('abook_incl',$_POST)) ? escape_tags($_POST['abook_incl']) : $orig_record[0]['abook_incl']);
 		$abook_excl = ((array_key_exists('abook_excl',$_POST)) ? escape_tags($_POST['abook_excl']) : $orig_record[0]['abook_excl']);
 
 
 		$hidden = intval($_POST['hidden']);
-	
+
 		$priority = intval($_POST['poll']);
 		if($priority > 5 || $priority < 0)
 			$priority = 0;
-	
+
 		if(! array_key_exists('closeness',$_POST)) {
 			$_POST['closeness'] = 80;
 		}
@@ -139,15 +140,15 @@ class Connedit extends Controller {
 		if($closeness < 0 || $closeness > 99) {
 			$closeness = 80;
 		}
-	
+
 		$rating = intval($_POST['rating']);
 		if($rating < (-10))
 			$rating = (-10);
 		if($rating > 10)
 			$rating = 10;
-	
+
 		$rating_text = trim(escape_tags($_REQUEST['rating_text']));
-		
+
 		$all_perms = Permissions::Perms();
 
 		if($all_perms) {
@@ -168,27 +169,27 @@ class Connedit extends Controller {
 			}
 		}
 
-		if(! is_null($autoperms)) 
+		if(! is_null($autoperms))
 			set_pconfig($channel['channel_id'],'system','autoperms',$autoperms);
-				
+
 		$new_friend = false;
-	
+
 		// only store a record and notify the directory if the rating changed
 
 		if(! $is_self) {
-	
+
 			$signed = $orig_record[0]['abook_xchan'] . '.' . $rating . '.' . $rating_text;
-			$sig = base64url_encode(rsa_sign($signed,$channel['channel_prvkey']));
+			$sig = base64url_encode(Crypto::sign($signed,$channel['channel_prvkey']));
 
 			$rated = ((intval($rating) || strlen($rating_text)) ? true : false);
-	
+
 			$record = 0;
-	
+
 			$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
 				dbesc($channel['channel_hash']),
 				dbesc($orig_record[0]['abook_xchan'])
 			);
-	
+
 			if($z) {
 				if(($z[0]['xlink_rating'] != $rating) || ($z[0]['xlink_rating_text'] != $rating_text)) {
 					$record = $z[0]['xlink_id'];
@@ -223,18 +224,18 @@ class Connedit extends Controller {
 				Master::Summon(array('Ratenotif','rating',$record));
 			}
 		}
-	
+
 		if(($_REQUEST['pending']) && intval($orig_record[0]['abook_pending'])) {
 
 			$new_friend = true;
-	
+
 			// @fixme it won't be common, but when you accept a new connection request
 			// the permissions will now be that of your permissions role and ignore
 			// any you may have set manually on the form. We'll probably see a bug if somebody
 			// tries to set the permissions *and* approve the connection in the same
 			// request. The workaround is to approve the connection, then go back and
 			// adjust permissions as desired.
-	
+
 			$p = Permissions::connect_perms(local_channel());
 			$my_perms = $p['perms'];
 			if($my_perms) {
@@ -247,7 +248,7 @@ class Connedit extends Controller {
 		$abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']);
 
 
-	
+
 		$r = q("UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d,
 			abook_incl = '%s', abook_excl = '%s'
 			where abook_id = %d AND abook_channel = %d",
@@ -259,7 +260,7 @@ class Connedit extends Controller {
 			intval($contact_id),
 			intval(local_channel())
 		);
-	
+
 		if($r)
 			info( t('Connection updated.') . EOL);
 		else
@@ -267,16 +268,16 @@ class Connedit extends Controller {
 
 		if(! intval(App::$poi['abook_self'])) {
 			if($new_friend) {
-				Master::Summon( [ 'Notifier', 'permission_accept', $contact_id ] ); 
+				Master::Summon( [ 'Notifier', 'permission_accept', $contact_id ] );
 			}
 
-			Master::Summon( [ 
-				'Notifier', 
-				(($new_friend) ? 'permission_create' : 'permission_update'), 
-				$contact_id 
+			Master::Summon( [
+				'Notifier',
+				(($new_friend) ? 'permission_create' : 'permission_update'),
+				$contact_id
 			]);
 		}
-	
+
 		if($new_friend) {
 			$default_group = $channel['channel_default_group'];
 			if($default_group) {
@@ -285,11 +286,11 @@ class Connedit extends Controller {
 				if($g)
 					group_add_member(local_channel(),'',App::$poi['abook_xchan'],$g['id']);
 			}
-	
+
 			// Check if settings permit ("post new friend activity" is allowed, and
 			// friends in general or this friend in particular aren't hidden)
 			// and send out a new friend activity
-	
+
 			$pr = q("select * from profile where uid = %d and is_default = 1 and hide_friends = 0",
 				intval($channel['channel_id'])
 			);
@@ -305,23 +306,23 @@ class Connedit extends Controller {
 				$xarr['deny_cid'] = $channel['channel_deny_cid'];
 				$xarr['deny_gid'] = $channel['channel_deny_gid'];
 				$xarr['item_private'] = (($xarr['allow_cid']||$xarr['allow_gid']||$xarr['deny_cid']||$xarr['deny_gid']) ? 1 : 0);
-	
+
 				$xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . App::$poi['xchan_url'] . ']' . App::$poi['xchan_name'] . '[/zrl]';
-	
+
 				$xarr['body'] .= "\n\n\n" . '[zrl=' . App::$poi['xchan_url'] . '][zmg=80x80]' . App::$poi['xchan_photo_m'] . '[/zmg][/zrl]';
-	
+
 				post_activity_item($xarr);
-	
+
 			}
-	
-	
+
+
 			// pull in a bit of content if there is any to pull in
 			Master::Summon(array('Onepoll',$contact_id));
-	
+
 		}
-	
+
 		// Refresh the structure in memory with the new data
-	
+
 		$r = q("SELECT abook.*, xchan.*
 			FROM abook left join xchan on abook_xchan = xchan_hash
 			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
@@ -331,34 +332,34 @@ class Connedit extends Controller {
 		if($r) {
 			App::$poi = $r[0];
 		}
-	
+
 		if($new_friend) {
 			$arr = array('channel_id' => local_channel(), 'abook' => App::$poi);
 			call_hooks('accept_follow', $arr);
 		}
-	
+
 		$this->connedit_clone($a);
-	
+
 		if(($_REQUEST['pending']) && (!$_REQUEST['done']))
 			goaway(z_root() . '/connections/ifpending');
-	
+
 		return;
-	
+
 	}
-	
+
 	/* @brief Clone connection
 	 *
 	 *
 	 */
-	
+
 	function connedit_clone(&$a) {
-	
+
 			if(! App::$poi)
 				return;
-	
-	
+
+
 			$channel = App::get_channel();
-	
+
 			$r = q("SELECT abook.*, xchan.*
 				FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d and abook_id = %d LIMIT 1",
@@ -368,40 +369,40 @@ class Connedit extends Controller {
 			if($r) {
 				App::$poi = array_shift($r);
 			}
-	
+
 			$clone = App::$poi;
-	
+
 			unset($clone['abook_id']);
 			unset($clone['abook_account']);
 			unset($clone['abook_channel']);
-	
+
 			$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
 			if($abconfig)
 				$clone['abconfig'] = $abconfig;
-	
+
 			Libsync::build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone)));
 	}
-	
+
 	/* @brief Generate content of connection edit page
 	 *
 	 *
 	 */
-	
+
 	function get() {
-	
+
 		$sort_type = 0;
 		$o = '';
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return login();
 		}
-	
+
 		$section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : '');
 		$channel = App::get_channel();
-	
+
 		$yes_no = array(t('No'),t('Yes'));
-	
+
 		$connect_perms = Permissions::connect_perms(local_channel());
 
 		$o .= "<script>function connectDefaultShare() {
@@ -415,13 +416,13 @@ class Connedit extends Controller {
 			}
 		}
 		$o .= " }\n</script>\n";
-	
+
 		if(argc() == 3) {
-	
+
 			$contact_id = intval(argv(1));
 			if(! $contact_id)
 				return;
-	
+
 			$cmd = argv(2);
 
 			$orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
@@ -429,17 +430,17 @@ class Connedit extends Controller {
 				intval($contact_id),
 				intval(local_channel())
 			);
-	
+
 			if(! count($orig_record)) {
 				notice( t('Could not access address book record.') . EOL);
 				goaway(z_root() . '/connections');
 			}
-	
+
 			if($cmd === 'update') {
 				// pull feed and consume it, which should subscribe to the hub.
 				Master::Summon(array('Poller',$contact_id));
 				goaway(z_root() . '/connedit/' . $contact_id);
-	
+
 			}
 
 			if($cmd === 'fetchvc') {
@@ -474,7 +475,7 @@ class Connedit extends Controller {
 					dbesc($orig_record[0]['xchan_hash'])
 				);
 				$cmd = 'refresh';
-			}	
+			}
 
 			if($cmd === 'refresh') {
 				if($orig_record[0]['xchan_network'] === 'zot') {
@@ -486,13 +487,13 @@ class Connedit extends Controller {
 						notice( t('Refresh failed - channel is currently unavailable.') );
 				}
 				else {
-	
+
 					// if you are on a different network we'll force a refresh of the connection basic info
 					Master::Summon(array('Notifier','permission_update',$contact_id));
 				}
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
-	
+
 			if($cmd === 'block') {
 				if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED)) {
 					$this->connedit_clone($a);
@@ -501,7 +502,7 @@ class Connedit extends Controller {
 					notice(t('Unable to set address book parameters.') . EOL);
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
-	
+
 			if($cmd === 'ignore') {
 				if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED)) {
 					$this->connedit_clone($a);
@@ -510,7 +511,7 @@ class Connedit extends Controller {
 					notice(t('Unable to set address book parameters.') . EOL);
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
-	
+
 			if($cmd === 'archive') {
 				if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED)) {
 					$this->connedit_clone($a);
@@ -519,7 +520,7 @@ class Connedit extends Controller {
 					notice(t('Unable to set address book parameters.') . EOL);
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
-	
+
 			if($cmd === 'hide') {
 				if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN)) {
 					$this->connedit_clone($a);
@@ -528,10 +529,10 @@ class Connedit extends Controller {
 					notice(t('Unable to set address book parameters.') . EOL);
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
-	
+
 			// We'll prevent somebody from unapproving an already approved contact.
 			// Though maybe somebody will want this eventually (??)
-	
+
 			if($cmd === 'approve') {
 				if(intval($orig_record[0]['abook_pending'])) {
 					if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING)) {
@@ -542,10 +543,10 @@ class Connedit extends Controller {
 				}
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
-	
-	
+
+
 			if($cmd === 'drop') {
-	
+
 				contact_remove(local_channel(), $orig_record[0]['abook_id']);
 
 				Master::Summon( [ 'Notifier', 'purge', local_channel(), $orig_record[0]['xchan_hash'] ] );
@@ -556,17 +557,17 @@ class Connedit extends Controller {
 						'entry_deleted' => true))
 					)
 				);
-	
+
 				info( t('Connection has been removed.') . EOL );
 				if(x($_SESSION,'return_url'))
 					goaway(z_root() . '/' . $_SESSION['return_url']);
 				goaway(z_root() . '/contacts');
-	
+
 			}
 		}
-	
+
 		if(App::$poi) {
-	
+
 			$abook_prev = 0;
 			$abook_next = 0;
 
@@ -595,14 +596,14 @@ class Connedit extends Controller {
  			}
 
 			$tools = array(
-	
+
 				'view' => array(
 					'label' => t('View Profile'),
 					'url'   => chanlink_cid($contact['abook_id']),
 					'sel'   => '',
 					'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']),
 				),
-	
+
 				'refresh' => array(
 					'label' => t('Refresh Permissions'),
 					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/refresh',
@@ -616,14 +617,14 @@ class Connedit extends Controller {
 					'sel'   => '',
 					'title' => t('Fetch updated photo'),
 				),
-	
+
 				'recent' => array(
 					'label' => t('Recent Activity'),
 					'url'   => z_root() . '/network/?f=&cid=' . $contact['abook_id'],
 					'sel'   => '',
 					'title' => t('View recent posts and comments'),
 				),
-	
+
 				'block' => array(
 					'label' => (intval($contact['abook_blocked']) ? t('Unblock') : t('Block')),
 					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/block',
@@ -631,7 +632,7 @@ class Connedit extends Controller {
 					'title' => t('Block (or Unblock) all communications with this connection'),
 					'info'   => (intval($contact['abook_blocked']) ? t('This connection is blocked!') : ''),
 				),
-	
+
 				'ignore' => array(
 					'label' => (intval($contact['abook_ignored']) ? t('Unignore') : t('Ignore')),
 					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/ignore',
@@ -639,7 +640,7 @@ class Connedit extends Controller {
 					'title' => t('Ignore (or Unignore) all inbound communications from this connection'),
 					'info'   => (intval($contact['abook_ignored']) ? t('This connection is ignored!') : ''),
 				),
-	
+
 				'archive' => array(
 					'label' => (intval($contact['abook_archived']) ? t('Unarchive') : t('Archive')),
 					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/archive',
@@ -647,7 +648,7 @@ class Connedit extends Controller {
 					'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'),
 					'info'   => (intval($contact['abook_archived']) ? t('This connection is archived!') : ''),
 				),
-	
+
 				'hide' => array(
 					'label' => (intval($contact['abook_hidden']) ? t('Unhide') : t('Hide')),
 					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/hide',
@@ -655,18 +656,18 @@ class Connedit extends Controller {
 					'title' => t('Hide or Unhide this connection from your other connections'),
 					'info'   => (intval($contact['abook_hidden']) ? t('This connection is hidden!') : ''),
 				),
-	
+
 				'delete' => array(
 					'label' => t('Delete'),
 					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/drop',
 					'sel'   => '',
 					'title' => t('Delete this connection'),
 				),
-	
+
 			);
 
 
-			if($contact['xchan_network'] === 'zot') {
+			if(in_array($contact['xchan_network'], ['zot6', 'zot'])) {
 				$tools['fetchvc'] = [
 					'label' => t('Fetch Vcard'),
 					'url'    => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc',
@@ -684,24 +685,24 @@ class Connedit extends Controller {
 					'sel'   => '',
 					'title' => t('Open Individual Permissions section by default'),
 			];
-	
+
 			$self = false;
-	
+
 			if(intval($contact['abook_self'])) {
 				$self = true;
 				$abook_prev = $abook_next = 0;
 			}
-	
+
 			$vc = get_abconfig(local_channel(),$contact['abook_xchan'],'system','vcard');
 
-			$vctmp = (($vc) ? \Sabre\VObject\Reader::read($vc) : null); 
+			$vctmp = (($vc) ? \Sabre\VObject\Reader::read($vc) : null);
 			$vcard = (($vctmp) ? get_vcard_array($vctmp,$contact['abook_id']) : [] );
 			if(! $vcard)
 				$vcard['fn'] = $contact['xchan_name'];
 
 
 			$tpl = get_markup_template("abook_edit.tpl");
-	
+
 			if(Apps::system_app_installed(local_channel(),'Affinity Tool')) {
 
 				$sections['affinity'] = [
@@ -710,7 +711,7 @@ class Connedit extends Controller {
 					'sel'   => '',
 					'title' => t('Open Set Affinity section by default'),
 				];
-	
+
 				$labels = [
 					t('Me'),
 					t('Family'),
@@ -720,7 +721,7 @@ class Connedit extends Controller {
 				];
 				call_hooks('affinity_labels',$labels);
 				$label_str = '';
-	
+
 				if($labels) {
 					foreach($labels as $l) {
 						if($label_str) {
@@ -731,11 +732,11 @@ class Connedit extends Controller {
 							$label_str .= "'" . $l . "'";
 					}
 				}
-	
+
 				$slider_tpl = get_markup_template('contact_slider.tpl');
-				
+
 				$slideval = intval($contact['abook_closeness']);
-				
+
 				$slide = replace_macros($slider_tpl,array(
 					'$min' => 1,
 					'$val' => $slideval,
@@ -751,22 +752,22 @@ class Connedit extends Controller {
 					'title' => t('Open Custom Filter section by default'),
 				];
 			}
-	
+
 			$rating_val = 0;
 			$rating_text = '';
-	
+
 			$xl = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
 				dbesc($channel['channel_hash']),
 				dbesc($contact['xchan_hash'])
 			);
-	
+
 			if($xl) {
 				$rating_val = intval($xl[0]['xlink_rating']);
 				$rating_text = $xl[0]['xlink_rating_text'];
 			}
-	
+
 			$rating_enabled = get_config('system','rating_enabled');
-	
+
 			if($rating_enabled) {
 				$rating = replace_macros(get_markup_template('rating_slider.tpl'),array(
 					'$min' => -10,
@@ -776,28 +777,28 @@ class Connedit extends Controller {
 			else {
 				$rating = false;
 			}
-	
-	
+
+
 			$perms = array();
 			$channel = App::get_channel();
-	
+
 			$global_perms = Permissions::Perms();
 
 			$existing = get_all_perms(local_channel(),$contact['abook_xchan'],false);
-	
+
 			$unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'),('Yes')));
-	
+
 			$multiprofs = ((feature_enabled(local_channel(),'multi_profiles')) ? true : false);
-	
+
 			if($slide && !$multiprofs)
 				$affinity = t('Set Affinity');
-	
+
 			if(!$slide && $multiprofs)
 				$affinity = t('Set Profile');
-	
+
 			if($slide && $multiprofs)
 				$affinity = t('Set Affinity & Profile');
-	
+
 			$theirs = q("select * from abconfig where chan = %d and xchan = '%s' and cat = 'their_perms'",
 					intval(local_channel()),
 					dbesc($contact['abook_xchan'])
@@ -812,20 +813,20 @@ class Connedit extends Controller {
 			foreach($global_perms as $k => $v) {
 				$thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k);
 //fixme
-				
+
 				$checkinherited = PermissionLimits::Get(local_channel(),$k);
-	
+
 				// For auto permissions (when $self is true) we don't want to look at existing
 				// permissions because they are enabled for the channel owner
 				if((! $self) && ($existing[$k]))
 					$thisperm = "1";
 
-				
 
-	
+
+
 				$perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
 			}
-	
+
 			$pcat = new Permcat(local_channel());
 			$pcatlist = $pcat->listing();
 			$permcats = [];
@@ -838,23 +839,23 @@ class Connedit extends Controller {
 			$locstr = locations_by_netid($contact['xchan_hash']);
 			if(! $locstr)
 				$locstr = unpunify($contact['xchan_url']);
-	
+
 			$clone_warn = '';
 			$clonable = (in_array($contact['xchan_network'],['zot', 'zot6', 'rss']) ? true : false);
 			if(! $clonable) {
 				$clone_warn = '<strong>';
-				$clone_warn .= ((intval($contact['abook_not_here'])) 
+				$clone_warn .= ((intval($contact['abook_not_here']))
 					? t('This connection is unreachable from this location.')
 					: t('This connection may be unreachable from other channel locations.')
 				);
 				$clone_warn .= '</strong><br>' . t('Location independence is not supported by their network.');
 			}
-					
+
 
 
 			if(intval($contact['abook_not_here']) && $unclonable)
 				$not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.');
-	
+
 			$o .= replace_macros($tpl, [
 				'$header'         => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
 				'$autoperms'      => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
@@ -910,7 +911,7 @@ class Connedit extends Controller {
 				'$name'           => $contact['xchan_name'],
 				'$abook_prev'     => $abook_prev,
 				'$abook_next'     => $abook_next,
-				'$vcard_label'    => t('Details'),	
+				'$vcard_label'    => t('Details'),
 				'$displayname'    => $displayname,
 				'$name_label'     => t('Name'),
 				'$org_label'      => t('Organisation'),
@@ -939,13 +940,13 @@ class Connedit extends Controller {
 				'$zip_code'       => t('ZIP Code'),
 				'$country'        => t('Country')
 			]);
-	
+
 			$arr = array('contact' => $contact,'output' => $o);
-	
+
 			call_hooks('contact_edit', $arr);
-	
+
 			return $arr['output'];
-	
-		}	
+
+		}
 	}
 }

Zotlabs/Module/Dav.php

@@ -124,7 +124,7 @@ class Dav extends \Zotlabs\Web\Controller {
 		// $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth));
 
 		// All we need to do now, is to fire up the server
-		$server->exec();
+		$server->start();
 
 		killme();
 	}

Zotlabs/Module/Directory.php

@@ -245,7 +245,7 @@ class Directory extends Controller {
 							$profile_link = chanlink_url($rr['url']);
 
 							$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
-							$connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
+							$connect_link = ((local_channel()) ? z_root() . '/follow?f=&interactive=1&url=' . urlencode($rr['address']) : '');
 
 							// Checking status is disabled ATM until someone checks the performance impact more carefully
 							//$online = remote_online_status($rr['address']);

Zotlabs/Module/Display.php

@@ -19,21 +19,21 @@ class Display extends \Zotlabs\Web\Controller {
 		if(argc() > 1) {
 			$module_format = substr(argv(1),strrpos(argv(1),'.') + 1);
 			if(! in_array($module_format,['atom','zot','json']))
-				$module_format = 'html';			
+				$module_format = 'html';
 		}
 
 		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}
-	
+
 		if(argc() > 1) {
 			$item_hash = argv(1);
 			if($module_format !== 'html') {
 				$item_hash = substr($item_hash,0,strrpos($item_hash,'.'));
 			}
 		}
-	
+
 		if($_REQUEST['mid'])
 			$item_hash = $_REQUEST['mid'];
 
@@ -42,19 +42,19 @@ class Display extends \Zotlabs\Web\Controller {
 			notice( t('Item not found.') . EOL);
 			return;
 		}
-	
+
 		$observer_is_owner = false;
 
 		if(local_channel() && (! $update)) {
-	
+
 			$channel = \App::get_channel();
 
 			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid'  => $channel['channel_deny_cid'], 
+				'allow_cid' => $channel['channel_allow_cid'],
+				'allow_gid' => $channel['channel_allow_gid'],
+				'deny_cid'  => $channel['channel_deny_cid'],
 				'deny_gid'  => $channel['channel_deny_gid']
-			); 
+			);
 
 			$x = array(
 				'is_owner'            => true,
@@ -62,7 +62,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'default_location'    => $channel['channel_location'],
 				'nickname'            => $channel['channel_address'],
 				'lockstate'           => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-				'acl'                 => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),	
+				'acl'                 => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
 				'permissions'         => $channel_acl,
 				'bang'                => '',
 				'visitor'             => true,
@@ -75,21 +75,21 @@ class Display extends \Zotlabs\Web\Controller {
 				'jotnets'             => true,
 				'reset'               => t('Reset form')
 			);
-	
+
 			$o = '<div id="jot-popup">';
 			$o .= status_editor($a,$x,false,'Display');
 			$o .= '</div>';
 		}
-	
+
 		// This page can be viewed by anybody so the query could be complicated
 		// First we'll see if there is a copy of the item which is owned by us - if we're logged in locally.
-		// If that fails (or we aren't logged in locally), 
+		// If that fails (or we aren't logged in locally),
 		// query an item in which the observer (if logged in remotely) has cid or gid rights
-		// and if that fails, look for a copy of the post that has no privacy restrictions.  
+		// and if that fails, look for a copy of the post that has no privacy restrictions.
 		// If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported.
-	
+
 		// find a copy of the item somewhere
-	
+
 		$target_item = null;
 
 		if(strpos($item_hash,'b64.') === 0)
@@ -97,10 +97,10 @@ class Display extends \Zotlabs\Web\Controller {
 		if($decoded)
 			$item_hash = $decoded;
 
-		$r = q("select id, uid, mid, parent, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1",
-			dbesc($item_hash . '%')
+		$r = q("select id, uid, mid, parent, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid = '%s' limit 1",
+			dbesc($item_hash)
 		);
-	
+
 		if($r) {
 			$target_item = $r[0];
 		}
@@ -117,14 +117,14 @@ class Display extends \Zotlabs\Web\Controller {
 		if($target_item['item_blocked'] == ITEM_MODERATED) {
 			goaway(z_root() . '/moderate/' . $target_item['id']);
 		}
-	
+
 		$r = null;
-	
+
 		if($target_item['item_type']  == ITEM_TYPE_WEBPAGE) {
 			$x = q("select * from channel where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['parent'])
@@ -141,7 +141,7 @@ class Display extends \Zotlabs\Web\Controller {
 			$x = q("select * from channel where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['parent'])
@@ -160,7 +160,7 @@ class Display extends \Zotlabs\Web\Controller {
 				intval($target_item['uid'])
 			);
 
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['parent'])
@@ -179,7 +179,7 @@ class Display extends \Zotlabs\Web\Controller {
 			notice( t('Page not found.') . EOL);
 			return '';
 		}
-		
+
 		$simple_update = '';
 		if($update && $_SESSION['loadtime'])
 			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
@@ -191,14 +191,14 @@ class Display extends \Zotlabs\Web\Controller {
 			//$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
 			$mid = $target_item['mid'];
 
-			// if we got a decoded hash we must encode it again before handing to javascript 
+			// if we got a decoded hash we must encode it again before handing to javascript
 			if($decoded)
 				$mid = 'b64.' . base64url_encode($mid);
 
 			$o .= '<div id="live-display"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1))
 				. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n";
-	
+
 			\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
 				'$baseurl' => z_root(),
 				'$pgtype'  => 'display',
@@ -230,7 +230,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'$mid'     => (($mid) ? urlencode($mid) : '')
 			));
 
-			head_add_link([ 
+			head_add_link([
 				'rel'   => 'alternate',
 				'type'  => 'application/json+oembed',
 				'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string),
@@ -243,94 +243,89 @@ class Display extends \Zotlabs\Web\Controller {
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
 
-		$sql_extra = public_permissions_sql($observer_hash);
+		$sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash));
 
 		if($noscript_content || $load) {
 
-			$r = null;
-
 			require_once('include/channel.php');
 			$sys = get_sys_channel();
-			$sysid = $sys['channel_id'];
+			// in case somebody turned off public access to sys channel content using permissions
+			// make that content unsearchable by ensuring the owner uid can't match
+			$sys_id = perm_is_allowed($sys['channel_id'], $observer_hash, 'view_stream') ? $sys['channel_id'] : 0;
+
+			$r = null;
 
 			if(local_channel()) {
-				$r = q("SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1",
+				$r = q("SELECT item.id AS item_id FROM item WHERE uid = %d AND mid = '%s' $item_normal LIMIT 1",
+					intval(local_channel()),
+					dbesc($target_item['parent_mid'])
+				);
+			}
+
+			if(!$r) {
+				$r = q("SELECT item.id AS item_id FROM item
+					WHERE ((mid = '%s'
+					AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''
+					AND item.deny_gid  = '' AND item_private = 0 )
+					AND uid IN ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
+					OR uid = %d ))) OR
+					(mid = '%s' $sql_extra ))
+					$item_normal
+					limit 1",
+					dbesc($target_item['parent_mid']),
+					intval($sys_id),
+					dbesc($target_item['parent_mid'])
+				);
+			}
+		}
+
+		elseif($update && !$load) {
+			require_once('include/channel.php');
+			$sys = get_sys_channel();
+			// in case somebody turned off public access to sys channel content using permissions
+			// make that content unsearchable by ensuring the owner uid can't match
+			$sys_id = perm_is_allowed($sys['channel_id'], $observer_hash, 'view_stream') ? $sys['channel_id'] : 0;
+
+			$r = null;
+			if(local_channel()) {
+				$r = q("SELECT item.parent AS item_id from item
+					WHERE uid = %d
+					AND parent_mid = '%s'
+					$item_normal_update
+					$simple_update
+					LIMIT 1",
 					intval(local_channel()),
 					dbesc($target_item['parent_mid'])
 				);
 			}
 
 			if(! $r) {
-
-				// in case somebody turned off public access to sys channel content using permissions
-				// make that content unsearchable by ensuring the owner uid can't match
-
-				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
-					$sysid = 0;
-
 				$r = q("SELECT item.id as item_id from item
-					WHERE mid = '%s'
-					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' 
-					AND item.deny_gid  = '' AND item_private = 0 ) 
+					WHERE ((parent_mid = '%s'
+					AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''
+					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-					OR uid = %d )
-					$sql_extra )
+					OR uid = %d ))) OR
+					(parent_mid = '%s' $sql_extra ))
 					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
-					intval($sysid)
-				);
-			}
-		}
-	
-		elseif($update && !$load) {
-			$r = null;
-
-			require_once('include/channel.php');
-			$sys = get_sys_channel();
-			$sysid = $sys['channel_id'];
-			if(local_channel()) {
-				$r = q("SELECT item.parent AS item_id from item
-					WHERE uid = %d
-					and parent_mid = '%s'
-					$item_normal_update
-					$simple_update
-					limit 1",
-					intval(local_channel()),
+					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
-			if($r === null) {
-				// in case somebody turned off public access to sys channel content using permissions
-				// make that content unsearchable by ensuring the owner_xchan can't match
-				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
-					$sysid = 0;
-				$r = q("SELECT item.parent AS item_id from item
-					WHERE parent_mid = '%s'
-					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' 
-					AND item.deny_gid  = '' AND item_private = 0 ) 
-					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-					OR uid = %d )
-					$sql_extra )
-					$item_normal_update
-					$simple_update
-					limit 1",
-					dbesc($target_item['parent_mid']),
-					intval($sysid)
-				);
-			}
 		}
-	
+
 		else {
-			$r = array();
+			$r = [];
 		}
 
 		if($r) {
 			$parents_str = ids_to_querystr($r,'item_id');
 			if($parents_str) {
-				$items = q("SELECT item.*, item.id AS item_id 
+				$items = q("SELECT item.*, item.id AS item_id
 					FROM item
-					WHERE parent in ( %s ) $item_normal ",
+					WHERE parent in ( %s ) $sql_extra $item_normal ",
 					dbesc($parents_str)
 				);
 				xchan_query($items);
@@ -341,10 +336,10 @@ class Display extends \Zotlabs\Web\Controller {
 		else {
 			$items = array();
 		}
-	
+
 
 		switch($module_format) {
-			
+
 		case 'html':
 
 			if ($update) {
@@ -363,7 +358,7 @@ class Display extends \Zotlabs\Web\Controller {
 				\App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . \App::$page['title'] : \App::$page['title']);
 
 				$o .= conversation($items, 'display', $update, 'client');
-			} 
+			}
 
 			break;
 
@@ -380,7 +375,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'$owner'         => '',
 				'$profile_page'  => xmlify(z_root() . '/display/' . $target_item['mid']),
 			));
-				
+
 			$x = [ 'xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params ];
 			call_hooks('atom_feed_top',$x);
 
@@ -406,13 +401,13 @@ class Display extends \Zotlabs\Web\Controller {
 			header('Content-type: application/atom+xml');
 			echo $atom;
 			killme();
-			
+
 		}
 
 		$o .= '<div id="content-complete"></div>';
 
 		if((($update && $load) || $noscript_content) && (! $items)) {
-			
+
 			$r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
 				dbesc($item_hash)
 			);
@@ -421,14 +416,14 @@ class Display extends \Zotlabs\Web\Controller {
 				if(intval($r[0]['item_deleted'])) {
 					notice( t('Item has been removed.') . EOL );
 				}
-				else {	
-					notice( t('Permission denied.') . EOL ); 
+				else {
+					notice( t('Permission denied.') . EOL );
 				}
 			}
 			else {
 				notice( t('Item not found.') . EOL );
 			}
-	
+
 		}
 
 		$_SESSION['loadtime'] = datetime_convert();

Zotlabs/Module/Editpost.php

@@ -58,9 +58,9 @@ class Editpost extends \Zotlabs\Web\Controller {
 
 		if ($catsenabled){
 		        $itm = fetch_post_tags($itm);
-	
+
 	                $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-	
+
 		        foreach ($cats as $cat) {
 		                if (strlen($category))
 		                        $category .= ', ';
@@ -95,6 +95,7 @@ class Editpost extends \Zotlabs\Web\Controller {
 			'defloc' => $channel['channel_location'],
 			'visitor' => true,
 			'title' => htmlspecialchars_decode($itm[0]['title'],ENT_COMPAT),
+			'summary' => htmlspecialchars_decode($itm[0]['summary'],ENT_COMPAT),
 			'category' => $category,
 			'showacl' => false,
 			'profile_uid' => $owner_uid,

Zotlabs/Module/Embedphotos.php

@@ -40,7 +40,8 @@ class Embedphotos extends \Zotlabs\Web\Controller {
 			if (!$href) {
 				json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false));
 			}
-			$resource_id = array_pop(explode('/', $href));
+			$arr = explode('/', $href);
+			$resource_id = array_pop($arr);
 			$x = self::photolink($resource_id);
 			if($x) 
 				json_return_and_die(array('status' => true, 'photolink' => $x, 'resource_id' => $resource_id));

Zotlabs/Module/Fhublocs.php

@@ -15,12 +15,12 @@ class Fhublocs extends \Zotlabs\Web\Controller {
 
 		if(! is_site_admin())
 			return;
-	
+
 		$o = '';
-	
+
 		$r = q("select * from channel where channel_removed = 0");
 		$sitekey = get_config('system','pubkey');
-		
+
 		if($r) {
 			foreach($r as $rr) {
 
@@ -38,14 +38,14 @@ class Fhublocs extends \Zotlabs\Web\Controller {
 					if($found) {
 						$o .= 'Hubloc exists for ' . $rr['channel_name'] . EOL;
 						continue;
-					}	
+					}
 				}
 				$y = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1",
 					dbesc($rr['channel_hash'])
 				);
 				if($y)
 					$primary_address = $y[0]['xchan_addr'];
-	
+
 				$hub_address = channel_reddress($rr);
 
 				$primary = (($hub_address === $primary_address) ? 1 : 0);
@@ -56,9 +56,9 @@ class Fhublocs extends \Zotlabs\Web\Controller {
 					dbesc($rr['channel_hash']),
 					dbesc(z_root())
 				);
-	
+
 				// Create a verified hub location pointing to this site.
-	
+
 /*
 				$h = hubloc_store_lowlevel(
 					[
@@ -69,7 +69,7 @@ class Fhublocs extends \Zotlabs\Web\Controller {
 						'hubloc_network'  => 'zot',
 						'hubloc_primary'  => $primary,
 						'hubloc_url'      => z_root(),
-						'hubloc_url_sig'  => base64url_encode(rsa_sign(z_root(),$rr['channel_prvkey'])),
+						'hubloc_url_sig'  => base64url_encode(Crypto::sign(z_root(),$rr['channel_prvkey'])),
 						'hubloc_host'     => \App::get_hostname(),
 						'hubloc_callback' => z_root() . '/post',
 						'hubloc_sitekey'  => $sitekey
@@ -99,11 +99,11 @@ class Fhublocs extends \Zotlabs\Web\Controller {
 					$o . 'local hubloc created for ' . $rr['channel_name'] . EOL;
 				else
 					$o .= 'DB update failed for ' . $rr['channel_name'] . EOL;
-	
+
 			}
-	
+
 			return $o;
-	
+
 		}
 	}
 }

Zotlabs/Module/Follow.php

@@ -14,7 +14,7 @@ use Zotlabs\Daemon\Master;
 class Follow extends Controller {
 
 	function init() {
-	
+
 		if (ActivityStreams::is_as_request() && argc() == 2) {
 
 			$abook_id = intval(argv(1));
@@ -73,11 +73,11 @@ class Follow extends Controller {
 		$url = notags(trim(punify($_REQUEST['url'])));
 		$return_url = $_SESSION['return_url'];
 		$confirm = intval($_REQUEST['confirm']);
-		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);	
+		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
 		$channel = App::get_channel();
 
 		$result = Connect::connect($channel,$url);
-		
+
 		if ($result['success'] == false) {
 			if ($result['message']) {
 				notice($result['message']);
@@ -89,9 +89,9 @@ class Follow extends Controller {
 				json_return_and_die($result);
 			}
 		}
-	
+
 		info( t('Connection added.') . EOL);
-	
+
 		$clone = array();
 		foreach ($result['abook'] as $k => $v) {
 			if (strpos($k,'abook_') === 0) {
@@ -101,30 +101,30 @@ class Follow extends Controller {
 		unset($clone['abook_id']);
 		unset($clone['abook_account']);
 		unset($clone['abook_channel']);
-	
+
 		$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
 		if ($abconfig) {
 			$clone['abconfig'] = $abconfig;
 		}
 		Libsync::build_sync_packet(0, [ 'abook' => [ $clone ] ], true);
-	
+
 		$can_view_stream = their_perms_contains($channel['channel_id'],$clone['abook_xchan'],'view_stream');
-	
+
 		// If we can view their stream, pull in some posts
-	
+
 		if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) {
 			Master::Summon([ 'Onepoll', $result['abook']['abook_id'] ]);
 		}
-	
+
 		if ($interactive) {
 			goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1');
 		}
 		else {
 			json_return_and_die([ 'success' => true ]);
 		}
-	
+
 	}
-	
+
 	function get() {
 		if (! local_channel()) {
 			return login();

Zotlabs/Module/Getfile.php

@@ -1,6 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Lib\Crypto;
 use Zotlabs\Web\HTTPSig;
 use Zotlabs\Lib\Libzot;
 
@@ -106,7 +107,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 				killme();
 			}
 
-			if(! rsa_verify($hash . '.' . $time,base64url_decode($sig),$channel['channel_pubkey'])) {
+			if(! Crypto::verify($hash . '.' . $time,base64url_decode($sig),$channel['channel_pubkey'])) {
 				logger('verify failed.');
 				killme();
 			}

Zotlabs/Module/Home.php

@@ -1,100 +1,114 @@
 <?php
+
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Lib\Libzot;
+use Zotlabs\Web\Controller;
+use Zotlabs\Web\HTTPSig;
+
 require_once('include/items.php');
 require_once('include/conversation.php');
 
 
-
-class Home extends \Zotlabs\Web\Controller {
+class Home extends Controller {
 
 	function init() {
 
-		$ret = array();
-	
-		call_hooks('home_init',$ret);
+		$ret = [];
+
+		call_hooks('home_init', $ret);
+
+		if (Libzot::is_zot_request()) {
+			$key = get_config('system', 'prvkey');
+			$ret = json_encode(Libzot::site_info());
+
+			$headers                     = ['Content-Type' => 'application/x-zot+json', 'Digest' => HTTPSig::generate_digest_header($ret)];
+			$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+			$h                           = HTTPSig::create_sig($headers, $key, z_root());
+			HTTPSig::set_headers($h);
+
+			echo $ret;
+			killme();
+		}
 
 		$splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
-	
-		$channel = \App::get_channel();
-		if(local_channel() && $channel && $channel['xchan_url'] && ! $splash) {
+
+		$channel = App::get_channel();
+		if (local_channel() && $channel && $channel['xchan_url'] && !$splash) {
 			$dest = (($ret['startpage']) ? $ret['startpage'] : '');
-			if(! $dest)
-				$dest = get_config('system','startpage');
-			if(! $dest)
+			if (!$dest)
+				$dest = get_config('system', 'startpage');
+			if (!$dest)
 				$dest = z_root() . '/network';
-	
+
 			goaway($dest);
 		}
 
-		if(remote_channel() && (! $splash) && $_SESSION['atoken']) {
+		if (remote_channel() && (!$splash) && $_SESSION['atoken']) {
 			$r = q("select * from atoken where atoken_id = %d",
 				intval($_SESSION['atoken'])
 			);
-			if($r) {
+			if ($r) {
 				$x = channelx_by_n($r[0]['atoken_uid']);
-				if($x) {
+				if ($x) {
 					goaway(z_root() . '/channel/' . $x['channel_address']);
 				}
 			}
-		} 
+		}
 
-	
-		if(get_account_id() && ! $splash) {
+		if (get_account_id() && !$splash) {
 			goaway(z_root() . '/new_channel');
 		}
-	
+
 	}
-	
-	
+
 	function get($update = 0, $load = false) {
-	
+
 		$o = '';
-	
-	
-		if(x($_SESSION,'theme'))
+
+		if (x($_SESSION, 'theme'))
 			unset($_SESSION['theme']);
-		if(x($_SESSION,'mobile_theme'))
+		if (x($_SESSION, 'mobile_theme'))
 			unset($_SESSION['mobile_theme']);
-	
+
 		$splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
-	
-		call_hooks('home_content',$o);
-		if($o)
+
+		call_hooks('home_content', $o);
+		if ($o)
 			return $o;
-	
-		$frontpage = get_config('system','frontpage');
-		if($frontpage) {
-			if(strpos($frontpage,'include:') !== false) {
-				$file = trim(str_replace('include:' , '', $frontpage));
-				if(file_exists($file)) {
-					\App::$page['template'] = 'full';
-					\App::$page['title'] = t('$Projectname');
-					$o .= file_get_contents($file);
+
+		$frontpage = get_config('system', 'frontpage');
+		if ($frontpage) {
+			if (strpos($frontpage, 'include:') !== false) {
+				$file = trim(str_replace('include:', '', $frontpage));
+				if (file_exists($file)) {
+					App::$page['template'] = 'full';
+					App::$page['title']    = t('$Projectname');
+					$o                     .= file_get_contents($file);
 					return $o;
 				}
 			}
-			if(strpos($frontpage,'http') !== 0)
+			if (strpos($frontpage, 'http') !== 0)
 				$frontpage = z_root() . '/' . $frontpage;
-			if(intval(get_config('system','mirror_frontpage'))) {
+			if (intval(get_config('system', 'mirror_frontpage'))) {
 				$o = '<html><head><title>' . t('$Projectname') . '</title></head><body style="margin: 0; padding: 0; border: none;" ><iframe src="' . $frontpage . '" width="100%" height="100%" style="margin: 0; padding: 0; border: none;" ></iframe></body></html>';
 				echo $o;
 				killme();
 			}
 			goaway($frontpage);
 		}
-	
-	
-		$sitename = get_config('system','sitename');
-		if($sitename) 
-			$o .= '<h1 class="home-welcome">' . sprintf( t('Welcome to %s') ,$sitename) . '</h1>';
-	
-		$loginbox = get_config('system','login_on_homepage');
-		if(intval($loginbox) || $loginbox === false)
+
+		$sitename = get_config('system', 'sitename');
+		if ($sitename)
+			$o .= '<h1 class="home-welcome">' . sprintf(t('Welcome to %s'), $sitename) . '</h1>';
+
+		$loginbox = get_config('system', 'login_on_homepage');
+		if (intval($loginbox) || $loginbox === false)
 			$o .= login(true);
-	
+
 		return $o;
-	
+
 	}
-	
+
 }

Zotlabs/Module/Hq.php

@@ -41,7 +41,7 @@ class Hq extends \Zotlabs\Web\Controller {
 		if(argc() > 1 && argv(1) !== 'load') {
 			$item_hash = argv(1);
 		}
-	
+
 		if($_REQUEST['mid'])
 			$item_hash = $_REQUEST['mid'];
 
@@ -49,9 +49,9 @@ class Hq extends \Zotlabs\Web\Controller {
 		$item_normal_update = item_normal_update();
 
 		if(! $item_hash) {
-			$r = q("SELECT mid FROM item 
+			$r = q("SELECT mid FROM item
 				WHERE uid = %d $item_normal
-				AND mid = parent_mid 
+				AND mid = parent_mid
 				ORDER BY created DESC LIMIT 1",
 				intval(local_channel())
 			);
@@ -71,10 +71,10 @@ class Hq extends \Zotlabs\Web\Controller {
 
 			$target_item = null;
 
-			$r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1",
-				dbesc($item_hash . '%')
+			$r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid = '%s' limit 1",
+				dbesc($item_hash)
 			);
-		
+
 			if($r) {
 				$target_item = $r[0];
 			}
@@ -83,7 +83,7 @@ class Hq extends \Zotlabs\Web\Controller {
 			if($target_item['item_blocked'] == ITEM_MODERATED) {
 				goaway(z_root() . '/moderate/' . $target_item['id']);
 			}
-		
+
 			$simple_update = '';
 			if($update && $_SESSION['loadtime'])
 				$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
@@ -94,16 +94,16 @@ class Hq extends \Zotlabs\Web\Controller {
 			$sys_item = false;
 
 		}
-	
+
 		if(! $update) {
 			$channel = \App::get_channel();
 
 			$channel_acl = [
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid'  => $channel['channel_deny_cid'], 
+				'allow_cid' => $channel['channel_allow_cid'],
+				'allow_gid' => $channel['channel_allow_gid'],
+				'deny_cid'  => $channel['channel_deny_cid'],
 				'deny_gid'  => $channel['channel_deny_gid']
-			]; 
+			];
 
 			$x = [
 				'is_owner'            => true,
@@ -143,7 +143,7 @@ class Hq extends \Zotlabs\Web\Controller {
 				// if the target item is not a post (eg a like) we want to address its thread parent
 				//$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
 				$mid = $target_item['mid'];
-				// if we got a decoded hash we must encode it again before handing to javascript 
+				// if we got a decoded hash we must encode it again before handing to javascript
 				if($decoded)
 					$mid = 'b64.' . base64url_encode($mid);
 			}
@@ -154,7 +154,7 @@ class Hq extends \Zotlabs\Web\Controller {
 			$o .= '<div id="live-hq"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . local_channel()
 				. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . ";</script>\r\n";
-	
+
 			\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[
 				'$baseurl' => z_root(),
 				'$pgtype'  => 'hq',
@@ -241,14 +241,14 @@ class Hq extends \Zotlabs\Web\Controller {
 		else {
 			$r = [];
 		}
-	
+
 		if($r) {
-			$items = q("SELECT item.*, item.id AS item_id 
+			$items = q("SELECT item.*, item.id AS item_id
 				FROM item
 				WHERE parent = '%s' $item_normal ",
 				dbesc($r[0]['item_id'])
 			);
-	
+
 			xchan_query($items,true,(($sys_item) ? local_channel() : 0));
 			$items = fetch_post_tags($items,true);
 			$items = conv_sort($items,'created');

Zotlabs/Module/Import.php

@@ -8,6 +8,7 @@ require_once('include/import.php');
 require_once('include/perm_upgrade.php');
 require_once('library/urlify/URLify.php');
 
+use Zotlabs\Lib\Crypto;
 use Zotlabs\Lib\Libzot;
 
 
@@ -208,12 +209,6 @@ class Import extends \Zotlabs\Web\Controller {
 
 		logger('import step 3');
 
-		if(is_array($data['hubloc'])) {
-			import_hublocs($channel,$data['hubloc'],$seize,$moving);
-		}
-
-		logger('import step 4');
-
 		// create new hubloc for the new channel at this site
 
 		if(array_key_exists('channel',$data)) {
@@ -227,7 +222,7 @@ class Import extends \Zotlabs\Web\Controller {
 						'hubloc_network'  => 'zot',
 						'hubloc_primary'  => (($seize) ? 1 : 0),
 						'hubloc_url'      => z_root(),
-						'hubloc_url_sig'  => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'])),
+						'hubloc_url_sig'  => base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey'])),
 						'hubloc_host'     => \App::get_hostname(),
 						'hubloc_callback' => z_root() . '/post',
 						'hubloc_sitekey'  => get_config('system','pubkey'),
@@ -256,7 +251,7 @@ class Import extends \Zotlabs\Web\Controller {
 					'hubloc_network'  => 'zot6',
 					'hubloc_primary'  => (($seize) ? 1 : 0),
 					'hubloc_url'      => z_root(),
-					'hubloc_url_sig'  => 'sha256.' . base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'])),
+					'hubloc_url_sig'  => 'sha256.' . base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey'])),
 					'hubloc_host'     => \App::get_hostname(),
 					'hubloc_callback' => z_root() . '/zot',
 					'hubloc_sitekey'  => get_config('system','pubkey'),
@@ -276,7 +271,7 @@ class Import extends \Zotlabs\Web\Controller {
 
 		}
 
-		logger('import step 5');
+		logger('import step 4');
 
 
 		// import xchans and contact photos
@@ -334,7 +329,7 @@ class Import extends \Zotlabs\Web\Controller {
 
 		}
 
-		logger('import step 6');
+		logger('import step 5');
 
 		// import xchans
 		$xchans = $data['xchan'];
@@ -403,7 +398,14 @@ class Import extends \Zotlabs\Web\Controller {
 				}
 			}
 
-			logger('import step 7');
+			logger('import step 6');
+		}
+
+		logger('import step 7');
+
+		// this must happen after xchans got imported!
+		if(is_array($data['hubloc'])) {
+			import_hublocs($channel,$data['hubloc'],$seize,$moving);
 		}
 
 		$friends = 0;

Zotlabs/Module/Invite.php

@@ -6,7 +6,7 @@ use Zotlabs\Lib\Apps;
 use Zotlabs\Web\Controller;
 
 /**
- * module: invite.php
+ * module: invitexv2.php
  *
  * send email invitations to join social network
  *
@@ -15,91 +15,291 @@ use Zotlabs\Web\Controller;
 
 class Invite extends Controller {
 
+	/**
+	 * While coding this, I want to introduce a system of qualified messages and notifications.
+	 * Each message consists of a 3 letter prefix, a 4 digit number and a one letter suffix (PREnnnnS).
+	 * The spirit about is not from me, but many decades used by IBM inc. in devel with best success.
+	 *
+	 * The system prefix, used uppercase as system message id, lowercase as css and js prefix (classes, ids etc).
+	 * Usually not used as self::MYP, but placed in the code dominant enough for easy to find.
+	 *
+	 * Concrete here:
+	 * The prefix indicates Z for the Zlabs(core), A for Account stuff, I for Invite.
+	 * The numbers scope will be 00xx within/for templates, 01xx for get, 02xx for post functions.
+	 * Message qualification ends with a uppercase suffix, where
+	 * 	I=Info(only),
+	 *	W=Warning(more then info and less then error),
+	 *	E=Error,
+	 *	F=Fatal(for unexpected errors).
+	 * Btw, in case of using fail2ban, a scan of messages going to log is very much more with ease,
+	 * esspecially in multi language driven systems where messages vary.
+	 *
+	 * @author Hilmar Runge
+	 * @version 2.0.0
+	 * @since 2020-01-20
+	 *
+	 */
+
+	const MYP = 	'ZAI';
+	const VERSION =	'2.0.0';
+
 	function post() {
-	
-		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
+
+		// zai02
+
+		if (! local_channel()) {
+			notice( 'ZAI0201E,' .t('Permission denied.') . EOL);
 			return;
 		}
 
-		if(! Apps::system_app_installed(local_channel(), 'Invite')) {
+		if (! Apps::system_app_installed(local_channel(), 'Invite')) {
+			notice( 'ZAI0202E,' . t('Invite App') . ' (' . t('Not Installed') . ')' . EOL);
 			return;
 		}
-	
+
 		check_form_security_token_redirectOnErr('/', 'send_invite');
-	
-		$max_invites = intval(get_config('system','max_invites'));
-		if(! $max_invites)
-			$max_invites = 50;
-	
-		$current_invites = intval(get_pconfig(local_channel(),'system','sent_invites'));
-		if($current_invites > $max_invites) {
-			notice( t('Total invitation limit exceeded.') . EOL);
+
+		$ok = $ko = 0;
+		$feedbk = '';
+		$isajax = is_ajax();
+		$eol 	= $isajax ? "\n" : EOL;
+		$policy  = intval(get_config('system','register_policy'));
+		if ($policy == REGISTER_CLOSED) {
+			notice( 'ZAI0212E,' . t('Register is closed') . ')' . EOL);
 			return;
-		};
-	
-	
-		$recips  = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array());
-		$message = ((x($_POST,'message'))    ? notags(trim($_POST['message']))    : '');
-	
-		$total = 0;
-	
-		if(get_config('system','invitation_only')) {
-			$invonly = true;
-			$x = get_pconfig(local_channel(),'system','invites_remaining');
-			if((! $x) && (! is_site_admin()))
-				return;
 		}
-	
-		foreach($recips as $recip) {
-	
-			$recip = trim($recip);
-			if(! $recip)
-				continue;
-	
-			if(! validate_email($recip)) {
-				notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
-				continue;
-			}
-	
-			else
-				$nmessage = $message;
-	
-			$account = App::get_account();
-	
-			$res = z_mail(
-				[ 
-				'toEmail'        => $recip,
-				'fromName'       => ' ',
-				'fromEmail'      => $account['account_email'],
-				'messageSubject' => t('Please join us on $Projectname'),
-				'textVersion'    => $nmessage,
-				]
-			);
-	
-			if($res) {
-				$total ++;
-				$current_invites ++;
-				set_pconfig(local_channel(),'system','sent_invites',$current_invites);
-				if($current_invites > $max_invites) {
-					notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
-					return;
+		if ($policy == REGISTER_OPEN)
+			$flags = 0;
+		elseif ($policy == REGISTER_APPROVE)
+			$flags = ACCOUNT_PENDING;
+		$flags  = ($flags | intval(get_config('system','verify_email')));
+
+		// how many max recipients in one mail submit
+		$maxto = get_config('system','invitation_max_recipients', 'na');
+		If (is_site_admin()) {
+			// set, if admin is operator, default to 12
+			if ($maxto === 'na') set_config('system','invitation_max_recipients', 12);
+		}
+		$maxto = ($maxto === 'na') ? 12 : $maxto;
+
+		// language code current for the invitation
+		$lcc  = x($_POST['zailcc'])  && preg_match('/[a-z\-]{2,5}/', $_POST['zailcc'])
+				? $_POST['zailcc']
+				: '';
+
+		// expiration duration amount quantity, in case of doubts defaults 2
+		$durn = x($_POST['zaiexpiren']) && preg_match('/[0-9]{1,2}/', $_POST['zaiexpiren'])
+				? trim(intval($_POST['zaiexpiren']))
+				: '2';
+		!$durn ? $durn = 2 : '';
+
+		// expiration duration unit 1st letter (day, weeks, months, years), defaults days
+		$durq = x($_POST['zaiexpire']) && preg_match('/[ihd]{1,1}/', $_POST['zaiexpire'])
+				? $_POST['zaiexpire']
+				: 'd';
+
+		$dur = self::calcdue($durn.$durq);
+		$due = t('Note, the invitation code is valid up to') . ' ' . $dur['due'];
+
+		if ($isajax) {
+			$feedbk .= 'ZAI0207I ' . $due . $eol;
+		}
+
+		// take the received email addresses and discart duplicates
+		$recips  = array_filter( array_unique( preg_replace('/^\s*$/', '',
+			((x($_POST,'zaito')) ? explode( "\n",$_POST['zaito']) : array() ) )));
+
+		$havto = count($recips);
+
+		if ( $havto > $maxto) {
+			$feedbk .= 'ZAI0210E ' . sprintf( t('Too many recipients for one invitation (max %d)'), $maxto) . $eol;
+			$ko++;
+
+		} elseif ( $havto == 0 ) {
+			$feedbk .= 'ZAI0211E ' . t('No recipients for this invitation') . $eol;
+			$ko++;
+
+		} else {
+
+			// each email address
+			foreach($recips as $n => $recip) {
+
+				// if empty ignore
+				$recip = $recips[$n] = trim($recip);
+				if(! $recip) continue;
+
+				// see if we have an email address who@domain.tld
+				if (!preg_match('/^.{2,64}\@[a-z0-9.-]{4,32}\.[a-z]{2,12}$/', $recip)) {
+					$feedbk .= 'ZAI0203E ' . ($n+1) . ': ' . sprintf( t('(%s) : Not a valid email address'), $recip) . $eol;
+					$ko++;
+					continue;
+				}
+				if(! validate_email($recip)) {
+					$feedbk .= 'ZAI0204E ' . ($n+1) . ': ' . sprintf( t('(%s) : Not a real email address'), $recip) . $eol;
+					$ko++;
+					continue;
+				}
+
+				// do we accept the email (not black listed)
+				if(! allowed_email($recip)) {
+					$feedbk .= 'ZAI0205E ' . ($n+1) . ': ' . sprintf( t('(%s) : Not allowed email address'), $recip) . $eol;
+					$ko++;
+					continue;
+				}
+
+				// is the email address just in use for account or registered before
+				$r = q("SELECT account_email       AS em FROM account  WHERE account_email = '%s'"
+					  . " UNION "
+					  ."SELECT reg_email           AS em FROM register WHERE reg_vital = 1 AND reg_email = '%s' LIMIT 1;",
+						dbesc($recip),
+						dbesc($recip)
+				);
+				if($r && $r[0]['em'] == $recip) {
+					$feedbk .= 'ZAI0206E ' . ($n+1) . ': ' . sprintf( t('(%s) : email address already in use'), $recip) . $eol;
+					$ko++;
+					continue;
+				}
+
+				if ($isajax) {
+					// seems we have an email address acceptable
+					$feedbk .= 'ZAI0209I ' . ($n+1) . ': ' . sprintf( t('(%s) : Accepted email address'), $recip) . $eol;
 				}
 			}
-			else {
-				notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
-			}
-	
 		}
-		notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
+
+		if ($isajax) {
+			// we are not silent on the ajax road
+			echo json_encode(array('feedbk' => $feedbk, 'due' => $due));
+
+			// that mission is complete
+			killme();
+			exit;
+		}
+
+		//	Total ?todo notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
+
+		// any errors up to now in fg?
+
+
+		// down from here, only on the main road (no more ajax)
+
+		// tell if sth is to tell
+		$feedbk ? notice($feedbk) . $eol : '';
+
+		if ($ko > 0) return;
+
+		// the personal mailtext
+		$mailtext = ((x($_POST,'zaitxt'))    ? notags(trim($_POST['zaitxt']))    : '');
+
+		// to log in db
+		$reonar = json_decode( ((x($_POST,'zaireon'))  ? notags(trim($_POST['zaireon']))    : ''), TRUE, 8) ;
+
+		// me, the invitor
+		$account = App::get_account();
+		$reonar['from'] = $account['account_email'];
+		$reonar['date'] = datetime_convert();
+		$reonar['fromip'] = $_SERVER['REMOTE_ADDR'];
+
+		// who is the invitor on
+		$inby = local_channel();
+
+		$ok = $ko = 0;
+
+		// send the mail(s)
+		foreach($recips as $n => $recip) {
+
+			$reonar['due'] = $due;
+			$reonar['to']  = $recip;
+			$reonar['txtpersonal'] = $mailtext;
+
+			// generate an invide code to store and pm
+			$invite_code = autoname(8) . rand(1000,9999);
+
+			// again the final localized templates  $reonar['subject'] $reonar['lang'] $reonar['tpl']
+
+			// save current operators lc and take the desired to mail
+			push_lang($reonar['lang']);
+			// resolve
+			$tx = replace_macros(get_intltext_template('invite.'.$reonar['tpl'].'.tpl'),
+				array(
+					'$projectname'		=> t('$Projectname'),
+					'$invite_code'		=> $invite_code,
+					'$invite_where' 	=> z_root() . '/register',
+					'$invite_whereami'	=> str_replace('@', '@+', $reonar['whereami']),
+					'$invite_whoami'	=> z_root() . '/channel/' . $reonar['whoami'],
+					'$invite_anywhere'	=> z_root() . '/pubsites'
+				)
+			);
+			// restore lc to operator
+			pop_lang();
+
+			$reonar['txttemplate'] = $tx;
+
+			// pm
+			$zem = z_mail(
+				[
+				'toEmail'        => $recip,
+				'fromName'       => ' ',
+				'fromEmail'      => $reonar['from'],
+				'messageSubject' => $reonar['subject'],
+				'textVersion'    => ($mailtext ? $mailtext . "\n\n" : '') . $tx . "\n" . $due,
+				]
+			);
+
+			if(!$zem) {
+
+				$ko++;
+				$msg = 'ZAI0208E,' . sprintf( t('%s : Message delivery failed.'), $recip);
+
+			} else {
+
+				$ok++;
+				$msg = 'ZAI0208I ' . sprintf( t('To %s : Message delivery success.'), $recip);
+
+				// if verify_email is the rule, email becomes a dId2 - NO
+				// $did2 = ($flags & ACCOUNT_UNVERIFIED) == ACCOUNT_UNVERIFIED ? $recip : '';
+
+				// always enforce verify email with invitations, thus email becomes a dId2
+				$did2 = $recip;
+				$flags |= ACCOUNT_UNVERIFIED;
+
+				// defaults vital, reg_pass
+				$r = q("INSERT INTO register ("
+				. "reg_flags,reg_didx,reg_did2,reg_hash,reg_created,reg_startup,reg_expires,reg_email,reg_byc,reg_uid,reg_atip,reg_lang,reg_stuff)"
+				. " VALUES ( %d, 'i', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s') ",
+					intval($flags),
+					dbesc($did2),
+					dbesc($invite_code),
+					dbesc(datetime_convert()),
+					dbesc(datetime_convert()),
+					dbesc($dur['due']),
+					dbesc($recip),
+					intval($inby),
+					intval($account['account_id']),
+					dbesc($reonar['fromip']),
+					dbesc($reonar['lang']),
+					dbesc(json_encode( array('reon' => $reonar) ))
+				);
+			}
+			$msg .= ' (a' . $account['account_id'] . ', c' . $inby . ', from:' . $reonar['from'] . ')';
+			zar_log( $msg);
+		}
+
+		$ok + $ko > 0
+		? notice( 'ZAI0212I ' . sprintf( t('%1$d mail(s) sent, %2$d mail error(s)'), $ok, $ko) . EOL)
+		: '';
+		//logger( print_r( $reonar, true) );
+
 		return;
 	}
-	
-	
+
+
 	function get() {
-	
+
+		// zai1
+
 		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
+			notice( 'ZAI0101E,' . t('Permission denied.') . EOL);
 			return;
 		}
 
@@ -107,68 +307,267 @@ class Invite extends Controller {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
 
-			$o = '<b>' . t('Invite App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Send email invitations to join this network');
+			$o = 'ZAI0102E,' . t('Invite App') . ' (' . t('Not Installed') . ')' . EOL;
 			return $o;
 		}
 
-		nav_set_selected('Invite');
-	
-		$tpl = get_markup_template('invite.tpl');
-		$invonly = false;
-	
-		if(get_config('system','invitation_only')) {
-			$invonly = true;
-			$x = get_pconfig(local_channel(),'system','invites_remaining');
-			if((! $x) && (! is_site_admin())) {
-				notice( t('You have no more invitations available') . EOL);
+		if (! (get_config('system','invitation_also') || get_config('system','invitation_only')) ) {
+			$o = 'ZAI0103E,' . t('Invites not proposed by configuration') . '. ';
+			$o .= t('Contact the site admin');
+			return $o;
+		}
+
+		// invitation_by_user may still not configured, the default 'na' will tell this
+		// if configured, 0 disables invitations by users, other numbers are how many invites a user may propagate
+		$invuser = get_config('system','invitation_by_user', 'na');
+
+		// if the mortal user drives the invitation
+		If (! is_site_admin()) {
+
+			// when not configured, 4 is the default
+			$invuser = ($invuser === 'na') ? 4 : $invuser;
+
+			// a config value 0 disables invitation by users
+			if (!$invuser) {
+				$o = 'ZAI0104E, ' . t('Invites by users not enabled') . '. ';
+				return $o;
+			}
+
+			if ($ihave >= $invuser) {
+				notice( 'ZAI0105W,' . t('You have no more invitations available') . EOL);
 				return '';
 			}
+
+		} else {
+			// general deity admin invite limit infinite (theoretical)
+			if ($invuser === 'na') set_config('system','invitation_by_user', 4);
+			// for display only
+			$invuser = '∞';
 		}
-	
-			if($invonly && ($x || is_site_admin())) {
-				$invite_code = autoname(8) . rand(1000,9999);
-				$nmessage = str_replace('$invite_code',$invite_code,$message);
-	
-				$r = q("INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ",
-					dbesc($invite_code),
-					dbesc(datetime_convert())
-				);
-	
-				if(! is_site_admin()) {
-					$x --;
-					if($x >= 0)
-						set_pconfig(local_channel(),'system','invites_remaining',$x);
-					else
-						return;
-				}
-			}
-	
+
+		// xchan record of the page observer
+		// while quoting matters the user, the sending is associated with a channel (of the user)
+		// also the admin may and should decide, which channel will told to the public
 		$ob = App::get_observer();
 		if(! $ob)
-			return $o;
-	
-		$channel = App::get_channel();
-	
+			return 'ZAI0109F,' . t('Not on xchan') . EOL;
+		$whereami = $ob['xchan_addr'];
+		$channel  = App::get_channel();
+		$whoami = $channel['channel_address'];
+
+		// to pass also to post()
+		$tao = 'tao.zai.whereami = ' . "'" . $whereami . "';\n"
+			 . 'tao.zai.whoami = ' 	 . "'" . $whoami . "';\n";
+
+		// expirations, duration interval
+		$dur = self::calcdue();
+		$tao .= 'tao.zai.expire = { durn: ' . $dur['durn']
+			  					. ', durq: ' . "'" . $dur['durq']  . "'"
+			  					. ', due: '  . "'" . $dur['due']   . "' };\n";
+
+		// to easy redisplay the empty form
+		nav_set_selected('Invite');
+
+		// inform about the count of invitations we have at all
+		$r = q("SELECT count(reg_id) as ct FROM register WHERE reg_vital = 1");		// where not admin TODO
+		$wehave = ($r ? $r[0]['ct'] : 0);
+
+		// invites max for all users except admins
+		$invmaxau = intval(get_config('system','invitations_max_users'));
+		if(! $invmaxau) {
+			$invmaxau = 50;
+			if (is_site_admin()) {
+				set_config('system','invitations_max_users',intval($invmaxau));
+			}
+		}
+
+		if ($wehave > $invmaxau) {
+			if (! is_site_admin()) {
+				$feedbk .= 'ZAI0200E,' . t('All users invitation limit exceeded.') . $eol;
+			}
+		}
+
+		// let see how many invites currently used by the user
+		$r = q("SELECT count(reg_id) AS n FROM register WHERE reg_vital = 1 AND reg_byc = %d",
+			 intval(local_channel()));
+		$ihave = $r ? $r[0]['n'] : 0;
+
+		$tpl = get_markup_template('invite.tpl');
+
+		$inv_rabots = array(
+ 					'i'	=> t('Minute(s)'),
+ 					'h' => t('Hour(s)')  ,
+ 					'd' => t('Day(s)')
+		);
+		$inv_expire = replace_macros(get_markup_template('field_duration.qmc.tpl'),
+			 array(
+			 	'label'  	=> t('Invitation expires after'),
+			 	'qmc'	 	=> 'zai',
+				'qmcid'		=> 'ZAI0014I',
+			 	'field' => 	array(
+			 		'name'  => 'expire',
+			 		'title' => t('duration up from now'),
+			 		'value' => ($invexpire_n ? $invexpire_n : 2),
+			 		'min'  => '1',
+			 		'max'  => '99',
+			 		'size' => '2',
+					'default' => ($invexpire_u ? $invexpire_u : 'd')
+			 	),
+			 	'rabot'	=> 	$inv_rabots
+			 )
+		);
+
+		// let generate an invite code that here and never will be applied (only to fill displayed template)
+		// real invite codes become generated for each recipient when we store the new invitation(s)
+		// $invite_code = substr(str_shuffle('abcdefghijklmnopqrstuvwxyz'), 0, 8) . rand(1000,9999);
+		// let take one descriptive for template (as said is never used)
+		$invite_code = 'INVITATE2020';
+
+		// what languages we use now
+		$lccmy	= ((isset(App::$config['system']['language'])) ? App::$config['system']['language'] : 'en');
+		// and all the localized templates belonging to invite
+		$tpls	= glob('view/*/invite.*.tpl');
+
+		$tpla=$tplx=$tplxs=array();
+		foreach ($tpls as $tpli) {
+			list( $nop, $l, $t ) = explode( '/', $tpli);
+			if ( preg_match('/\.subject/', $t) =='1' ) {
+				// indicate a subject tpl exists
+				$t=str_replace(array('invite.', '.subject', '.tpl'), '', $t);
+				$tplxs[$l][$t]=true;
+				continue;
+			}
+			// collect unique template names cross all languages and
+			// tpla[language][]=template those available in each language
+			$tplx[] = $tpla[$l][] = str_replace( array('invite.', '.tpl'), '', $t);
+		}
+
+		$langs = array_keys($tpla);
+		asort($langs);
+
+		$tplx = array_unique($tplx);
+		asort($tplx);
+
+		// prepare current language and the default standard template (causual) for js
+		// With and in js, I use a var 'tao' as a shortcut for top array object
+		// and also qualify the object with the prefix zai = tao.zai as my var used outsite functions
+		// can be unique within the overall included spaghette whirls
+		// one can say Im too lazy to write prototypes and just I can agree.
+		// tao simply applies the fact of using the same var as object and/or array in ja.
+		$tao.='tao.zai.lccmy = ' . "'" . $lccmy . "';\n" . 'tao.zai.itpl = ' . "'" . 'casual' . "';\n";
+
+		$lcclane=$tx=$tplin='';
+		//$lccsym='<span class="fa zai_fa zai_lccsym"></span>';	// alt 
+		$tplsym='<span class="fa zai_fa"></span>';
+
+		// I will uncomment for js console debug
+		// $tao.='tao.zai.debug = ' . "'" . json_encode($tplxs) . "';\n";
+
+		// running thru the localized templates (subjects and textmsgs) and bring them to tao
+		// lcc LanguageCountryCode,
+		// lcc2 is a 2 character and lcc5 a 5 character LanguageCountryCode
+		foreach($tpla as $l => $tn) {
+
+			// restyle lc to iso getttext format to avoid errors in js, hilite the current
+			$lcc = str_replace('-', '_', $l);
+			$hi = ($l == $lccmy) ? ' zai_hi' : '';
+			$lcc2 = strlen($l) == 2 ? ' zai_lcc2' : '';
+			$lcc5 = strlen($l) == 5 ? ' zai_lcc5' : '';
+			$lccg = ' zai_lccg' . substr( $l, 0, 2 );
+			$lcclane
+			.= 	'<span class="fa zai_fa zai_lccsym' . $lcc2 . $lcc5 . $lccg . '"></span>'
+			.	'<a href="javascript:;" class="zai_lcc' . $lcc2 . $lcc5 . $lccg . $hi . '">' . $lcc . '</a>';
+			//  textmsg
+			$tao .= 'tao.zai.t.' . $lcc . ' = {};' . "\n";
+			//  subject
+			$tao .= 'tao.zai.s.' . $lcc . ' = {};' . "\n";
+
+			// resolve localized templates and take intented lc for
+			foreach($tn as $t1) {
+
+				// save current lc and take the desired
+				push_lang($l);
+
+				// resolve
+				$tx = replace_macros(get_intltext_template('invite.'.$t1.'.tpl'),
+					array(
+						'$projectname'		=> t('$Projectname'),
+						'$invite_code'		=> $invite_code,
+						'$invite_where' 	=> z_root() . '/register',
+						'$invite_whereami'	=> $whereami,
+						'$invite_whoami'	=> z_root() . '/channel/' . $whoami,
+						'$invite_anywhere'	=> z_root() . '/pubsites'
+					)
+				);
+
+				// a default subject if no associated exists
+				$ts=t('Invitation');
+				if ( $tplxs[$l][$t1] )
+					$ts = replace_macros(get_intltext_template('invite.'.$t1.'.subject.tpl'),
+					array(
+						'$projectname'		=> t('$Projectname'),
+						'$invite_loc'		=> get_config('system','sitename')
+					)
+				);
+
+				// restore lc to current foreground
+				pop_lang();
+
+				// bring to tao as js like it
+				$tao .= 'tao.zai.t.' . $lcc . '.' . $t1 . " = '" . rawurlencode($tx) . "';\n";
+				$tao .= 'tao.zai.s.' . $lcc . '.' . $t1 . " = '" . rawurlencode($ts) . "';\n";
+			}
+		}
+
+		// hilite the current defauls just from the beginning
+		foreach ($tplx as $t1) {
+			$hi = ($t1 == 'casual') ? ' zai_hi' : '';
+			$tplin .= $tplsym.'<a href="javascript:;" id="zai-' . $t1
+					. '" class="invites'.$hi.'">' . $t1 . '</a>';
+		}
+
+		// fill the form for foreground
 		$o = replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("send_invite"),
+			'$zai'	=> strtolower(self::MYP),
+			'$tao'	=> $tao,
 			'$invite' => t('Send invitations'),
-			'$addr_text' => t('Enter email addresses, one per line:'),
-			'$msg_text' => t('Your message:'),
-			'$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n"
-				. $linktxt
-				. (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code:') . " " . $invite_code . "\r\n" . "\r\n" : '')
-				. t('1. Register at any $Projectname location (they are all inter-connected)')
-				. "\r\n" . "\r\n" . z_root() . '/register'
-				. "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.')
-				. "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit') . " " . z_root() . '/channel/' . $channel['channel_address'] . ')'
-				. "\r\n" . "\r\n"
-				. t('3. Click [Connect]')
-				. "\r\n" . "\r\n"  ,
+			'$ihave'  => 'ZAI0106I, ' . t('Invitations I am using') . ': ' . $ihave . ' / ' . $invuser,
+			'$wehave' => 'ZAI0107I, ' . t('Invitations we are using') . ': ' . $wehave . ' / ' . $invmaxau,
+			'$n10' => 'ZAI0010I',	'$m10' => t('§ Note, the email(s) sent will be recorded in the system logs'),
+			'$n11' => 'ZAI0011I',	'$m11' => t('Enter email addresses, one per line:'),
+			'$n12' => 'ZAI0012I',	'$m12' => t('Your message:'),
+			'$n13' => 'ZAI0013I',	'$m13' => t('Invite template'),
+			'$inv_expire' => $inv_expire,
+			'$subject_label' => t('Subject:'),
+			'$subject'	=> t('Invitation'),
+			'$lcclane'		=> $lcclane,
+			'$tplin'	=> $tplin,
+			'$standard_message' => '',
+			'$personal_message' => '',
+			'$personal_pointer' => t('Here you may enter personal notes to the recipient(s)'),
+			'$due' => t('Note, the invitation code is valid up to') . ' ' . $dur['due'],
 			'$submit' => t('Submit')
 		));
-	
+
 		return $o;
 	}
-	
+
+	function calcdue($duri=false) {
+		// expirations, duration interval
+		if ($duri===false)
+			$duri = get_config('system','register_expire', '2d');
+		if ( preg_match( '/^[0-9]{1,2}[ihdwmy]{1}$/', $duri ) ) {
+			$durq = substr($duri, -1);
+			$durn = substr($duri, 0, -1);
+			$due  = date('Y-m-d H:i:s', strtotime('+' . $durn . ' '
+				  . str_replace( array(':i',':h',':d',':w',':m',':y'),
+			 				 	 array('minutes', 'hours', 'days', 'weeks', 'months', 'years'),
+			 		 (':'.$durq))
+				));
+			return array( 'durn' => $durn, 'durq' => $durq, 'due' => $due);
+		}
+		return false;
+	}
 }
+

Zotlabs/Module/Item.php

@@ -55,7 +55,12 @@ class Item extends Controller {
 
 			$portable_id = EMPTY_STR;
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$i = null;
 
@@ -132,13 +137,14 @@ class Item extends Controller {
 
 
 			$i = Activity::encode_item_collection($items, 'conversation/' . $item_id, 'OrderedCollection');
-			if($portable_id) {
-				ThreadListener::store(z_root() . '/item/' . $item_id,$portable_id);
-			}
 
 			if(! $i)
 				http_status_exit(404, 'Not found');
 
+			if($portable_id && (! intval($items[0]['item_private']))) {
+				ThreadListener::store(z_root() . '/item/' . $item_id, $portable_id);
+			}
+
 			$x = array_merge(['@context' => [
 				ACTIVITYSTREAMS_JSONLD_REV,
 				'https://w3id.org/security/v1',
@@ -166,7 +172,12 @@ class Item extends Controller {
 
 			$portable_id = EMPTY_STR;
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$i = null;
 
@@ -237,6 +248,16 @@ class Item extends Controller {
 			if(! $i)
 				http_status_exit(404, 'Not found');
 
+			if ($portable_id && (! intval($items[0]['item_private']))) {
+				$c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s'",
+					intval($items[0]['uid']),
+					dbesc($portable_id)
+				);
+				if (! $c) {
+					ThreadListener::store(z_root() . '/item/' . $item_id, $portable_id);
+				}
+			}
+
 			$x = array_merge(['@context' => [
 				ACTIVITYSTREAMS_JSONLD_REV,
 				'https://w3id.org/security/v1',
@@ -810,29 +831,16 @@ class Item extends Controller {
 			// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
 			// we may need virtual or template classes to implement the possible alternatives
 
-			if(strpos($body,'[/summary]') !== false) {
-			    $match = '';
-			    $cnt = preg_match("/\[summary\](.*?)\[\/summary\]/ism",$body,$match);
-			    if($cnt) {
-			        $summary .= $match[1];
-			    }
-			    $body_content = preg_replace("/\[summary\](.*?)\[\/summary\]/ism", '',$body);
-			    $body = trim($body_content);
-			}
-
-			$summary = cleanup_bbcode($summary);
-
 			$body = cleanup_bbcode($body);
 
 			// Look for tags and linkify them
 
-			$results = linkify_tags($summary, ($uid) ? $uid : $profile_uid);
 			$results = linkify_tags($body, ($uid) ? $uid : $profile_uid);
 
 			if($results) {
 
 				// Set permissions based on tag replacements
-				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private);
+				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $private, $parent_item);
 
 				foreach($results as $result) {
 					$success = $result['success'];
@@ -876,15 +884,10 @@ class Item extends Controller {
 
 			if(! $preview) {
 				fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
-
                 fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],((strpos($summary,'[/crypt]')) ? $_POST['media_str'] : $summary),$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
-
-
 				fix_attached_file_permissions($channel,$observer['xchan_hash'],((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
-
 			}
 
-
 			$attachments = '';
 			$match = false;
 
@@ -922,10 +925,9 @@ class Item extends Controller {
 				}
 			}
 
+			// BBCODE end alert
 		}
 
-	// BBCODE end alert
-
 		if(strlen($categories)) {
 
 			$cats = explode(',',$categories);

Zotlabs/Module/Like.php

@@ -1,37 +1,42 @@
 <?php
+
 namespace Zotlabs\Module;
 
+use App;
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\Libsync;
+use Zotlabs\Web\Controller;
+use Zotlabs\Daemon\Master;
+
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
 require_once('include/conversation.php');
 
-class Like extends \Zotlabs\Web\Controller {
+class Like extends Controller {
 
 	private function reaction_to_activity($reaction) {
 
 		$acts = [
-			'like'        => ACTIVITY_LIKE ,
-			'dislike'     => ACTIVITY_DISLIKE ,
-			'agree'       => ACTIVITY_AGREE ,
-			'disagree'    => ACTIVITY_DISAGREE ,
-			'abstain'     => ACTIVITY_ABSTAIN ,
-			'attendyes'   => ACTIVITY_ATTEND ,
-			'attendno'    => ACTIVITY_ATTENDNO ,
+			'like'        => ACTIVITY_LIKE,
+			'dislike'     => ACTIVITY_DISLIKE,
+			'agree'       => ACTIVITY_AGREE,
+			'disagree'    => ACTIVITY_DISAGREE,
+			'abstain'     => ACTIVITY_ABSTAIN,
+			'attendyes'   => ACTIVITY_ATTEND,
+			'attendno'    => ACTIVITY_ATTENDNO,
 			'attendmaybe' => ACTIVITY_ATTENDMAYBE
 		];
 
 		// unlike (etc.) reactions are an undo of positive reactions, rather than a negative action.
 		// The activity is the same in undo actions and will have the same activity mapping
 
-		if(substr($reaction,0,2) === 'un') {
-			$reaction = substr($reaction,2);
+		if (substr($reaction, 0, 2) === 'un') {
+			$reaction = substr($reaction, 2);
 		}
 
-		if(array_key_exists($reaction,$acts)) {
+		if (array_key_exists($reaction, $acts)) {
 			return $acts[$reaction];
 		}
 
@@ -41,60 +46,69 @@ class Like extends \Zotlabs\Web\Controller {
 
 	private function like_response($arr) {
 
-		if($arr['conv_mode'] === 'channel') {
+		$page_mode = (($arr['item']['item_thread_top'] && $_REQUEST['page_mode']) ? $_REQUEST['page_mode'] : 'r_preview');
+		$conv_mode = (($_REQUEST['conv_mode']) ? $_REQUEST['conv_mode'] : 'network');
+
+		if ($conv_mode === 'channel') {
 			$parts = explode('@', $arr['owner_xchan']['xchan_addr']);
 			profile_load($parts[0]);
 		}
 
-
 		$item_normal = item_normal();
 
-		$activities = q("SELECT item.*, item.id AS item_id FROM item
-			WHERE uid = %d $item_normal
-			AND thr_parent = '%s'
-			AND verb IN ('%s', '%s', '%s', '%s', '%s')",
-			intval($arr['item']['uid']),
-			dbesc($arr['item']['mid']),
-			dbesc(ACTIVITY_LIKE),
-			dbesc(ACTIVITY_DISLIKE),
-			dbesc(ACTIVITY_ATTEND),
-			dbesc(ACTIVITY_ATTENDNO),
-			dbesc(ACTIVITY_ATTENDMAYBE)
-		);
-
-		xchan_query($activities,true);
-
-		$convitems[] = $arr['item'];
-		$convitems = array_merge($convitems, $activities);
-
-		$convitems = fetch_post_tags($convitems,true);
+		if ($page_mode === 'list') {
+			$items = q("SELECT item.*, item.id AS item_id FROM item
+				WHERE uid = %d $item_normal
+				AND parent = %d",
+				intval($arr['item']['uid']),
+				intval($arr['item']['parent'])
+			);
+			xchan_query($items, true);
+			$items = fetch_post_tags($items, true);
+			$items = conv_sort($items, 'commented');
+		}
+		else {
+			$activities = q("SELECT item.*, item.id AS item_id FROM item
+				WHERE uid = %d $item_normal
+				AND thr_parent = '%s'
+				AND verb IN ('%s', '%s', '%s', '%s', '%s')",
+				intval($arr['item']['uid']),
+				dbesc($arr['item']['mid']),
+				dbesc(ACTIVITY_LIKE),
+				dbesc(ACTIVITY_DISLIKE),
+				dbesc(ACTIVITY_ATTEND),
+				dbesc(ACTIVITY_ATTENDNO),
+				dbesc(ACTIVITY_ATTENDMAYBE)
+			);
+			xchan_query($activities, true);
+			$items = array_merge([$arr['item']], $activities);
+			$items = fetch_post_tags($items, true);
+		}
 
 		$ret = [
 			'success' => 1,
 			'orig_id' => $arr['orig_item_id'], //this is required for pubstream items where $item_id != $item['id']
-			'id' => $arr['item']['id'],
-			'html' => conversation($convitems, $arr['conv_mode'], true, 'r_preview'),
+			'id'      => $arr['item']['id'],
+			'html'    => conversation($items, $conv_mode, true, $page_mode),
 		];
-
 		return $ret;
 
 	}
 
 	public function get() {
 
-		$o = EMPTY_STR;
-
+		$o           = EMPTY_STR;
 		$sys_channel = get_sys_channel();
-		$sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0);
-
-		$observer = \App::get_observer();
+		$observer    = App::get_observer();
 		$interactive = $_REQUEST['interactive'];
-		if((! $observer) || ($interactive)) {
+
+		if ((!$observer) || ($interactive)) {
 			$o .= '<h1>' . t('Like/Dislike') . '</h1>';
 			$o .= EOL . EOL;
 
-			if(! $observer) {
-				$_SESSION['return_url'] = \App::$query_string;
+			if (!$observer) {
+				$_SESSION['return_url'] = App::$query_string;
+
 				$o .= t('This action is restricted to members.') . EOL;
 				$o .= t('Please <a href="rmagic">login with your $Projectname ID</a> or <a href="register">register as a new $Projectname member</a> to continue.') . EOL;
 				return $o;
@@ -102,56 +116,54 @@ class Like extends \Zotlabs\Web\Controller {
 		}
 
 		$verb = notags(trim($_GET['verb']));
-		$mode = (($_GET['conv_mode'] === 'channel') ? 'channel' : 'network');
 
-		if(! $verb)
+		if (!$verb)
 			$verb = 'like';
 
 		$activity = $this->reaction_to_activity($verb);
 
-		if(! $activity) {
+		if (!$activity) {
 			return EMPTY_STR;
 		}
 
 		$is_rsvp = false;
-		if (in_array($activity, [ ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE ])) {
+		if (in_array($activity, [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE])) {
 			$is_rsvp = true;
 		}
 
-
 		$extended_like = false;
-		$object = $target = null;
-		$post_type = EMPTY_STR;
-		$objtype = EMPTY_STR;
+		$object        = $target = null;
+		$post_type     = EMPTY_STR;
+		$objtype       = EMPTY_STR;
 
-		if(argc() == 3) {
+		if (argc() == 3) {
 
-			if(! $observer)
+			if (!$observer)
 				killme();
 
 			$extended_like = true;
-			$obj_type = argv(1);
-			$obj_id = argv(2);
-			$public = true;
+			$obj_type      = argv(1);
+			$obj_id        = argv(2);
+			$public        = true;
 
-			if($obj_type == 'profile') {
+			if ($obj_type == 'profile') {
 				$r = q("select * from profile where profile_guid = '%s' limit 1",
 					dbesc(argv(2))
 				);
-				if(! $r)
+				if (!$r)
 					killme();
 				$owner_uid = $r[0]['uid'];
-				if($r[0]['is_default'])
+				if ($r[0]['is_default'])
 					$public = true;
-				if(! $public) {
+				if (!$public) {
 					$d = q("select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d",
 						dbesc($r[0]['profile_guid']),
 						intval($owner_uid)
 					);
-					if(! $d) {
+					if (!$d) {
 						// forgery - illegal
-						if($interactive) {
-							notice( t('Invalid request.') . EOL);
+						if ($interactive) {
+							notice(t('Invalid request.') . EOL);
 							return $o;
 						}
 						killme();
@@ -159,25 +171,25 @@ class Like extends \Zotlabs\Web\Controller {
 					// $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) {
+					foreach ($d as $dd) {
 						$allow_cid .= '<' . $dd['abook_xchan'] . '>';
 					}
 				}
 				$post_type = t('channel');
-				$objtype = ACTIVITY_OBJ_PROFILE;
+				$objtype   = ACTIVITY_OBJ_PROFILE;
 
 				$profile = $r[0];
 			}
-			elseif($obj_type == 'thing') {
+			elseif ($obj_type == 'thing') {
 
 				$r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
-	            	intval(TERM_OBJ_THING),
-	            	dbesc(argv(2))
-	        	);
+					intval(TERM_OBJ_THING),
+					dbesc(argv(2))
+				);
 
-				if(! $r) {
-					if($interactive) {
-						notice( t('Invalid request.') . EOL);
+				if (!$r) {
+					if ($interactive) {
+						notice(t('Invalid request.') . EOL);
 						return $o;
 					}
 					killme();
@@ -187,19 +199,19 @@ class Like extends \Zotlabs\Web\Controller {
 
 				$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)
+				$deny_cid  = $r[0]['deny_cid'];
+				$deny_gid  = $r[0]['deny_gid'];
+				if ($allow_cid || $allow_gid || $deny_cid || $deny_gid)
 					$public = false;
 
 				$post_type = t('thing');
-				$objtype = ACTIVITY_OBJ_PROFILE;
-				$tgttype = ACTIVITY_OBJ_THING;
+				$objtype   = ACTIVITY_OBJ_PROFILE;
+				$tgttype   = ACTIVITY_OBJ_THING;
 
 				$links   = array();
-				$links[] = array('rel' => 'alternate', 'type' => 'text/html',
-					'href' => z_root() . '/thing/' . $r[0]['obj_obj']);
-				if($r[0]['imgurl'])
+				$links[] = array('rel'  => 'alternate', 'type' => 'text/html',
+								 'href' => z_root() . '/thing/' . $r[0]['obj_obj']);
+				if ($r[0]['imgurl'])
 					$links[] = array('rel' => 'photo', 'href' => $r[0]['obj_imgurl']);
 
 				$target = json_encode(array(
@@ -213,9 +225,9 @@ class Like extends \Zotlabs\Web\Controller {
 
 			}
 
-			if(! ($owner_uid && $r)) {
-				if($interactive) {
-					notice( t('Invalid request.') . EOL);
+			if (!($owner_uid && $r)) {
+				if ($interactive) {
+					notice(t('Invalid request.') . EOL);
 					return $o;
 				}
 				killme();
@@ -223,11 +235,11 @@ class Like extends \Zotlabs\Web\Controller {
 
 			// The resultant activity is going to be a wall-to-wall post, so make sure this is allowed
 
-			$perms = get_all_perms($owner_uid,$observer['xchan_hash']);
+			$perms = get_all_perms($owner_uid, $observer['xchan_hash']);
 
-			if(! ($perms['post_like'] && $perms['view_profile'])) {
-				if($interactive) {
-					notice( t('Permission denied.') . EOL);
+			if (!($perms['post_like'] && $perms['view_profile'])) {
+				if ($interactive) {
+					notice(t('Permission denied.') . EOL);
 					return $o;
 				}
 				killme();
@@ -236,18 +248,18 @@ class Like extends \Zotlabs\Web\Controller {
 			$ch = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
 				intval($owner_uid)
 			);
-			if(! $ch) {
-				if($interactive) {
-					notice( t('Channel unavailable.') . EOL);
+			if (!$ch) {
+				if ($interactive) {
+					notice(t('Channel unavailable.') . EOL);
 					return $o;
 				}
 				killme();
 			}
 
-			if(! $plink)
+			if (!$plink)
 				$plink = '[zrl=' . z_root() . '/profile/' . $ch[0]['channel_address'] . ']' . $post_type . '[/zrl]';
 
-			$object = json_encode(Activity::fetch_profile([ 'id' => channel_url($ch[0]) ]));
+			$object = json_encode(Activity::fetch_profile(['id' => channel_url($ch[0])]));
 
 			// second like of the same thing is "undo" for the first like
 
@@ -255,26 +267,26 @@ class Like extends \Zotlabs\Web\Controller {
 				intval($ch[0]['channel_id']),
 				dbesc($observer['xchan_hash']),
 				dbesc($activity),
-				dbesc(($tgttype)?$tgttype:$objtype),
+				dbesc(($tgttype) ? $tgttype : $objtype),
 				dbesc($obj_id)
 			);
 
-			if($z) {
+			if ($z) {
 				$z[0]['deleted'] = 1;
-				Libsync::build_sync_packet($ch[0]['channel_id'],array('likes' => $z));
+				Libsync::build_sync_packet($ch[0]['channel_id'], array('likes' => $z));
 
 				q("delete from likes where id = %d",
 					intval($z[0]['id'])
 				);
-				if($z[0]['i_mid']) {
+				if ($z[0]['i_mid']) {
 					$r = q("select id from item where mid = '%s' and uid = %d limit 1",
 						dbesc($z[0]['i_mid']),
 						intval($ch[0]['channel_id'])
 					);
-					if($r)
-						drop_item($r[0]['id'],false);
-					if($interactive) {
-						notice( t('Previous action reversed.') . EOL);
+					if ($r)
+						drop_item($r[0]['id'], false);
+					if ($interactive) {
+						notice(t('Previous action reversed.') . EOL);
 						return $o;
 					}
 				}
@@ -283,7 +295,7 @@ class Like extends \Zotlabs\Web\Controller {
 		}
 		else {
 
-			if(! $observer)
+			if (!$observer)
 				killme();
 
 			// this is used to like an item or comment
@@ -304,32 +316,30 @@ class Like extends \Zotlabs\Web\Controller {
 			// create a copy of the parent in your stream. If not the conversation
 			// parent, copy that as well.
 
-			if($r) {
-				if($r[0]['uid'] === $sys_channel['channel_id'] && local_channel()) {
-					$r = [ copy_of_pubitem(\App::get_channel(), $r[0]['mid']) ];
+			if ($r) {
+				if ($r[0]['uid'] === $sys_channel['channel_id'] && local_channel()) {
+					$r = [copy_of_pubitem(App::get_channel(), $r[0]['mid'])];
 				}
 			}
 
-			if(! $item_id || (! $r)) {
+			if (!$item_id || (!$r)) {
 				logger('like: no item ' . $item_id);
 				killme();
 			}
 
-			xchan_query($r,true);
-
-			$item = $r[0];
+			xchan_query($r, true);
 
+			$item      = $r[0];
 			$owner_uid = $r[0]['uid'];
 			$owner_aid = $r[0]['aid'];
 
-            $can_comment = false;
-            if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self']))
-                $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments');
-            else
-                $can_comment = can_comment_on_post($observer['xchan_hash'],$item);
+			if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self']))
+				$can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments');
+			else
+				$can_comment = can_comment_on_post($observer['xchan_hash'], $item);
 
-            if(! $can_comment) {
-				notice( t('Permission denied') . EOL);
+			if (!$can_comment) {
+				notice(t('Permission denied') . EOL);
 				killme();
 			}
 
@@ -337,7 +347,7 @@ class Like extends \Zotlabs\Web\Controller {
 				dbesc($item['owner_xchan'])
 			);
 
-			if($r)
+			if ($r)
 				$thread_owner = $r[0];
 			else
 				killme();
@@ -345,24 +355,24 @@ class Like extends \Zotlabs\Web\Controller {
 			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($item['author_xchan'])
 			);
-			if($r)
+			if ($r)
 				$item_author = $r[0];
 			else
 				killme();
 
-			$verbs = " '".dbesc($activity)."' ";
+			$verbs = " '" . dbesc($activity) . "' ";
 
 			$multi_undo = false;
 
 			// event participation and consensus items are essentially radio toggles. If you make a subsequent choice,
 			// we need to eradicate your first choice.
 
-			if($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
-				$verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' ";
+			if ($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
+				$verbs      = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' ";
 				$multi_undo = 1;
 			}
-			if($activity === ACTIVITY_AGREE || $activity === ACTIVITY_DISAGREE || $activity === ACTIVITY_ABSTAIN) {
-				$verbs = " '" . dbesc(ACTIVITY_AGREE) . "','" . dbesc(ACTIVITY_DISAGREE) . "','" . dbesc(ACTIVITY_ABSTAIN) . "' ";
+			if ($activity === ACTIVITY_AGREE || $activity === ACTIVITY_DISAGREE || $activity === ACTIVITY_ABSTAIN) {
+				$verbs      = " '" . dbesc(ACTIVITY_AGREE) . "','" . dbesc(ACTIVITY_DISAGREE) . "','" . dbesc(ACTIVITY_ABSTAIN) . "' ";
 				$multi_undo = true;
 			}
 
@@ -375,45 +385,41 @@ class Like extends \Zotlabs\Web\Controller {
 				intval($owner_uid)
 			);
 
-			if($r) {
+			if ($r) {
 				// already liked it. Drop that item.
 				require_once('include/items.php');
-				foreach($r as $rr) {
-					drop_item($rr['id'],false,DROPITEM_PHASE1);
+				foreach ($r as $rr) {
+					drop_item($rr['id'], false, DROPITEM_PHASE1);
 					// set the changed timestamp on the parent so we'll see the update without a page reload
-					$z = q("update item set changed = '%s' where id = %d and uid = %d",
+					q("update item set changed = '%s' where id = %d and uid = %d",
 						dbesc(datetime_convert()),
 						intval($rr['parent']),
 						intval($rr['uid'])
 					);
 					// Prior activity was a duplicate of the one we're submitting, just undo it;
 					// don't fall through and create another
-					if(activity_match($rr['verb'],$activity))
+					if (activity_match($rr['verb'], $activity))
 						$multi_undo = false;
 
 					// drop_item was not done interactively, so we need to invoke the notifier
 					// in order to push the changes to connections
 
-					\Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$rr['id']));
-
+					Master::Summon(array('Notifier', 'drop', $rr['id']));
 
 
 				}
 
-				if($interactive)
+				if ($interactive)
 					return;
 
-				if(! $multi_undo) {
+				if (!$multi_undo) {
 					$ret = self::like_response([
-						'item' => $item,
+						'item'         => $item,
 						'orig_item_id' => $item_id,
-						'owner_xchan' => $thread_owner,
-						'conv_mode' => $mode
+						'owner_xchan'  => $thread_owner
 					]);
 					json_return_and_die($ret);
 				}
-
-
 			}
 		}
 
@@ -421,43 +427,39 @@ class Like extends \Zotlabs\Web\Controller {
 
 		$arr = array();
 
-		$arr['uuid']  = $uuid;
-		$arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/') . $uuid;
+		$arr['uuid'] = $uuid;
+		$arr['mid']  = z_root() . (($is_rsvp) ? '/activity/' : '/item/') . $uuid;
 
-		if($extended_like) {
+		if ($extended_like) {
 			$arr['item_thread_top'] = 1;
-			$arr['item_origin'] = 1;
-			$arr['item_wall'] = 1;
+			$arr['item_origin']     = 1;
+			$arr['item_wall']       = 1;
 		}
 		else {
 			$post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
-			if($item['obj_type'] === ACTIVITY_OBJ_EVENT)
+			if ($item['obj_type'] === ACTIVITY_OBJ_EVENT)
 				$post_type = t('event');
 
-			$links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink']));
-			$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+			$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE);
 
-			if($objtype === ACTIVITY_OBJ_NOTE && (! intval($item['item_thread_top'])))
+			if ($objtype === ACTIVITY_OBJ_NOTE && (!intval($item['item_thread_top'])))
 				$objtype = ACTIVITY_OBJ_COMMENT;
 
+			$object = json_encode(Activity::fetch_item(['id' => $item['mid']]));
 
-			$body = $item['body'];
-
-			$object = json_encode(Activity::fetch_item( [ 'id' => $item['mid'] ]));
-
-			if(! intval($item['item_thread_top']))
+			if (!intval($item['item_thread_top']))
 				$post_type = 'comment';
 
-			$arr['item_origin'] = 1;
+			$arr['item_origin']   = 1;
 			$arr['item_notshown'] = 1;
-			$arr['item_type'] = $item['item_type'];
+			$arr['item_type']     = $item['item_type'];
 
-			if(intval($item['item_wall']))
+			if (intval($item['item_wall']))
 				$arr['item_wall'] = 1;
 
 			// if this was a linked photo and was hidden, unhide it.
 
-			if(intval($item['item_hidden'])) {
+			if (intval($item['item_hidden'])) {
 				$r = q("update item set item_hidden = 0 where id = %d",
 					intval($item['id'])
 				);
@@ -465,103 +467,95 @@ class Like extends \Zotlabs\Web\Controller {
 
 		}
 
-		if($verb === 'like')
+		if ($verb === 'like')
 			$bodyverb = t('%1$s likes %2$s\'s %3$s');
-		if($verb === 'dislike')
+		if ($verb === 'dislike')
 			$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-		if($verb === 'agree')
+		if ($verb === 'agree')
 			$bodyverb = t('%1$s agrees with %2$s\'s %3$s');
-		if($verb === 'disagree')
+		if ($verb === 'disagree')
 			$bodyverb = t('%1$s doesn\'t agree with %2$s\'s %3$s');
-		if($verb === 'abstain')
+		if ($verb === 'abstain')
 			$bodyverb = t('%1$s abstains from a decision on %2$s\'s %3$s');
-		if($verb === 'attendyes')
+		if ($verb === 'attendyes')
 			$bodyverb = t('%1$s is attending %2$s\'s %3$s');
-		if($verb === 'attendno')
+		if ($verb === 'attendno')
 			$bodyverb = t('%1$s is not attending %2$s\'s %3$s');
-		if($verb === 'attendmaybe')
+		if ($verb === 'attendmaybe')
 			$bodyverb = t('%1$s may attend %2$s\'s %3$s');
 
-		if(! isset($bodyverb))
-				killme();
+		if (!isset($bodyverb))
+			killme();
 
-
-
-		if($extended_like) {
-			$ulink = '[zrl=' . $ch[0]['xchan_url'] . '][bdi]' . $ch[0]['xchan_name'] . '[/bdi][/zrl]';
-			$alink = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]';
+		if ($extended_like) {
+			$ulink   = '[zrl=' . $ch[0]['xchan_url'] . '][bdi]' . $ch[0]['xchan_name'] . '[/bdi][/zrl]';
+			$alink   = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]';
 			$private = (($public) ? 0 : 1);
 		}
 		else {
-			$arr['parent']       = $item['id'];
-			$arr['thr_parent']   = $item['mid'];
-			$ulink = '[zrl=' . $item_author['xchan_url'] . '][bdi]' . $item_author['xchan_name'] . '[/bdi][/zrl]';
-			$alink = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]';
-			$plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
-			$allow_cid       = $item['allow_cid'];
-			$allow_gid       = $item['allow_gid'];
-			$deny_cid        = $item['deny_cid'];
-			$deny_gid        = $item['deny_gid'];
-			$private         = $item['private'];
+			$arr['parent']     = $item['id'];
+			$arr['thr_parent'] = $item['mid'];
+			$ulink             = '[zrl=' . $item_author['xchan_url'] . '][bdi]' . $item_author['xchan_name'] . '[/bdi][/zrl]';
+			$alink             = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]';
+			$plink             = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
+			$allow_cid         = $item['allow_cid'];
+			$allow_gid         = $item['allow_gid'];
+			$deny_cid          = $item['deny_cid'];
+			$deny_gid          = $item['deny_gid'];
+			$private           = $item['private'];
 
 		}
 
-
 		$arr['aid']          = (($extended_like) ? $ch[0]['channel_account_id'] : $owner_aid);
 		$arr['uid']          = $owner_uid;
-
-
 		$arr['item_flags']   = $item['item_flags'];
 		$arr['item_wall']    = $item['item_wall'];
 		$arr['parent_mid']   = (($extended_like) ? $arr['mid'] : $item['mid']);
 		$arr['owner_xchan']  = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']);
 		$arr['author_xchan'] = $observer['xchan_hash'];
+		$arr['body']         = sprintf($bodyverb, $alink, $ulink, $plink);
 
-
-		$arr['body']          =  sprintf( $bodyverb, $alink, $ulink, $plink );
-		if($obj_type === 'thing' && $r[0]['imgurl']) {
+		if ($obj_type === 'thing' && $r[0]['imgurl']) {
 			$arr['body'] .= "\n\n[zmg=80x80]" . $r[0]['imgurl'] . '[/zmg]';
 		}
-		if($obj_type === 'profile') {
-			if($public) {
+		if ($obj_type === 'profile') {
+			if ($public) {
 				$arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]';
 			}
 			else
 				$arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]';
 		}
 
+		$arr['verb']     = $activity;
+		$arr['obj_type'] = $objtype;
+		$arr['obj']      = $object;
 
-		$arr['verb']          = $activity;
-		$arr['obj_type']      = $objtype;
-		$arr['obj']           = $object;
-
-		if($target) {
-			$arr['tgt_type']  = $tgttype;
-			$arr['target']    = $target;
+		if ($target) {
+			$arr['tgt_type'] = $tgttype;
+			$arr['target']   = $target;
 		}
 
-		$arr['allow_cid']     = $allow_cid;
-		$arr['allow_gid']     = $allow_gid;
-		$arr['deny_cid']      = $deny_cid;
-		$arr['deny_gid']      = $deny_gid;
-		$arr['item_private']  = $private;
+		$arr['allow_cid']    = $allow_cid;
+		$arr['allow_gid']    = $allow_gid;
+		$arr['deny_cid']     = $deny_cid;
+		$arr['deny_gid']     = $deny_gid;
+		$arr['item_private'] = $private;
 
-		call_hooks('post_local',$arr);
+		call_hooks('post_local', $arr);
 
-		$post = item_store($arr);
+		$post    = item_store($arr);
 		$post_id = $post['item_id'];
 
 		// save the conversation from expiration
 
-		if(local_channel() && array_key_exists('item',$post) && (intval($post['item']['id']) != intval($post['item']['parent'])))
+		if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent'])))
 			retain_item($post['item']['parent']);
 
 		$arr['id'] = $post_id;
 
 		call_hooks('post_local_end', $arr);
 
-
-		if($extended_like) {
+		if ($extended_like) {
 			$r = q("insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')",
 				intval($ch[0]['channel_id']),
 				dbesc($observer['xchan_hash']),
@@ -569,36 +563,35 @@ class Like extends \Zotlabs\Web\Controller {
 				intval($post_id),
 				dbesc($arr['mid']),
 				dbesc($activity),
-				dbesc(($tgttype)? $tgttype : $objtype),
+				dbesc(($tgttype) ? $tgttype : $objtype),
 				dbesc($obj_id),
-				dbesc(($target) ? $target  : $object)
+				dbesc(($target) ? $target : $object)
 			);
 			$r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
 				dbesc($observer['xchan_hash']),
 				dbesc($ch[0]['channel_hash']),
 				dbesc($arr['mid']),
 				dbesc($activity),
-				dbesc(($tgttype)? $tgttype : $objtype),
+				dbesc(($tgttype) ? $tgttype : $objtype),
 				dbesc($obj_id)
 			);
-			if($r)
-				Libsync::build_sync_packet($ch[0]['channel_id'],array('likes' => $r));
+			if ($r)
+				Libsync::build_sync_packet($ch[0]['channel_id'], array('likes' => $r));
 
 		}
 
-		\Zotlabs\Daemon\Master::Summon(array('Notifier','like',$post_id));
+		Master::Summon(array('Notifier', 'like', $post_id));
 
-		if($interactive) {
-			notice( t('Action completed.') . EOL);
+		if ($interactive) {
+			notice(t('Action completed.') . EOL);
 			$o .= t('Thank you.');
 			return $o;
 		}
 
 		$ret = self::like_response([
-			'item' => $item,
+			'item'         => $item,
 			'orig_item_id' => $item_id,
-			'owner_xchan' => $thread_owner,
-			'conv_mode' => $mode
+			'owner_xchan'  => $thread_owner
 		]);
 		json_return_and_die($ret);
 

Zotlabs/Module/Network.php

@@ -20,44 +20,46 @@ class Network extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']))
-			goaway('search' . '?f=&search=' . $_GET['search']);
-	
+		$search = $_GET['search'] ?? '';
+
+		if(in_array(substr($search, 0, 1),[ '@', '!', '?']) || strpos($search, 'https://') === 0)
+			goaway(z_root() . '/search?f=&search=' . $search);
+
 		if(count($_GET) < 2) {
 			$network_options = get_pconfig(local_channel(),'system','network_page_default');
 			if($network_options)
-				goaway('network' . '?f=&' . $network_options);
+				goaway(z_root() . '/network?f=&' . $network_options);
 		}
-	
+
 		$channel = App::get_channel();
 		App::$profile_uid = local_channel();
 		head_set_icon($channel['xchan_photo_s']);
-	
+
 	}
-	
+
 	function get($update = 0, $load = false) {
-	
+
 		if(! local_channel()) {
 			$_SESSION['return_url'] = App::$query_string;
 			return login(false);
 		}
-	
+
 		$o = '';
 
 		$arr = array('query' => App::$query_string);
-	
+
 		call_hooks('network_content_init', $arr);
-	
+
 		$channel = App::get_channel();
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
-	
+
 		$datequery = $datequery2 = '';
-	
+
 		$group = 0;
-	
+
 		$nouveau    = false;
-	
+
 		$datequery  = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
 		$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
 		$gid        = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0);
@@ -80,20 +82,20 @@ class Network extends \Zotlabs\Web\Controller {
 				break;
 		}
 
-		$search = (($_GET['search']) ? $_GET['search'] : '');
+		$search = $_GET['search'] ?? '';
 		if($search) {
 			if(strpos($search,'#') === 0) {
 				$hashtags = substr($search,1);
 				$search = '';
 			}
 		}
-	
+
 		if($datequery)
 			$order = 'post';
-	
-	
+
+
 		// filter by collection (e.g. group)
-	
+
 		if($gid) {
 			$r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
 				intval($gid),
@@ -106,12 +108,12 @@ class Network extends \Zotlabs\Web\Controller {
 				goaway(z_root() . '/network');
 				// NOTREACHED
 			}
-	
+
 			$group      = $gid;
 			$group_hash = $r[0]['hash'];
 			$def_acl    = array('allow_gid' => '<' . $r[0]['hash'] . '>');
 		}
-	
+
 		$default_cmin = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1));
 		$default_cmax = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1));
 
@@ -127,18 +129,20 @@ class Network extends \Zotlabs\Web\Controller {
 		$net      = ((x($_GET,'net'))   ? $_GET['net']           : '');
 		$pf       = ((x($_GET,'pf'))    ? $_GET['pf']            : '');
 		$unseen   = ((x($_GET,'unseen'))    ? $_GET['unseen']            : '');
-		
-                if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
+
+		if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
 			$affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
 			if ($affinity_locked) {
-                        	set_pconfig(local_channel(),'affinity','cmin',$cmin);
-                        	set_pconfig(local_channel(),'affinity','cmax',$cmax);
+				set_pconfig(local_channel(),'affinity','cmin',$cmin);
+				set_pconfig(local_channel(),'affinity','cmax',$cmax);
 			}
-                }
+		}
 
 		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
 			$nouveau = true;
 
+		$cid_r = [];
+
 		if($cid) {
 			$cid_r = q("SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_pubforum from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1",
 				intval($cid),
@@ -155,16 +159,16 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 			$def_acl = [ 'allow_cid' => '<' . $cid_r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
 		}
-	
+
 		if(! $update) {
-	
+
 			// search terms header
 			if($search || $hashtags) {
 				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
 					'$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT,'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8'))
 				));
 			}
-	
+
 			nav_set_selected('Network');
 
 			$bang = '!';
@@ -179,14 +183,14 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid'  => $channel['channel_deny_cid'], 
+				'allow_cid' => $channel['channel_allow_cid'],
+				'allow_gid' => $channel['channel_allow_gid'],
+				'deny_cid'  => $channel['channel_deny_cid'],
 				'deny_gid'  => $channel['channel_deny_gid']
 			);
 
 			$private_editing = (($group || $cid) ? true : false);
-	
+
 			$x = array(
 				'is_owner'         => true,
 				'allow_location'   => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
@@ -204,28 +208,28 @@ class Network extends \Zotlabs\Web\Controller {
 				'jotnets' => true,
 				'reset' => t('Reset form')
 			);
-	
+
 			$status_editor = status_editor($a,$x,false,'Network');
 			$o .= $status_editor;
 
 		}
-	
-	
+
+
 		// We don't have to deal with ACL's on this page. You're looking at everything
 		// that belongs to you, hence you can see all of it. We will filter by group if
 		// desired.
-	
-	
+
+
 		$sql_options  = (($star)
 			? " and item_starred = 1 "
 			: '');
-	
+
 		$sql_nets = '';
 
 		$item_thread_top = ' AND item_thread_top = 1 ';
-	
+
 		$sql_extra = '';
-	
+
 		if($group) {
 
 			$contact_str = '';
@@ -241,18 +245,18 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 			$item_thread_top = '';
 			$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
-	
+
 			$x = group_rec_byhash(local_channel(), $group_hash);
-	
+
 			if($x) {
 				$title = replace_macros(get_markup_template("section_title.tpl"),array(
 					'$title' => t('Privacy group: ') . $x['gname']
 				));
 			}
-	
+
 			$o = $title;
 			$o .= $status_editor;
-	
+
 		}
 		elseif($cid_r) {
 			$item_thread_top = '';
@@ -324,14 +328,219 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 		}
-	
+
 		if(x($category)) {
 			$sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
 		}
 		if(x($hashtags)) {
 			$sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
 		}
-	
+
+		$sql_extra3 = '';
+
+		if($datequery) {
+			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
+		}
+		if($datequery2) {
+			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+		}
+
+		$sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id ");
+		$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
+
+		if(x($_GET,'search')) {
+			$search = escape_tags($_GET['search']);
+			if(strpos($search,'#') === 0) {
+				$sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG);
+			}
+			else {
+				$sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ",
+					dbesc(protect_sprintf('%' . $search . '%')),
+					dbesc(protect_sprintf('%' . $search . '%'))
+				);
+			}
+		}
+
+		if ($verb) {
+
+			// the presence of a leading dot in the verb determines
+			// whether to match the type of activity or the child object.
+			// The name 'verb' is a holdover from the earlier XML
+			// ActivityStreams specification.
+
+			if (substr($verb,0,1) === '.') {
+				$verb = substr($verb,1);
+				$sql_extra .= sprintf(" AND item.obj_type like '%s' ",
+					dbesc(protect_sprintf('%' . $verb . '%'))
+				);
+			}
+			else {
+				$sql_extra .= sprintf(" AND item.verb like '%s' ",
+					dbesc(protect_sprintf('%' . $verb . '%'))
+				);
+			}
+		}
+
+		if(strlen($file)) {
+			$sql_extra .= term_query('item',$file,TERM_FILE);
+		}
+
+		if ($dm) {
+			$sql_extra .= " AND item_private = 2 ";
+		}
+
+		if($conv) {
+			$item_thread_top = '';
+			$sql_extra .= " AND ( author_xchan = '" . dbesc($channel['channel_hash']) . "' OR item_mentionsme = 1 ) ";
+		}
+
+		if($update && ! $load) {
+
+			// only setup pagination on initial page view
+			$pager_sql = '';
+
+		}
+		else {
+			$itemspage = get_pconfig(local_channel(),'system','itemspage');
+			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
+			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+		}
+
+		// cmin and cmax are both -1 when the affinity tool is disabled
+
+		if(($cmin != (-1)) || ($cmax != (-1))) {
+
+			// Not everybody who shows up in the network stream will be in your address book.
+			// By default those that aren't are assumed to have closeness = 99; but this isn't
+			// recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
+			// the stream with a NULL address book entry.
+
+			$sql_nets .= " AND ";
+
+			if($cmax == 99)
+				$sql_nets .= " ( ";
+
+			$sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " ";
+			$sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) ";
+
+			if($cmax == 99)
+				$sql_nets .= " OR abook.abook_closeness IS NULL ) ";
+
+		}
+
+		$net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
+		$net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
+
+		$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
+		$uids = " and item.uid = " . local_channel() . " ";
+
+		if(feature_enabled(local_channel(), 'network_list_mode'))
+			$page_mode = 'list';
+		else
+			$page_mode = 'client';
+
+		$parents_str = '';
+
+		// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
+		// or three and look at your matrix page - after opening up your browser. The first page loads just as it
+		// should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page
+		// (before the page 1 content). The update code is actually doing just what it's supposed
+		// to, it's fetching posts that have the ITEM_UNSEEN bit set. But the reason that page 2 content is being
+		// returned in an UPDATE is because you hadn't gotten that far yet - you're still on page 1 and everything
+		// that we loaded for page 1 is now marked as seen. But the stuff on page 2 hasn't been. So... it's being
+		// treated as "new fresh" content because it is unseen. We need to distinguish it somehow from content
+		// which "arrived as you were reading page 1". We're going to do this
+		// by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items
+		// which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers...
+
+		$simple_update = '';
+		if($update && $_SESSION['loadtime'])
+			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
+
+		$items = [];
+
+		if($nouveau && $load) {
+			// "New Item View" - show all items unthreaded in reverse created date order
+			$items = q("SELECT item.*, item.id AS item_id, created FROM item
+				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+				$net_query
+				WHERE true $uids $item_normal
+				and (abook.abook_blocked = 0 or abook.abook_flags is null)
+				$sql_extra $sql_options $sql_nets
+				$net_query2
+				ORDER BY item.created DESC $pager_sql "
+			);
+
+			$parents_str = ids_to_querystr($items,'item_id');
+
+			require_once('include/items.php');
+
+			xchan_query($items);
+
+			$items = fetch_post_tags($items,true);
+		}
+		elseif($update) {
+
+			// Normal conversation view
+
+			if($order === 'post')
+				$ordering = "created";
+			else
+				$ordering = "commented";
+
+			if($load) {
+				// Fetch a page full of parent items for this page
+				$r = q("SELECT item.parent AS item_id FROM item
+					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+					$net_query
+					WHERE true $uids $item_thread_top $item_normal
+					AND item.mid = item.parent_mid
+					and (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra3 $sql_extra $sql_options $sql_nets
+					$net_query2
+					ORDER BY $ordering DESC $pager_sql "
+				);
+			}
+			else {
+
+				// this is an update
+				$r = q("SELECT item.parent AS item_id FROM item
+					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+					$net_query
+					WHERE true $uids $item_normal_update $simple_update
+					and (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra3 $sql_extra $sql_options $sql_nets $net_query2"
+				);
+			}
+
+			// Then fetch all the children of the parents that are on this page
+
+			if($r) {
+
+				$parents_str = ids_to_querystr($r,'item_id');
+
+				$items = q("SELECT item.*, item.id AS item_id FROM item
+					WHERE true $uids $item_normal
+					AND item.parent IN ( %s )
+					$sql_extra ",
+					dbesc($parents_str)
+				);
+
+				xchan_query($items,true);
+				$items = fetch_post_tags($items,true);
+				$items = conv_sort($items,$ordering);
+			}
+			else {
+				$items = array();
+			}
+
+		}
+
+		$mode = (($nouveau) ? 'network-new' : 'network');
+
+		if($search)
+			$mode = 'search';
+
 		if(! $update) {
 			// The special div is needed for liveUpdate to kick in for this page.
 			// We only launch liveUpdate if you aren't filtering in some incompatible
@@ -340,13 +549,13 @@ class Network extends \Zotlabs\Web\Controller {
 			$maxheight = get_pconfig(local_channel(),'system','network_divmore_height');
 			if(! $maxheight)
 				$maxheight = 400;
-	
-	
+
+
 			$o .= '<div id="live-network"></div>' . "\r\n";
-			$o .= "<script> var profile_uid = " . local_channel() 
-				. "; var profile_page = " . App::$pager['page'] 
+			$o .= "<script> var profile_uid = " . local_channel()
+				. "; var profile_page = " . App::$pager['page']
 				. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
-	
+
 			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
 				'$baseurl' => z_root(),
 				'$pgtype'  => 'network',
@@ -377,221 +586,19 @@ class Network extends \Zotlabs\Web\Controller {
 				'$net'     => (($net) ? urlencode($net) : ''),
 				'$dbegin'  => $datequery2,
 				'$pf'      => (($pf) ? intval($pf) : 0),
-				'$unseen'  => (($unseen) ? urlencode($unseen) : '')
+				'$unseen'  => (($unseen) ? urlencode($unseen) : ''),
+				'$page_mode' => $page_mode
 			));
 		}
-	
-		$sql_extra3 = '';
-	
-		if($datequery) {
-			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-		}
-		if($datequery2) {
-			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
-		}
-	
-		$sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id ");
-		$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
-	
-		if(x($_GET,'search')) {
-			$search = escape_tags($_GET['search']);
-			if(strpos($search,'#') === 0) {
-				$sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG);
-			}
-			else {
-				$sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ",
-					dbesc(protect_sprintf('%' . $search . '%')),
-					dbesc(protect_sprintf('%' . $search . '%'))
-				);
-			}
-		}
-	
-		if ($verb) {
 
-			// the presence of a leading dot in the verb determines
-			// whether to match the type of activity or the child object.
-			// The name 'verb' is a holdover from the earlier XML
-			// ActivityStreams specification.
-
-			if (substr($verb,0,1) === '.') {
-				$verb = substr($verb,1);
-				$sql_extra .= sprintf(" AND item.obj_type like '%s' ",
-					dbesc(protect_sprintf('%' . $verb . '%'))
-				);
-			}
-			else {
-				$sql_extra .= sprintf(" AND item.verb like '%s' ",
-					dbesc(protect_sprintf('%' . $verb . '%'))
-				);
-			}
-		}
-	
-		if(strlen($file)) {
-			$sql_extra .= term_query('item',$file,TERM_FILE);
-		}
-
-		if ($dm) {
-			$sql_extra .= " AND item_private = 2 ";
-		}
-	
-		if($conv) {
-			$item_thread_top = '';
-			$sql_extra .= " AND ( author_xchan = '" . dbesc($channel['channel_hash']) . "' OR item_mentionsme = 1 ) ";
-		}
-	
-		if($update && ! $load) {
-	
-			// only setup pagination on initial page view
-			$pager_sql = '';
-	
-		}
-		else {
-			$itemspage = get_pconfig(local_channel(),'system','itemspage');
-			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
-			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-		}
-	
-		// cmin and cmax are both -1 when the affinity tool is disabled
-
-		if(($cmin != (-1)) || ($cmax != (-1))) {
-	
-			// Not everybody who shows up in the network stream will be in your address book.
-			// By default those that aren't are assumed to have closeness = 99; but this isn't
-			// recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
-			// the stream with a NULL address book entry.
-	
-			$sql_nets .= " AND ";
-	
-			if($cmax == 99)
-				$sql_nets .= " ( ";
-	
-			$sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " ";
-			$sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) ";
-	
-			if($cmax == 99)
-				$sql_nets .= " OR abook.abook_closeness IS NULL ) ";
-	
-		}
-
-		$net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : ''); 
-		$net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
-
-		$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
-		$uids = " and item.uid = " . local_channel() . " ";
-	
-		if(feature_enabled(local_channel(), 'network_list_mode'))
-			$page_mode = 'list';
-		else
-			$page_mode = 'client';
-
-		$parents_str = '';
-
-		// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
-		// or three and look at your matrix page - after opening up your browser. The first page loads just as it
-		// should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page
-		// (before the page 1 content). The update code is actually doing just what it's supposed
-		// to, it's fetching posts that have the ITEM_UNSEEN bit set. But the reason that page 2 content is being
-		// returned in an UPDATE is because you hadn't gotten that far yet - you're still on page 1 and everything
-		// that we loaded for page 1 is now marked as seen. But the stuff on page 2 hasn't been. So... it's being
-		// treated as "new fresh" content because it is unseen. We need to distinguish it somehow from content
-		// which "arrived as you were reading page 1". We're going to do this
-		// by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items
-		// which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers...
-
-		$simple_update = '';
-		if($update && $_SESSION['loadtime'])
-			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
-
-		if($nouveau && $load) {
-			// "New Item View" - show all items unthreaded in reverse created date order
-			$items = q("SELECT item.*, item.id AS item_id, created FROM item 
-				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-				$net_query
-				WHERE true $uids $item_normal
-				and (abook.abook_blocked = 0 or abook.abook_flags is null)
-				$sql_extra $sql_options $sql_nets
-				$net_query2
-				ORDER BY item.created DESC $pager_sql "
-			);
-
-			$parents_str = ids_to_querystr($items,'item_id');
-
-			require_once('include/items.php');
-	
-			xchan_query($items);
-	
-			$items = fetch_post_tags($items,true);
-		}
-		elseif($update) {
-	
-			// Normal conversation view
-	
-			if($order === 'post')
-				$ordering = "created";
-			else
-				$ordering = "commented";
-	
-			if($load) {
-				// Fetch a page full of parent items for this page
-				$r = q("SELECT item.parent AS item_id FROM item 
-					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-					$net_query
-					WHERE true $uids $item_thread_top $item_normal
-					AND item.mid = item.parent_mid
-					and (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra3 $sql_extra $sql_options $sql_nets
-					$net_query2
-					ORDER BY $ordering DESC $pager_sql "
-				);
-			}
-			else {
-
-				// this is an update
-				$r = q("SELECT item.parent AS item_id FROM item
-					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-					$net_query
-					WHERE true $uids $item_normal_update $simple_update
-					and (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra3 $sql_extra $sql_options $sql_nets $net_query2"
-				);
-			}
-
-			// Then fetch all the children of the parents that are on this page
-	
-			if($r) {
-	
-				$parents_str = ids_to_querystr($r,'item_id');
-	
-				$items = q("SELECT item.*, item.id AS item_id FROM item
-					WHERE true $uids $item_normal
-					AND item.parent IN ( %s )
-					$sql_extra ",
-					dbesc($parents_str)
-				);
-	
-				xchan_query($items,true);
-				$items = fetch_post_tags($items,true);
-				$items = conv_sort($items,$ordering);
-			}
-			else {
-				$items = array();
-			}
-
-		}
-	
-		$mode = (($nouveau) ? 'network-new' : 'network');
-
-		if($search)
-			$mode = 'search';
-	
 		$o .= conversation($items,$mode,$update,$page_mode);
-	
+
 		if(($items) && (! $update))
 			$o .= alt_pager(count($items));
 
 		$_SESSION['loadtime'] = datetime_convert();
-	
+
 		return $o;
 	}
-	
+
 }

Zotlabs/Module/New_channel.php

@@ -11,7 +11,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 	function init() {
 
 		$cmd = ((argc() > 1) ? argv(1) : '');
-	
+
 		if($cmd === 'autofill.json') {
 			require_once('library/urlify/URLify.php');
 			$result = array('error' => false, 'message' => '');
@@ -20,14 +20,14 @@ class New_channel extends \Zotlabs\Web\Controller {
 			$x = false;
 
 			if(get_config('system','unicode_usernames')) {
-				$x = punify(mb_strtolower($n)); 
+				$x = punify(mb_strtolower($n));
 			}
 
 			if((! $x) || strlen($x) > 64)
 				$x = strtolower(\URLify::transliterate($n));
-	
+
 			$test = array();
-	
+
 			// first name
 			if(strpos($x,' '))
 				$test[] = legal_webbie(substr($x,0,strpos($x,' ')));
@@ -44,19 +44,19 @@ class New_channel extends \Zotlabs\Web\Controller {
 
 			json_return_and_die(check_webbie($test));
 		}
-	
+
 		if($cmd === 'checkaddr.json') {
 			require_once('library/urlify/URLify.php');
 			$result = array('error' => false, 'message' => '');
 			$n = trim($_REQUEST['nick']);
 			if(! $n) {
-				$n = trim($_REQUEST['name']);	
+				$n = trim($_REQUEST['name']);
 			}
 
 			$x = false;
 
 			if(get_config('system','unicode_usernames')) {
-				$x = punify(mb_strtolower($n)); 
+				$x = punify(mb_strtolower($n));
 			}
 
 			if((! $x) || strlen($x) > 64)
@@ -64,7 +64,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 
 
 			$test = array();
-	
+
 			// first name
 			if(strpos($x,' '))
 				$test[] = legal_webbie(substr($x,0,strpos($x,' ')));
@@ -80,57 +80,57 @@ class New_channel extends \Zotlabs\Web\Controller {
 				$test[] = $n;
 				$test[] = $n . mt_rand(1000,9999);
 			}
-	
+
 			for($y = 0; $y < 100; $y ++)
 				$test[] = 'id' . mt_rand(1000,9999);
-	
+
 			json_return_and_die(check_webbie($test));
 		}
-	
-	
+
+
 	}
-	
+
 	function post() {
-	
+
 		$arr = $_POST;
-	
+
 		$acc = \App::get_account();
 		$arr['account_id'] = get_account_id();
-	
-		// prevent execution by delegated channels as well as those not logged in. 
+
+		// prevent execution by delegated channels as well as those not logged in.
 		// get_account_id() returns the account_id from the session. But \App::$account
-		// may point to the original authenticated account. 
-	
+		// may point to the original authenticated account.
+
 		if((! $acc) || ($acc['account_id'] != $arr['account_id'])) {
 			notice( t('Permission denied.') . EOL );
 			return;
 		}
-	
+
 		$result = create_identity($arr);
-	
+
 		if(! $result['success']) {
 			notice($result['message']);
 			return;
 		}
-	
+
 		$newuid = $result['channel']['channel_id'];
-	
+
 		change_channel($result['channel']['channel_id']);
-	
-		$next_page = get_config('system', 'workflow_channel_next', 'profiles');		
+
+		$next_page = get_config('system', 'workflow_channel_next', 'profiles');
 		goaway(z_root() . '/' . $next_page);
-	
+
 	}
-	
+
 	function get() {
-	
+
 		$acc = \App::get_account();
-	
+
 		if((! $acc) || $acc['account_id'] != get_account_id()) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		$default_role = '';
 		$aid = get_account_id();
 		if($aid) {
@@ -140,7 +140,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 			if($r && (! intval($r[0]['total']))) {
 				$default_role = get_config('system','default_permissions_role','social');
 			}
-	
+
 			$limit = account_service_class_fetch(get_account_id(),'total_identities');
 			$canadd = true;
 			if($r && ($limit !== false)) {
@@ -155,7 +155,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 		}
 
 		$name_help = '<span id="name_help_loading" style="display:none">' . t('Loading') . '</span><span id="name_help_text">';
-		$name_help .= (($default_role) 
+		$name_help .= (($default_role)
 			? t('Your real name is recommended.')
 			: t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"')
 		);
@@ -176,10 +176,10 @@ class New_channel extends \Zotlabs\Web\Controller {
 		$nickhub = '@' . \App::get_hostname();
 		$nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*");
 		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.') . '<br>' . '<a href="help/member/member_guide#Channel_Permission_Roles" target="_blank">' . t('Read more about channel permission roles') . '</a>',$perm_roles);
-	
+
 		$o = replace_macros(get_markup_template('new_channel.tpl'), array(
 			'$title'        => t('Create a Channel'),
-			'$desc'         => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.') , 
+			'$desc'         => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.') ,
 			'$label_import' => t('or <a href="import">import an existing channel</a> from another location.'),
 			'$name'         => $name,
 			'$role'		    => $role,
@@ -190,10 +190,10 @@ class New_channel extends \Zotlabs\Web\Controller {
 			'$channel_usage_message' => $channel_usage_message,
 			'$canadd'	=> $canadd
 		));
-	
+
 		return $o;
-	
+
 	}
-	
-	
+
+
 }

Zotlabs/Module/Notifications.php

@@ -6,25 +6,28 @@ require_once('include/bbcode.php');
 class Notifications extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		nav_set_selected('Notifications');
-	
+
 		$o = '';
+		$notif_content = '';
+		$notifications_available = false;
 
 		$r = q("select count(*) as total from notify where uid = %d and seen = 0",
 			intval(local_channel())
 		);
-		if($r && intval($t[0]['total']) > 49) {
+		if($r && intval($r[0]['total']) > 49) {
 			$r = q("select * from notify where uid = %d
 				and seen = 0 order by created desc limit 50",
 				intval(local_channel())
 			);
-		} else {
+		}
+		else {
 			$r1 = q("select * from notify where uid = %d
 				and seen = 0 order by created desc limit 50",
 				intval(local_channel())
@@ -32,13 +35,13 @@ class Notifications extends \Zotlabs\Web\Controller {
 			$r2 = q("select * from notify where uid = %d
 				and seen = 1 order by created desc limit %d",
 				intval(local_channel()),
-				intval(50 - intval($t[0]['total']))
+				intval(50 - intval($r[0]['total']))
 			);
 			$r = array_merge($r1,$r2);
 		}
-			
+
 		if($r) {
-			$notifications_available = 1;
+			$notifications_available = true;
 			foreach ($r as $rr) {
 				$x = strip_tags(bbcode($rr['msg']));
 				$notif_content .= replace_macros(get_markup_template('notify.tpl'),array(
@@ -52,17 +55,17 @@ class Notifications extends \Zotlabs\Web\Controller {
 			}
 		}
 		else {
-			$notif_content .= t('No more system notifications.');
+			$notif_content = t('No more system notifications.');
 		}
-			
+
 		$o .= replace_macros(get_markup_template('notifications.tpl'),array(
 			'$notif_header' => t('System Notifications'),
 			'$notif_link_mark_seen' => t('Mark all seen'),
 			'$notif_content' => $notif_content,
 			'$notifications_available' => $notifications_available,
 		));
-	
+
 		return $o;
 	}
-	
+
 }

Zotlabs/Module/Oep.php

@@ -11,24 +11,24 @@ require_once('include/security.php');
 class Oep extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		logger('oep: ' . print_r($_REQUEST,true), LOGGER_DEBUG, LOG_INFO);
-	
+
 		$html = ((argc() > 1 && argv(1) === 'html') ? true : false);
 		if($_REQUEST['url']) {
 			$_REQUEST['url'] = strip_zids($_REQUEST['url']);
 			$url = $_REQUEST['url'];
 		}
-	
+
 		if(! $url)
 			http_status_exit(404, 'Not found');
-	
+
 		$maxwidth  = $_REQUEST['maxwidth'];
 		$maxheight = $_REQUEST['maxheight'];
 		$format = $_REQUEST['format'];
 		if($format && $format !== 'json')
 			http_status_exit(501, 'Not implemented');
-	
+
 		if(fnmatch('*/photos/*/album/*',$url))
 			$arr = $this->oep_album_reply($_REQUEST);
 		elseif(fnmatch('*/photos/*/image/*',$url))
@@ -47,7 +47,7 @@ class Oep extends \Zotlabs\Web\Controller {
 			$arr = $this->oep_cards_reply($_REQUEST);
 		elseif(fnmatch('*/articles/*',$url))
 			$arr = $this->oep_articles_reply($_REQUEST);
-	
+
 		if($arr) {
 			if($html) {
 				if($arr['type'] === 'rich') {
@@ -61,13 +61,13 @@ class Oep extends \Zotlabs\Web\Controller {
 			}
 			killme();
 		}
-	
+
 		http_status_exit(404,'Not found');
-	
+
 	}
-	
+
 	function oep_display_reply($args) {
-	
+
 		$ret = array();
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
@@ -83,8 +83,8 @@ class Oep extends \Zotlabs\Web\Controller {
 
 		$item_normal = item_normal();
 
-		$p = q("select * from item where mid like '%s' limit 1",
-	  		dbesc($res . '%')
+		$p = q("select * from item where mid = '%s' limit 1",
+	  		dbesc($res)
 		);
 
 		if(! $p)
@@ -92,7 +92,7 @@ class Oep extends \Zotlabs\Web\Controller {
 
 		$c = channelx_by_n($p[0]['uid']);
 
-	
+
 		if(! ($c && $res))
 			return;
 
@@ -100,27 +100,27 @@ class Oep extends \Zotlabs\Web\Controller {
 			return;
 
 		$sql_extra = item_permissions_sql($c['channel_id']);
-	
-		$p = q("select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1",
-			dbesc($res . '%'),
+
+		$p = q("select * from item where mid = '%s' and uid = %d $sql_extra $item_normal limit 1",
+			dbesc($res),
 			intval($c['channel_id'])
 		);
 
 		if(! $p)
 			return;
-		
+
 		xchan_query($p,true);
 		$p = fetch_post_tags($p,true);
 
 		// This function can get tripped up if the item is already a reshare
-		// (the multiple share declarations do not parse cleanly if nested) 
+		// (the multiple share declarations do not parse cleanly if nested)
 		// So build a template with a known nonsense string as the content, and then
 		// replace that known string with the actual rendered content, sending
 		// each content layer through bbcode() separately.
 
 		$x = '2eGriplW^*Jmf4';
 
-	        
+
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
             "' profile='".$p[0]['author']['xchan_url'] .
             "' avatar='".$p[0]['author']['xchan_photo_s'].
@@ -131,29 +131,29 @@ class Oep extends \Zotlabs\Web\Controller {
 	    if($p[0]['title'])
             $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
 
-		$o .= $x; 
+		$o .= $x;
 		$o .= "[/share]";
 		$o = bbcode($o);
-	
+
 		$o = str_replace($x,bbcode($p[0]['body']),$o);
-	
+
 		$ret['type'] = 'rich';
-	
+
 		$w = (($maxwidth) ? $maxwidth : 640);
 		$h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-	
+
 		$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
-		
+
 		$ret['width'] = $w;
 		$ret['height'] = $h;
-	
+
 		return $ret;
-	
+
 	}
 
 
 	function oep_cards_reply($args) {
-	
+
 		$ret = [];
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
@@ -164,7 +164,7 @@ class Oep extends \Zotlabs\Web\Controller {
 			$res = $matches[3];
 		}
 		if(! ($nick && $res))
-			return $ret; 
+			return $ret;
 
 		$channel = channelx_by_nick($nick);
 
@@ -187,8 +187,8 @@ class Oep extends \Zotlabs\Web\Controller {
 			return $ret;
 		}
 
-		$r = q("select * from item 
-			where item.uid = %d and item_type = %d 
+		$r = q("select * from item
+			where item.uid = %d and item_type = %d
 			$sql_extra order by item.created desc",
 			intval($channel['channel_id']),
 			intval(ITEM_TYPE_CARD)
@@ -208,7 +208,7 @@ class Oep extends \Zotlabs\Web\Controller {
 
 		$x = '2eGriplW^*Jmf4';
 
-	        
+
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
             "' profile='".$p[0]['author']['xchan_url'] .
             "' avatar='".$p[0]['author']['xchan_photo_s'].
@@ -219,28 +219,28 @@ class Oep extends \Zotlabs\Web\Controller {
 	    if($p[0]['title'])
             $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
 
-		$o .= $x; 
+		$o .= $x;
 		$o .= "[/share]";
 		$o = bbcode($o);
-	
+
 		$o = str_replace($x,bbcode($p[0]['body']),$o);
-	
+
 		$ret['type'] = 'rich';
-	
+
 		$w = (($maxwidth) ? $maxwidth : 640);
 		$h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-	
+
 		$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
-		
+
 		$ret['width'] = $w;
 		$ret['height'] = $h;
-	
+
 		return $ret;
-	
+
 	}
 
 	function oep_articles_reply($args) {
-	
+
 		$ret = [];
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
@@ -251,7 +251,7 @@ class Oep extends \Zotlabs\Web\Controller {
 			$res = $matches[3];
 		}
 		if(! ($nick && $res))
-			return $ret; 
+			return $ret;
 
 		$channel = channelx_by_nick($nick);
 
@@ -273,8 +273,8 @@ class Oep extends \Zotlabs\Web\Controller {
 			return $ret;
 		}
 
-		$r = q("select * from item 
-			where item.uid = %d and item_type = %d 
+		$r = q("select * from item
+			where item.uid = %d and item_type = %d
 			$sql_extra order by item.created desc",
 			intval($channel['channel_id']),
 			intval(ITEM_TYPE_ARTICLE)
@@ -294,7 +294,7 @@ class Oep extends \Zotlabs\Web\Controller {
 
 		$x = '2eGriplW^*Jmf4';
 
-	        
+
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
             "' profile='".$p[0]['author']['xchan_url'] .
             "' avatar='".$p[0]['author']['xchan_photo_s'].
@@ -305,71 +305,71 @@ class Oep extends \Zotlabs\Web\Controller {
 	    if($p[0]['title'])
             $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
 
-		$o .= $x; 
+		$o .= $x;
 		$o .= "[/share]";
 		$o = bbcode($o);
-	
+
 		$o = str_replace($x,bbcode($p[0]['body']),$o);
-	
+
 		$ret['type'] = 'rich';
-	
+
 		$w = (($maxwidth) ? $maxwidth : 640);
 		$h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-	
+
 		$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
-		
+
 		$ret['width'] = $w;
 		$ret['height'] = $h;
-	
+
 		return $ret;
-	
+
 	}
 
-	
+
 	function oep_mid_reply($args) {
-	
+
 		$ret = array();
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
 		$maxheight = intval($args['maxheight']);
-	
+
 		if(preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#',$url,$matches)) {
 			$chn = $matches[3];
 			$res = $matches[5];
 		}
-	
+
 		if(! ($chn && $res))
 			return;
 		$c = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($chn)
 		);
-	
+
 		if(! $c)
 			return;
 
 		if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_stream'))
 			return;
-	
+
 		$sql_extra = item_permissions_sql($c[0]['channel_id']);
-	
+
 		$p = q("select * from item where mid = '%s' and uid = %d $sql_extra limit 1",
 	  		dbesc($res),
 			intval($c[0]['channel_id'])
 		);
 		if(! $p)
 			return;
-		
+
 		xchan_query($p,true);
 		$p = fetch_post_tags($p,true);
 
 		// This function can get tripped up if the item is already a reshare
-		// (the multiple share declarations do not parse cleanly if nested) 
+		// (the multiple share declarations do not parse cleanly if nested)
 		// So build a template with a known nonsense string as the content, and then
 		// replace that known string with the actual rendered content, sending
 		// each content layer through bbcode() separately.
 
 		$x = '2eGriplW^*Jmf4';
-			
+
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
 			"' profile='".$p[0]['author']['xchan_url'] .
 			"' avatar='".$p[0]['author']['xchan_photo_s'].
@@ -379,52 +379,52 @@ class Oep extends \Zotlabs\Web\Controller {
 			"' message_id='".$p[0]['mid']."']";
 		if($p[0]['title'])
 			$o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
-		$o .= $x; 
+		$o .= $x;
 		$o .= "[/share]";
 		$o = bbcode($o);
-	
+
 		$o = str_replace($x,bbcode($p[0]['body']),$o);
 
 		$ret['type'] = 'rich';
-	
+
 		$w = (($maxwidth) ? $maxwidth : 640);
 		$h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-	
+
 		$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
-		
+
 		$ret['width'] = $w;
 		$ret['height'] = $h;
-	
+
 		return $ret;
-	
+
 	}
-	
+
 	function oep_profile_reply($args) {
-	
-		
+
+
 		require_once('include/channel.php');
 
 		$url = $args['url'];
-	
+
 		if(preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#',$url,$matches)) {
 			$chn = $matches[3];
 		}
-	
+
 		if(! $chn)
 			return;
-	
+
 		$c = channelx_by_nick($chn);
-	
+
 		if(! $c)
 			return;
-	
-	
+
+
 		$maxwidth  = intval($args['maxwidth']);
 		$maxheight = intval($args['maxheight']);
-	
+
 		$width = 800;
 		$height = 375;
-	
+
 		if($maxwidth) {
 			$width = $maxwidth;
 			$height = (375 / 800) * $width;
@@ -434,59 +434,59 @@ class Oep extends \Zotlabs\Web\Controller {
 				$width = (800 / 375) * $maxheight;
 				$height = $maxheight;
 			}
-		} 
+		}
 		$ret = array();
-	
+
 		$ret['type'] = 'rich';
 		$ret['width'] = intval($width);
 		$ret['height'] = intval($height);
-	
+
 		$ret['html'] = get_zcard_embed($c,get_observer_hash(),array('width' => $width, 'height' => $height));
-	
+
 		return $ret;
-	
+
 	}
-	
+
 	function oep_album_reply($args) {
-	
+
 		$ret = array();
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
 		$maxheight = intval($args['maxheight']);
-	
+
 		if(preg_match('|//(.*?)/(.*?)/(.*?)/album/|',$url,$matches)) {
 			$chn = $matches[3];
 			$res = basename($url);
 		}
-	
+
 		if(! ($chn && $res))
 			return;
 		$c = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($chn)
 		);
-	
+
 		if(! $c)
 			return;
-	
+
 		if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files'))
 			return;
 
 		$sql_extra = permissions_sql($c[0]['channel_id']);
-	
+
 		$p = q("select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
 	  		dbesc($res),
 			intval($c[0]['channel_id'])
 		);
 		if(! $p)
 			return;
-	
+
 		$res = $p[0]['resource_id'];
-	
+
 		$r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
 			intval($c[0]['channel_id']),
 			dbesc($res)
 		);
-	
+
 		if($r) {
 			foreach($r as $rr) {
 				$foundres = false;
@@ -494,62 +494,62 @@ class Oep extends \Zotlabs\Web\Controller {
 					continue;
 				if($maxwidth && $rr['width'] > $maxwidth)
 					continue;
-				$foundres = true;			
+				$foundres = true;
 				break;
 			}
-	
+
 			if($foundres) {
 				$ret['type'] = 'link';
 				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
 				$ret['thumbnail_width'] = $rr['width'];
 				$ret['thumbnail_height'] = $rr['height'];
 			}
-				
-	
+
+
 		}
 		return $ret;
-	
+
 	}
-	
-	
+
+
 	function oep_phototop_reply($args) {
-	
+
 		$ret = array();
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
 		$maxheight = intval($args['maxheight']);
-	
+
 		if(preg_match('|//(.*?)/(.*?)/(.*?)$|',$url,$matches)) {
 			$chn = $matches[3];
 		}
-	
+
 		if(! $chn)
 			return;
 		$c = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($chn)
 		);
-	
+
 		if(! $c)
 			return;
-	
+
 		if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files'))
 			return;
 
 		$sql_extra = permissions_sql($c[0]['channel_id']);
-	
+
 		$p = q("select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
 			intval($c[0]['channel_id'])
 		);
 		if(! $p)
 			return;
-	
+
 		$res = $p[0]['resource_id'];
-	
+
 		$r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
 			intval($c[0]['channel_id']),
 			dbesc($res)
 		);
-	
+
 		if($r) {
 			foreach($r as $rr) {
 				$foundres = false;
@@ -557,42 +557,42 @@ class Oep extends \Zotlabs\Web\Controller {
 					continue;
 				if($maxwidth && $rr['width'] > $maxwidth)
 					continue;
-				$foundres = true;			
+				$foundres = true;
 				break;
 			}
-	
+
 			if($foundres) {
 				$ret['type'] = 'link';
 				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
 				$ret['thumbnail_width'] = $rr['width'];
 				$ret['thumbnail_height'] = $rr['height'];
 			}
-				
-	
+
+
 		}
 		return $ret;
-	
+
 	}
-	
-	
+
+
 	function oep_photo_reply($args) {
-	
+
 		$ret = array();
 		$url = $args['url'];
 		$maxwidth  = intval($args['maxwidth']);
 		$maxheight = intval($args['maxheight']);
-	
+
 		if(preg_match('|//(.*?)/(.*?)/(.*?)/image/|',$url,$matches)) {
 			$chn = $matches[3];
 			$res = basename($url);
 		}
-	
+
 		if(! ($chn && $res))
 			return;
 		$c = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($chn)
 		);
-	
+
 		if(! $c)
 			return;
 
@@ -600,13 +600,13 @@ class Oep extends \Zotlabs\Web\Controller {
 			return;
 
 		$sql_extra = permissions_sql($c[0]['channel_id']);
-	
-	
+
+
 		$r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
 			intval($c[0]['channel_id']),
 			dbesc($res)
 		);
-	
+
 		if($r) {
 			foreach($r as $rr) {
 				$foundres = false;
@@ -614,20 +614,20 @@ class Oep extends \Zotlabs\Web\Controller {
 					continue;
 				if($maxwidth && $rr['width'] > $maxwidth)
 					continue;
-				$foundres = true;			
+				$foundres = true;
 				break;
 			}
-	
+
 			if($foundres) {
 				$ret['type'] = 'link';
 				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
 				$ret['thumbnail_width'] = $rr['width'];
 				$ret['thumbnail_height'] = $rr['height'];
 			}
-				
-	
+
+
 		}
 		return $ret;
-	
+
 	}
 }

Zotlabs/Module/Pconfig.php

@@ -8,16 +8,16 @@ use Zotlabs\Lib\Libsync;
 class Pconfig extends \Zotlabs\Web\Controller {
 
 	function post() {
-	
+
 		if(! local_channel())
 			return;
-	
-	
+
+
 		if($_SESSION['delegate'])
 			return;
-	
+
 		check_form_security_token_redirectOnErr('/pconfig', 'pconfig');
-	
+
 		$cat = trim(escape_tags($_POST['cat']));
 		$k = trim(escape_tags($_POST['k']));
 		$v = trim($_POST['v']);
@@ -27,16 +27,16 @@ class Pconfig extends \Zotlabs\Web\Controller {
 		if (preg_match('|^a:[0-9]+:{.*}$|s',$v) || preg_match('|O:8:"stdClass":[0-9]+:{.*}$|s',$v)) {
 			return;
 		}
-	
+
 		if(in_array(argv(2),$this->disallowed_pconfig())) {
 			notice( t('This setting requires special processing and editing has been blocked.') . EOL);
 			return;
 		}
-		
+
 		if(strpos($k,'password') !== false) {
-			$v = z_obscure($v);
+			$v = obscurify($v);
 		}
-	
+
 		set_pconfig(local_channel(),$cat,$k,$v);
 		Libsync::build_sync_packet();
 
@@ -46,24 +46,24 @@ class Pconfig extends \Zotlabs\Web\Controller {
 			goaway(z_root() . '/pconfig/' . $cat . '/' .  $k);
 
 	}
-	
-	
+
+
 	function get() {
-	
+
 		if(! local_channel()) {
 			return login();
 		}
-	
+
 		$content = '<h3>' . t('Configuration Editor') . '</h3>';
 		$content .= '<div class="descriptive-paragraph">' . t('Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.') . '</div>' . EOL . EOL;
-	
-	
-	
+
+
+
 		if(argc() == 3) {
 			$content .= '<a href="pconfig">pconfig[' . local_channel() . ']</a>' . EOL;
 			$content .= '<a href="pconfig/' . escape_tags(argv(1)) . '">pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']</a>' . EOL . EOL;
 			$content .= '<a href="pconfig/' . escape_tags(argv(1)) . '/' . escape_tags(argv(2)) . '" >pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . ']</a> = ' . get_pconfig(local_channel(),escape_tags(argv(1)),escape_tags(argv(2))) . EOL;
-	
+
 			if(in_array(argv(2),$this->disallowed_pconfig())) {
 				notice( t('This setting requires special processing and editing has been blocked.') . EOL);
 				return $content;
@@ -71,8 +71,8 @@ class Pconfig extends \Zotlabs\Web\Controller {
 			else
 				$content .= $this->pconfig_form(escape_tags(argv(1)),escape_tags(argv(2)));
 		}
-	
-	
+
+
 		if(argc() == 2) {
 			$content .= '<a href="pconfig">pconfig[' . local_channel() . ']</a>' . EOL;
 			load_pconfig(local_channel(),escape_tags(argv(1)));
@@ -80,9 +80,9 @@ class Pconfig extends \Zotlabs\Web\Controller {
 				$content .= '<a href="pconfig/' . escape_tags(argv(1)) . '/' . $k . '" >pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . $k . ']</a> = ' . escape_tags($x) . EOL;
 			}
 		}
-	
+
 		if(argc() == 1) {
-	
+
 			$r = q("select * from pconfig where uid = " . local_channel());
 			if($r) {
 				foreach($r as $rr) {
@@ -91,33 +91,33 @@ class Pconfig extends \Zotlabs\Web\Controller {
 			}
 		}
 		return $content;
-	
+
 	}
-	
-	
+
+
 	function pconfig_form($cat,$k) {
-	
+
 		$o = '<form action="pconfig" method="post" >';
 		$o .= '<input type="hidden" name="form_security_token" value="' . get_form_security_token('pconfig') . '" />';
-	
+
 		$v = get_pconfig(local_channel(),$cat,$k);
-		if(strpos($k,'password') !== false) 
-			$v = z_unobscure($v);
-	
+		if(strpos($k,'password') !== false)
+			$v = unobscurify($v);
+
 		$o .= '<input type="hidden" name="cat" value="' . $cat . '" />';
 		$o .= '<input type="hidden" name="k" value="' . $k . '" />';
-	
+
 		if(strpos($v,"\n"))
 			$o .= '<textarea name="v" >' . escape_tags($v) . '</textarea>';
 	 	else
 			$o .= '<input type="text" name="v" value="' . escape_tags($v) . '" />';
-	
-		$o .= EOL . EOL; 
+
+		$o .= EOL . EOL;
 		$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" />';
 		$o .= '</form>';
-	
+
 		return $o;
-	
+
 	}
 
 
@@ -127,5 +127,5 @@ class Pconfig extends \Zotlabs\Web\Controller {
 			'permissions_role'
 		);
 	}
-	
+
 }

Zotlabs/Module/Photo.php

@@ -147,7 +147,7 @@ class Photo extends \Zotlabs\Web\Controller {
 			);
 			if($r) {
 				$allowed = (-1);
-
+				$filename = $r[0]['filename'];
 				$u = intval($r[0]['photo_usage']);
 				if($u) {
 					$allowed = 1;
@@ -180,7 +180,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				$channel = channelx_by_n($r[0]['uid']);
 
 				// Now we'll see if we can access the photo
-				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
+				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 					dbesc($photo),
 					intval($resolution)
 				);
@@ -194,9 +194,9 @@ class Photo extends \Zotlabs\Web\Controller {
 					$mimetype = $e[0]['mimetype'];
 					$modified = strtotime($e[0]['edited'] . 'Z');
 
-					if(intval($e[0]['os_storage'])) {
+					if(intval($e[0]['os_storage']))
 						$streaming = $data;
-					}
+
 					if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '')
 						$prvcachecontrol = 'no-store, no-cache, must-revalidate';
 				}
@@ -282,7 +282,7 @@ class Photo extends \Zotlabs\Web\Controller {
 		header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data)));
 
 		// If it's a file resource, stream it. 
-		if($streaming && $channel) {
+		if($streaming) {
 			if(strpos($streaming,'store') !== false)
 				$istream = fopen($streaming,'rb');
 			else

Zotlabs/Module/Pin.php

@@ -6,6 +6,7 @@ namespace Zotlabs\Module;
  */
 
 use App;
+use Zotlabs\Lib\Libsync;
 
 class Pin extends \Zotlabs\Web\Controller {
 
@@ -64,6 +65,6 @@ class Pin extends \Zotlabs\Web\Controller {
 				http_status_exit(404, 'Not found');
 		}
 
-		build_sync_packet($r[0]['uid'], [ 'config' ]);
+		Libsync::build_sync_packet($r[0]['uid'], [ 'config' ]);
 	}
 }

Zotlabs/Module/Prate.php

@@ -2,21 +2,23 @@
 namespace Zotlabs\Module;
 
 
+use Zotlabs\Lib\Crypto;
+
 class Prate extends \Zotlabs\Web\Controller {
 
 	function init() {
 		if($_SERVER['REQUEST_METHOD'] === 'post')
 			return;
-	
+
 		if(! local_channel())
 			return;
-	
+
 		$channel = \App::get_channel();
-	
+
 		$target = argv(1);
 		if(! $target)
 			return;
-	
+
 		$r = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
 			dbesc($channel['channel_hash']),
 			dbesc($target)
@@ -25,34 +27,34 @@ class Prate extends \Zotlabs\Web\Controller {
 			json_return_and_die(array('rating' => $r[0]['xlink_rating'],'rating_text' => $r[0]['xlink_rating_text']));
 		killme();
 	}
-	
+
 		function post() {
-	
+
 		if(! local_channel())
 			return;
-	
+
 		$channel = \App::get_channel();
-	
+
 		$target = trim($_REQUEST['target']);
 		if(! $target)
 			return;
-	
+
 		if($target === $channel['channel_hash'])
 			return;
-	
+
 		$rating = intval($_POST['rating']);
 		if($rating < (-10))
 			$rating = (-10);
 		if($rating > 10)
 			$rating = 10;
-	
+
 		$rating_text = trim(escape_tags($_REQUEST['rating_text']));
-	
+
 		$signed = $target . '.' . $rating . '.' . $rating_text;
-	
-		$sig = base64url_encode(rsa_sign($signed,$channel['channel_prvkey']));
-	
-	
+
+		$sig = base64url_encode(Crypto::sign($signed,$channel['channel_prvkey']));
+
+
 		$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
 			dbesc($channel['channel_hash']),
 			dbesc($target)
@@ -87,19 +89,19 @@ class Prate extends \Zotlabs\Web\Controller {
 		if($record) {
 			\Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
 		}
-	
+
 		json_return_and_die(array('result' => true));;
 	}
-				
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
+
+
+
 }