"profile locator/address" is now called "Identity Address" to reduce confusion

[friendica.git] / mod / invite.php

diff --git a/mod/invite.php b/mod/invite.php
index efe0a59b11d1a60adf215b3bf6188b318caa9edb..1c511959574820d0a4646ec8ccea2a3538306559 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -1,15 +1,22 @@
 <?php
 
+/**
+ * module: invite.php
+ *
+ * send email invitations to join social network
+ *
+ */
 
 function invite_post(&$a) {
+
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
 
-       $recips = explode("\n",$_POST['recipients']);
-       $message = $_POST['message'];
+       $recips  = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array());
+       $message = ((x($_POST,'message'))    ? notags(trim($_POST['message']))    : '');
 
        $total = 0;
 
@@ -17,41 +24,47 @@ function invite_post(&$a) {
 
                $recip = trim($recip);
 
-               if(!eregi('[A-Za-z0-9._%-]+@[A-Za-z0-9._%-]+\.[A-Za-z]{2,6}', $recip)) {
-                       notice(  $recip . t(' : ') . t('Not a valid email address.') . EOL);
+               if(! valid_email($recip)) {
+                       notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
                        continue;
                }
 
-                $res = mail($recip, t('Please join my network on ') . $a->config['sitename'], $message, "From: " . $a->user['email']);
+               $res = mail($recip, sprintf(t('Please join my network on %s'), $a->config['sitename']), 
+                       $message, 
+                       "From: " . $a->user['email'] . "\n"
+                       . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                       . 'Content-transfer-encoding: 8bit' );
+
                if($res) {
                        $total ++;
                }
                else {
-                       notice( $recip . t(' : ') . t('Message delivery failed.') . EOL);
+                       notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
                }
 
        }
-       notice( $total . t(' messages sent.') . EOL);
+       notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
        return;
 }
 
 
 function invite_content(&$a) {
+
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
-       $tpl = file_get_contents('view/invite.tpl');
+       $tpl = load_view_file('view/invite.tpl');
        
        $o = replace_macros($tpl, array(
                '$invite' => t('Send invitations'),
                '$addr_text' => t('Enter email addresses, one per line:'),
                '$msg_text' => t('Your message:'),
-               '$default_message' => t('Please join my social network on ') . $a->config['sitename'] . t("\r\n") . t("\r\n")
-                       . t('To accept this invitation, please visit:') . t("\r\n") . t("\r\n") . $a->get_baseurl()
-                       . t("\r\n") . t("\r\n") . t('Once you have registered, please make an introduction via my profile page at:') 
-                       . t("\r\n") . t("\r\n") . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,
+               '$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
+                       . t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
+                       . "\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'] ,
                '$submit' => t('Submit')
        ));