From d593a217a433a4e859878ae4ab06098c68778d5f Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Tue, 14 Jun 2011 18:41:18 +0200 Subject: [PATCH] Moved autoresponder - templates to own directory (now following correct schema) Signed-off-by: Florian Aders (EleRas) --- customer_autoresponder.php | 46 +++++++++---------- .../autoresponder.tpl | 0 .../autoresponder_add.tpl | 0 .../autoresponder_autoresponder.tpl | 0 .../autoresponder_edit.tpl | 0 .../autoresponder.tpl | 0 .../autoresponder_add.tpl | 0 .../autoresponder_autoresponder.tpl | 0 .../autoresponder_edit.tpl | 0 9 files changed, 23 insertions(+), 23 deletions(-) rename templates/Classic/customer/{email => autoresponder}/autoresponder.tpl (100%) rename templates/Classic/customer/{email => autoresponder}/autoresponder_add.tpl (100%) rename templates/Classic/customer/{email => autoresponder}/autoresponder_autoresponder.tpl (100%) rename templates/Classic/customer/{email => autoresponder}/autoresponder_edit.tpl (100%) rename templates/Froxlor/customer/{email => autoresponder}/autoresponder.tpl (100%) rename templates/Froxlor/customer/{email => autoresponder}/autoresponder_add.tpl (100%) rename templates/Froxlor/customer/{email => autoresponder}/autoresponder_autoresponder.tpl (100%) rename templates/Froxlor/customer/{email => autoresponder}/autoresponder_edit.tpl (100%) diff --git a/customer_autoresponder.php b/customer_autoresponder.php index 0452255b..94c7ebd9 100644 --- a/customer_autoresponder.php +++ b/customer_autoresponder.php @@ -32,13 +32,13 @@ if($action == "add") $account = trim($_POST['account']); $subject = trim($_POST['subject']); $message = trim($_POST['message']); - + $date_from_off = isset($_POST['date_from_off']) ? -1 : 0; $date_until_off = isset($_POST['date_until_off']) ? -1 : 0; - + /* - * @TODO validate date (DD-MM-YYYY) - */ + * @TODO validate date (DD-MM-YYYY) + */ $ts_from = -1; $ts_until = -1; @@ -106,10 +106,10 @@ if($action == "add") { $accounts.= ""; } - + $date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true); $date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true); - + #$isactive = makeyesno('active', '1', '0', '1'); $autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addautoresponder.php'; @@ -117,8 +117,8 @@ if($action == "add") $title = $autoresponder_add_data['autoresponder_add']['title']; $image = $autoresponder_add_data['autoresponder_add']['image']; - - eval("echo \"" . getTemplate("email/autoresponder_add") . "\";"); + + eval("echo \"" . getTemplate("autoresponder/autoresponder_add") . "\";"); } // Edit autoresponder @@ -136,10 +136,10 @@ if($action == "edit") $date_from_off = isset($_POST['date_from_off']) ? -1 : 0; $date_until_off = isset($_POST['date_until_off']) ? -1 : 0; - + /* - * @TODO validate date (DD-MM-YYYY) - */ + * @TODO validate date (DD-MM-YYYY) + */ $ts_from = -1; $ts_until = -1; @@ -152,7 +152,7 @@ if($action == "edit") { $date_until = $_POST['date_until']; $ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4)); - } + } if(empty($account) || empty($subject) @@ -191,7 +191,7 @@ if($action == "edit") SET `message` = '" . $db->escape($message) . "', `enabled` = '" . (int)$ResponderActive . "', `date_from` = '" . (int)$ts_from . "', - `date_until` = '" . (int)$ts_until . "', + `date_until` = '" . (int)$ts_until . "', `subject` = '" . $db->escape($subject) . "' WHERE `email` = '" . $db->escape($account) . "' AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "' @@ -213,10 +213,10 @@ if($action == "edit") $row = $db->fetch_array($result); $subject = htmlspecialchars($row['subject']); $message = htmlspecialchars($row['message']); - + $date_from = (int)$row['date_from']; $date_until = (int)$row['date_until']; - + if($date_from == -1) { $deactivated = '-1'; @@ -228,7 +228,7 @@ if($action == "edit") $date_from = date('d-m-Y', $date_from); } $date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true); - + if($date_until == -1) { $deactivated = '-1'; @@ -240,7 +240,7 @@ if($action == "edit") $date_until = date('d-m-Y', $date_until); } $date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true); - + #$isactive = makeyesno('active', '1', '0', $row['enabled']); $autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_editautoresponder.php'; @@ -249,7 +249,7 @@ if($action == "edit") $title = $autoresponder_edit_data['autoresponder_edit']['title']; $image = $autoresponder_edit_data['autoresponder_edit']['image']; - eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";"); + eval("echo \"" . getTemplate("autoresponder/autoresponder_edit") . "\";"); } // Delete autoresponder @@ -286,7 +286,7 @@ if($action == "delete") // List existing autoresponders -else +else { $autoresponder = ''; $count = 0; @@ -305,14 +305,14 @@ else elseif($row['date_from'] != -1 && $row['date_until'] == -1) { $activated_date = $lng['autoresponder']['date_from'].': '.date('d-m-Y', $row['date_from']); - } + } else { $activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']); } - eval("\$autoresponder.=\"" . getTemplate("email/autoresponder_autoresponder") . "\";"); + eval("\$autoresponder.=\"" . getTemplate("autoresponder/autoresponder_autoresponder") . "\";"); $count++; - } + } - eval("echo \"" . getTemplate("email/autoresponder") . "\";"); + eval("echo \"" . getTemplate("autoresponder/autoresponder") . "\";"); } diff --git a/templates/Classic/customer/email/autoresponder.tpl b/templates/Classic/customer/autoresponder/autoresponder.tpl similarity index 100% rename from templates/Classic/customer/email/autoresponder.tpl rename to templates/Classic/customer/autoresponder/autoresponder.tpl diff --git a/templates/Classic/customer/email/autoresponder_add.tpl b/templates/Classic/customer/autoresponder/autoresponder_add.tpl similarity index 100% rename from templates/Classic/customer/email/autoresponder_add.tpl rename to templates/Classic/customer/autoresponder/autoresponder_add.tpl diff --git a/templates/Classic/customer/email/autoresponder_autoresponder.tpl b/templates/Classic/customer/autoresponder/autoresponder_autoresponder.tpl similarity index 100% rename from templates/Classic/customer/email/autoresponder_autoresponder.tpl rename to templates/Classic/customer/autoresponder/autoresponder_autoresponder.tpl diff --git a/templates/Classic/customer/email/autoresponder_edit.tpl b/templates/Classic/customer/autoresponder/autoresponder_edit.tpl similarity index 100% rename from templates/Classic/customer/email/autoresponder_edit.tpl rename to templates/Classic/customer/autoresponder/autoresponder_edit.tpl diff --git a/templates/Froxlor/customer/email/autoresponder.tpl b/templates/Froxlor/customer/autoresponder/autoresponder.tpl similarity index 100% rename from templates/Froxlor/customer/email/autoresponder.tpl rename to templates/Froxlor/customer/autoresponder/autoresponder.tpl diff --git a/templates/Froxlor/customer/email/autoresponder_add.tpl b/templates/Froxlor/customer/autoresponder/autoresponder_add.tpl similarity index 100% rename from templates/Froxlor/customer/email/autoresponder_add.tpl rename to templates/Froxlor/customer/autoresponder/autoresponder_add.tpl diff --git a/templates/Froxlor/customer/email/autoresponder_autoresponder.tpl b/templates/Froxlor/customer/autoresponder/autoresponder_autoresponder.tpl similarity index 100% rename from templates/Froxlor/customer/email/autoresponder_autoresponder.tpl rename to templates/Froxlor/customer/autoresponder/autoresponder_autoresponder.tpl diff --git a/templates/Froxlor/customer/email/autoresponder_edit.tpl b/templates/Froxlor/customer/autoresponder/autoresponder_edit.tpl similarity index 100% rename from templates/Froxlor/customer/email/autoresponder_edit.tpl rename to templates/Froxlor/customer/autoresponder/autoresponder_edit.tpl