Fix and refactor module Admin\Accounts part I

2 files changed, 43 insertions, 103 deletions

diff --git a/include/account.php b/include/account.php
index 884c07389..615c802f4 100644
--- a/include/account.php
+++ b/include/account.php
@@ -613,59 +613,45 @@ function send_register_success_email($email,$password) {
 }
 
 /**
- * @brief Allows a user registration.
+ * Mark a pending registration as approved, and notify the account
+ * holder by email.
  *
- * @param string $hash
- * @return array|boolean
+ * @param string $hash		The registration hash of the entry to approve
+ *
+ * @return bool
  */
-function account_allow($hash) {
-
-	$ret = array('success' => false);
+function account_allow(string $hash): bool {
 
 	$register = q("SELECT * FROM register WHERE reg_hash = '%s' LIMIT 1",
 		dbesc($hash)
 	);
 
-	if(! $register)
-		return $ret;
+	if (! $register) {
+		logger(
+			"Entry with hash '{$hash}' was not found in the register table.",
+			LOGGER_NORMAL,
+			LOG_ERR
+		);
+		return false;
+	}
 
-	$account = q("SELECT * FROM account WHERE account_id = %d LIMIT 1",
-		intval($register[0]['reg_uid'])
-	);
+	$account = get_account_by_id($register[0]['reg_uid']);
 
-	// a register entry without account assigned to
-	if(! $account)
-		return $ret;
+	if (! $account) {
+		logger(
+			"Account '{$register[0]['reg_uid']}' mentioned by registration hash '{$hash}' was not found.",
+			LOGGER_NORMAL,
+			LOG_ERR
+		);
+		return false;
+	}
 
-	// [hilmar ->
+	$transaction = new DbaTransaction(DBA::$dba);
 
-	q("START TRANSACTION");
-	//q("DELETE FROM register WHERE reg_hash = '%s'",
-	//	dbesc($register[0]['reg_hash'])
-	//);
 	$r1 = q("UPDATE register SET reg_vital = 0 WHERE reg_hash = '%s'",
 		dbesc($register[0]['reg_hash'])
 	);
 
-	/* instead of ...
-
-	// unblock
-	q("UPDATE account SET    account_flags = (account_flags & ~%d) "
-		.			" WHERE (account_flags & %d)>0 AND account_id = %d",
-		intval(ACCOUNT_BLOCKED),
-		intval(ACCOUNT_BLOCKED),
-		intval($register[0]['reg_uid'])
-	);
-
-	// unpend
-	q("UPDATE account SET    account_flags = (account_flags & ~%d) "
-		. 			" WHERE (account_flags & %d)>0 AND account_id = %d",
-		intval(ACCOUNT_PENDING),
-		intval(ACCOUNT_PENDING),
-		intval($register[0]['reg_uid'])
-	);
-
-	*/
 	// together unblock and unpend
 	$r2 = q("UPDATE account SET account_flags = %d WHERE account_id = %d",
 		intval($account['account_flags']
@@ -674,9 +660,7 @@ function account_allow($hash) {
 	);
 
 	if($r1 && $r2) {
-		q("COMMIT");
-
-		// <- hilmar]
+		$transaction->commit();
 
 		push_lang($register[0]['reg_lang']);
 
@@ -684,35 +668,35 @@ function account_allow($hash) {
 		$email_msg = replace_macros($email_tpl, array(
 				'$sitename' => Config::Get('system','sitename'),
 				'$siteurl' =>  z_root(),
-				'$username' => $account[0]['account_email'],
-				'$email' => $account[0]['account_email'],
+				'$username' => $account['account_email'],
+				'$email' => $account['account_email'],
 				'$password' => '',
-				'$uid' => $account[0]['account_id']
+				'$uid' => $account['account_id']
 		));
 
 		$res = z_mail(
 			[
-			'toEmail' => $account[0]['account_email'],
+			'toEmail' => $account['account_email'],
 			'messageSubject' => sprintf( t('Registration details for %s'), Config::Get('system','sitename')),
 			'textVersion' => $email_msg,
 			]
 		);
 
-		pop_lang();
+		if (! $res) {
+			info(t("Sending account approval email to {$account['email']} failed..."));
+		}
 
-		if(Config::Get('system', 'auto_channel_create', 1))
-			auto_channel_create($register[0]['uid']);
+		pop_lang();
 
-		if ($res) {
-			info( t('Account approved.') . EOL );
-			return true;
+		if(Config::Get('system', 'auto_channel_create', 1)) {
+			auto_channel_create($register[0]['reg_uid']);
 		}
 
-	// [hilmar ->
-	} else {
-		q("ROLLBACK");
+		info( t('Account approved.') . EOL );
+		return true;
 	}
-	// <- hilmar]
+
+	return false;
 }
 
 
diff --git a/include/network.php b/include/network.php
index 50e8b1c89..a8ccee15c 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2,6 +2,7 @@
 
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\Config;
+use Zotlabs\Lib\Mailer;
 use Zotlabs\Lib\Zotfinger;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\Queue;
@@ -1813,54 +1814,9 @@ function network_to_name($s) {
  */
 function z_mail($params) {
 
-	if(! $params['fromEmail']) {
-		$params['fromEmail'] = Config::Get('system','from_email');
-		if(! $params['fromEmail'])
-			$params['fromEmail'] = 'Administrator' . '@' . App::get_hostname();
-	}
-	if(! $params['fromName']) {
-		$params['fromName'] = Config::Get('system','from_email_name');
-		if(! $params['fromName'])
-			$params['fromName'] = Zotlabs\Lib\System::get_site_name();
-	}
-	if(! $params['replyTo']) {
-		$params['replyTo'] = Config::Get('system','reply_address');
-		if(! $params['replyTo'])
-			$params['replyTo'] = 'noreply' . '@' . App::get_hostname();
-	}
-
-	$params['sent']   = false;
-	$params['result'] = false;
-
-	/**
-	 * @hooks email_send
-	 *   * \e params @see z_mail()
-	 */
-	call_hooks('email_send', $params);
-
-	if($params['sent']) {
-		logger('notification: z_mail returns ' . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG);
-		return $params['result'];
-	}
-
-	$fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
-	$messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
-
-	$messageHeader =
-		$params['additionalMailHeader'] .
-		"From: $fromName <{$params['fromEmail']}>" . PHP_EOL .
-		"Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL .
-		"Content-Type: text/plain; charset=UTF-8";
-
-	// send the message
-	$res = mail(
-		$params['toEmail'],								// send to address
-		$messageSubject,								// subject
-		$params['textVersion'],
-		$messageHeader									// message headers
-	);
-	logger('notification: z_mail returns ' . (($res) ? 'success' : 'failure'), LOGGER_DEBUG);
-	return $res;
+	// Delegate the call to the Mailer class.
+	$mailer = new Mailer($params);
+	return $mailer->deliver();
 }