From 865f7036fde38924c8bda7a5203c491951c2f078 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Fri, 4 Mar 2011 21:45:17 +0100
Subject: [PATCH] Adding formfields for autoresponder (part 2, forgot some
 files), fixes #629

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 customer_autoresponder.php                    | 22 ++++++++++++++-----
 .../formfield.emails_addautoresponder.php     |  4 ++++
 .../customer/email/autoresponder_add.tpl      |  2 +-
 .../customer/email/autoresponder_edit.tpl     |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/customer_autoresponder.php b/customer_autoresponder.php
index c0c6e1be..2258c346 100644
--- a/customer_autoresponder.php
+++ b/customer_autoresponder.php
@@ -109,7 +109,15 @@ if($action == "add")
 	
 	$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';
+	$autoresponder_add_form = htmlform::genHTMLForm($autoresponder_add_data);
+
+	$title = $autoresponder_add_data['autoresponder_add']['title'];
+	$image = $autoresponder_add_data['autoresponder_add']['image'];
+	
 	eval("echo \"" . getTemplate("email/autoresponder_add") . "\";");
 }
 
@@ -212,6 +220,7 @@ if($action == "edit")
 	if($date_from == -1)
 	{
 		$deactivated = '-1';
+		$date_from = '';
 	}
 	else
 	{
@@ -223,7 +232,7 @@ if($action == "edit")
 	if($date_until == -1)
 	{
 		$deactivated = '-1';
-		$date_until = '-1';
+		$date_until = '';
 	}
 	else
 	{
@@ -231,13 +240,14 @@ 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']);
 
-	$checked = '';
+	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_editautoresponder.php';
+	$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
 
-	if($row['enabled'] == 1)
-	{
-		$checked = "checked=\"checked\"";
-	}
+	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
+	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
 
 	eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";");
 }
diff --git a/lib/formfields/customer/email/formfield.emails_addautoresponder.php b/lib/formfields/customer/email/formfield.emails_addautoresponder.php
index 0957901c..69e2de66 100644
--- a/lib/formfields/customer/email/formfield.emails_addautoresponder.php
+++ b/lib/formfields/customer/email/formfield.emails_addautoresponder.php
@@ -46,6 +46,10 @@ return array(
 						'maxlength' => 10,
 						'ul_field' => $date_until_off,
 					),
+					'subject' => array(
+						'label' => $lng['autoresponder']['subject'],
+						'type' => 'text',
+					),
 					'message' => array(
 						'style' => 'vertical-align:top;',
 						'label' => $lng['autoresponder']['message'],
diff --git a/templates/Froxlor/customer/email/autoresponder_add.tpl b/templates/Froxlor/customer/email/autoresponder_add.tpl
index 2e5f07c9..8b40eaae 100644
--- a/templates/Froxlor/customer/email/autoresponder_add.tpl
+++ b/templates/Froxlor/customer/email/autoresponder_add.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="images/Froxlor/icons/{$image}" alt="{$title}" />&nbsp;
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
 				{$title}
 				</h2>
 		</header>
diff --git a/templates/Froxlor/customer/email/autoresponder_edit.tpl b/templates/Froxlor/customer/email/autoresponder_edit.tpl
index 3c5c85a0..4a228590 100644
--- a/templates/Froxlor/customer/email/autoresponder_edit.tpl
+++ b/templates/Froxlor/customer/email/autoresponder_edit.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="images/Froxlor/icons/{$image}" alt="{$title}" />&nbsp;
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
 				{$title}
 			</h2>
 		</header>