From f3d505170a82f292984cf322d101fb979bc80744 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:17:13 +0100 Subject: [PATCH] bugfix customer_email formfield integration --- customer_email.php | 22 +++++++++++----------- lib/navigation/00.froxlor.main.php | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/customer_email.php b/customer_email.php index 3099d1fd..635f0446 100644 --- a/customer_email.php +++ b/customer_email.php @@ -282,13 +282,13 @@ elseif($page == 'emails') } $iscatchall = makeyesno('iscatchall', '1', '0', '0'); - - $email_add_form = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_edit.php'; - $email_add_form = htmlform::genHTMLForm($email_add_form); - $title = $email_add_form['emails_edit']['title']; - $image = $email_add_form['emails_edit']['image']; - + $email_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_add.php'; + $email_add_form = htmlform::genHTMLForm($email_add_data); + + $title = $email_add_data['emails_add']['title']; + $image = $email_add_data['emails_add']['image']; + eval("echo \"" . getTemplate("email/emails_add") . "\";"); } } @@ -328,12 +328,12 @@ elseif($page == 'emails') $destinations_count = count($result['destination']); $result = htmlentities_array($result); - - $email_edit_form = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_edit.php'; - $email_edit_form = htmlform::genHTMLForm($email_edit_form); - $title = $email_edit_form['emails_edit']['title']; - $image = $email_edit_form['emails_edit']['image']; + $email_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_edit.php'; + $email_edit_form = htmlform::genHTMLForm($email_edit_data); + + $title = $email_edit_data['emails_edit']['title']; + $image = $email_edit_data['emails_edit']['image']; eval("echo \"" . getTemplate("email/emails_edit") . "\";"); } diff --git a/lib/navigation/00.froxlor.main.php b/lib/navigation/00.froxlor.main.php index 3531e7e2..931d8252 100644 --- a/lib/navigation/00.froxlor.main.php +++ b/lib/navigation/00.froxlor.main.php @@ -56,7 +56,7 @@ return array ( array ( 'url' => 'customer_email.php?page=emails&action=add', 'label' => $lng['emails']['emails_add'], - 'required_resources' => 'emails', + 'required_resources' => 'emails' ), array ( 'url' => 'customer_autoresponder.php',