From 6956eadaad637561561fad83727043f56f36f1b4 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 7 Apr 2021 17:19:29 +0200
Subject: registrations: minor cleanup

---
 Zotlabs/Module/Admin/Site.php | 10 +++-------
 Zotlabs/Module/Register.php   |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index bf47f8c62..87226295b 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -512,11 +512,11 @@ class Site {
 				get_config('system','verify_email'),
 				t("Check to verify email addresses used in account registration (recommended)."),
 				"", "", 'ZAR0890C'),
-			'$abandon_days'     => array('abandon_days',
+			'$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.'),
-				'appears not to be implemented (2010.01)'),
+				t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')
+			),
 			// <-hilmar]
 
 			'$role'         => $role,
@@ -553,13 +553,9 @@ 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"),
 		));
 	}
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 95d9da3b7..142be728a 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -573,7 +573,7 @@ class Register extends Controller {
 			'$reg_is'       => $registration_is,
 			'$registertext' => bbcode(get_config('system','register_text')),
 			'$other_sites'  => $other_sites,
-			'$msg'			=> $opal['rn'] . ',' . $opal['an'],
+			'$msg'          => $opal['msg'],
 			'$invitations'  => $invitations,
 			'$invite_code'  => $invite_code,
 			'$haveivc'		=> t('I have an invite code'),
@@ -593,7 +593,7 @@ class Register extends Controller {
 			'$pass1'        => $password,
 			'$pass2'        => $password2,
 			'$submit'       => t('Register'),
-			'$verify_note'  => (($email_verify) ? t('This site requires verification. After completing this form, please check the notice or your email for further instructions.') : '')
+			//'$verify_note'  => (($email_verify) ? t('This site requires verification. After completing this form, please check the notice or your email for further instructions.') : '')
 		));
 
 		return $o;
-- 
cgit v1.2.3