allow parentless items from SN - add more tracing on notify failures

[friendica.git] / mod / regmod.php

diff --git a/mod/regmod.php b/mod/regmod.php
index 49a7194934d3b5502a2c5acb939e895c51e26017..eabbec090b92ef9d445f58951f8b1fbd058db786 100644 (file)
--- 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];
 
 
@@ -74,7 +81,7 @@ function regmod_content(&$a) {
                ));
 
                $res = mail($user[0]['email'], t('Registration details for '). $a->config['sitename'],
-                       $email_tpl,'From: ' . t('Administrator@') . $_SERVER[SERVER_NAME] );
+                       $email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
 
                if($res) {
                        notice( t('Account approved.') . EOL );