X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=5ed7642005628546069db335f818a55e97fe5971;hb=5f1ef732e05c79584e6ea1cdb14360a7dd388a9d;hp=8e6a577d43234fdd621036d35fd7ce2e88e7165e;hpb=6709beb2ac776bb06bd0d9d7749faac9a065863c;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index 8e6a577d43..5ed7642005 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,6 +1,11 @@
 <?php
 
+require_once('include/email.php');
+
 function user_allow($hash) {
+
+	$a = get_app();
+
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
 		dbesc($hash)
 	);
@@ -46,9 +51,9 @@ function user_allow($hash) {
 			'$uid' => $user[0]['uid']
 	));
 
-	$res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
+	$res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'),
 		$email_tpl,
-			'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+			'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
 
@@ -61,6 +66,11 @@ function user_allow($hash) {
 
 }
 
+
+// This does not have to go through user_remove() and save the nickname
+// permanently against re-registration, as the person was not yet
+// allowed to have friends on this system
+
 function user_deny($hash) {
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
@@ -104,7 +114,7 @@ function regmod_content(&$a) {
 		return $o;
 	}
 
-	if(!is_site_admin()) {
+	if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
 		notice( t('Permission denied.') . EOL);
 		return '';
 	}