Ecard now allows admins to give user the option to send a non-watermarked version of the image.
This commit is contained in:
parent
16d9ea7b59
commit
daf3339606
@ -30,6 +30,7 @@ class Admin_ecard_Controller extends Admin_Controller {
|
|||||||
access::verify_csrf();
|
access::verify_csrf();
|
||||||
$form = $this->_get_admin_form();
|
$form = $this->_get_admin_form();
|
||||||
if ($form->validate()) {
|
if ($form->validate()) {
|
||||||
|
module::set_var("ecard","send_plain",$form->ecard->send_plain->value);
|
||||||
module::set_var("ecard", "sender", $form->ecard->sender->value);
|
module::set_var("ecard", "sender", $form->ecard->sender->value);
|
||||||
module::set_var("ecard", "bcc", $form->ecard->bcc->value);
|
module::set_var("ecard", "bcc", $form->ecard->bcc->value);
|
||||||
module::set_var("ecard", "subject", $form->ecard->subject->value);
|
module::set_var("ecard", "subject", $form->ecard->subject->value);
|
||||||
@ -60,6 +61,12 @@ class Admin_ecard_Controller extends Admin_Controller {
|
|||||||
$ecard_settings->input("max_length")
|
$ecard_settings->input("max_length")
|
||||||
->label(t("Maximum message length"))
|
->label(t("Maximum message length"))
|
||||||
->value(module::get_var("ecard","max_length"));
|
->value(module::get_var("ecard","max_length"));
|
||||||
|
if(module::is_active("watermark")) {
|
||||||
|
$ecard_settings->checkbox("send_plain")
|
||||||
|
->label(t("Allow users to send non-watermarked versions"))
|
||||||
|
->value(true)
|
||||||
|
->checked(module::get_var("ecard","send_plain"));
|
||||||
|
}
|
||||||
$ecard_settings->dropdown("access_permissions")
|
$ecard_settings->dropdown("access_permissions")
|
||||||
->label(t("Who can send eCards?"))
|
->label(t("Who can send eCards?"))
|
||||||
->options(array("everybody" => t("Everybody"),
|
->options(array("everybody" => t("Everybody"),
|
||||||
|
@ -58,14 +58,28 @@ class Ecard_Controller extends Controller {
|
|||||||
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());
|
||||||
|
if($form->send_ecard->send_fresh->checked == true) {
|
||||||
|
$tmpfile = tempnam(TMPPATH, "clean");
|
||||||
|
if($form->send_ecard->send_thumbnail->checked == true) {
|
||||||
|
$options = array("width" => module::get_var("gallery", "thumb_size"), "height" => module::get_var("gallery", "thumb_size"), "master" => Image::AUTO);
|
||||||
|
gallery_graphics::resize($item->file_path(), $tmpfile, $options);
|
||||||
|
$mime->addHTMLImage($tmpfile,$item->mime_type,$item->name);
|
||||||
|
} else {
|
||||||
|
$options = array("width" => module::get_var("gallery", "resize_size"), "height" => module::get_var("gallery", "resize_size"), "master" => Image::AUTO);
|
||||||
|
gallery_graphics::resize($item->file_path(), $tmpfile, $options);
|
||||||
|
$mime->addHTMLImage($tmpfile,$item->mime_type,$item->name);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
if($form->send_ecard->send_thumbnail->checked == true) {
|
if($form->send_ecard->send_thumbnail->checked == true) {
|
||||||
$mime->addHTMLImage($item->thumb_path(),$item->mime_type,$item->name);
|
$mime->addHTMLImage($item->thumb_path(),$item->mime_type,$item->name);
|
||||||
} else {
|
} else {
|
||||||
$mime->addHTMLImage($item->resize_path(),$item->mime_type,$item->name);
|
$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'));
|
$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, $cc);
|
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc, $cc);
|
||||||
}
|
}
|
||||||
|
unlink($tmpfile);
|
||||||
message::success("eCard successfully sent");
|
message::success("eCard successfully sent");
|
||||||
json::reply(array("result" => "success"));
|
json::reply(array("result" => "success"));
|
||||||
} else {
|
} else {
|
||||||
|
@ -57,6 +57,12 @@ class ecard_Core {
|
|||||||
->label(t("Send thumbnail image, instead of resized image."))
|
->label(t("Send thumbnail image, instead of resized image."))
|
||||||
->value(true)
|
->value(true)
|
||||||
->checked(false);
|
->checked(false);
|
||||||
|
if(module::get_var("ecard","send_plain") == true && module::is_active("watermark")) {
|
||||||
|
$group->checkbox("send_fresh")
|
||||||
|
->label(t("Send non-watermarked image."))
|
||||||
|
->value(true)
|
||||||
|
->checked(false);
|
||||||
|
}
|
||||||
$group->hidden("item_id")->value($item_id);
|
$group->hidden("item_id")->value($item_id);
|
||||||
module::event("ecard_send_form", $form);
|
module::event("ecard_send_form", $form);
|
||||||
module::event("captcha_protect_form", $form);
|
module::event("captcha_protect_form", $form);
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
class ecard_installer {
|
class ecard_installer {
|
||||||
private static function getversion() {
|
private static function getversion() {
|
||||||
return 10;
|
return 11;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function setversion() {
|
private static function setversion() {
|
||||||
@ -27,6 +27,7 @@ class ecard_installer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function install() {
|
static function install() {
|
||||||
|
module::set_var("ecard","send_plain",false);
|
||||||
module::set_var("ecard", "subject", "You have been sent an eCard");
|
module::set_var("ecard", "subject", "You have been sent an eCard");
|
||||||
module::set_var("ecard", "message",
|
module::set_var("ecard", "message",
|
||||||
"Hello, \r\n%fromname has sent you an eCard. " .
|
"Hello, \r\n%fromname has sent you an eCard. " .
|
||||||
@ -38,7 +39,8 @@ class ecard_installer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function upgrade($version) {
|
static function upgrade($version) {
|
||||||
if($version <= 8) {
|
if($version <= 10) {
|
||||||
|
module::set_var("ecard","send_plain",false);
|
||||||
module::set_var("ecard", "message",
|
module::set_var("ecard", "message",
|
||||||
"Hello, \r\n%fromname has sent you an eCard. " .
|
"Hello, \r\n%fromname has sent you an eCard. " .
|
||||||
"Click the image to be taken to the gallery.");
|
"Click the image to be taken to the gallery.");
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
name = "E-Card"
|
name = "E-Card"
|
||||||
description = "Send a photo as a postcard"
|
description = "Send a photo as a postcard"
|
||||||
version = 10
|
version = 11
|
||||||
|
@ -30,6 +30,7 @@ class Admin_ecard_Controller extends Admin_Controller {
|
|||||||
access::verify_csrf();
|
access::verify_csrf();
|
||||||
$form = $this->_get_admin_form();
|
$form = $this->_get_admin_form();
|
||||||
if ($form->validate()) {
|
if ($form->validate()) {
|
||||||
|
module::set_var("ecard","send_plain",$form->ecard->send_plain->value);
|
||||||
module::set_var("ecard", "sender", $form->ecard->sender->value);
|
module::set_var("ecard", "sender", $form->ecard->sender->value);
|
||||||
module::set_var("ecard", "bcc", $form->ecard->bcc->value);
|
module::set_var("ecard", "bcc", $form->ecard->bcc->value);
|
||||||
module::set_var("ecard", "subject", $form->ecard->subject->value);
|
module::set_var("ecard", "subject", $form->ecard->subject->value);
|
||||||
@ -60,6 +61,12 @@ class Admin_ecard_Controller extends Admin_Controller {
|
|||||||
$ecard_settings->input("max_length")
|
$ecard_settings->input("max_length")
|
||||||
->label(t("Maximum message length"))
|
->label(t("Maximum message length"))
|
||||||
->value(module::get_var("ecard","max_length"));
|
->value(module::get_var("ecard","max_length"));
|
||||||
|
if(module::is_active("watermark")) {
|
||||||
|
$ecard_settings->checkbox("send_plain")
|
||||||
|
->label(t("Allow users to send non-watermarked versions"))
|
||||||
|
->value(true)
|
||||||
|
->checked(module::get_var("ecard","send_plain"));
|
||||||
|
}
|
||||||
$ecard_settings->dropdown("access_permissions")
|
$ecard_settings->dropdown("access_permissions")
|
||||||
->label(t("Who can send eCards?"))
|
->label(t("Who can send eCards?"))
|
||||||
->options(array("everybody" => t("Everybody"),
|
->options(array("everybody" => t("Everybody"),
|
||||||
|
@ -58,14 +58,28 @@ class Ecard_Controller extends Controller {
|
|||||||
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());
|
||||||
|
if($form->send_ecard->send_fresh->checked == true) {
|
||||||
|
$tmpfile = tempnam(TMPPATH, "clean");
|
||||||
|
if($form->send_ecard->send_thumbnail->checked == true) {
|
||||||
|
$options = array("width" => module::get_var("gallery", "thumb_size"), "height" => module::get_var("gallery", "thumb_size"), "master" => Image::AUTO);
|
||||||
|
gallery_graphics::resize($item->file_path(), $tmpfile, $options);
|
||||||
|
$mime->addHTMLImage($tmpfile,$item->mime_type,$item->name);
|
||||||
|
} else {
|
||||||
|
$options = array("width" => module::get_var("gallery", "resize_size"), "height" => module::get_var("gallery", "resize_size"), "master" => Image::AUTO);
|
||||||
|
gallery_graphics::resize($item->file_path(), $tmpfile, $options);
|
||||||
|
$mime->addHTMLImage($tmpfile,$item->mime_type,$item->name);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
if($form->send_ecard->send_thumbnail->checked == true) {
|
if($form->send_ecard->send_thumbnail->checked == true) {
|
||||||
$mime->addHTMLImage($item->thumb_path(),$item->mime_type,$item->name);
|
$mime->addHTMLImage($item->thumb_path(),$item->mime_type,$item->name);
|
||||||
} else {
|
} else {
|
||||||
$mime->addHTMLImage($item->resize_path(),$item->mime_type,$item->name);
|
$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'));
|
$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, $cc);
|
self::_notify($headers['to'], $headers['from'], $headers['subject'], $item, $body, $mime->headers(), $bcc, $cc);
|
||||||
}
|
}
|
||||||
|
unlink($tmpfile);
|
||||||
message::success("eCard successfully sent");
|
message::success("eCard successfully sent");
|
||||||
json::reply(array("result" => "success"));
|
json::reply(array("result" => "success"));
|
||||||
} else {
|
} else {
|
||||||
|
@ -57,6 +57,12 @@ class ecard_Core {
|
|||||||
->label(t("Send thumbnail image, instead of resized image."))
|
->label(t("Send thumbnail image, instead of resized image."))
|
||||||
->value(true)
|
->value(true)
|
||||||
->checked(false);
|
->checked(false);
|
||||||
|
if(module::get_var("ecard","send_plain") == true && module::is_active("watermark")) {
|
||||||
|
$group->checkbox("send_fresh")
|
||||||
|
->label(t("Send non-watermarked image."))
|
||||||
|
->value(true)
|
||||||
|
->checked(false);
|
||||||
|
}
|
||||||
$group->hidden("item_id")->value($item_id);
|
$group->hidden("item_id")->value($item_id);
|
||||||
module::event("ecard_send_form", $form);
|
module::event("ecard_send_form", $form);
|
||||||
module::event("captcha_protect_form", $form);
|
module::event("captcha_protect_form", $form);
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
class ecard_installer {
|
class ecard_installer {
|
||||||
private static function getversion() {
|
private static function getversion() {
|
||||||
return 10;
|
return 11;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function setversion() {
|
private static function setversion() {
|
||||||
@ -27,6 +27,7 @@ class ecard_installer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function install() {
|
static function install() {
|
||||||
|
module::set_var("ecard","send_plain",false);
|
||||||
module::set_var("ecard", "subject", "You have been sent an eCard");
|
module::set_var("ecard", "subject", "You have been sent an eCard");
|
||||||
module::set_var("ecard", "message",
|
module::set_var("ecard", "message",
|
||||||
"Hello, \r\n%fromname has sent you an eCard. " .
|
"Hello, \r\n%fromname has sent you an eCard. " .
|
||||||
@ -38,7 +39,8 @@ class ecard_installer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function upgrade($version) {
|
static function upgrade($version) {
|
||||||
if($version <= 8) {
|
if($version <= 10) {
|
||||||
|
module::set_var("ecard","send_plain",false);
|
||||||
module::set_var("ecard", "message",
|
module::set_var("ecard", "message",
|
||||||
"Hello, \r\n%fromname has sent you an eCard. " .
|
"Hello, \r\n%fromname has sent you an eCard. " .
|
||||||
"Click the image to be taken to the gallery.");
|
"Click the image to be taken to the gallery.");
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
name = "E-Card"
|
name = "E-Card"
|
||||||
description = "Send a photo as a postcard"
|
description = "Send a photo as a postcard"
|
||||||
version = 10
|
version = 11
|
||||||
|
Reference in New Issue
Block a user