Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / invite.php

diff --git a/mod/invite.php b/mod/invite.php
index aea92a663a01f53d37e1b50b3747740d07f5aa8c..2db71742f167e20d7016ce0e346efaccaf166279 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -9,9 +9,9 @@
 
 require_once('include/email.php');
 
-function invite_post(&$a) {
+function invite_post(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -95,9 +95,9 @@ function invite_post(&$a) {
 }
 
 
-function invite_content(&$a) {
+function invite_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -112,15 +112,15 @@ function invite_content(&$a) {
                        notice( t('You have no more invitations available') . EOL);
                        return '';
                }
-       }                       
+       }
 
-       $dirloc = get_config('system','directory_submit_url');
+       $dirloc = get_config('system','directory');
        if(strlen($dirloc)) {
                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.'), dirname($dirloc) . '/siteinfo');
+                       $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())
-                       . "\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.'),dirname($dirloc) . '/siteinfo');
+                       $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 {
                $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
@@ -135,10 +135,10 @@ function invite_content(&$a) {
                '$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" . 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;
-}
\ No newline at end of file
+}