trying to recommit the deletion of old files.
This commit is contained in:
parent
435b677141
commit
e94df5cdd0
@ -1,98 +1,95 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 2 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class Ecard_Controller extends Controller {
|
||||
/**
|
||||
* Send the ecard.
|
||||
*/
|
||||
public function send($id) {
|
||||
$item = ORM::factory("item", $id);
|
||||
access::required("view", $item);
|
||||
if (!ecard::can_send_ecard()) {
|
||||
access::forbidden();
|
||||
}
|
||||
|
||||
$form = ecard::get_send_form($item);
|
||||
try {
|
||||
$valid = $form->validate();
|
||||
} catch (ORM_Validation_Exception $e) {
|
||||
// Translate ORM validation errors into form error messages
|
||||
foreach ($e->validation->errors() as $key => $error) {
|
||||
$form->edit_item->inputs[$key]->add_error($error, 1);
|
||||
}
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
if ($valid) {
|
||||
$v = new View("ecard_email.html");
|
||||
$v->item = $item;
|
||||
$v->subject = module::get_var("ecard", "subject");
|
||||
$to_name = $form->send_ecard->to_name->value;
|
||||
$from_name = $form->send_ecard->from_name->value;
|
||||
$bcc = module::get_var("ecard", "bcc");
|
||||
$v->message = t(module::get_var("ecard", "message"), array("toname" => $to_name, "fromname" => $from_name));
|
||||
$v->custom_message = $form->send_ecard->text->value;
|
||||
$v->image = $item->name;
|
||||
$to = $form->send_ecard->inputs["to_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");
|
||||
$mime = new Mail_mime("\n");
|
||||
$mime->setHTMLBody($v->render());
|
||||
$mime->addHTMLImage($item->resize_path(),$item->mime_type,$item->name);
|
||||
$body = $mime->get(array('html_charset' => 'UTF-8', 'text_charset' => 'UTF-8','text_encoding' => '8bit','head_charset' => 'UTF-8'));
|
||||
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc);
|
||||
message::success("eCard successfully sent");
|
||||
json::reply(array("result" => "success"));
|
||||
} else {
|
||||
json::reply(array("result" => "error", "html" => (string) $form));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Present a form for sending a new ecard.
|
||||
*/
|
||||
public function form_send($item_id) {
|
||||
$item = ORM::factory("item", $item_id);
|
||||
access::required("view", $item);
|
||||
if (!ecard::can_send_ecard()) {
|
||||
access::forbidden();
|
||||
}
|
||||
|
||||
print ecard::prefill_send_form(ecard::get_send_form($item));
|
||||
}
|
||||
|
||||
private static function _notify($to, $from, $subject, $item, $text, $headers, $bcc) {
|
||||
$sendmail = Sendmail::factory();
|
||||
$sendmail
|
||||
->to($to)
|
||||
->from($from)
|
||||
->subject($subject);
|
||||
if(isset($bcc)) {
|
||||
$sendmail->header("bcc",$bcc);
|
||||
}
|
||||
foreach($headers as $key => $value) {
|
||||
$sendmail->header($key,$value);
|
||||
}
|
||||
$sendmail
|
||||
->message($text)
|
||||
->send();
|
||||
return;
|
||||
}
|
||||
}
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2010 Bharat Mediratta
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 2 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
class Ecard_Controller extends Controller {
|
||||
/**
|
||||
* Send the ecard.
|
||||
*/
|
||||
public function send($id) {
|
||||
$item = ORM::factory("item", $id);
|
||||
access::required("view", $item);
|
||||
if (!ecard::can_send_ecard()) {
|
||||
access::forbidden();
|
||||
}
|
||||
$form = ecard::get_send_form($item);
|
||||
try {
|
||||
$valid = $form->validate();
|
||||
} catch (ORM_Validation_Exception $e) {
|
||||
// Translate ORM validation errors into form error messages
|
||||
foreach ($e->validation->errors() as $key => $error) {
|
||||
$form->edit_item->inputs[$key]->add_error($error, 1);
|
||||
}
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
if ($valid) {
|
||||
$v = new View("ecard_email.html");
|
||||
$v->item = $item;
|
||||
$v->subject = module::get_var("ecard", "subject");
|
||||
$to_name = $form->send_ecard->to_name->value;
|
||||
$from_name = $form->send_ecard->from_name->value;
|
||||
$bcc = module::get_var("ecard", "bcc");
|
||||
$v->message = t(module::get_var("ecard", "message"), array("toname" => $to_name, "fromname" => $from_name));
|
||||
$v->custom_message = $form->send_ecard->text->value;
|
||||
$v->image = $item->name;
|
||||
$to = $form->send_ecard->inputs["to_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");
|
||||
$mime = new Mail_mime("\n");
|
||||
$mime->setHTMLBody($v->render());
|
||||
$mime->addHTMLImage($item->resize_path(),$item->mime_type,$item->name);
|
||||
$body = $mime->get(array('html_charset' => 'UTF-8', 'text_charset' => 'UTF-8','text_encoding' => '8bit','head_charset' => 'UTF-8'));
|
||||
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc);
|
||||
message::success("eCard successfully sent");
|
||||
json::reply(array("result" => "success"));
|
||||
} else {
|
||||
json::reply(array("result" => "error", "html" => (string) $form));
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Present a form for sending a new ecard.
|
||||
*/
|
||||
public function form_send($item_id) {
|
||||
$item = ORM::factory("item", $item_id);
|
||||
access::required("view", $item);
|
||||
if (!ecard::can_send_ecard()) {
|
||||
access::forbidden();
|
||||
}
|
||||
print ecard::prefill_send_form(ecard::get_send_form($item));
|
||||
}
|
||||
private static function _notify($to, $from, $subject, $item, $text, $headers, $bcc) {
|
||||
$sendmail = Sendmail::factory();
|
||||
$sendmail
|
||||
->to($to)
|
||||
->from($from)
|
||||
->subject($subject);
|
||||
if(isset($bcc)) {
|
||||
$sendmail->header("bcc",$bcc);
|
||||
}
|
||||
foreach($headers as $key => $value) {
|
||||
$sendmail->header($key,$value);
|
||||
}
|
||||
$sendmail
|
||||
->message($text)
|
||||
->send();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user