[Openupload-svn-update] SF.net SVN: openupload:[381] branches/v0.4/plugins/email.inc.php

[<ts...@us...>]

Revision: 381
          http://openupload.svn.sourceforge.net/openupload/?rev=381&view=rev
Author:   tsdogs
Date:     2010-03-24 15:56:20 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
a few modifications to fix minor bugs in the email plugin dealing with multiple recipients

Modified Paths:
--------------
    branches/v0.4/plugins/email.inc.php

Modified: branches/v0.4/plugins/email.inc.php
===================================================================
--- branches/v0.4/plugins/email.inc.php	2010-03-22 15:36:13 UTC (rev 380)
+++ branches/v0.4/plugins/email.inc.php	2010-03-24 15:56:20 UTC (rev 381)
@@ -28,29 +28,30 @@
     $finfo[0]['email_removelink']=$_POST['removelink'];
     $finfo[0]['subject']=$_POST['subject'];
     $finfo[0]['message']=$_POST['message'];
-    if ($finfo[0]['emailme']=="yes") {
-      if ($_SESSION['user']['email']=='') {
+// TODO: Fix this mess with the e-mail sender
+    if ($_SESSION['user']['email']=='') {
+      if ($finfo[0]['emailme']=="yes") {
         /* check valid e-mail */
         if (!validEmail($_POST['email'])) {
           app()->error(tr('Your e-mail address isn\'t valid!'));
           return false;
         }
         $finfo[0]['emailfrom']=$_POST['email'];
-      } else {
-        $finfo[0]['emailfrom']=$_SESSION['user']['email'];
       }
+    } else {
+      $finfo[0]['emailfrom']=$_SESSION['user']['email'];
     }
     if (!isset($this->config['multirecipients'][$group]) and isset($this->config['multirecipients']['*'])) {
       $this->config['multirecipients'][$group]=$this->config['multirecipients']['*'];
     }
     if ($finfo[0]['emailto']!='') {
       if ($this->config['multirecipients'][$group]=='1') {
-        $emailto = trim(split(';',$_POST['emailto']));
+        $emailto = split(';',$_POST['emailto']);
       } else {
         $emailto[0] = $_POST['emailto']; 
       }
       foreach ($emailto as $destination) {
-        if (!validEmail($destination)) {
+        if (!validEmail(trim($destination))) {
           app()->error(tr('Destination e-mail address "%1" isn\'t valid!',$destination));
           return false;
         }
@@ -75,7 +76,10 @@
       $subject = $finfo[0]['subject']!=''?$finfo[0]['subject']:tr("An upload was delivered to you"); 
       $subject = app()->config['site']['title'].': '.$subject;
       app()->tpl->assign('remove',$finfo[0]['email_removelink']);
-      sendMail($finfo[0]['emailfrom'],$finfo[0]['emailfrom'],$finfo[0]['emailto'],$subject,'plugins/email/notify');
+      $emails = split(';',$finfo[0]['emailto']);
+      foreach ($emails as $emailto) {
+        sendMail($finfo[0]['emailfrom'],$finfo[0]['emailfrom'],trim($emailto),$subject,'plugins/email/notify');
+      }
     }
     /* don't send it twice */
     $finfo[0]['emailme']=='';
@@ -102,7 +106,10 @@
       $finfo[0]['message']=$_GET['message']; 
       app()->tpl->assign('finfo',$finfo);
       app()->tpl->assign('remove',$_GET['removelink']);
-      sendMail($_SESSION['user']['email'],$_SESSION['user']['email'],$_GET['emailto'],$subject,'plugins/email/notify');
+      $emails = split(';',$_GET['emailto']);
+      foreach ($emails as $emailto) {
+        sendMail($_SESSION['user']['email'],$_SESSION['user']['email'],trim($emailto),$subject,'plugins/email/notify');
+      }
       app()->message(tr('E-mail was sent to: %1!',$_GET['emailto']));
       redirect('?action=l&step=2&id='.$_GET['id']);
       return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.