diff --git a/customer_email.php b/customer_email.php index adc0b8d2..3099d1fd 100644 --- a/customer_email.php +++ b/customer_email.php @@ -282,6 +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']; + eval("echo \"" . getTemplate("email/emails_add") . "\";"); } } @@ -321,6 +328,13 @@ 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']; + eval("echo \"" . getTemplate("email/emails_edit") . "\";"); } } @@ -505,6 +519,13 @@ elseif($page == 'accounts') $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); $quota = $settings['system']['mail_quota']; + + $account_add_form = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addaccount.php'; + $account_add_form = htmlform::genHTMLForm($account_add_form); + + $title = $account_add_form['emails_addaccount']['title']; + $image = $account_add_form['emails_addaccount']['image']; + eval("echo \"" . getTemplate("email/account_add") . "\";"); } } @@ -543,6 +564,13 @@ elseif($page == 'accounts') { $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); + + $account_changepw = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php'; + $account_changepw = htmlform::genHTMLForm($account_changepw); + + $title = $account_changepw['emails_accountchangepasswd']['title']; + $image = $account_changepw['emails_accountchangepasswd']['image']; + eval("echo \"" . getTemplate("email/account_changepw") . "\";"); } } @@ -584,6 +612,13 @@ elseif($page == 'accounts') { $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); + + $quota_edit = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangequota.php'; + $quota_edit = htmlform::genHTMLForm($quota_edit); + + $title = $quota_edit['emails_accountchangequota']['title']; + $image = $quota_edit['emails_accountchangequota']['image']; + eval("echo \"" . getTemplate("email/account_changequota") . "\";"); } } @@ -678,6 +713,13 @@ elseif($page == 'forwarders') { $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); + + $forwarder_add_form = include_once dirname(__FILE__).'/lib/formfields/customer/emails/formfield.emails_addforwarder.php'; + $forwarder_add_form = htmlform::genHTMLForm($forwarder_add_form); + + $title = $forwarder_add_form['emails_addforwarder']['title']; + $image = $forwarder_add_form['emails_addforwarder']['image']; + eval("echo \"" . getTemplate("email/forwarder_add") . "\";"); } } diff --git a/templates/Froxlor/customer/email/account_add.tpl b/templates/Froxlor/customer/email/account_add.tpl index d2b25f2b..87e1a1e7 100644 --- a/templates/Froxlor/customer/email/account_add.tpl +++ b/templates/Froxlor/customer/email/account_add.tpl @@ -14,29 +14,7 @@ $header Froxlor - {$lng['emails']['emails_add']} - - - - - - - - - - - - - - - - - - - - - - - + {$account_add_form}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
{$lng['emails']['alternative_emailaddress']}:

diff --git a/templates/Froxlor/customer/email/account_changepw.tpl b/templates/Froxlor/customer/email/account_changepw.tpl index 1c42a6d9..9a211a30 100644 --- a/templates/Froxlor/customer/email/account_changepw.tpl +++ b/templates/Froxlor/customer/email/account_changepw.tpl @@ -1,26 +1,30 @@ $header -

- - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
-
-
-
+
+
+

+ {$lng['menue']['main']['changepassword']}  + {$lng['menue']['main']['changepassword']} +

+
+ +
+ +
+
+ Froxlor - {$lng['menue']['main']['changepassword']} + + + {$account_changepw} +
+ +

+ + + + +

+
+
+
+
$footer \ No newline at end of file diff --git a/templates/Froxlor/customer/email/account_changequota.tpl b/templates/Froxlor/customer/email/account_changequota.tpl index b39d30c7..8f96bddd 100644 --- a/templates/Froxlor/customer/email/account_changequota.tpl +++ b/templates/Froxlor/customer/email/account_changequota.tpl @@ -1,26 +1,30 @@ $header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['emails']['quota_edit']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
-
-
-
+
+
+

+ {$lng['emails']['quota_edit']}  + {$lng['emails']['quota_edit']} +

+
+ +
+ +
+
+ Froxlor - {$lng['emails']['quota_edit']} + + + {$quota_edit} +
+ +

+ + + + +

+
+
+
+
$footer \ No newline at end of file diff --git a/templates/Froxlor/customer/email/autoresponder_add.tpl b/templates/Froxlor/customer/email/autoresponder_add.tpl index d3df8fae..d0588985 100644 --- a/templates/Froxlor/customer/email/autoresponder_add.tpl +++ b/templates/Froxlor/customer/email/autoresponder_add.tpl @@ -1,42 +1,30 @@ $header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['autoresponder']['autoresponder_new']}
{$lng['autoresponder']['account']}:
{$lng['autoresponder']['active']}:
{$lng['autoresponder']['date_from']} (dd-mm-yyyy): {$date_from_off}
{$lng['autoresponder']['date_until']} (dd-mm-yyyy): {$date_until_off}
{$lng['autoresponder']['subject']}:
{$lng['autoresponder']['message']}:
-
-
-
+
+
+

+ {$lng['autoresponder']['autoresponder_new']}  + {$lng['autoresponder']['autoresponder_new']} +

+
+ +
+ +
+
+ Froxlor - {$lng['emails']['forwarder_add']} + + + {$autoresponder_add_form} +
+ +

+ + + + +

+
+
+
+
$footer \ No newline at end of file diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl index 8debbeaa..8559dc2f 100644 --- a/templates/Froxlor/customer/email/emails_add.tpl +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -23,17 +23,7 @@ $header Froxlor - {$lng['emails']['emails_add']} - - - - - - - - - - - + {$email_add_form}
{$lng['emails']['emailaddress']}: @
{$lng['emails']['iscatchall']}$iscatchall

diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl index 9e702951..fc259a61 100644 --- a/templates/Froxlor/customer/email/emails_edit.tpl +++ b/templates/Froxlor/customer/email/emails_edit.tpl @@ -14,43 +14,7 @@ $header Froxlor - {$lng['emails']['emails_edit']} - - - - - - - - - - - - - - - - - - - - - - + {$email_edit_form}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['emails']['account']}: - - {$lng['panel']['yes']} [{$lng['menue']['main']['changepassword']}] [{$lng['emails']['account_delete']}] - - - {$lng['panel']['no']} [{$lng['emails']['account_add']}] - -
{$lng['customer']['email_quota']}:{$result['quota']} {$lng['panel']['megabyte']} [{$lng['emails']['quota_edit']}]
{$lng['emails']['catchall']}: - - {$lng['panel']['yes']} - - - {$lng['panel']['no']} - - [{$lng['panel']['toggle']}] -
{$lng['emails']['forwarders']} ({$forwarders_count}):$forwarders{$lng['emails']['forwarder_add']}

diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl index 4d60a9f7..509b7258 100644 --- a/templates/Froxlor/customer/email/forwarder_add.tpl +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -14,17 +14,7 @@ $header Froxlor - {$lng['emails']['forwarder_add']} - - - - - - - - - - - + {$forwarder_add_form}
{$lng['emails']['from']}:{$result['email_full']}
{$lng['emails']['to']}: