From 76c3bca8a80e89fe5427fb387efec80abaac0b8f Mon Sep 17 00:00:00 2001 From: dmolavi Date: Tue, 11 Jan 2011 21:06:47 -0500 Subject: [PATCH] Added length restriction to ecard message (255 chars). This is done via a Kohana validation check, but I should be able to get a realtime JS update in there soon enough. --- 3.0/modules/ecard/helpers/ecard.php | 7 ++++--- 3.0/modules/ecard/helpers/ecard_installer.php | 2 +- 3.0/modules/ecard/module.info | 2 +- 3.1/modules/ecard/helpers/ecard.php | 7 ++++--- 3.1/modules/ecard/helpers/ecard_installer.php | 2 +- 3.1/modules/ecard/module.info | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/3.0/modules/ecard/helpers/ecard.php b/3.0/modules/ecard/helpers/ecard.php index 8b922bf2..5b45d759 100644 --- a/3.0/modules/ecard/helpers/ecard.php +++ b/3.0/modules/ecard/helpers/ecard.php @@ -50,10 +50,11 @@ class ecard_Core { ->error_messages("required", t("You must enter a valid email address")) ->error_messages("invalid", t("You must enter a valid email address")); $group->textarea("text") - ->label(t("Message")) + ->label(t("Message (255 chars max)")) ->id("g-text") - ->rules("required") - ->error_messages("required", t("You must enter a message")); + ->rules("required|length[0,255]") + ->error_messages("required", t("You must enter a message")) + ->error_messages("length", t("Your message is too long, please shorten.")); $group->checkbox("send_to_self") ->label(t("Send yourself a copy")) ->value(true) diff --git a/3.0/modules/ecard/helpers/ecard_installer.php b/3.0/modules/ecard/helpers/ecard_installer.php index 66ef5d31..953ad3e0 100644 --- a/3.0/modules/ecard/helpers/ecard_installer.php +++ b/3.0/modules/ecard/helpers/ecard_installer.php @@ -25,6 +25,6 @@ class ecard_installer { "Click the image to be taken to the gallery."); module::set_var("ecard", "bcc", ""); module::set_var("ecard", "access_permissions", "everybody"); - module::set_version("ecard", 6); + module::set_version("ecard", 7); } } diff --git a/3.0/modules/ecard/module.info b/3.0/modules/ecard/module.info index 0a13b636..979aae83 100644 --- a/3.0/modules/ecard/module.info +++ b/3.0/modules/ecard/module.info @@ -1,4 +1,4 @@ name = "E-Card" description = "Send a photo as a postcard" -version = 6 +version = 7 diff --git a/3.1/modules/ecard/helpers/ecard.php b/3.1/modules/ecard/helpers/ecard.php index a365c9ab..616c71a3 100644 --- a/3.1/modules/ecard/helpers/ecard.php +++ b/3.1/modules/ecard/helpers/ecard.php @@ -50,10 +50,11 @@ class ecard_Core { ->error_messages("required", t("You must enter a valid email address")) ->error_messages("invalid", t("You must enter a valid email address")); $group->textarea("text") - ->label(t("Message")) + ->label(t("Message (255 chars max)")) ->id("g-text") - ->rules("required") - ->error_messages("required", t("You must enter a message")); + ->rules("required|length[0,255]") + ->error_messages("required", t("You must enter a message")) + ->error_messages("length", t("Your message is too long, please shorten.")); $group->checkbox("send_to_self") ->label(t("Send yourself a copy")) ->value(true) diff --git a/3.1/modules/ecard/helpers/ecard_installer.php b/3.1/modules/ecard/helpers/ecard_installer.php index 66ef5d31..953ad3e0 100644 --- a/3.1/modules/ecard/helpers/ecard_installer.php +++ b/3.1/modules/ecard/helpers/ecard_installer.php @@ -25,6 +25,6 @@ class ecard_installer { "Click the image to be taken to the gallery."); module::set_var("ecard", "bcc", ""); module::set_var("ecard", "access_permissions", "everybody"); - module::set_version("ecard", 6); + module::set_version("ecard", 7); } } diff --git a/3.1/modules/ecard/module.info b/3.1/modules/ecard/module.info index 0a13b636..979aae83 100644 --- a/3.1/modules/ecard/module.info +++ b/3.1/modules/ecard/module.info @@ -1,4 +1,4 @@ name = "E-Card" description = "Send a photo as a postcard" -version = 6 +version = 7