public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #77 from easyrhino/patch-1

Browse Source 
Moving foreach($to_array as $to) to just before the self::_notify is necessary to make "message::success" work for multiple recipients. Otherwise, ecard fails with multiple recipients. Also added a trim around the $to so spaces before/after email address don't blow out function, and also reindented the code using Notepad++. Hope this works for the contrib team.
This commit is contained in:
Bharat Mediratta 2011-07-11 12:00:19 -07:00
commit 4c66b631c1
1 changed files with 116 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
3.1/modules/ecard/controllers/ecard.php
View File

@ -1,27 +1,27 @@
<?php defined("SYSPATH") or die("No direct script access."); <?php defined("SYSPATH") or die("No direct script access.");
/** /**
* Gallery - a web based photo album viewer and editor * Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2011 Bharat Mediratta * Copyright (C) 2000-2011 Bharat Mediratta
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Ecard_Controller extends Controller { class Ecard_Controller extends Controller {
/** /**
* Send the ecard. * Send the ecard.
*/ */
public function send($id) { public function send($id) {
$item = ORM::factory("item", $id); $item = ORM::factory("item", $id);
access::required("view", $item); access::required("view", $item);
@ -40,8 +40,6 @@ class Ecard_Controller extends Controller {
} }
if ($valid) { if ($valid) {
$to_array = explode(",",$form->send_ecard->inputs["to_email"]->value);
foreach($to_array as $to) {
$v = new View("ecard_email.html"); $v = new View("ecard_email.html");
$v->item = $item; $v->item = $item;
$v->subject = module::get_var("ecard", "subject"); $v->subject = module::get_var("ecard", "subject");
@ -54,7 +52,7 @@ class Ecard_Controller extends Controller {
$v->custom_message = $form->send_ecard->text->value; $v->custom_message = $form->send_ecard->text->value;
$v->image = $item->name; $v->image = $item->name;
$from = $form->send_ecard->inputs["from_email"]->value; $from = $form->send_ecard->inputs["from_email"]->value;
$headers = array("from" => $from_name."<".$from.">", "to" => $to, "subject" => module::get_var("ecard", "subject"));
require_once(MODPATH. "ecard/lib/mime.php"); require_once(MODPATH. "ecard/lib/mime.php");
$mime = new Mail_mime("\n"); $mime = new Mail_mime("\n");
$mime->setHTMLBody($v->render()); $mime->setHTMLBody($v->render());
@ -77,18 +75,22 @@ class Ecard_Controller extends Controller {
} }
} }
$body = $mime->get(array('html_charset' => 'UTF-8', 'text_charset' => 'UTF-8','text_encoding' => '8bit','head_charset' => 'UTF-8')); $body = $mime->get(array('html_charset' => 'UTF-8', 'text_charset' => 'UTF-8','text_encoding' => '8bit','head_charset' => 'UTF-8'));
$to_array = explode(",",$form->send_ecard->inputs["to_email"]->value);
foreach($to_array as $to) {
$headers = array("from" => $from_name."<".$from.">", "to" => trim($to), "subject" => module::get_var("ecard", "subject"));
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc, $cc); self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc, $cc);
} }
unlink($tmpfile); unlink($tmpfile);
message::success("eCard successfully sent"); message::success("eCard successfully sent to ".$form->send_ecard->inputs["to_email"]->value);
json::reply(array("result" => "success")); json::reply(array("result" => "success"));
} else { } else {
json::reply(array("result" => "error", "html" => (string) $form)); json::reply(array("result" => "error", "html" => (string) $form));
} }
} }
/** /**
* Present a form for sending a new ecard. * Present a form for sending a new ecard.
*/ */
public function form_send($item_id) { public function form_send($item_id) {
$item = ORM::factory("item", $item_id); $item = ORM::factory("item", $item_id);
access::required("view", $item); access::required("view", $item);