remove items from export - too much memory consumed, will have to stream items,photos

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 97038def0ba15a0d6b8b02d85aad9c10762372b9..95e9d581f1c9806e19d1818ed3da73f972252d9f 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -307,7 +307,7 @@ function register_post(&$a) {
                                '$password' => $new_password,
                                '$uid' => $newuid ));
 
-               $res = mail($email, t('Registration details for ') . $a->config['sitename'],
+               $res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
                        $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
 
@@ -344,7 +344,7 @@ function register_post(&$a) {
                                '$hash' => $hash
                 ));
 
-               $res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
+               $res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
                        $email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
                if($res) {
@@ -401,6 +401,10 @@ function register_content(&$a) {
                $oidlabel = t("Your OpenID \x28optional\x29: ");
        }
 
+       // I set this and got even more fake names than before...
+
+       $realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
+
        if(get_config('system','publish_all')) {
                $profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
        }
@@ -423,6 +427,7 @@ function register_content(&$a) {
        $o = load_view_file("view/register.tpl");
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
+               '$realpeople' => $realpeople,
                '$regtitle'  => t('Registration'),
                '$registertext' =>((x($a->config,'register_text'))
                        ? '<div class="error-message">' . $a->config['register_text'] . '</div>'
@@ -433,7 +438,7 @@ function register_content(&$a) {
                '$openid'    => $openid_url,
                '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
                '$addrlabel' => t('Your Email Address: '),
-               '$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'),
+               '$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
                '$nicklabel' => t('Choose a nickname: '),
                '$photo'     => $photo,
                '$publish'   => $profile_publish,