"notes" app

[friendica.git] / mod / regmod.php

diff --git a/mod/regmod.php b/mod/regmod.php
index 932b109ebca32ea0762b0ddc3477044106e96fb3..fe29cb185f66e75fc885e4a3fef301b1a5373060 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -12,10 +12,15 @@ function regmod_content(&$a) {
                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];
 
 
@@ -46,7 +51,7 @@ 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;
 
        }
@@ -65,7 +70,16 @@ function regmod_content(&$a) {
                        intval($register[0]['uid'])
                );
                
-               $email_tpl = load_view_file("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 = get_intltext_template("register_open_eml.tpl");
                $email_tpl = replace_macros($email_tpl, array(
                                '$sitename' => $a->config['sitename'],
                                '$siteurl' =>  $a->get_baseurl(),
@@ -75,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 );