From b5ce20734445f03d070e8b6faf1ed73950f62c81 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 7 May 2021 10:03:12 +0000
Subject: register: implement remove_expired_registrations() and minor fixes

---
 Zotlabs/Daemon/Cron.php           | 10 ++++++----
 Zotlabs/Lib/Enotify.php           |  2 +-
 Zotlabs/Module/Admin/Channels.php |  2 +-
 Zotlabs/Module/Regate.php         |  5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index 4732dfa75..335ff9751 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -55,11 +55,13 @@ 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()
 		);
@@ -131,7 +133,7 @@ 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(),
@@ -192,7 +194,7 @@ class Cron {
 		// 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_quoteinterval('1 DAY')
@@ -238,7 +240,7 @@ class Cron {
 
 		set_config('system', 'lastcron', datetime_convert());
 
-		//All done - clear the lockfile	
+		//All done - clear the lockfile
 		@unlink($lockfile);
 
 		return;
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index ac782c740..7e33f09b8 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -983,7 +983,7 @@ class Enotify {
 			'photo' => z_root() . '/' . get_default_profile_photo(48),
 			'when' => datetime_convert('UTC', date_default_timezone_get(),$rr['reg_created']),
 			'hclass' => ('notify-unseen'),
-			'message' => t('verified')
+			'message' => t('status verified')
 		];
 
 		return $x;
diff --git a/Zotlabs/Module/Admin/Channels.php b/Zotlabs/Module/Admin/Channels.php
index e0f26112d..09769a166 100644
--- a/Zotlabs/Module/Admin/Channels.php
+++ b/Zotlabs/Module/Admin/Channels.php
@@ -173,4 +173,4 @@ class Channels {
 		return $o;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php
index b5f7f0958..379195461 100644
--- a/Zotlabs/Module/Regate.php
+++ b/Zotlabs/Module/Regate.php
@@ -102,9 +102,10 @@ class Regate extends \Zotlabs\Web\Controller {
 							if (($flags & ACCOUNT_UNVERIFIED) == ACCOUNT_UNVERIFIED) {
 
 								// verification success
-								$msg 	= 'ZAR1237I' . ' ' . t('Verify successfull');
+								$msg_code = 'ZAR1237I';
+								$msg = t('Verification successful');
 								$reonar = json_decode( $r['reg_stuff'], true);
-								$reonar['valid'] = $now . ',' . $ip . ' ' . $did2 . ' ' . $msg;
+								$reonar['valid'] = $now . ',' . $ip . ' ' . $did2 . ' ' . $msg_code . ' ' . $msg;
 
 								// clear flag
 								$flags &= $flags ^ ACCOUNT_UNVERIFIED;
-- 
cgit v1.2.3