From 4d3a555b53f3fdd710d7d502bb812d9a565a35f4 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 15 Apr 2021 09:26:47 +0000
Subject: register: minor fixes and template cleanup

---
 Zotlabs/Lib/Enotify.php           |  2 +-
 Zotlabs/Module/Admin/Accounts.php |  3 ++-
 Zotlabs/Module/Register.php       | 13 +++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 490557477..ac782c740 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -978,7 +978,7 @@ class Enotify {
 
 		$x = [
 			'notify_link' => z_root() . '/admin/accounts',
-			'name' => (($rr['reg_email']) ? $rr['reg_email'] : $rr['reg_did2']),
+			'name' => $rr['reg_did2'],
 			//'addr' => '',
 			'photo' => z_root() . '/' . get_default_profile_photo(48),
 			'when' => datetime_convert('UTC', date_default_timezone_get(),$rr['reg_created']),
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php
index 0c0725bd2..32029eb00 100644
--- a/Zotlabs/Module/Admin/Accounts.php
+++ b/Zotlabs/Module/Admin/Accounts.php
@@ -299,7 +299,7 @@ class Accounts {
 			'$sel_deny' => t('Deny selected'),
 			'$sel_aprv' => t('Approve selected'),
 			'$h_pending' => t('Verified registrations waiting for approval'),
-			'$th_pending' => array(t('Request date'), 'dId2', t('Email'), 'IP', t('IP Count')),
+			'$th_pending' => array(t('Request date'), 'dId2', t('Email'), 'IP', t('Requests')),
 			'$no_pending' =>  t('No verified registrations.'),
 			'$approve' => t('Approve'),
 			'$deny' => t('Deny'),
@@ -330,6 +330,7 @@ class Accounts {
 			'$tao'		=> $tao,
 			'$pending' 	=> $pending,
 			'$users' 	=> $users,
+			'$msg'      => t('Message')
 		));
 		$o .= paginate($a);
 
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 1cbea663a..1188651bd 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -532,17 +532,13 @@ class Register extends Controller {
 
 		$invite_code  = array('invite_code', t('Please enter your invitation code'), ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : ""));
 
-		$name = array('name', t('Your name'),
-			((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.'));
+		$name = array('name', t('Your name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Real name is preferred'), '', '', $duty['atform']);
 		$nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl'));
-		$nickname = array('nickname', t('Choose a short nickname'),
-			((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''),
-			sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'),
-			$nickhub));
+		$nickname = array('nickname', t('Choose a short nickname'),	((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), t('Your nickname will be used to create an easy to remember channel address'), '', '', $duty['atform']);
 
-		$tos = array('tos', $label_tos, '', '', array(t('no'),t('yes')));
+		$tos = array('tos', $label_tos, ((x($_REQUEST,'tos')) ? $_REQUEST['tos'] : ''), '', [t('no'),t('yes')], $duty['atform']);
 
-		$register_msg = ['register_msg', t('Why do you want to join this hub?')];
+		$register_msg = ['register_msg', t('Why do you want to join this hub?'), ((x($_REQUEST,'register_msg')) ? $_REQUEST['register_msg'] : '')];
 
 		require_once('include/bbcode.php');
 
@@ -571,6 +567,7 @@ class Register extends Controller {
 			'$pass1'        => $password,
 			'$pass2'        => $password2,
 			'$submit'       => t('Register'),
+			'$nickhub'      => $nickhub
 
 		));
 
-- 
cgit v1.2.3