X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=b985ee3644e69600d960a98cfe8f73be19109c88;hb=cde17704ddbbe2b4926824aa2aa7aec7a9ac2dd6;hp=abf673a92949d75bdf826d268697c49750726688;hpb=0bcd5522315649c8d4652b8bfaa9bec328b9d548;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index abf673a929..b985ee3644 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -4,16 +4,23 @@
 
 function regmod_content(&$a) {
 
+	$_SESSION['return_url'] = $a->cmd;
+
 	if(! local_user()) {
 		notice( t('Please login.') . EOL);
 		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 		return $o;
 	}
 
+	if((! (x($a->config,'admin_email'))) || ($a->config['admin_email'] !== $a->user['email'])) {
+		notice( t('Permission denied.') . EOL);
+		return '';
+	}
+
 	if($a->argc != 3)
 		killme();
 
-	$cmd = $a->argv[1];
+	$cmd  = $a->argv[1];
 	$hash = $a->argv[2];
 
 
@@ -29,7 +36,7 @@ function regmod_content(&$a) {
 		intval($register[0]['uid'])
 	);
 
-	if($cmd == 'deny') {
+	if($cmd === 'deny') {
 
 		$r = q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($register[0]['uid'])
@@ -44,12 +51,12 @@ function regmod_content(&$a) {
 		$r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
 			dbesc($register[0]['hash'])
 		);
-		notice( t('Registration revoked for ') . $user[0]['username'] . EOL);
+		notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
 		return;
 
 	}
 
-	if($cmd == 'allow') {
+	if($cmd === 'allow') {
 
 		if(! count($user))
 			killme();
@@ -63,7 +70,16 @@ function regmod_content(&$a) {
 			intval($register[0]['uid'])
 		);
 		
-		$email_tpl = file_get_contents("view/register_open_eml.tpl");
+		$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
+			intval($user[0]['uid'])
+		);
+		if(count($r) && $r[0]['net-publish']) {
+			$url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+			if($url && strlen(get_config('system','directory_submit_url')))
+				proc_run('php',"include/directory.php","$url");
+		}
+
+		$email_tpl = load_view_file("view/register_open_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
 				'$sitename' => $a->config['sitename'],
 				'$siteurl' =>  $a->get_baseurl(),
@@ -73,8 +89,11 @@ function regmod_content(&$a) {
 				'$uid' => $user[0]['uid']
 		));
 
-		$res = mail($user[0]['email'], t('Registration details for '). $a->config['sitename'],
-			$email_tpl,'From: ' . t('Administrator@') . $_SERVER[SERVER_NAME] );
+		$res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
+			$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 
 		if($res) {
 			notice( t('Account approved.') . EOL );