Merge branch 'redesign' of git.froxlor.org:froxlor into redesign

Conflicts:
	templates/Froxlor/customer/email/emails_add.tpl
	templates/Froxlor/customer/email/emails_edit.tpl
	templates/Froxlor/customer/email/forwarder_add.tpl

customer_domains.php

@@ -381,6 +381,13 @@ elseif($page == 'domains')
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, NULL, true) . makeoption($lng['domain']['homedir'], 1, NULL, true);
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+
+				$subdomain_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domains_add.php';
+				$subdomain_add_form = htmlform::genHTMLForm($subdomain_add_data);
+
+				$title = $subdomain_add_data['domain_add']['title'];
+				$image = $subdomain_add_data['domain_add']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_add") . "\";");
 			}
 		}
@@ -569,6 +576,12 @@ elseif($page == 'domains')
 				$domainip = $result_ipandport['ip'];
 				$result = htmlentities_array($result);
 
+				$subdomain_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domains_edit.php';
+				$subdomain_edit_form = htmlform::genHTMLForm($subdomain_edit_data);
+
+				$title = $subdomain_edit_data['domain_edit']['title'];
+				$image = $subdomain_edit_data['domain_edit']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}

customer_email.php

@@ -283,11 +283,11 @@ 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);
+				$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_form['emails_edit']['title'];
-        $image = $email_add_form['emails_edit']['image'];
+				$title = $email_add_data['emails_add']['title'];
+				$image = $email_add_data['emails_add']['image'];
 
 				eval("echo \"" . getTemplate("email/emails_add") . "\";");
 			}
@@ -329,11 +329,11 @@ 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);
+			$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_form['emails_edit']['title'];
-        $image = $email_edit_form['emails_edit']['image'];
+			$title = $email_edit_data['emails_edit']['title'];
+			$image = $email_edit_data['emails_edit']['image'];
 			
 			eval("echo \"" . getTemplate("email/emails_edit") . "\";");
 		}
@@ -520,11 +520,11 @@ elseif($page == 'accounts')
 					$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);
+					$account_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addaccount.php';
+					$account_add_form = htmlform::genHTMLForm($account_add_data);
 
-        $title = $account_add_form['emails_addaccount']['title'];
-        $image = $account_add_form['emails_addaccount']['image'];
+					$title = $account_add_data['emails_addaccount']['title'];
+					$image = $account_add_data['emails_addaccount']['image'];
 
 					eval("echo \"" . getTemplate("email/account_add") . "\";");
 				}
@@ -565,11 +565,11 @@ 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);
+				$account_changepw_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php';
+				$account_changepw_form = htmlform::genHTMLForm($account_changepw_data);
 
-        $title = $account_changepw['emails_accountchangepasswd']['title'];
-        $image = $account_changepw['emails_accountchangepasswd']['image'];
+				$title = $account_changepw_data['emails_accountchangepasswd']['title'];
+				$image = $account_changepw_data['emails_accountchangepasswd']['image'];
 
 				eval("echo \"" . getTemplate("email/account_changepw") . "\";");
 			}
@@ -613,11 +613,11 @@ 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);
+				$quota_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangequota.php';
+				$quota_edit_form = htmlform::genHTMLForm($quota_edit_data);
 
-        $title = $quota_edit['emails_accountchangequota']['title'];
-        $image = $quota_edit['emails_accountchangequota']['image'];
+				$title = $quota_edit_data['emails_accountchangequota']['title'];
+				$image = $quota_edit_data['emails_accountchangequota']['image'];
         
 				eval("echo \"" . getTemplate("email/account_changequota") . "\";");
 			}
@@ -714,11 +714,11 @@ 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);
+					$forwarder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addforwarder.php';
+					$forwarder_add_form = htmlform::genHTMLForm($forwarder_add_data);
 
-        $title = $forwarder_add_form['emails_addforwarder']['title'];
-        $image = $forwarder_add_form['emails_addforwarder']['image'];
+					$title = $forwarder_add_data['emails_addforwarder']['title'];
+					$image = $forwarder_add_data['emails_addforwarder']['image'];
 
 					eval("echo \"" . getTemplate("email/forwarder_add") . "\";");
 				}

lib/formfields/customer/domains/formfield.domains_add.php

