Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / invite.php

diff --git a/mod/invite.php b/mod/invite.php
index 1f559dabc0445ac62b7cfd27d35f35035947fdf3..2db71742f167e20d7016ce0e346efaccaf166279 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -9,10 +9,9 @@
 
 require_once('include/email.php');
 
-if(! function_exists('invite_post')) {
-function invite_post(&$a) {
+function invite_post(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -50,7 +49,7 @@ function invite_post(&$a) {
                        notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
                        continue;
                }
-
+               
                if($invonly && ($x || is_site_admin())) {
                        $code = autoname(8) . srand(1000,9999);
                        $nmessage = str_replace('$invite_code',$code,$message);
@@ -71,8 +70,8 @@ function invite_post(&$a) {
                else
                        $nmessage = $message;
 
-               $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'),
-                       $nmessage,
+               $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), 
+                       $nmessage, 
                        "From: " . $a->user['email'] . "\n"
                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
                        . 'Content-transfer-encoding: 8bit' );
@@ -94,12 +93,11 @@ function invite_post(&$a) {
        notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
        return;
 }
-}
 
-if(! function_exists('invite_content')) {
-function invite_content(&$a) {
 
-       if(! local_user()) {
+function invite_content(App &$a) {
+
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -121,7 +119,7 @@ function invite_content(&$a) {
                if($a->config['register_policy'] == REGISTER_CLOSED)
                        $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
                elseif($a->config['register_policy'] != REGISTER_CLOSED)
-                       $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
+                       $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
                        . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
        }
        else {
@@ -136,12 +134,11 @@ function invite_content(&$a) {
                '$msg_text' => t('Your message:'),
                '$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
                        . $linktxt
-                       . "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
-                       . "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
+                       . "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
+                       . "\r\n" . "\r\n" . App::get_baseurl() . '/profile/' . $a->user['nickname']
                        . "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
                '$submit' => t('Submit')
        ));
 
        return $o;
 }
-}