From d882bad706542eb1e64c24567b8bf112f6cebb89 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 4 Jun 2021 07:43:23 +0000
Subject: fix login name label for the case when system.verify_email is
 disabled

---
 Zotlabs/Daemon/Directory.php |  2 +-
 boot.php                     | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php
index 1f307b273..35d184206 100644
--- a/Zotlabs/Daemon/Directory.php
+++ b/Zotlabs/Daemon/Directory.php
@@ -74,7 +74,7 @@ class Directory {
 			 * the directory packet. That means we'll try again on the next poll run.
 			 */
 
-			$hash = random_string();
+			$hash = new_uuid();
 
 			Queue::insert(array(
 				'hash'       => $hash,
diff --git a/boot.php b/boot.php
index bb2d094ea..66ccd4309 100644
--- a/boot.php
+++ b/boot.php
@@ -1710,21 +1710,24 @@ function login($register = false, $form_id = 'main-login', $hiddens = false, $lo
 			$_SESSION['login_return_url'] = App::$query_string;
 	}
 
-	$o .= replace_macros($tpl,array(
+	$email_required = get_config('system', 'verify_email');
+	$lname_label = (($email_required) ? t('Email or nickname') : t('Nickname'));
+
+	$o .= replace_macros($tpl, [
 		'$dest_url'     => $dest_url,
 		'$login_page'   => $login_page,
 		'$logout'       => t('Logout'),
 		'$login'        => t('Login'),
 		'$remote_login' => t('Remote Authentication'),
 		'$form_id'      => $form_id,
-		'$lname'        => array('username', t('Login/Email') , '', ''),
-		'$lpassword'    => array('password', t('Password'), '', ''),
-		'$remember_me'  => array((($login_page) ? 'remember' : 'remember_me'), t('Remember me'), '', '',array(t('No'),t('Yes'))),
+		'$lname'        => ['username', $lname_label],
+		'$lpassword'    => ['password', t('Password')],
+		'$remember_me'  => [(($login_page) ? 'remember' : 'remember_me'), t('Remember me'), '', '', [t('No'),t('Yes')]],
 		'$hiddens'      => $hiddens,
 		'$register'     => $reg,
 		'$lostpass'     => t('Forgot your password?'),
-		'$lostlink'     => t('Password Reset'),
-	));
+		'$lostlink'     => (($email_required) ? t('Password Reset') : ''),
+	]);
 
 	/**
 	 * @hooks login_hook
-- 
cgit v1.2.3