@@ -12,61 +12,53 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Formfields
- * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ * @version    $Id: formfield.domains_edit.php 130 2010-12-22 00:54:11Z d00p $
  */
 
 return array(
 	'domain_add' => array(
 		'title' => $lng['domains']['subdomain_add'],
-		'image' => 'icons/add_domain.png',
+		'image' => 'icons/domain_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['domains']['subdomain_add'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'domain' => array(
 						'label' => $lng['domains']['domainname'],
 						'type' => 'text'
 					),
-					'aliasdomain' => array(
+					'alias' => array(
 						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
 						'select_var' => $aliasdomains
 					),
-					'pathedit' => array(
-						'visible' => ($settings['panel']['pathedit'] != 'Dropdown' ? true : false),
-						'label' => $lng['panel']['pathorurl'],
-						'desc' => $lng['panel']['pathDescription'], // TODO was ist mit: $lng['panel']['pathDescriptionEx'] ?
-						'type' => 'text',
-						'value' => $pathSelect
-					),
-					'pathedit_dropdown' => array(
-						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
+					'path' => array(
 						'label' => $lng['panel']['path'],
-						'type' => 'text',
-						'value' => $pathSelect
+						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
+						'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'),
+						'select_var' => $pathSelect
 					),
-					'pathedit_dropdown2' => array(
+					'url' => array(
 						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
 						'label' => $lng['panel']['urloverridespath'],
 						'type' => 'text',
-						'value' => $urlvalue,
-						'size' => 30
+						'value' => $urlvalue
 					),
-					'apache2_customerRedirect' => array(
+					'redirectcode' => array(
 						'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
 						'label' => $lng['domains']['redirectifpathisurl'],
 						'desc' => $lng['domains']['redirectifpathisurlinfo'],
 						'type' => 'select',
 						'select_var' => $redirectcode
 					),
-					'ssl' => array(
+					'ssl_redirect' => array(
 						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
 						'label' => 'SSL Redirect',
 						'type' => 'yesno',
 						'yesno_var' => $ssl_redirect
 					),
-					'openbasedir' => array(
+					'openbasedir_path' => array(
 						'label' => $lng['domain']['openbasedirpath'],
 						'type' => 'select',
 						'select_var' => $openbasedir

lib/formfields/customer/domains/formfield.domains_edit.php

@@ -34,58 +34,50 @@ return array(
 						'type' => 'label',
 						'value' => $domainip
 					),
-					'alias_check' => array(
+					'alias' => array(
 						'visible' => ($alias_check == '0' ? true : false),
 						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
 						'select_var' => $domains
 					),
-					'pathedit' => array(
-						'visible' => ($settings['panel']['pathedit'] != 'Dropdown' ? true : false),
-						'label' => $lng['panel']['pathorurl'],
-						'desc' => $lng['panel']['pathDescription'], // TODO was ist mit: $lng['panel']['pathDescriptionEx'] ?
-						'type' => 'text',
-						'value' => $pathSelect
-					),
-					'pathedit_dropdown' => array(
-						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
+					'path' => array(
 						'label' => $lng['panel']['path'],
-						'type' => 'text',
-						'value' => $pathSelect
+						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
+						'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'),
+						'select_var' => $pathSelect
 					),
-					'pathedit_dropdown2' => array(
+					'url' => array(
 						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
 						'label' => $lng['panel']['urloverridespath'],
 						'type' => 'text',
-						'value' => $urlvalue,
-						'size' => 30
+						'value' => $urlvalue
 					),
-					'apache2_customerRedirect' => array(
+					'redirectcode' => array(
 						'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
 						'label' => $lng['domains']['redirectifpathisurl'],
 						'desc' => $lng['domains']['redirectifpathisurlinfo'],
 						'type' => 'select',
 						'select_var' => $redirectcode
 					),
-					'parentdomain' => array(
+					'iswildcarddomain' => array(
 						'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false),
 						'label' => $lng['domains']['wildcarddomain'],
-						'type' => 'label',
-						'value' => $iswildcarddomain
+						'type' => 'yesno',
+						'yesno_var' => $iswildcarddomain
 					),
-					'emaildomain' => array(
+					'isemaildomain' => array(
 						'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false),
 						'label' => 'Emaildomain',
-						'type' => 'label',
-						'value' => $isemaildomain
+						'type' => 'yesno',
+						'yesno_var' => $isemaildomain
 					),
-					'ssl' => array(
+					'ssl_redirect' => array(
 						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
 						'label' => 'SSL Redirect',
-						'type' => 'label',
-						'value' => $ssl_redirect
+						'type' => 'yesno',
+						'yesno_var' => $ssl_redirect
 					),
-					'openbasedir' => array(
+					'openbasedir_path' => array(
 						'label' => $lng['domain']['openbasedirpath'],
 						'type' => 'select',
 						'select_var' => $openbasedir

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',

templates/Froxlor/customer/domains/domains_add.tpl

@@ -1,57 +1,30 @@
 $header
-	<form method="post" action="$filename">
+<article>
+	<header>
+		<h2>
+			<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+			{$title}
+		</h2>
+	</header>
+
+	<section class="fullform bradiusodd">
+
+			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
+
+					<table class="formtable">
+						  {$subdomain_add_form}
+					</table>
+
+					<p style="display: none;">
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
 						<input type="hidden" name="action" value="$action" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['domains']['subdomain_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['domains']['domainname']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" name="subdomain" value="" size="15" maxlength="50" /> <b>.</b> <select class="tendina_nobordo" name="domain">$domains</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><select name="alias">$aliasdomains</select></td>
-			</tr>
-			<if $settings['panel']['pathedit'] != 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
-					<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
-				</tr>
-			</if>
-			<if $settings['panel']['pathedit'] == 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['path']}:</td>
-					<td class="main_field_display">{$pathSelect}</td>
-				</tr>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
-					<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
-				</tr>
-			</if>
-			<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
-				<tr>
-					<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
-					<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
-				</tr>
-			</if>
-			<if $settings['system']['use_ssl'] == '1'>
-                        <tr>
-                                <td class="main_field_name">SSL Redirect:</td>
-                                <td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>
-                        </tr>
-			</if>
-			<tr>
-				<td class="main_field_name">{$lng['domain']['openbasedirpath']}:</td>
-				<td class="main_field_display" nowrap><select name="openbasedir_path">$openbasedir</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['domains']['subdomain_add']}" /></td>
-			</tr>
-		</table>
+						<input type="hidden" name="send" value="send" />
+					</p>
+				</fieldset>
 			</form>
-	<br />
-	<br />
+	</section>
+</article>
 $footer

templates/Froxlor/customer/domains/domains_edit.tpl

@@ -1,76 +1,31 @@
 $header
-	<form method="post" action="$filename">
+<article>
+	<header>
+		<h2>
+			<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+			{$title}
+		</h2>
+	</header>
+
+	<section class="fullform bradiusodd">
+
+			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
+
+					<table class="formtable">
+						  {$subdomain_edit_form}
+					</table>
+
+					<p style="display: none;">
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
 						<input type="hidden" name="action" value="$action" />
 						<input type="hidden" name="id" value="$id" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
-			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['domains']['subdomain_edit']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['domains']['domainname']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$result['domain']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['dns']['destinationip']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$domainip}</td>
-			</tr>
-			<if $alias_check == '0'>
-				<tr>
-					<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
-					<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td>
-				</tr>
-			</if>
-			<if $settings['panel']['pathedit'] != 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
-					<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
-				</tr>
-			</if>
-			<if $settings['panel']['pathedit'] == 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['path']}:</td>
-					<td class="main_field_display">{$pathSelect}</td>
-				</tr>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
-					<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
-				</tr>
-			</if>
-			<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
-				<tr>
-					<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
-					<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
-				</tr>
-			</if>
-			<if $result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0' >
-				<tr>
-					<td class="main_field_name">{$lng['domains']['wildcarddomain']}</td>
-					<td class="main_field_display" nowrap="nowrap">$iswildcarddomain</td>
-				</tr>
-			</if>
-			<if ( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0' >
-				<tr>
-					<td class="main_field_name">Emaildomain:</td>
-					<td class="main_field_display" nowrap="nowrap">$isemaildomain</td>
-				</tr>
-			</if>
-			<if $settings['system']['use_ssl'] == '1'>
-				<tr>
-					<td class="main_field_name">SSL Redirect:</td>
-					<td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>
-				</tr>
-			</if>
-			<tr>
-				<td class="main_field_name">{$lng['domain']['openbasedirpath']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><select name="openbasedir_path">$openbasedir</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['panel']['save']}" /></td>
-			</tr>
-		</table>
+						<input type="hidden" name="send" value="send" />
+					</p>
+				</fieldset>
 			</form>
-	<br />
-	<br />
+	</section>
+</article>
 $footer

templates/Froxlor/customer/email/account_add.tpl

@@ -2,8 +2,8 @@ $header
 	<article>
 		<header>
 			<h2>
-			<img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['account_add']}" />&nbsp;
-			{$lng['emails']['account_add']}
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
 			</h2>
 		</header>
 
@@ -11,7 +11,7 @@ $header
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
 					<table class="formtable">
 						{$account_add_form}
@@ -21,10 +21,13 @@ $header
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
 						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="id" value="$id" />
 						<input type="hidden" name="send" value="send" />
 					</p>
 				</fieldset>
 			</form>
+
 		</section>
+
 	</article>
 $footer

templates/Froxlor/customer/email/account_changepw.tpl

@@ -2,8 +2,8 @@ $header
 	<article>
 		<header>
 			<h2>
-      <img src="images/Froxlor/icons/email_add.png" alt="{$lng['menue']['main']['changepassword']}" />&nbsp;
-      {$lng['menue']['main']['changepassword']}
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
 			</h2>
 		</header>
 
@@ -11,20 +11,23 @@ $header
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-          <legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changepassword']}</legend>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
 					<table class="formtable">
-            {$account_changepw}
+						{$account_changepw_form}
 					</table>
 
 					<p style="display: none;">
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
 						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="id" value="$id" />
 						<input type="hidden" name="send" value="send" />
 					</p>
 				</fieldset>
 			</form>
+
 		</section>
+
 	</article>
 $footer

templates/Froxlor/customer/email/account_changequota.tpl

@@ -2,8 +2,8 @@ $header
 	<article>
 		<header>
 			<h2>
-      <img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['quota_edit']}" />&nbsp;
-      {$lng['emails']['quota_edit']}
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
 			</h2>
 		</header>
 
@@ -11,20 +11,23 @@ $header
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-          <legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['quota_edit']}</legend>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
 					<table class="formtable">
-            {$quota_edit}
+						{$quota_edit_form}
 					</table>
 
 					<p style="display: none;">
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
 						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="id" value="$id" />
 						<input type="hidden" name="send" value="send" />
 					</p>
 				</fieldset>
 			</form>
+
 		</section>
+
 	</article>
 $footer

templates/Froxlor/customer/email/emails_add.tpl

@@ -1,39 +0,0 @@
-$header
-<article>
-	<if $domains == ''>
-			<div class="messagewrapperfull">
-				<div class="warningcontainer bradius">
-					<div class="warningtitle">{$lng['admin']['warning']}</div>
-					<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
-				</div>
-			</div>
-	</if>
-	<else>
-	<header>
-		<h2>
-			<img src="images/Froxlor/icons/{}$image alt="{$title}" />&nbsp;
-			{$title}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
-
-					<table class="formtable">
-						  {$email_add_form}
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="$action" />
-						<input type="hidden" name="send" value="send" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
-$footer

templates/Froxlor/customer/email/emails_edit.tpl

@@ -1,30 +0,0 @@
-$header
-<article>
-	<header>
-		<h2>
-			<img src="images/Froxlor/icons/{$title}" alt="{$title}" />&nbsp;
-			{$title}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
-
-					<table class="formtable">
-            {$email_edit_form}
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="$action" />
-						<input type="hidden" name="send" value="send" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
-$footer

templates/Froxlor/customer/email/forwarder_add.tpl

@@ -1,30 +0,0 @@
-$header
-<article>
-	<header>
-		<h2>
-			<img src="images/Froxlor/icons/{$image}" alt="{$title}" />&nbsp;
-			{$title}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
-
-					<table class="formtable">
-						  {$forwarder_add_form}
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="$action" />
-						<input type="hidden" name="send" value="send" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
-$footer