From d8b43f60b8fc8263983214b164ad6a21fa448117 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Fri, 11 Feb 2011 13:32:22 +0100 Subject: [PATCH 01/39] Added missing smtpd_sasl_type = dovecot for gentoo-postfix-config --- .../misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf index c355de85..44414c76 100644 --- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf @@ -52,6 +52,7 @@ smtpd_sasl_security_options = noanonymous broken_sasl_auth_clients = yes ## Dovecot Settings for deliver, SASL Auth and virtual transport mailbox_command = /usr/libexec/dovecot/deliver +smtpd_sasl_type = dovecot smtpd_sasl_path = private/auth virtual_transport = dovecot dovecot_destination_recipient_limit = 1 From 885bf7e88c9f7779c14d9713ab40e5696e42ecb7 Mon Sep 17 00:00:00 2001 From: Andreas Burchert Date: Fri, 11 Feb 2011 22:08:22 +0100 Subject: [PATCH 02/39] Added customer/domain formfields. --- .../domains/formfield.domains_add.php | 78 +++++++++++++++ .../domains/formfield.domains_edit.php | 97 +++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 lib/formfields/customer/domains/formfield.domains_add.php create mode 100644 lib/formfields/customer/domains/formfield.domains_edit.php diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php new file mode 100644 index 00000000..7d63ff7b --- /dev/null +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -0,0 +1,78 @@ + (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 $ + */ + +return array( + 'domain_add' => array( + 'title' => $lng['domains']['subdomain_add'], + 'image' => 'icons/add_domain.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['domains']['subdomain_add'], + 'image' => 'icons/add_domain.png', + 'fields' => array( + 'domain' => array( + 'label' => $lng['domains']['domainname'], + 'type' => 'text' + ), + 'aliasdomain' => 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), + 'label' => $lng['panel']['path'], + 'type' => 'text', + 'value' => $pathSelect + ), + 'pathedit_dropdown2' => array( + 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), + 'label' => $lng['panel']['urloverridespath'], + 'type' => 'text', + 'value' => $urlvalue, + 'size' => 30 + ), + 'apache2_customerRedirect' => 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( + 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), + 'label' => 'SSL Redirect', + 'type' => 'text', + 'yesno_var' => $ssl_redirect + ), + 'openbasedir' => array( + 'label' => $lng['domain']['openbasedirpath'], + 'type' => 'select', + 'select_var' => $openbasedir + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php new file mode 100644 index 00000000..e81eb8e8 --- /dev/null +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -0,0 +1,97 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * @version $Id: formfield.domains_edit.php 130 2010-12-22 00:54:11Z d00p $ + */ + +return array( + 'domain_edit' => array( + 'title' => $lng['domains']['subdomain_edit'], + 'image' => 'icons/domain_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['domains']['subdomain_edit'], + 'image' => 'icons/domain_edit.png', + 'fields' => array( + 'domain' => array( + 'label' => $lng['domains']['domainname'], + 'type' => 'label', + 'value' => $result['domain'] + ), + 'dns' => array( + 'label' => $lng['dns']['destinationip'], + 'type' => 'label', + 'value' => $domainip + ), + 'alias_check' => 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), + 'label' => $lng['panel']['path'], + 'type' => 'text', + 'value' => $pathSelect + ), + 'pathedit_dropdown2' => array( + 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), + 'label' => $lng['panel']['urloverridespath'], + 'type' => 'text', + 'value' => $urlvalue, + 'size' => 30 + ), + 'apache2_customerRedirect' => 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( + 'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false), + 'label' => $lng['domains']['wildcarddomain'], + 'type' => 'label', + 'value' => $iswildcarddomain + ), + 'emaildomain' => array( + 'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false), + 'label' => 'Emaildomain', + 'type' => 'label', + 'value' => $isemaildomain + ), + 'ssl' => array( + 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), + 'label' => 'SSL Redirect', + 'type' => 'label', + 'value' => $ssl_redirect + ), + 'openbasedir' => array( + 'label' => $lng['domain']['openbasedirpath'], + 'type' => 'select', + 'select_var' => $openbasedir + ) + ) + ) + ) + ) +); From 8cb615df5fdb1d6756fc9ebe80926f53b62b3e24 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 15:15:55 +0100 Subject: [PATCH 03/39] Converted customer -> mysql to new formbuilder --- customer_mysql.php | 12 +++++ lib/.gitignore | 1 + .../customer/mysql/formfield.mysql_add.php | 49 ++++++++++++++++++ .../customer/mysql/formfield.mysql_edit.php | 50 +++++++++++++++++++ .../Froxlor/customer/mysql/mysqls_add.tpl | 49 ++++++------------ .../Froxlor/customer/mysql/mysqls_edit.tpl | 48 ++++++------------ 6 files changed, 142 insertions(+), 67 deletions(-) create mode 100644 lib/.gitignore create mode 100644 lib/formfields/customer/mysql/formfield.mysql_add.php create mode 100644 lib/formfields/customer/mysql/formfield.mysql_edit.php diff --git a/customer_mysql.php b/customer_mysql.php index 4e5e56c4..e5b9d16c 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -256,6 +256,12 @@ elseif($page == 'mysqls') $sendinfomail = makeyesno('sendinfomail', '1', '0', '0'); + $mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php'; + $mysql_add_form = htmlform::genHTMLForm($mysql_add_data); + + $title = $mysql_add_data['mysql_add']['title']; + $image = $mysql_add_data['mysql_add']['image']; + eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";"); } } @@ -307,6 +313,12 @@ elseif($page == 'mysqls') } else { + $mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php'; + $mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data); + + $title = $mysql_edit_data['mysql_edit']['title']; + $image = $mysql_edit_data['mysql_edit']['image']; + eval("echo \"" . getTemplate("mysql/mysqls_edit") . "\";"); } } diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 00000000..015be9fe --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1 @@ +userdata.inc.php diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php new file mode 100644 index 00000000..adb166fb --- /dev/null +++ b/lib/formfields/customer/mysql/formfield.mysql_add.php @@ -0,0 +1,49 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'mysql_add' => array( + 'title' => $lng['mysql']['database_create'], + 'image' => 'icons/mysql_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['mysql']['database_create'], + 'image' => 'icons/mysql_add.png', + 'fields' => array( + 'description' => array( + 'label' => $lng['mysql']['databasedescription'], + 'type' => 'text', + ), + 'mysql_server' => array( + 'visible' => (1 < count($sql_root) ? true : false), + 'label' => $lng['mysql']['mysql_server'], + 'type' => 'select', + 'select_var' => $mysql_servers, + ), + 'mysql_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + ), + 'sendinfomail' => array( + 'label' => $lng['customer']['sendinfomail'], + 'type' => 'yesno', + 'yesno_var' => $sendinfomail, + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php new file mode 100644 index 00000000..bd812fae --- /dev/null +++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php @@ -0,0 +1,50 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'mysql_edit' => array( + 'title' => $lng['mysql']['database_edit'], + 'image' => 'icons/mysql_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['mysql']['database_edit'], + 'image' => 'icons/mysql_edit.png', + 'fields' => array( + 'databasename' => array( + 'label' => $lng['mysql']['databasename'], + 'type' => 'label', + 'value' => $result['databasename'], + ), + 'description' => array( + 'label' => $lng['mysql']['databasedescription'], + 'type' => 'text', + 'value' => $result['description'], + ), + 'mysql_server' => array( + 'visible' => (1 < count($sql_root) ? true : false), + 'label' => $lng['mysql']['mysql_server'], + 'type' => 'label', + 'value' => $sql_root[$result['dbserver']]['caption'] + ), + 'mysql_password' => array( + 'label' => $lng['changepassword']['new_password_ifnotempty'], + 'type' => 'password', + ), + ) + ) + ) + ) +); diff --git a/templates/Froxlor/customer/mysql/mysqls_add.tpl b/templates/Froxlor/customer/mysql/mysqls_add.tpl index 309882ce..c1168dae 100644 --- a/templates/Froxlor/customer/mysql/mysqls_add.tpl +++ b/templates/Froxlor/customer/mysql/mysqls_add.tpl @@ -1,43 +1,23 @@ $header -
-
-

- {$lng['mysql']['database_create']}  - {$lng['mysql']['database_create']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['mysql']['database_create']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - + {$mysql_add_form}
{$lng['mysql']['databasedescription']}:
{$lng['mysql']['mysql_server']}:
{$lng['login']['password']}:
{$lng['customer']['sendinfomail']}:{$sendinfomail}
-

+

@@ -45,6 +25,7 @@ $header

-
-
+ +
+
$footer diff --git a/templates/Froxlor/customer/mysql/mysqls_edit.tpl b/templates/Froxlor/customer/mysql/mysqls_edit.tpl index 2a93c9f5..a5426538 100644 --- a/templates/Froxlor/customer/mysql/mysqls_edit.tpl +++ b/templates/Froxlor/customer/mysql/mysqls_edit.tpl @@ -1,50 +1,32 @@ $header -
-
-

- {$lng['mysql']['database_edit']}  - {$lng['mysql']['database_edit']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['mysql']['database_edit']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - + {$mysql_edit_form}
{$lng['mysql']['databasename']}:{$result['databasename']}
{$lng['mysql']['databasedescription']}:
{$lng['mysql']['mysql_server']}:{$sql_root[$result['dbserver']]['caption']}
{$lng['changepassword']['new_password_ifnotempty']}:

+

-
-
+ +
+
$footer From 3f93044121949b19e3457f2020800f2b8ed39fdb Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 15:47:37 +0100 Subject: [PATCH 04/39] add formields for email stuff --- .../domains/formfield.domains_add.php | 2 +- .../formfield.emails_accountchangepasswd.php | 40 ++++++++++++ .../formfield.emails_accountchangequota.php | 41 ++++++++++++ .../customer/email/formfield.emails_add.php | 45 +++++++++++++ .../email/formfield.emails_addaccount.php | 52 +++++++++++++++ .../email/formfield.emails_addforwarder.php | 40 ++++++++++++ .../customer/email/formfield.emails_edit.php | 64 +++++++++++++++++++ 7 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 lib/formfields/customer/email/formfield.emails_accountchangepasswd.php create mode 100644 lib/formfields/customer/email/formfield.emails_accountchangequota.php create mode 100644 lib/formfields/customer/email/formfield.emails_add.php create mode 100644 lib/formfields/customer/email/formfield.emails_addaccount.php create mode 100644 lib/formfields/customer/email/formfield.emails_addforwarder.php create mode 100644 lib/formfields/customer/email/formfield.emails_edit.php diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 7d63ff7b..45a9b92b 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -63,7 +63,7 @@ return array( 'ssl' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), 'label' => 'SSL Redirect', - 'type' => 'text', + 'type' => 'yesno', 'yesno_var' => $ssl_redirect ), 'openbasedir' => array( diff --git a/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php new file mode 100644 index 00000000..da72cf02 --- /dev/null +++ b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php @@ -0,0 +1,40 @@ + (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 $ + */ + +return array( + 'emails_accountchangepasswd' => array( + 'title' => $lng['menue']['main']['changepassword'], + 'image' => 'icons/email_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['menue']['main']['changepassword'], + 'image' => 'icons/email_edit.png', + 'fields' => array( + 'email_full' => array( + 'label' => $lng['emails']['emailaddress'], + 'type' => 'label', + 'value' => $result['email_full'] + ), + 'email_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password' + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/email/formfield.emails_accountchangequota.php b/lib/formfields/customer/email/formfield.emails_accountchangequota.php new file mode 100644 index 00000000..28e9da70 --- /dev/null +++ b/lib/formfields/customer/email/formfield.emails_accountchangequota.php @@ -0,0 +1,41 @@ + (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 $ + */ + +return array( + 'emails_accountchangequota' => array( + 'title' => $lng['emails']['quota_edit'], + 'image' => 'icons/email_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['emails']['quota_edit'], + 'image' => 'icons/email_edit.png', + 'fields' => array( + 'email_full' => array( + 'label' => $lng['emails']['emailaddress'], + 'type' => 'label', + 'value' => $result['email_full'] + ), + 'email_quota' => array( + 'label' => $lng['emails']['quota'].' ('.$lng['panel']['megabyte'].')', + 'type' => 'text', + 'value' => $result['quota'] + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/email/formfield.emails_add.php b/lib/formfields/customer/email/formfield.emails_add.php new file mode 100644 index 00000000..5ea85d68 --- /dev/null +++ b/lib/formfields/customer/email/formfield.emails_add.php @@ -0,0 +1,45 @@ + (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 $ + */ + +return array( + 'emails_add' => array( + 'title' => $lng['emails']['emails_add'], + 'image' => 'icons/email_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['emails']['emails_add'], + 'image' => 'icons/email_add.png', + 'fields' => array( + 'email_part' => array( + 'label' => $lng['emails']['emailaddress'], + 'type' => 'text' + ), + 'domain' => array( + 'label' => '@TODO up to email-part', + 'type' => 'select', + 'select_var' => $domains + ), + 'pathedit' => array( + 'label' => $lng['emails']['iscatchall'], + 'type' => 'yesno', + 'yesno_var' => $iscatchall + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/email/formfield.emails_addaccount.php b/lib/formfields/customer/email/formfield.emails_addaccount.php new file mode 100644 index 00000000..895b682e --- /dev/null +++ b/lib/formfields/customer/email/formfield.emails_addaccount.php @@ -0,0 +1,52 @@ + (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 $ + */ + +return array( + 'emails_addaccount' => array( + 'title' => $lng['emails']['account_add'], + 'image' => 'icons/email_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['emails']['account_add'], + 'image' => 'icons/email_add.png', + 'fields' => array( + 'email_full' => array( + 'label' => $lng['emails']['emailaddress'], + 'type' => 'label', + 'value' => $result['email_full'] + ), + 'email_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password' + ), + 'email_quota' => array( + 'visible' => $settings['system']['mail_quota_enabled'], + 'label' => $lng['emails']['quota'], + 'desc' => $lng['panel']['megabyte'], + 'type' => 'text', + 'value' => $quota + ), + 'alternative_email' => array( + 'visible' => $settings['panel']['sendalternativemail'], + 'label' => $lng['emails']['alternative_emailaddress'], + 'type' => 'text' + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/email/formfield.emails_addforwarder.php b/lib/formfields/customer/email/formfield.emails_addforwarder.php new file mode 100644 index 00000000..9532bd68 --- /dev/null +++ b/lib/formfields/customer/email/formfield.emails_addforwarder.php @@ -0,0 +1,40 @@ + (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 $ + */ + +return array( + 'emails_addforwarder' => array( + 'title' => $lng['emails']['forwarder_add'], + 'image' => 'icons/add_autoresponder.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['emails']['forwarder_add'], + 'image' => 'icons/add_autoresponder.png', + 'fields' => array( + 'email_full' => array( + 'label' => $lng['emails']['from'], + 'type' => 'label', + 'value' => $result['email_full'] + ), + 'destination' => array( + 'label' => $lng['emails']['to'], + 'type' => 'text' + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/email/formfield.emails_edit.php b/lib/formfields/customer/email/formfield.emails_edit.php new file mode 100644 index 00000000..9a45d847 --- /dev/null +++ b/lib/formfields/customer/email/formfield.emails_edit.php @@ -0,0 +1,64 @@ + (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 $ + */ + +return array( + 'emails_edit' => array( + 'title' => $lng['emails']['emails_edit'], + 'image' => 'icons/email_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['emails']['emails_edit'], + 'image' => 'icons/email_edit.png', + 'fields' => array( + 'email_full' => array( + 'label' => $lng['emails']['emailaddress'], + 'type' => 'label', + 'value' => $result['email_full'] + ), + 'account_yes' => array( + 'visible' => ($result['popaccountid'] != 0 ? true : false), + 'label' => $lng['emails']['account'], + 'type' => 'label', + 'value' => $lng['panel']['yes'].' ['.$lng['menue']['main']['changepassword'].'] ['.$lng['emails']['account_delete'].']' + ), + 'account_no' => array( + 'visible' => ($result['popaccountid'] == 0 ? true : false), + 'label' => $lng['emails']['account'], + 'type' => 'label', + 'value' => $lng['panel']['no'].' ['.$lng['emails']['account_add'].']' + ), + 'mail_quota' => array( + 'visible' => ($result['popaccountid'] != 0 && $settings['system']['mail_quota_enabled']), + 'label' => $lng['customer']['email_quota'], + 'type' => 'label', + 'value' => $result['quota'].' '.$lng['panel']['megabyte'].' ['.$lng['emails']['quota_edit'].']' + ), + 'mail_catchall' => array( + 'label' => $lng['emails']['catchall'], + 'type' => 'label', + 'value' => ($result['iscatchall'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']).' ['.$lng['panel']['toggle'].']' + ), + 'mail_fwds' => array( + 'label' => $lng['emails']['forwarders'].' ('.$forwarders_count.')', + 'type' => 'label', + 'value' => $forwarders.' '.$lng['emails']['forwarder_add'].'' + ) + ) + ) + ) + ) +); From 26aed64bf82f2d4d9c89199fdf451cb4ab266bd0 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 16:08:05 +0100 Subject: [PATCH 05/39] Converted customer -> ftp to new formbuilder Signed-off-by: Florian Aders (EleRas) --- customer_ftp.php | 14 ++++- .../customer/ftp/formfield.ftp_add.php | 56 ++++++++++++++++++ .../customer/ftp/formfield.ftp_edit.php | 57 +++++++++++++++++++ .../customer/mysql/formfield.mysql_add.php | 4 +- .../customer/mysql/formfield.mysql_edit.php | 4 +- .../Froxlor/customer/ftp/accounts_add.tpl | 51 +++++------------ .../Froxlor/customer/ftp/accounts_edit.tpl | 51 +++++------------ 7 files changed, 158 insertions(+), 79 deletions(-) create mode 100644 lib/formfields/customer/ftp/formfield.ftp_add.php create mode 100644 lib/formfields/customer/ftp/formfield.ftp_edit.php diff --git a/customer_ftp.php b/customer_ftp.php index bc591acf..207fb60d 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -270,6 +270,12 @@ elseif($page == 'accounts') $sendinfomail = makeyesno('sendinfomail', '1', '0', '0'); + $ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php'; + $ftp_add_form = htmlform::genHTMLForm($ftp_add_data); + + $title = $ftp_add_data['ftp_add']['title']; + $image = $ftp_add_data['ftp_add']['image']; + eval("echo \"" . getTemplate("ftp/accounts_add") . "\";"); } } @@ -352,7 +358,13 @@ elseif($page == 'accounts') $domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']); } } - + + $ftp_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_edit.php'; + $ftp_edit_form = htmlform::genHTMLForm($ftp_edit_data); + + $title = $ftp_edit_data['ftp_edit']['title']; + $image = $ftp_edit_data['ftp_edit']['image']; + eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";"); } } diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php new file mode 100644 index 00000000..a020cef3 --- /dev/null +++ b/lib/formfields/customer/ftp/formfield.ftp_add.php @@ -0,0 +1,56 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'ftp_add' => array( + 'title' => $lng['ftp']['account_add'], + 'image' => 'icons/add_user.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ftp']['account_add'], + 'image' => 'icons/add_user.png', + 'fields' => array( + 'ftp_username' => array( + 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), + 'label' => $lng['login']['username'], + 'type' => 'text' + ), + 'ftp_domain' => array( + 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), + 'label' => $lng['domains']['domainname'], + 'type' => 'select', + 'select_var' => (isset($domains) ? $domains : ""), + ), + 'path' => array( + 'label' => $lng['panel']['path'], + 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null), + 'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'), + 'select_var' => $pathSelect, + ), + 'ftp_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + ), + 'sendinfomail' => array( + 'label' => $lng['customer']['sendinfomail'], + 'type' => 'yesno', + 'yesno_var' => $sendinfomail, + ), + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/ftp/formfield.ftp_edit.php b/lib/formfields/customer/ftp/formfield.ftp_edit.php new file mode 100644 index 00000000..c7054516 --- /dev/null +++ b/lib/formfields/customer/ftp/formfield.ftp_edit.php @@ -0,0 +1,57 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'ftp_edit' => array( + 'title' => $lng['ftp']['account_edit'], + 'image' => 'icons/edit_user.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ftp']['account_edit'], + 'image' => 'icons/edit_user.png', + 'fields' => array( + 'username' => array( + 'label' => $lng['login']['username'], + 'type' => 'label', + 'value' => $result['username'], + ), + 'ftp_username' => array( + 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), + 'label' => $lng['login']['username'], + 'type' => 'text' + ), + 'ftp_domain' => array( + 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), + 'label' => $lng['domains']['domainname'], + 'type' => 'select', + 'select_var' => (isset($domains) ? $domains : ""), + ), + 'path' => array( + 'label' => $lng['panel']['path'], + 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : NULL), + 'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'), + 'select_var' => $pathSelect + ), + 'ftp_password' => array( + 'label' => $lng['login']['password'], + 'desc' => $lng['ftp']['editpassdescription'], + 'type' => 'password', + ), + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php index adb166fb..efa46b91 100644 --- a/lib/formfields/customer/mysql/formfield.mysql_add.php +++ b/lib/formfields/customer/mysql/formfield.mysql_add.php @@ -17,11 +17,11 @@ return array( 'mysql_add' => array( 'title' => $lng['mysql']['database_create'], - 'image' => 'icons/mysql_add.png', + 'image' => 'icons/add_mysql.png', 'sections' => array( 'section_a' => array( 'title' => $lng['mysql']['database_create'], - 'image' => 'icons/mysql_add.png', + 'image' => 'icons/add_mysql.png', 'fields' => array( 'description' => array( 'label' => $lng['mysql']['databasedescription'], diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php index bd812fae..617a1c03 100644 --- a/lib/formfields/customer/mysql/formfield.mysql_edit.php +++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php @@ -17,11 +17,11 @@ return array( 'mysql_edit' => array( 'title' => $lng['mysql']['database_edit'], - 'image' => 'icons/mysql_edit.png', + 'image' => 'icons/edit_mysql.png', 'sections' => array( 'section_a' => array( 'title' => $lng['mysql']['database_edit'], - 'image' => 'icons/mysql_edit.png', + 'image' => 'icons/edit_mysql.png', 'fields' => array( 'databasename' => array( 'label' => $lng['mysql']['databasename'], diff --git a/templates/Froxlor/customer/ftp/accounts_add.tpl b/templates/Froxlor/customer/ftp/accounts_add.tpl index 3b16c280..92444d4c 100644 --- a/templates/Froxlor/customer/ftp/accounts_add.tpl +++ b/templates/Froxlor/customer/ftp/accounts_add.tpl @@ -1,44 +1,20 @@ $header -
-
-

- {$lng['ftp']['account_add']}  - {$lng['ftp']['account_add']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['ftp']['account_add']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - - - - - + {$ftp_add_form}
{$lng['login']['username']}:
{$lng['domains']['domainname']}:
{$lng['panel']['path']}:
{$lng['panel']['pathDescription']}		{$pathSelect}
{$lng['login']['password']}:
{$lng['customer']['sendinfomail']}:{$sendinfomail}

@@ -49,6 +25,7 @@ $header

-
-
+ +
+
$footer diff --git a/templates/Froxlor/customer/ftp/accounts_edit.tpl b/templates/Froxlor/customer/ftp/accounts_edit.tpl index 336f3956..9b21bc48 100644 --- a/templates/Froxlor/customer/ftp/accounts_edit.tpl +++ b/templates/Froxlor/customer/ftp/accounts_edit.tpl @@ -1,44 +1,20 @@ $header -
-
-

- {$lng['ftp']['account_edit']}  - {$lng['ftp']['account_edit']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['ftp']['account_edit']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - - - - - + {$ftp_edit_form}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['username']}:
{$lng['domains']['domainname']}:
{$lng['panel']['path']}:
{$lng['panel']['pathDescription']}		{$pathSelect}
{$lng['login']['password']}:
{$lng['ftp']['editpassdescription']}

@@ -49,6 +25,7 @@ $header

-
-
+ +
+
$footer From 9e798c636201320b484070e6028d989eea8dbd3a Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 16:13:57 +0100 Subject: [PATCH 06/39] add formfields for customer_extras --- .../extras/formfield.htaccess_add.php | 65 ++++++++++++++++++ .../extras/formfield.htaccess_edit.php | 67 +++++++++++++++++++ .../extras/formfield.htpasswd_add.php | 49 ++++++++++++++ .../extras/formfield.htpasswd_edit.php | 50 ++++++++++++++ 4 files changed, 231 insertions(+) create mode 100644 lib/formfields/customer/extras/formfield.htaccess_add.php create mode 100644 lib/formfields/customer/extras/formfield.htaccess_edit.php create mode 100644 lib/formfields/customer/extras/formfield.htpasswd_add.php create mode 100644 lib/formfields/customer/extras/formfield.htpasswd_edit.php diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php new file mode 100644 index 00000000..81a58a61 --- /dev/null +++ b/lib/formfields/customer/extras/formfield.htaccess_add.php @@ -0,0 +1,65 @@ + (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 $ + */ + +return array( + 'htaccess_add' => array( + 'title' => $lng['extras']['pathoptions_add'], + 'image' => 'icons/add_htpasswd.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['pathoptions_add'], + 'image' => 'icons/add_htpasswd.png', + 'fields' => array( + 'path' => array( + 'label' => $lng['panel']['path'], + 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null), + 'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'), + 'select_var' => $pathSelect + ), + 'options_indexes' => array( + 'label' => $lng['extras']['directory_browsing'], + 'type' => 'yesno', + 'yesno_var' => $options_indexes + ), + 'error404path' => array( + 'label' => $lng['extras']['errordocument404path'], + 'desc' => $lng['panel']['descriptionerrordocument'], + 'type' => 'text' + ), + 'error403path' => array( + 'visible' => ($settings['system']['webserver'] == 'apache2'), + 'label' => $lng['extras']['errordocument403path'], + 'desc' => $lng['panel']['descriptionerrordocument'], + 'type' => 'text' + ), + 'error500path' => array( + 'visible' => ($settings['system']['webserver'] == 'apache2'), + 'label' => $lng['extras']['errordocument500path'], + 'desc' => $lng['panel']['descriptionerrordocument'], + 'type' => 'text' + ), + 'options_cgi' => array( + 'visible' => ($cperlenabled == 1), + 'label' => $lng['extras']['execute_perl'], + 'type' => 'yesno', + 'yesno_var' => $options_cgi + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/extras/formfield.htaccess_edit.php b/lib/formfields/customer/extras/formfield.htaccess_edit.php new file mode 100644 index 00000000..8a4cf558 --- /dev/null +++ b/lib/formfields/customer/extras/formfield.htaccess_edit.php @@ -0,0 +1,67 @@ + (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 $ + */ + +return array( + 'htaccess_edit' => array( + 'title' => $lng['extras']['pathoptions_edit'], + 'image' => 'icons/edit_htpasswd.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['pathoptions_edit'], + 'image' => 'icons/edit_htpasswd.png', + 'fields' => array( + 'path' => array( + 'label' => $lng['panel']['path'], + 'type' => 'label', + 'value' => $result['path'] + ), + 'options_indexes' => array( + 'label' => $lng['extras']['directory_browsing'], + 'type' => 'yesno', + 'yesno_var' => $options_indexes + ), + 'error404path' => array( + 'label' => $lng['extras']['errordocument404path'], + 'desc' => $lng['panel']['descriptionerrordocument'], + 'type' => 'text', + 'value' => $result['error404path'] + ), + 'error403path' => array( + 'visible' => ($settings['system']['webserver'] == 'apache2'), + 'label' => $lng['extras']['errordocument403path'], + 'desc' => $lng['panel']['descriptionerrordocument'], + 'type' => 'text', + 'value' => $result['error403path'] + ), + 'error500path' => array( + 'visible' => ($settings['system']['webserver'] == 'apache2'), + 'label' => $lng['extras']['errordocument500path'], + 'desc' => $lng['panel']['descriptionerrordocument'], + 'type' => 'text', + 'value' => $result['error500path'] + ), + 'options_cgi' => array( + 'visible' => ($cperlenabled == 1), + 'label' => $lng['extras']['execute_perl'], + 'type' => 'yesno', + 'yesno_var' => $options_cgi + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/extras/formfield.htpasswd_add.php b/lib/formfields/customer/extras/formfield.htpasswd_add.php new file mode 100644 index 00000000..441f2f37 --- /dev/null +++ b/lib/formfields/customer/extras/formfield.htpasswd_add.php @@ -0,0 +1,49 @@ + (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 $ + */ + +return array( + 'htpasswd_add' => array( + 'title' => $lng['extras']['directoryprotection_add'], + 'image' => 'icons/add_htpasswd.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['directoryprotection_add'], + 'image' => 'icons/add_htpasswd.png', + 'fields' => array( + 'path' => array( + 'label' => $lng['panel']['path'], + 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null), + 'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'), + 'select_var' => $pathSelect + ), + 'username' => array( + 'label' => $lng['login']['username'], + 'type' => 'text' + ), + 'directory_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password' + ), + 'directory_authname' => array( + 'label' => $lng['extras']['htpasswdauthname'], + 'type' => 'text' + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/extras/formfield.htpasswd_edit.php b/lib/formfields/customer/extras/formfield.htpasswd_edit.php new file mode 100644 index 00000000..2be420f3 --- /dev/null +++ b/lib/formfields/customer/extras/formfield.htpasswd_edit.php @@ -0,0 +1,50 @@ + (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 $ + */ + +return array( + 'htpasswd_edit' => array( + 'title' => $lng['extras']['directoryprotection_add'], + 'image' => 'icons/add_htpasswd.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['directoryprotection_add'], + 'image' => 'icons/add_htpasswd.png', + 'fields' => array( + 'path' => array( + 'label' => $lng['panel']['path'], + 'type' => 'label', + 'value' => $result['path'] + ), + 'username' => array( + 'label' => $lng['login']['username'], + 'type' => 'label', + 'value' => $result['username'] + ), + 'directory_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password' + ), + 'directory_authname' => array( + 'label' => $lng['extras']['htpasswdauthname'], + 'type' => 'text', + 'value' => $result['authname'] + ) + ) + ) + ) + ) +); From 0b20a154f548e61894bf90d97c7b5a693af7dc5c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 Feb 2011 16:18:24 +0100 Subject: [PATCH 07/39] Finished email stuff. --- customer_email.php | 42 ++++++++++++ .../Froxlor/customer/email/account_add.tpl | 24 +------ .../customer/email/account_changepw.tpl | 52 +++++++------- .../customer/email/account_changequota.tpl | 52 +++++++------- .../customer/email/autoresponder_add.tpl | 68 ++++++++----------- .../Froxlor/customer/email/emails_add.tpl | 12 +--- .../Froxlor/customer/email/emails_edit.tpl | 38 +---------- .../Froxlor/customer/email/forwarder_add.tpl | 12 +--- 8 files changed, 130 insertions(+), 170 deletions(-) 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']}:
 

From 44febee3579ad389754a187d400e1d6517f479e8 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 16:42:25 +0100 Subject: [PATCH 08/39] use htaccess-formfields --- customer_extras.php | 14 +++++ .../Froxlor/customer/extras/htaccess_add.tpl | 63 +++++-------------- .../Froxlor/customer/extras/htaccess_edit.tpl | 61 +++++------------- 3 files changed, 45 insertions(+), 93 deletions(-) diff --git a/customer_extras.php b/customer_extras.php index a6b1d3f9..df451cb4 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -357,6 +357,13 @@ elseif($page == 'htaccess') $options_indexes = makeyesno('options_indexes', '1', '0', '0'); $cperlenabled = customerHasPerlEnabled($userinfo['customerid']); $options_cgi = makeyesno('options_cgi', '1', '0', '0'); + + $htaccess_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_add.php'; + $htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data); + + $title = $htaccess_add_data['htaccess_add']['title']; + $image = $htaccess_add_data['htaccess_add']['image']; + eval("echo \"" . getTemplate("extras/htaccess_add") . "\";"); } } @@ -418,6 +425,13 @@ elseif($page == 'htaccess') $cperlenabled = customerHasPerlEnabled($userinfo['customerid']); $options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']); $result = htmlentities_array($result); + + $htaccess_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_edit.php'; + $htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data); + + $title = $htaccess_edit_data['htaccess_edit']['title']; + $image = $htaccess_edit_data['htaccess_edit']['image']; + eval("echo \"" . getTemplate("extras/htaccess_edit") . "\";"); } } diff --git a/templates/Froxlor/customer/extras/htaccess_add.tpl b/templates/Froxlor/customer/extras/htaccess_add.tpl index 0271baea..14eca14d 100644 --- a/templates/Froxlor/customer/extras/htaccess_add.tpl +++ b/templates/Froxlor/customer/extras/htaccess_add.tpl @@ -1,55 +1,20 @@ $header -

-
-

- {$lng['extras']['pathoptions_add']}  - {$lng['extras']['pathoptions_add']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['extras']['pathoptions_add']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {$htaccess_add_form}
- {$lng['panel']['path']}:
- {$lng['panel']['pathDescription']} - 		{$pathSelect}
{$lng['extras']['directory_browsing']}:$options_indexes
{$lng['extras']['errordocument404path']}:
{$lng['panel']['descriptionerrordocument']}
{$lng['extras']['errordocument403path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['errordocument500path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['execute_perl']}:$options_cgi

@@ -60,6 +25,8 @@ $header

-
-
+ +
+ +
$footer diff --git a/templates/Froxlor/customer/extras/htaccess_edit.tpl b/templates/Froxlor/customer/extras/htaccess_edit.tpl index d1b0cc17..828b4b4d 100644 --- a/templates/Froxlor/customer/extras/htaccess_edit.tpl +++ b/templates/Froxlor/customer/extras/htaccess_edit.tpl @@ -1,62 +1,33 @@ $header -
-
-

- {$lng['extras']['pathoptions_edit']}  - {$lng['extras']['pathoptions_edit']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor -  + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {$htaccess_edit_form}
{$lng['panel']['path']}:{$result['path']}
{$lng['extras']['directory_browsing']}:$options_indexes
{$lng['extras']['errordocument404path']}:
{$lng['panel']['descriptionerrordocument']}
{$lng['extras']['errordocument403path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['errordocument500path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['execute_perl']}:$options_cgi

+

-
-
+ +
+ +
$footer From 3e83ae8a6ebd98c1177e5b3d771a46988a58e1f0 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 16:47:07 +0100 Subject: [PATCH 09/39] use htpasswd-formfields --- customer_extras.php | 14 ++++++ .../Froxlor/customer/extras/htpasswds_add.tpl | 49 ++++++------------- .../customer/extras/htpasswds_edit.tpl | 47 ++++++------------ 3 files changed, 45 insertions(+), 65 deletions(-) diff --git a/customer_extras.php b/customer_extras.php index df451cb4..b49e3052 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -161,6 +161,13 @@ elseif($page == 'htpasswds') else { $pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']); + + $htpasswd_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_add.php'; + $htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data); + + $title = $htpasswd_add_data['htpasswd_add']['title']; + $image = $htpasswd_add_data['htpasswd_add']['image']; + eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";"); } } @@ -220,6 +227,13 @@ elseif($page == 'htpasswds') } $result = htmlentities_array($result); + + $htpasswd_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_edit.php'; + $htpasswd_edit_form = htmlform::genHTMLForm($htpasswd_edit_data); + + $title = $htpasswd_edit_data['htpasswd_edit']['title']; + $image = $htpasswd_edit_data['htpasswd_edit']['image']; + eval("echo \"" . getTemplate("extras/htpasswds_edit") . "\";"); } } diff --git a/templates/Froxlor/customer/extras/htpasswds_add.tpl b/templates/Froxlor/customer/extras/htpasswds_add.tpl index 9b85ee14..87404177 100644 --- a/templates/Froxlor/customer/extras/htpasswds_add.tpl +++ b/templates/Froxlor/customer/extras/htpasswds_add.tpl @@ -1,41 +1,20 @@ $header -
-
-

- {$lng['extras']['directoryprotection_add']}  - {$lng['extras']['directoryprotection_add']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['extras']['directoryprotection_add']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - + {$htpasswd_add_form}
- {$lng['panel']['path']}:
- {$lng['panel']['pathDescription']} - 		{$pathSelect}
{$lng['login']['username']}:
{$lng['login']['password']}:
{$lng['extras']['htpasswdauthname']}:

@@ -46,6 +25,8 @@ $header

-
-
+ +
+ +
$footer diff --git a/templates/Froxlor/customer/extras/htpasswds_edit.tpl b/templates/Froxlor/customer/extras/htpasswds_edit.tpl index eab2c101..8b848dc3 100644 --- a/templates/Froxlor/customer/extras/htpasswds_edit.tpl +++ b/templates/Froxlor/customer/extras/htpasswds_edit.tpl @@ -1,48 +1,33 @@ $header -
-
-

- {$lng['extras']['directoryprotection_edit']}  - {$lng['extras']['directoryprotection_edit']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['extras']['directoryprotection_edit']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - + {$htpasswd_edit_form}
{$lng['panel']['path']}:{$result['path']}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['password']}:
{$lng['extras']['htpasswdauthname']}:

+

-
-
+ +
+ +
$footer From f3d505170a82f292984cf322d101fb979bc80744 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:17:13 +0100 Subject: [PATCH 10/39] 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', From a807ffd91845736fbb3a5b7977e4eb9ad53c5e9f Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:24:07 +0100 Subject: [PATCH 11/39] fix more customer_email formfiled usage --- customer_email.php | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/customer_email.php b/customer_email.php index 635f0446..73ac20e0 100644 --- a/customer_email.php +++ b/customer_email.php @@ -519,13 +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']; - + $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_data['emails_addaccount']['title']; + $image = $account_add_data['emails_addaccount']['image']; + eval("echo \"" . getTemplate("email/account_add") . "\";"); } } @@ -564,13 +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']; - + $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_data['emails_accountchangepasswd']['title']; + $image = $account_changepw_data['emails_accountchangepasswd']['image']; + eval("echo \"" . getTemplate("email/account_changepw") . "\";"); } } @@ -612,12 +612,12 @@ 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']; + $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_data['emails_accountchangequota']['title']; + $image = $quota_edit_data['emails_accountchangequota']['image']; eval("echo \"" . getTemplate("email/account_changequota") . "\";"); } @@ -713,13 +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']; - + $forwarder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/emails/formfield.emails_addforwarder.php'; + $forwarder_add_form = htmlform::genHTMLForm($forwarder_add_data); + + $title = $forwarder_add_data['emails_addforwarder']['title']; + $image = $forwarder_add_data['emails_addforwarder']['image']; + eval("echo \"" . getTemplate("email/forwarder_add") . "\";"); } } From 87b15ce57d6ca5df2adadf18870fd4578e55e5b3 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:32:36 +0100 Subject: [PATCH 12/39] fix more templates for fieldform usage --- .../Froxlor/customer/email/account_add.tpl | 28 +++++----- .../customer/email/account_changepw.tpl | 55 ++++++++++--------- .../customer/email/account_changequota.tpl | 55 ++++++++++--------- .../Froxlor/customer/email/emails_add.tpl | 52 +++++++++--------- .../Froxlor/customer/email/emails_edit.tpl | 11 ++-- .../Froxlor/customer/email/forwarder_add.tpl | 8 +-- 6 files changed, 109 insertions(+), 100 deletions(-) diff --git a/templates/Froxlor/customer/email/account_add.tpl b/templates/Froxlor/customer/email/account_add.tpl index 87e1a1e7..684f25cd 100644 --- a/templates/Froxlor/customer/email/account_add.tpl +++ b/templates/Froxlor/customer/email/account_add.tpl @@ -1,20 +1,20 @@ $header -
-
-

- {$lng['emails']['account_add']}  - {$lng['emails']['account_add']} -

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['emails']['emails_add']} + Froxlor - {$title} - {$account_add_form} + {$account_add_form}

@@ -25,6 +25,8 @@ $header

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

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

-
- -
+
+
+

+ {$title}  + {$title} +

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

- - - - -

-
- -
-
-$footer \ No newline at end of file + + {$account_changepw_form} +
+ +

+ + + + + +

+ + + +
+ +
+$footer diff --git a/templates/Froxlor/customer/email/account_changequota.tpl b/templates/Froxlor/customer/email/account_changequota.tpl index 8f96bddd..5550e05b 100644 --- a/templates/Froxlor/customer/email/account_changequota.tpl +++ b/templates/Froxlor/customer/email/account_changequota.tpl @@ -1,30 +1,33 @@ $header -
-
-

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

-
- -
+
+
+

+ {$title}  + {$title} +

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

- - - - -

-
- -
-
-$footer \ No newline at end of file + + {$quota_edit_form} +
+ +

+ + + + + +

+ + + +
+ +
+$footer diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl index 8559dc2f..13548d2c 100644 --- a/templates/Froxlor/customer/email/emails_add.tpl +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -7,33 +7,33 @@ $header

{$lng['emails']['noemaildomainaddedyet']}
- -
-

- {$lng['emails']['emails_add']}  - {$lng['emails']['emails_add']} -

-
+
+

+ {$title}  + {$title} +

+
+ +
-
- -
-
- Froxlor - {$lng['emails']['emails_add']} - - - {$email_add_form} -
- -

- - - - -

-
-
-
+
+
+ Froxlor - {$lng['emails']['emails_add']} + + + {$email_add_form} +
+ +

+ + + + +

+
+
+
+ $footer diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl index fc259a61..883e776b 100644 --- a/templates/Froxlor/customer/email/emails_edit.tpl +++ b/templates/Froxlor/customer/email/emails_edit.tpl @@ -2,25 +2,26 @@ $header

- {$lng['emails']['emails_edit']}  - {$lng['emails']['emails_edit']} + {$title}  + {$title}

- +
- Froxlor - {$lng['emails']['emails_edit']} + Froxlor - {$lng['emails']['emails_add']} - {$email_edit_form} + {$email_edit_form}

+

diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl index 509b7258..b0a2564f 100644 --- a/templates/Froxlor/customer/email/forwarder_add.tpl +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -2,16 +2,16 @@ $header

- {$lng['emails']['forwarder_add']}  - {$lng['emails']['forwarder_add']} + {$title}  + {$title}

- +
- Froxlor - {$lng['emails']['forwarder_add']} + Froxlor - {$lng['emails']['emails_add']} {$forwarder_add_form} From fea75e2c2fc8d0b9f816164d1d70230067c72d94 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:34:20 +0100 Subject: [PATCH 13/39] fix even more templates --- templates/Froxlor/customer/email/account_add.tpl | 1 + templates/Froxlor/customer/email/forwarder_add.tpl | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/Froxlor/customer/email/account_add.tpl b/templates/Froxlor/customer/email/account_add.tpl index 684f25cd..35c9f233 100644 --- a/templates/Froxlor/customer/email/account_add.tpl +++ b/templates/Froxlor/customer/email/account_add.tpl @@ -21,6 +21,7 @@ $header +

diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl index b0a2564f..58978e31 100644 --- a/templates/Froxlor/customer/email/forwarder_add.tpl +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -21,6 +21,7 @@ $header +

From 9ddd3a2a5806a9a58a06d2ec2f73bfb1f5fffa07 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:42:02 +0100 Subject: [PATCH 14/39] fix typo --- customer_email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customer_email.php b/customer_email.php index 73ac20e0..a7255f90 100644 --- a/customer_email.php +++ b/customer_email.php @@ -714,7 +714,7 @@ elseif($page == 'forwarders') $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); - $forwarder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/emails/formfield.emails_addforwarder.php'; + $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_data['emails_addforwarder']['title']; From cc96aef50f2d7841120705669560c069e23ae761 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 17:48:54 +0100 Subject: [PATCH 15/39] fix integration of formfields in customer-domains --- customer_domains.php | 13 +++ .../Froxlor/customer/domains/domains_add.tpl | 85 +++++---------- .../Froxlor/customer/domains/domains_edit.tpl | 103 +++++------------- .../Froxlor/customer/email/emails_add.tpl | 4 +- 4 files changed, 73 insertions(+), 132 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index 8b6cbce7..6028311c 100644 --- a/customer_domains.php +++ b/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") . "\";"); } } diff --git a/templates/Froxlor/customer/domains/domains_add.tpl b/templates/Froxlor/customer/domains/domains_add.tpl index 419a1ec6..6107bcd1 100644 --- a/templates/Froxlor/customer/domains/domains_add.tpl +++ b/templates/Froxlor/customer/domains/domains_add.tpl @@ -1,57 +1,30 @@ $header - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['domains']['subdomain_add']}
{$lng['domains']['domainname']}: .
{$lng['domains']['aliasdomain']}:
{$lng['panel']['pathorurl']}:
{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}		{$pathSelect}
{$lng['panel']['path']}:{$pathSelect}
{$lng['panel']['urloverridespath']}:
{$lng['domains']['redirectifpathisurl']}:
{$lng['domains']['redirectifpathisurlinfo']}
SSL Redirect:$ssl_redirect
{$lng['domain']['openbasedirpath']}:
- -
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$subdomain_add_form} +
+ +

+ + + + +

+
+
+
+
+$footer diff --git a/templates/Froxlor/customer/domains/domains_edit.tpl b/templates/Froxlor/customer/domains/domains_edit.tpl index e253c72a..9959d727 100644 --- a/templates/Froxlor/customer/domains/domains_edit.tpl +++ b/templates/Froxlor/customer/domains/domains_edit.tpl @@ -1,76 +1,31 @@ $header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['domains']['subdomain_edit']}
{$lng['domains']['domainname']}:{$result['domain']}
{$lng['dns']['destinationip']}:{$domainip}
{$lng['domains']['aliasdomain']}:
{$lng['panel']['pathorurl']}:
{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}		{$pathSelect}
{$lng['panel']['path']}:{$pathSelect}
{$lng['panel']['urloverridespath']}:
{$lng['domains']['redirectifpathisurl']}:
{$lng['domains']['redirectifpathisurlinfo']}
{$lng['domains']['wildcarddomain']}$iswildcarddomain
Emaildomain:$isemaildomain
SSL Redirect:$ssl_redirect
{$lng['domain']['openbasedirpath']}:
-
-
-
+
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$subdomain_edit_form} +
+ +

+ + + + + +

+
+
+
+
$footer diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl index 13548d2c..edd12d12 100644 --- a/templates/Froxlor/customer/email/emails_add.tpl +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -19,8 +19,8 @@ $header
- Froxlor - {$lng['emails']['emails_add']} - + Froxlor - {$title} + {$email_add_form}
From b8ab1edc5634f99244180a21ab9c7364e30e9cce Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 18:16:54 +0100 Subject: [PATCH 16/39] fix domain-formfields --- .../domains/formfield.domains_add.php | 34 ++++++-------- .../domains/formfield.domains_edit.php | 44 ++++++++----------- 2 files changed, 31 insertions(+), 47 deletions(-) diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 45a9b92b..e1bda09b 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -12,61 +12,53 @@ * @author Froxlor team (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 diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php index e81eb8e8..1abb0f8f 100644 --- a/lib/formfields/customer/domains/formfield.domains_edit.php +++ b/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 From b13d20d44c71a3735467cd34f29f3d6106cd9630 Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Sat, 12 Feb 2011 18:20:22 +0100 Subject: [PATCH 17/39] Fixed email templates in design: Classic, Froxlor --- .../Classic/customer/email/account_add.tpl | 26 +----------- .../customer/email/account_changepw.tpl | 14 +------ .../customer/email/account_changequota.tpl | 14 +------ .../customer/email/autoresponder_add.tpl | 32 +-------------- .../customer/email/autoresponder_edit.tpl | 2 +- .../Classic/customer/email/emails_add.tpl | 20 +--------- .../Classic/customer/email/emails_edit.tpl | 40 +------------------ .../Classic/customer/email/forwarder_add.tpl | 14 +------ .../customer/email/autoresponder_add.tpl | 6 +-- .../Froxlor/customer/email/emails_add.tpl | 6 +-- .../Froxlor/customer/email/emails_edit.tpl | 6 +-- .../Froxlor/customer/email/forwarder_add.tpl | 6 +-- 12 files changed, 27 insertions(+), 159 deletions(-) diff --git a/templates/Classic/customer/email/account_add.tpl b/templates/Classic/customer/email/account_add.tpl index 9ee1b5a4..2bb422e5 100644 --- a/templates/Classic/customer/email/account_add.tpl +++ b/templates/Classic/customer/email/account_add.tpl @@ -6,31 +6,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - + + {$account_add_form}
 {$lng['emails']['account_add']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
{$lng['emails']['alternative_emailaddress']}:
$title {$title}

diff --git a/templates/Classic/customer/email/account_changepw.tpl b/templates/Classic/customer/email/account_changepw.tpl index 1ac9aec3..34971069 100644 --- a/templates/Classic/customer/email/account_changepw.tpl +++ b/templates/Classic/customer/email/account_changepw.tpl @@ -6,19 +6,9 @@ $header - - - - - - - - - - - - + + {$account_changepw}
 {$lng['menue']['main']['changepassword']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
{$title} {$title}

diff --git a/templates/Classic/customer/email/account_changequota.tpl b/templates/Classic/customer/email/account_changequota.tpl index ce53923c..a4f032b9 100644 --- a/templates/Classic/customer/email/account_changequota.tpl +++ b/templates/Classic/customer/email/account_changequota.tpl @@ -6,19 +6,9 @@ $header - - - - - - - - - - - - + + {$quota_edit}
 {$lng['emails']['quota_edit']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
{$title} {$title}

diff --git a/templates/Classic/customer/email/autoresponder_add.tpl b/templates/Classic/customer/email/autoresponder_add.tpl index 7186e9c9..31879d01 100644 --- a/templates/Classic/customer/email/autoresponder_add.tpl +++ b/templates/Classic/customer/email/autoresponder_add.tpl @@ -4,37 +4,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {$autoresponder_add_form}
 {$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']}:
{$title} {$title}

diff --git a/templates/Classic/customer/email/autoresponder_edit.tpl b/templates/Classic/customer/email/autoresponder_edit.tpl index 5f82e6b1..cd9f9ddf 100644 --- a/templates/Classic/customer/email/autoresponder_edit.tpl +++ b/templates/Classic/customer/email/autoresponder_edit.tpl @@ -5,7 +5,7 @@ $header - + diff --git a/templates/Classic/customer/email/emails_add.tpl b/templates/Classic/customer/email/emails_add.tpl index 44a0852a..a2da73cb 100644 --- a/templates/Classic/customer/email/emails_add.tpl +++ b/templates/Classic/customer/email/emails_add.tpl @@ -5,25 +5,9 @@ $header
 {$lng['autoresponder']['autoresponder_edit']}{$title} {$title}
{$lng['autoresponder']['account']}:
- + - - - - - - - - - - - - - - - - - + {$email_add_form}
 {$lng['emails']['emails_add']}$title {$title}
{$lng['emails']['emailaddress']}: @
{$lng['emails']['iscatchall']}$iscatchall
{$lng['emails']['noemaildomainaddedyet']}

diff --git a/templates/Classic/customer/email/emails_edit.tpl b/templates/Classic/customer/email/emails_edit.tpl index 3b3f8245..3f6cc570 100644 --- a/templates/Classic/customer/email/emails_edit.tpl +++ b/templates/Classic/customer/email/emails_edit.tpl @@ -1,45 +1,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - + + {$email_edit_form}
 {$lng['emails']['emails_edit']}
{$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']}{$title} {$title}


diff --git a/templates/Classic/customer/email/forwarder_add.tpl b/templates/Classic/customer/email/forwarder_add.tpl index 7ec80417..4c0dcf1e 100644 --- a/templates/Classic/customer/email/forwarder_add.tpl +++ b/templates/Classic/customer/email/forwarder_add.tpl @@ -6,19 +6,9 @@ $header - - - - - - - - - - - - + + {$forwarder_add_form}
 {$lng['emails']['forwarder_add']}
{$lng['emails']['from']}:{$result['email_full']}
{$lng['emails']['to']}:
 {$title} {$title}

diff --git a/templates/Froxlor/customer/email/autoresponder_add.tpl b/templates/Froxlor/customer/email/autoresponder_add.tpl index d0588985..7268a1c9 100644 --- a/templates/Froxlor/customer/email/autoresponder_add.tpl +++ b/templates/Froxlor/customer/email/autoresponder_add.tpl @@ -2,8 +2,8 @@ $header

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

@@ -11,7 +11,7 @@ $header
- Froxlor - {$lng['emails']['forwarder_add']} + Froxlor - {$title} {$autoresponder_add_form} diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl index 8559dc2f..15764fc8 100644 --- a/templates/Froxlor/customer/email/emails_add.tpl +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -11,8 +11,8 @@ $header

- {$lng['emails']['emails_add']}  - {$lng['emails']['emails_add']} +   + {$title}

@@ -20,7 +20,7 @@ $header
- Froxlor - {$lng['emails']['emails_add']} + Froxlor - {$title}
{$email_add_form} diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl index fc259a61..f55604fe 100644 --- a/templates/Froxlor/customer/email/emails_edit.tpl +++ b/templates/Froxlor/customer/email/emails_edit.tpl @@ -2,8 +2,8 @@ $header

- {$lng['emails']['emails_edit']}  - {$lng['emails']['emails_edit']} + {$title}  + {$title}

@@ -11,7 +11,7 @@ $header
- Froxlor - {$lng['emails']['emails_edit']} + Froxlor - {$title}
{$email_edit_form} diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl index 509b7258..e075bdbc 100644 --- a/templates/Froxlor/customer/email/forwarder_add.tpl +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -2,8 +2,8 @@ $header

- {$lng['emails']['forwarder_add']}  - {$lng['emails']['forwarder_add']} + {$title}  + {$title}

@@ -11,7 +11,7 @@ $header
- Froxlor - {$lng['emails']['forwarder_add']} + Froxlor - {$title}
{$forwarder_add_form} From 8e83c5f7883622cb7607fb5171c323c720b1b462 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 12 Feb 2011 18:27:32 +0100 Subject: [PATCH 18/39] bugfix domain-formfields (again) --- .../customer/domains/formfield.domains_add.php | 10 +++++++--- templates/Classic/customer/domains/domains_add.tpl | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index e1bda09b..ad88b3d3 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -24,10 +24,15 @@ return array( 'title' => $lng['domains']['subdomain_add'], 'image' => 'icons/domain_add.png', 'fields' => array( - 'domain' => array( + 'subdomain' => array( 'label' => $lng['domains']['domainname'], 'type' => 'text' ), + 'domain' => array( + 'label' => '@TODO up to subdomain-part', + 'type' => 'select', + 'select_var' => $domains + ), 'alias' => array( 'label' => $lng['domains']['aliasdomain'], 'type' => 'select', @@ -42,8 +47,7 @@ return array( 'url' => array( 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), 'label' => $lng['panel']['urloverridespath'], - 'type' => 'text', - 'value' => $urlvalue + 'type' => 'text' ), 'redirectcode' => array( 'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false), diff --git a/templates/Classic/customer/domains/domains_add.tpl b/templates/Classic/customer/domains/domains_add.tpl index 7dfe3990..d9862601 100644 --- a/templates/Classic/customer/domains/domains_add.tpl +++ b/templates/Classic/customer/domains/domains_add.tpl @@ -28,7 +28,7 @@ $header - + From 0cfc75976fcad5af4611f697deae5287349b8814 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 18:33:59 +0100 Subject: [PATCH 19/39] Fixing customer -> ftp in classic layout Signed-off-by: Florian Aders (EleRas) --- .../Classic/customer/ftp/accounts_add.tpl | 28 ++--------------- .../Classic/customer/ftp/accounts_edit.tpl | 30 ++----------------- .../Froxlor/customer/ftp/accounts_edit.tpl | 1 + 3 files changed, 6 insertions(+), 53 deletions(-) diff --git a/templates/Classic/customer/ftp/accounts_add.tpl b/templates/Classic/customer/ftp/accounts_add.tpl index 9ff4d23b..795f6c7a 100644 --- a/templates/Classic/customer/ftp/accounts_add.tpl +++ b/templates/Classic/customer/ftp/accounts_add.tpl @@ -5,33 +5,9 @@ $header
{$lng['panel']['urloverridespath']}:
- - - - - - - - - - - - - - - - - - - - - - - - - - + + {$ftp_add_form}
 {$lng['ftp']['account_add']}
{$lng['login']['username']}:
{$lng['domains']['domainname']}:
{$lng['panel']['path']}:
{$lng['panel']['pathDescription']}		{$pathSelect}
{$lng['login']['password']}:
{$lng['customer']['sendinfomail']}:{$sendinfomail}
 {$title}

diff --git a/templates/Classic/customer/ftp/accounts_edit.tpl b/templates/Classic/customer/ftp/accounts_edit.tpl index d092f66c..0d00707d 100644 --- a/templates/Classic/customer/ftp/accounts_edit.tpl +++ b/templates/Classic/customer/ftp/accounts_edit.tpl @@ -6,35 +6,11 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - - - + + {$ftp_edit_form}
 {$lng['ftp']['account_edit']}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['username']}:
{$lng['domains']['domainname']}:
{$lng['panel']['path']}:
{$lng['panel']['pathDescription']}		{$pathSelect}
{$lng['login']['password']}:
{$lng['ftp']['editpassdescription']}
 {$title}


-$footer \ No newline at end of file +$footer diff --git a/templates/Froxlor/customer/ftp/accounts_edit.tpl b/templates/Froxlor/customer/ftp/accounts_edit.tpl index 9b21bc48..f6158a18 100644 --- a/templates/Froxlor/customer/ftp/accounts_edit.tpl +++ b/templates/Froxlor/customer/ftp/accounts_edit.tpl @@ -22,6 +22,7 @@ $header +

From 8032addc0af58146758d4953faf5005c52d26d44 Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Sat, 12 Feb 2011 18:36:00 +0100 Subject: [PATCH 20/39] Finished template for Classic: extras --- .../Classic/customer/extras/htaccess_add.tpl | 39 +------------------ .../Classic/customer/extras/htaccess_edit.tpl | 36 +---------------- .../Classic/customer/extras/htpasswds_add.tpl | 25 +----------- .../customer/extras/htpasswds_edit.tpl | 22 +---------- 4 files changed, 8 insertions(+), 114 deletions(-) diff --git a/templates/Classic/customer/extras/htaccess_add.tpl b/templates/Classic/customer/extras/htaccess_add.tpl index 69025abb..0377bb7c 100644 --- a/templates/Classic/customer/extras/htaccess_add.tpl +++ b/templates/Classic/customer/extras/htaccess_add.tpl @@ -5,44 +5,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {$htaccess_add_form}
 {$lng['extras']['pathoptions_add']}
- {$lng['panel']['path']}:
- {$lng['panel']['pathDescription']} - 		{$pathSelect}
{$lng['extras']['directory_browsing']}:$options_indexes
{$lng['extras']['errordocument404path']}:
{$lng['panel']['descriptionerrordocument']}
{$lng['extras']['errordocument403path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['errordocument500path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['execute_perl']}:$options_cgi
{$title} {$title}

diff --git a/templates/Classic/customer/extras/htaccess_edit.tpl b/templates/Classic/customer/extras/htaccess_edit.tpl index 1579e35a..c14936d7 100644 --- a/templates/Classic/customer/extras/htaccess_edit.tpl +++ b/templates/Classic/customer/extras/htaccess_edit.tpl @@ -6,41 +6,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {$htaccess_edit_form}
 {$lng['extras']['pathoptions_edit']}
{$lng['panel']['path']}:{$result['path']}
{$lng['extras']['directory_browsing']}:$options_indexes
{$lng['extras']['errordocument404path']}:
{$lng['panel']['descriptionerrordocument']}
{$lng['extras']['errordocument403path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['errordocument500path']}:
{$lng['panel']['descriptionerrordocument']} -
{$lng['panel']['not_supported']}lighttpd
 -
{$lng['extras']['execute_perl']}:$options_cgi
{$title} {$title}

diff --git a/templates/Classic/customer/extras/htpasswds_add.tpl b/templates/Classic/customer/extras/htpasswds_add.tpl index 60c9eae7..cd75df0e 100644 --- a/templates/Classic/customer/extras/htpasswds_add.tpl +++ b/templates/Classic/customer/extras/htpasswds_add.tpl @@ -5,30 +5,9 @@ $header - - - - - - - - - - - - - - - - - - - - + + {$htpasswd_add_form}
 {$lng['extras']['directoryprotection_add']}
- {$lng['panel']['path']}:
- {$lng['panel']['pathDescription']} - 		{$pathSelect}
{$lng['login']['username']}:
{$lng['login']['password']}:
{$lng['extras']['htpasswdauthname']}:
{$title} {$title}

diff --git a/templates/Classic/customer/extras/htpasswds_edit.tpl b/templates/Classic/customer/extras/htpasswds_edit.tpl index 0dd6af31..290d2331 100644 --- a/templates/Classic/customer/extras/htpasswds_edit.tpl +++ b/templates/Classic/customer/extras/htpasswds_edit.tpl @@ -6,27 +6,9 @@ $header - - - - - - - - - - - - - - - - - - - - + + {$htpasswd_edit_form}
 {$lng['extras']['directoryprotection_edit']}
{$lng['panel']['path']}:{$result['path']}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['password']}:
{$lng['extras']['htpasswdauthname']}:
{$title} {$title}

From ed4acb01185e42f2d6b016b29c197c3229a9694b Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 18:37:11 +0100 Subject: [PATCH 21/39] Fixing forms in customer -> mysql classic template Signed-off-by: Florian Aders (EleRas) --- .../Classic/customer/mysql/mysqls_add.tpl | 26 +++---------------- .../Classic/customer/mysql/mysqls_edit.tpl | 24 ++--------------- 2 files changed, 5 insertions(+), 45 deletions(-) diff --git a/templates/Classic/customer/mysql/mysqls_add.tpl b/templates/Classic/customer/mysql/mysqls_add.tpl index 6e7134e1..6fb61ce6 100644 --- a/templates/Classic/customer/mysql/mysqls_add.tpl +++ b/templates/Classic/customer/mysql/mysqls_add.tpl @@ -5,31 +5,11 @@ $header - - - - - - - - - - - - - - - - - - - - - - + + {$mysql_add_form}
 {$lng['mysql']['database_create']}
{$lng['mysql']['databasedescription']}:
{$lng['mysql']['mysql_server']}:
{$lng['login']['password']}:
{$lng['customer']['sendinfomail']}:{$sendinfomail}
 {$title}


-$footer \ No newline at end of file +$footer diff --git a/templates/Classic/customer/mysql/mysqls_edit.tpl b/templates/Classic/customer/mysql/mysqls_edit.tpl index 361be8a6..bdd27005 100644 --- a/templates/Classic/customer/mysql/mysqls_edit.tpl +++ b/templates/Classic/customer/mysql/mysqls_edit.tpl @@ -6,29 +6,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - + + {$mysql_edit_form}
 {$lng['mysql']['database_edit']}
{$lng['mysql']['databasename']}:{$result['databasename']}
{$lng['mysql']['databasedescription']}:
{$lng['mysql']['mysql_server']}:{$sql_root[$result['dbserver']]['caption']}
{$lng['changepassword']['new_password_ifnotempty']}:
 {$title}

From 382cf45e081f992bb0c45deb9047c1926b47f6fb Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 18:54:44 +0100 Subject: [PATCH 22/39] Changing customer -> ticket to new formfield - stuff Signed-off-by: Florian Aders (EleRas) --- customer_tickets.php | 13 +++ .../customer/ticket/formfield.ticket_add.php | 50 ++++++++++ .../ticket/formfield.ticket_reply.php | 51 ++++++++++ .../Classic/customer/ticket/tickets_new.tpl | 26 +----- .../Classic/customer/ticket/tickets_reply.tpl | 26 +----- .../Froxlor/customer/ticket/tickets_new.tpl | 64 ++++++------- .../Froxlor/customer/ticket/tickets_reply.tpl | 92 +++++++++---------- 7 files changed, 192 insertions(+), 130 deletions(-) create mode 100644 lib/formfields/customer/ticket/formfield.ticket_add.php create mode 100644 lib/formfields/customer/ticket/formfield.ticket_reply.php diff --git a/customer_tickets.php b/customer_tickets.php index ad90d428..9e7f844a 100644 --- a/customer_tickets.php +++ b/customer_tickets.php @@ -247,6 +247,13 @@ elseif($page == 'tickets') } $ticketsopen = (int)$opentickets['count']; + + $ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_add.php'; + $ticket_add_form = htmlform::genHTMLForm($ticket_add_data); + + $title = $ticket_add_data['ticket_add']['title']; + $image = $ticket_add_data['ticket_add']['image']; + eval("echo \"" . getTemplate("ticket/tickets_new") . "\";"); } } @@ -360,6 +367,12 @@ elseif($page == 'tickets') // don't forget the main-ticket! + $ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_reply.php'; + $ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data); + + $title = $ticket_reply_data['ticket_reply']['title']; + $image = $ticket_reply_data['ticket_reply']['image']; + eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";"); } } diff --git a/lib/formfields/customer/ticket/formfield.ticket_add.php b/lib/formfields/customer/ticket/formfield.ticket_add.php new file mode 100644 index 00000000..d88b69f5 --- /dev/null +++ b/lib/formfields/customer/ticket/formfield.ticket_add.php @@ -0,0 +1,50 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'ticket_add' => array( + 'title' => $lng['ticket']['ticket_new'], + 'image' => 'icons/ticket_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ticket']['ticket_new'], + 'image' => 'icons/ticket_add.png', + 'fields' => array( + 'subject' => array( + 'label' => $lng['ticket']['subject'], + 'type' => 'text', + ), + 'priority' => array( + 'label' => $lng['ticket']['priority'], + 'type' => 'select', + 'select_var' => $priorities, + ), + 'categories' => array( + 'label' => $lng['ticket']['category'], + 'type' => 'select', + 'select_var' => $categories, + ), + 'message' => array( + 'label' => $lng['ticket']['message'], + 'type' => 'textarea', + 'rows' => 12, + 'cols' => 60, + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/ticket/formfield.ticket_reply.php b/lib/formfields/customer/ticket/formfield.ticket_reply.php new file mode 100644 index 00000000..698e55d6 --- /dev/null +++ b/lib/formfields/customer/ticket/formfield.ticket_reply.php @@ -0,0 +1,51 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'ticket_reply' => array( + 'title' => $lng['ticket']['ticket_reply'], + 'image' => 'icons/ticket_reply.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ticket']['ticket_reply'], + 'image' => 'icons/ticket_reply.png', + 'fields' => array( + 'subject' => array( + 'label' => $lng['ticket']['subject'], + 'type' => 'text', + 'value' => "Re: $subject", + ), + 'priority' => array( + 'label' => $lng['ticket']['priority'], + 'type' => 'select', + 'select_var' => $priorities, + ), + 'category' => array( + 'label' => $lng['ticket']['category'], + 'type' => 'label', + 'value' => $row['name'], + ), + 'message' => array( + 'label' => $lng['ticket']['message'], + 'type' => 'textarea', + 'rows' => 12, + 'cols' => 60, + ), + ) + ) + ) + ) +); diff --git a/templates/Classic/customer/ticket/tickets_new.tpl b/templates/Classic/customer/ticket/tickets_new.tpl index 21d13b3d..283738de 100644 --- a/templates/Classic/customer/ticket/tickets_new.tpl +++ b/templates/Classic/customer/ticket/tickets_new.tpl @@ -5,31 +5,11 @@ $header - - - - - - - - - - - - - - - - - - - - - - + + {$ticket_add_form}
 {$lng['ticket']['ticket_new']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:
{$lng['ticket']['message']}:
 {$title}


-$footer \ No newline at end of file +$footer diff --git a/templates/Classic/customer/ticket/tickets_reply.tpl b/templates/Classic/customer/ticket/tickets_reply.tpl index fe2183aa..ab0e613d 100644 --- a/templates/Classic/customer/ticket/tickets_reply.tpl +++ b/templates/Classic/customer/ticket/tickets_reply.tpl @@ -10,29 +10,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - + + {$ticket_reply_form}
 {$lng['ticket']['ticket_reply']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:{$row['name']}
{$lng['ticket']['message']}:
 {$title}
@@ -48,4 +28,4 @@ $header

-$footer \ No newline at end of file +$footer diff --git a/templates/Froxlor/customer/ticket/tickets_new.tpl b/templates/Froxlor/customer/ticket/tickets_new.tpl index 83be09b3..495a5015 100644 --- a/templates/Froxlor/customer/ticket/tickets_new.tpl +++ b/templates/Froxlor/customer/ticket/tickets_new.tpl @@ -1,35 +1,31 @@ $header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['ticket']['ticket_new']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:
{$lng['ticket']['message']}:
-
-
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$ticket_add_form} +
+ +

+ + + + +

+
+
+ +
+
+$footer diff --git a/templates/Froxlor/customer/ticket/tickets_reply.tpl b/templates/Froxlor/customer/ticket/tickets_reply.tpl index 7ccdf2c3..bce91972 100644 --- a/templates/Froxlor/customer/ticket/tickets_reply.tpl +++ b/templates/Froxlor/customer/ticket/tickets_reply.tpl @@ -1,51 +1,43 @@ $header -
- - - - - - $ticket_replies - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['ticket']['ticket_reply']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:{$row['name']}
{$lng['ticket']['message']}:
- - - - - - - - - -
 {$lng['ticket']['ticket_reopen']}
{$lng['ticket']['ticket_reopen']}
- -
-
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ + +
+ $ticket_replies +
+ + +
+ +
+
+ Froxlor - {$title} + + + + {$ticket_reply_form} +
+ + + {$lng['ticket']['ticket_reopen']} + + +

+ + + + + +

+
+
+ +
+
+$footer From 014e350a9e719abad814c8d2ef6d494ebd5108b3 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 19:54:31 +0100 Subject: [PATCH 23/39] It's 2011 :P Signed-off-by: Florian Aders (EleRas) --- templates/Classic/footer.tpl | 2 +- templates/Froxlor/footer.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Classic/footer.tpl b/templates/Classic/footer.tpl index d98325a4..b16bbe35 100644 --- a/templates/Classic/footer.tpl +++ b/templates/Classic/footer.tpl @@ -8,7 +8,7 @@ {$version}{$branding} - © 2009-2010 by the Froxlor Team + © 2009-2011 by the Froxlor Team
Theme based on work by: Luca Piona and Luca Longinotti
{$lng['panel']['translator']}: {$lng['translator']} diff --git a/templates/Froxlor/footer.tpl b/templates/Froxlor/footer.tpl index 60ffa9d5..90453d0a 100644 --- a/templates/Froxlor/footer.tpl +++ b/templates/Froxlor/footer.tpl @@ -4,7 +4,7 @@ {$version}{$branding} - © 2009-2010 by the Froxlor Team + © 2009-2011 by the Froxlor Team
{$lng['panel']['translator']}: {$lng['translator']} From 0b38e192d4b9208ff3272029ea4d19557755b06e Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 12 Feb 2011 20:03:08 +0100 Subject: [PATCH 24/39] Now with the auto-date-setter Signed-off-by: Florian Aders (EleRas) --- templates/Classic/footer.tpl | 2 +- templates/Froxlor/footer.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Classic/footer.tpl b/templates/Classic/footer.tpl index b16bbe35..c5a9491c 100644 --- a/templates/Classic/footer.tpl +++ b/templates/Classic/footer.tpl @@ -8,7 +8,7 @@ {$version}{$branding} - © 2009-2011 by the Froxlor Team + © 2009-{$current_year} by the Froxlor Team
Theme based on work by: Luca Piona and Luca Longinotti
{$lng['panel']['translator']}: {$lng['translator']} diff --git a/templates/Froxlor/footer.tpl b/templates/Froxlor/footer.tpl index 90453d0a..634ea4c7 100644 --- a/templates/Froxlor/footer.tpl +++ b/templates/Froxlor/footer.tpl @@ -4,7 +4,7 @@ {$version}{$branding} - © 2009-2011 by the Froxlor Team + © 2009-{$current_year} by the Froxlor Team
{$lng['panel']['translator']}: {$lng['translator']} From 59f8002a5d822711384406a3d7d8ec3bd0f16af1 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 13 Feb 2011 12:30:56 +0100 Subject: [PATCH 25/39] fix undefined index in templates_edit template --- templates/admin/templates/templates_edit.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/templates/templates_edit.tpl b/templates/admin/templates/templates_edit.tpl index 4fbdc8bb..4b28a05f 100644 --- a/templates/admin/templates/templates_edit.tpl +++ b/templates/admin/templates/templates_edit.tpl @@ -98,7 +98,7 @@ $header {$lng['admin']['templates']['PASSWORD']} - {$lng['admin']['templates']['trafficninetypercent']} + {$lng['admin']['templates']['trafficmaxpercent']} {TRAFFIC}: @@ -181,4 +181,4 @@ $header

-$footer \ No newline at end of file +$footer From 840d9f59159a79f23e6483fd20c94c6825a5c739 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 13 Feb 2011 12:33:10 +0100 Subject: [PATCH 26/39] fix unmerged templates to use actual $lng-values --- templates/Classic/admin/templates/templates_add_2.tpl | 4 ++-- templates/Classic/admin/templates/templates_edit.tpl | 4 ++-- templates/Froxlor/admin/templates/templates_add_2.tpl | 2 +- templates/Froxlor/admin/templates/templates_edit.tpl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/Classic/admin/templates/templates_add_2.tpl b/templates/Classic/admin/templates/templates_add_2.tpl index da724f8a..6ba15a5a 100644 --- a/templates/Classic/admin/templates/templates_add_2.tpl +++ b/templates/Classic/admin/templates/templates_add_2.tpl @@ -96,7 +96,7 @@ $header {$lng['admin']['templates']['PASSWORD']} - {$lng['admin']['templates']['trafficninetypercent']} + {$lng['admin']['templates']['trafficmaxpercent']} {TRAFFIC}: @@ -179,4 +179,4 @@ $header

-$footer \ No newline at end of file +$footer diff --git a/templates/Classic/admin/templates/templates_edit.tpl b/templates/Classic/admin/templates/templates_edit.tpl index a805e6db..6dd1d4ba 100644 --- a/templates/Classic/admin/templates/templates_edit.tpl +++ b/templates/Classic/admin/templates/templates_edit.tpl @@ -98,7 +98,7 @@ $header {$lng['admin']['templates']['PASSWORD']} - {$lng['admin']['templates']['trafficninetypercent']} + {$lng['admin']['templates']['trafficmaxpercent']} {TRAFFIC}: @@ -181,4 +181,4 @@ $header

-$footer \ No newline at end of file +$footer diff --git a/templates/Froxlor/admin/templates/templates_add_2.tpl b/templates/Froxlor/admin/templates/templates_add_2.tpl index 3ee8b746..2b7fb739 100644 --- a/templates/Froxlor/admin/templates/templates_add_2.tpl +++ b/templates/Froxlor/admin/templates/templates_add_2.tpl @@ -120,7 +120,7 @@ $header - {$lng['admin']['templates']['trafficninetypercent']} + {$lng['admin']['templates']['trafficmaxpercent']} diff --git a/templates/Froxlor/admin/templates/templates_edit.tpl b/templates/Froxlor/admin/templates/templates_edit.tpl index 77b3faab..fff660ae 100644 --- a/templates/Froxlor/admin/templates/templates_edit.tpl +++ b/templates/Froxlor/admin/templates/templates_edit.tpl @@ -121,7 +121,7 @@ $header - {$lng['admin']['templates']['trafficninetypercent']} + {$lng['admin']['templates']['trafficmaxpercent']} From a0406c9749a0136fd8e0915a8ae9b45137be189f Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 12:41:50 +0100 Subject: [PATCH 27/39] Fixed naming of icon in add domain Signed-off-by: Florian Aders (EleRas) --- lib/formfields/customer/domains/formfield.domains_add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index ad88b3d3..bf0dbc7e 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -18,11 +18,11 @@ return array( 'domain_add' => array( 'title' => $lng['domains']['subdomain_add'], - 'image' => 'icons/domain_add.png', + 'image' => 'icons/add_domain.png', 'sections' => array( 'section_a' => array( 'title' => $lng['domains']['subdomain_add'], - 'image' => 'icons/domain_add.png', + 'image' => 'icons/add_domain.png', 'fields' => array( 'subdomain' => array( 'label' => $lng['domains']['domainname'], From f85d983c847aecc2e25837957d9be4303856d561 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 12:45:19 +0100 Subject: [PATCH 28/39] Fixed naming of icon in FTP edit Signed-off-by: Florian Aders (EleRas) --- lib/formfields/customer/ftp/formfield.ftp_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/formfields/customer/ftp/formfield.ftp_edit.php b/lib/formfields/customer/ftp/formfield.ftp_edit.php index c7054516..42199ff9 100644 --- a/lib/formfields/customer/ftp/formfield.ftp_edit.php +++ b/lib/formfields/customer/ftp/formfield.ftp_edit.php @@ -17,11 +17,11 @@ return array( 'ftp_edit' => array( 'title' => $lng['ftp']['account_edit'], - 'image' => 'icons/edit_user.png', + 'image' => 'icons/user_edit.png', 'sections' => array( 'section_a' => array( 'title' => $lng['ftp']['account_edit'], - 'image' => 'icons/edit_user.png', + 'image' => 'icons/user_edit.png', 'fields' => array( 'username' => array( 'label' => $lng['login']['username'], From 107c84fdbca4f7e37ba100a1b4bae7373d3ec3b2 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 12:48:21 +0100 Subject: [PATCH 29/39] Fixed typo in customer -> add ticket form Signed-off-by: Florian Aders (EleRas) --- lib/formfields/customer/ticket/formfield.ticket_add.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/formfields/customer/ticket/formfield.ticket_add.php b/lib/formfields/customer/ticket/formfield.ticket_add.php index d88b69f5..be86b2da 100644 --- a/lib/formfields/customer/ticket/formfield.ticket_add.php +++ b/lib/formfields/customer/ticket/formfield.ticket_add.php @@ -32,7 +32,7 @@ return array( 'type' => 'select', 'select_var' => $priorities, ), - 'categories' => array( + 'category' => array( 'label' => $lng['ticket']['category'], 'type' => 'select', 'select_var' => $categories, From 61d5d4a1509669a375a1ede1e4d3fc2e38e8c282 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 12:52:12 +0100 Subject: [PATCH 30/39] Fixed naming of icon in MySQL edit Signed-off-by: Florian Aders (EleRas) --- lib/formfields/customer/mysql/formfield.mysql_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php index 617a1c03..bd812fae 100644 --- a/lib/formfields/customer/mysql/formfield.mysql_edit.php +++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php @@ -17,11 +17,11 @@ return array( 'mysql_edit' => array( 'title' => $lng['mysql']['database_edit'], - 'image' => 'icons/edit_mysql.png', + 'image' => 'icons/mysql_edit.png', 'sections' => array( 'section_a' => array( 'title' => $lng['mysql']['database_edit'], - 'image' => 'icons/edit_mysql.png', + 'image' => 'icons/mysql_edit.png', 'fields' => array( 'databasename' => array( 'label' => $lng['mysql']['databasename'], From cc1b45ac6e99717d2bf47935d8a68ca681a9ee95 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 13:10:11 +0100 Subject: [PATCH 31/39] Readded files which were deleted during broken merge 7b01cb47de0093cd61988e747cd6dd4c251f459e Signed-off-by: Florian Aders (EleRas) --- .../Froxlor/customer/email/emails_add.tpl | 39 +++++++++++++++++++ .../Froxlor/customer/email/emails_edit.tpl | 31 +++++++++++++++ .../Froxlor/customer/email/forwarder_add.tpl | 31 +++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 templates/Froxlor/customer/email/emails_add.tpl create mode 100644 templates/Froxlor/customer/email/emails_edit.tpl create mode 100644 templates/Froxlor/customer/email/forwarder_add.tpl diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl new file mode 100644 index 00000000..2ccddbaf --- /dev/null +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -0,0 +1,39 @@ +$header +
+ +
+
+
{$lng['admin']['warning']}
+

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

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$email_add_form} +
+ +

+ + + + +

+
+
+
+
+$footer diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl new file mode 100644 index 00000000..81f78645 --- /dev/null +++ b/templates/Froxlor/customer/email/emails_edit.tpl @@ -0,0 +1,31 @@ +$header +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$email_edit_form} +
+ +

+ + + + +

+
+
+ +
+
+$footer diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl new file mode 100644 index 00000000..90cb5861 --- /dev/null +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -0,0 +1,31 @@ +$header +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$forwarder_add_form} +
+ +

+ + + + +

+
+
+ +
+
+$footer From 88d0fe5752c54195e49e7dedf02d6f3618ab4b44 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 18:01:41 +0100 Subject: [PATCH 32/39] Fixing customer ticket reply - view Signed-off-by: Florian Aders (EleRas) --- .../Froxlor/customer/ticket/tickets_reply.tpl | 4 +-- .../customer/ticket/tickets_tickets_list.tpl | 26 +++++++++++-------- .../customer/ticket/tickets_tickets_main.tpl | 26 +++++++++++-------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/templates/Froxlor/customer/ticket/tickets_reply.tpl b/templates/Froxlor/customer/ticket/tickets_reply.tpl index bce91972..1b1dc4de 100644 --- a/templates/Froxlor/customer/ticket/tickets_reply.tpl +++ b/templates/Froxlor/customer/ticket/tickets_reply.tpl @@ -8,9 +8,7 @@ $header -
- $ticket_replies -
+ $ticket_replies
diff --git a/templates/Froxlor/customer/ticket/tickets_tickets_list.tpl b/templates/Froxlor/customer/ticket/tickets_tickets_list.tpl index 31dec034..f8269f3f 100644 --- a/templates/Froxlor/customer/ticket/tickets_tickets_list.tpl +++ b/templates/Froxlor/customer/ticket/tickets_tickets_list.tpl @@ -1,11 +1,15 @@ - - - - - - - - - - -
  {$lastchange} von {$by}
{$subject}
{$message}
\ No newline at end of file +
+ + + + + + + + + + +
{$lastchange} {$lng['ticket']['by']} {$by}
{$subject}
{$message}
+

+
+
diff --git a/templates/Froxlor/customer/ticket/tickets_tickets_main.tpl b/templates/Froxlor/customer/ticket/tickets_tickets_main.tpl index 4eb04acf..2f743bb3 100644 --- a/templates/Froxlor/customer/ticket/tickets_tickets_main.tpl +++ b/templates/Froxlor/customer/ticket/tickets_tickets_main.tpl @@ -1,11 +1,15 @@ - - - - - - - - - - -
  {$dt} von {$by} ({$status})
{$subject}
{$message}
\ No newline at end of file +
+ + + + + + + + + + +
{$dt} {$lng['ticket']['by']} {$by} ({$status})
{$subject}
{$message}
+
+
+
From 4400125c7eef6b1f81cff8352b1077b2fe951c87 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 18:36:56 +0100 Subject: [PATCH 33/39] Fixed icon naming Signed-off-by: Florian Aders (EleRas) --- ...{add_autoresponder.png => autoresponder_add.png} | Bin .../icons/{add_domain.png => domain_add.png} | Bin .../icons/{edit_group.png => group_edit.png} | Bin .../icons/{add_htaccess.png => htaccess_add.png} | Bin .../icons/{add_htpasswd.png => htpasswd_add.png} | Bin .../icons/{edit_htpasswd.png => htpasswd_edit.png} | Bin .../Froxlor/icons/{add_mysql.png => mysql_add.png} | Bin .../icons/{answer_ticket.png => ticket_answer.png} | Bin ...archive_search.png => ticket_archive_search.png} | Bin .../icons/{close_ticket.png => ticket_close.png} | Bin .../icons/{reopen_ticket.png => ticket_reopen.png} | Bin .../icons/{show_ticket.png => ticket_show.png} | Bin images/Froxlor/icons/{add_user.png => user_add.png} | Bin lib/formfields/admin/admin/formfield.admin_add.php | 8 ++++---- lib/formfields/admin/admin/formfield.admin_edit.php | 2 +- .../admin/customer/formfield.customer_add.php | 8 ++++---- .../admin/domains/formfield.domains_add.php | 12 ++++++------ .../customer/domains/formfield.domains_add.php | 4 ++-- .../email/formfield.emails_addforwarder.php | 4 ++-- .../customer/extras/formfield.htaccess_add.php | 4 ++-- .../customer/extras/formfield.htaccess_edit.php | 4 ++-- .../customer/extras/formfield.htpasswd_edit.php | 4 ++-- lib/formfields/customer/ftp/formfield.ftp_add.php | 4 ++-- .../customer/mysql/formfield.mysql_add.php | 4 ++-- templates/Froxlor/admin/admins/admins.tpl | 6 +++--- templates/Froxlor/admin/customers/customers.tpl | 6 +++--- templates/Froxlor/admin/domains/domains.tpl | 4 ++-- templates/Froxlor/admin/ticket/archive.tpl | 2 +- templates/Froxlor/admin/ticket/archived_tickets.tpl | 2 +- templates/Froxlor/admin/ticket/tickets_tickets.tpl | 8 ++++---- templates/Froxlor/customer/domains/domainlist.tpl | 4 ++-- templates/Froxlor/customer/email/autoresponder.tpl | 4 ++-- templates/Froxlor/customer/extras/htaccess.tpl | 4 ++-- templates/Froxlor/customer/extras/htpasswds.tpl | 4 ++-- templates/Froxlor/customer/ftp/accounts.tpl | 6 +++--- templates/Froxlor/customer/mysql/mysqls.tpl | 4 ++-- .../Froxlor/customer/ticket/tickets_tickets.tpl | 8 ++++---- 37 files changed, 60 insertions(+), 60 deletions(-) rename images/Froxlor/icons/{add_autoresponder.png => autoresponder_add.png} (100%) rename images/Froxlor/icons/{add_domain.png => domain_add.png} (100%) rename images/Froxlor/icons/{edit_group.png => group_edit.png} (100%) rename images/Froxlor/icons/{add_htaccess.png => htaccess_add.png} (100%) rename images/Froxlor/icons/{add_htpasswd.png => htpasswd_add.png} (100%) rename images/Froxlor/icons/{edit_htpasswd.png => htpasswd_edit.png} (100%) rename images/Froxlor/icons/{add_mysql.png => mysql_add.png} (100%) rename images/Froxlor/icons/{answer_ticket.png => ticket_answer.png} (100%) rename images/Froxlor/icons/{archive_search.png => ticket_archive_search.png} (100%) rename images/Froxlor/icons/{close_ticket.png => ticket_close.png} (100%) rename images/Froxlor/icons/{reopen_ticket.png => ticket_reopen.png} (100%) rename images/Froxlor/icons/{show_ticket.png => ticket_show.png} (100%) rename images/Froxlor/icons/{add_user.png => user_add.png} (100%) diff --git a/images/Froxlor/icons/add_autoresponder.png b/images/Froxlor/icons/autoresponder_add.png similarity index 100% rename from images/Froxlor/icons/add_autoresponder.png rename to images/Froxlor/icons/autoresponder_add.png diff --git a/images/Froxlor/icons/add_domain.png b/images/Froxlor/icons/domain_add.png similarity index 100% rename from images/Froxlor/icons/add_domain.png rename to images/Froxlor/icons/domain_add.png diff --git a/images/Froxlor/icons/edit_group.png b/images/Froxlor/icons/group_edit.png similarity index 100% rename from images/Froxlor/icons/edit_group.png rename to images/Froxlor/icons/group_edit.png diff --git a/images/Froxlor/icons/add_htaccess.png b/images/Froxlor/icons/htaccess_add.png similarity index 100% rename from images/Froxlor/icons/add_htaccess.png rename to images/Froxlor/icons/htaccess_add.png diff --git a/images/Froxlor/icons/add_htpasswd.png b/images/Froxlor/icons/htpasswd_add.png similarity index 100% rename from images/Froxlor/icons/add_htpasswd.png rename to images/Froxlor/icons/htpasswd_add.png diff --git a/images/Froxlor/icons/edit_htpasswd.png b/images/Froxlor/icons/htpasswd_edit.png similarity index 100% rename from images/Froxlor/icons/edit_htpasswd.png rename to images/Froxlor/icons/htpasswd_edit.png diff --git a/images/Froxlor/icons/add_mysql.png b/images/Froxlor/icons/mysql_add.png similarity index 100% rename from images/Froxlor/icons/add_mysql.png rename to images/Froxlor/icons/mysql_add.png diff --git a/images/Froxlor/icons/answer_ticket.png b/images/Froxlor/icons/ticket_answer.png similarity index 100% rename from images/Froxlor/icons/answer_ticket.png rename to images/Froxlor/icons/ticket_answer.png diff --git a/images/Froxlor/icons/archive_search.png b/images/Froxlor/icons/ticket_archive_search.png similarity index 100% rename from images/Froxlor/icons/archive_search.png rename to images/Froxlor/icons/ticket_archive_search.png diff --git a/images/Froxlor/icons/close_ticket.png b/images/Froxlor/icons/ticket_close.png similarity index 100% rename from images/Froxlor/icons/close_ticket.png rename to images/Froxlor/icons/ticket_close.png diff --git a/images/Froxlor/icons/reopen_ticket.png b/images/Froxlor/icons/ticket_reopen.png similarity index 100% rename from images/Froxlor/icons/reopen_ticket.png rename to images/Froxlor/icons/ticket_reopen.png diff --git a/images/Froxlor/icons/show_ticket.png b/images/Froxlor/icons/ticket_show.png similarity index 100% rename from images/Froxlor/icons/show_ticket.png rename to images/Froxlor/icons/ticket_show.png diff --git a/images/Froxlor/icons/add_user.png b/images/Froxlor/icons/user_add.png similarity index 100% rename from images/Froxlor/icons/add_user.png rename to images/Froxlor/icons/user_add.png diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php index 70ca9851..a35b25c4 100644 --- a/lib/formfields/admin/admin/formfield.admin_add.php +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -18,11 +18,11 @@ return array( 'admin_add' => array( 'title' => $lng['admin']['admin_add'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['admin']['accountdata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'loginname' => array( 'label' => $lng['login']['username'], @@ -43,7 +43,7 @@ return array( ), 'section_b' => array( 'title' => $lng['admin']['contactdata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'name' => array( 'label' => $lng['customer']['name'], @@ -59,7 +59,7 @@ return array( ), 'section_c' => array( 'title' => $lng['admin']['servicedata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'ipaddress' => array( 'label' => $lng['serversettings']['ipaddress']['title'], diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php index 012077d1..e23598b7 100644 --- a/lib/formfields/admin/admin/formfield.admin_edit.php +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -68,7 +68,7 @@ return array( ), 'section_c' => array( 'title' => $lng['admin']['servicedata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'visible' => ($result['adminid'] != $userinfo['userid'] ? true : false), 'fields' => array( 'ipaddress' => array( diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php index 5b326fa5..6c7e30bc 100644 --- a/lib/formfields/admin/customer/formfield.customer_add.php +++ b/lib/formfields/admin/customer/formfield.customer_add.php @@ -18,11 +18,11 @@ return array( 'customer_add' => array( 'title' => $lng['admin']['customer_add'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['admin']['accountdata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'new_loginname' => array( 'label' => $lng['login']['username'], @@ -56,7 +56,7 @@ return array( ), 'section_b' => array( 'title' => $lng['admin']['contactdata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'name' => array( 'label' => $lng['customer']['name'], @@ -106,7 +106,7 @@ return array( ), 'section_c' => array( 'title' => $lng['admin']['servicedata'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'diskspace' => array( 'label' => $lng['customer']['diskspace'], diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index 22ce7863..93dddf35 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -18,11 +18,11 @@ return array( 'domain_add' => array( 'title' => $lng['admin']['domain_add'], - 'image' => 'icons/add_domain.png', + 'image' => 'icons/domain_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['domains']['domainsettings'], - 'image' => 'icons/add_domain.png', + 'image' => 'icons/domain_add.png', 'fields' => array( 'domain' => array( 'label' => 'Domain', @@ -71,7 +71,7 @@ return array( ), 'section_b' => array( 'title' => $lng['admin']['webserversettings'], - 'image' => 'icons/add_domain.png', + 'image' => 'icons/domain_add.png', 'fields' => array( 'documentroot' => array( 'visible' => ($userinfo['change_serversettings'] == '1' ? true : false), @@ -131,7 +131,7 @@ return array( ), 'section_c' => array( 'title' => $lng['admin']['phpserversettings'], - 'image' => 'icons/add_domain.png', + 'image' => 'icons/domain_add.png', 'visible' => (($userinfo['change_serversettings'] == '1' || $userinfo['caneditphpsettings'] == '1') ? true : false), 'fields' => array( 'openbasedir' => array( @@ -164,7 +164,7 @@ return array( ), 'section_d' => array( 'title' => $lng['admin']['nameserversettings'], - 'image' => 'icons/add_domain.png', + 'image' => 'icons/domain_add.png', 'visible' => ($userinfo['change_serversettings'] == '1' ? true : false), 'fields' => array( 'isbinddomain' => array( @@ -181,7 +181,7 @@ return array( ), 'section_e' => array( 'title' => $lng['admin']['mailserversettings'], - 'image' => 'icons/add_domain.png', + 'image' => 'icons/domain_add.png', 'fields' => array( 'isemaildomain' => array( 'label' => $lng['admin']['emaildomain'], diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index bf0dbc7e..ad88b3d3 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -18,11 +18,11 @@ 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( 'subdomain' => array( 'label' => $lng['domains']['domainname'], diff --git a/lib/formfields/customer/email/formfield.emails_addforwarder.php b/lib/formfields/customer/email/formfield.emails_addforwarder.php index 9532bd68..e247003f 100644 --- a/lib/formfields/customer/email/formfield.emails_addforwarder.php +++ b/lib/formfields/customer/email/formfield.emails_addforwarder.php @@ -18,11 +18,11 @@ return array( 'emails_addforwarder' => array( 'title' => $lng['emails']['forwarder_add'], - 'image' => 'icons/add_autoresponder.png', + 'image' => 'icons/autoresponder_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['emails']['forwarder_add'], - 'image' => 'icons/add_autoresponder.png', + 'image' => 'icons/autoresponder_add.png', 'fields' => array( 'email_full' => array( 'label' => $lng['emails']['from'], diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php index 81a58a61..57f489cb 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_add.php +++ b/lib/formfields/customer/extras/formfield.htaccess_add.php @@ -18,11 +18,11 @@ return array( 'htaccess_add' => array( 'title' => $lng['extras']['pathoptions_add'], - 'image' => 'icons/add_htpasswd.png', + 'image' => 'icons/htpasswd_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['pathoptions_add'], - 'image' => 'icons/add_htpasswd.png', + 'image' => 'icons/htpasswd_add.png', 'fields' => array( 'path' => array( 'label' => $lng['panel']['path'], diff --git a/lib/formfields/customer/extras/formfield.htaccess_edit.php b/lib/formfields/customer/extras/formfield.htaccess_edit.php index 8a4cf558..216a6114 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_edit.php +++ b/lib/formfields/customer/extras/formfield.htaccess_edit.php @@ -18,11 +18,11 @@ return array( 'htaccess_edit' => array( 'title' => $lng['extras']['pathoptions_edit'], - 'image' => 'icons/edit_htpasswd.png', + 'image' => 'icons/htpasswd_edit.png', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['pathoptions_edit'], - 'image' => 'icons/edit_htpasswd.png', + 'image' => 'icons/htpasswd_edit.png', 'fields' => array( 'path' => array( 'label' => $lng['panel']['path'], diff --git a/lib/formfields/customer/extras/formfield.htpasswd_edit.php b/lib/formfields/customer/extras/formfield.htpasswd_edit.php index 2be420f3..a21b085a 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_edit.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_edit.php @@ -18,11 +18,11 @@ return array( 'htpasswd_edit' => array( 'title' => $lng['extras']['directoryprotection_add'], - 'image' => 'icons/add_htpasswd.png', + 'image' => 'icons/htpasswd_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['directoryprotection_add'], - 'image' => 'icons/add_htpasswd.png', + 'image' => 'icons/htpasswd_add.png', 'fields' => array( 'path' => array( 'label' => $lng['panel']['path'], diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php index a020cef3..19475ecc 100644 --- a/lib/formfields/customer/ftp/formfield.ftp_add.php +++ b/lib/formfields/customer/ftp/formfield.ftp_add.php @@ -17,11 +17,11 @@ return array( 'ftp_add' => array( 'title' => $lng['ftp']['account_add'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['ftp']['account_add'], - 'image' => 'icons/add_user.png', + 'image' => 'icons/user_add.png', 'fields' => array( 'ftp_username' => array( 'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php index efa46b91..adb166fb 100644 --- a/lib/formfields/customer/mysql/formfield.mysql_add.php +++ b/lib/formfields/customer/mysql/formfield.mysql_add.php @@ -17,11 +17,11 @@ return array( 'mysql_add' => array( 'title' => $lng['mysql']['database_create'], - 'image' => 'icons/add_mysql.png', + 'image' => 'icons/mysql_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['mysql']['database_create'], - 'image' => 'icons/add_mysql.png', + 'image' => 'icons/mysql_add.png', 'fields' => array( 'description' => array( 'label' => $lng['mysql']['databasedescription'], diff --git a/templates/Froxlor/admin/admins/admins.tpl b/templates/Froxlor/admin/admins/admins.tpl index 68cf48f3..20d9edab 100644 --- a/templates/Froxlor/admin/admins/admins.tpl +++ b/templates/Froxlor/admin/admins/admins.tpl @@ -2,7 +2,7 @@ $header

-   +   {$lng['admin']['admins']} ({$admincount})

@@ -17,7 +17,7 @@ $header
-   +   {$lng['admin']['admin_add']}
@@ -52,7 +52,7 @@ $header
-   +   {$lng['admin']['admin_add']}
diff --git a/templates/Froxlor/admin/customers/customers.tpl b/templates/Froxlor/admin/customers/customers.tpl index f2ded955..9b70d834 100644 --- a/templates/Froxlor/admin/customers/customers.tpl +++ b/templates/Froxlor/admin/customers/customers.tpl @@ -2,7 +2,7 @@ $header

-   +   {$lng['admin']['customers']} ({$customercount})

@@ -17,7 +17,7 @@ $header
-   +   {$lng['admin']['customer_add']}
@@ -54,7 +54,7 @@ $header
-   +   {$lng['admin']['customer_add']}
diff --git a/templates/Froxlor/admin/domains/domains.tpl b/templates/Froxlor/admin/domains/domains.tpl index e55d26b9..2f4370c5 100644 --- a/templates/Froxlor/admin/domains/domains.tpl +++ b/templates/Froxlor/admin/domains/domains.tpl @@ -17,7 +17,7 @@
-   +   {$lng['admin']['domain_add']}
@@ -61,7 +61,7 @@
-   +   {$lng['admin']['domain_add']}
diff --git a/templates/Froxlor/admin/ticket/archive.tpl b/templates/Froxlor/admin/ticket/archive.tpl index a0b24ff8..c1be28c8 100644 --- a/templates/Froxlor/admin/ticket/archive.tpl +++ b/templates/Froxlor/admin/ticket/archive.tpl @@ -32,7 +32,7 @@ $header

-   +   {$lng['ticket']['search']}

diff --git a/templates/Froxlor/admin/ticket/archived_tickets.tpl b/templates/Froxlor/admin/ticket/archived_tickets.tpl index 43b1afad..62ce25d9 100644 --- a/templates/Froxlor/admin/ticket/archived_tickets.tpl +++ b/templates/Froxlor/admin/ticket/archived_tickets.tpl @@ -6,7 +6,7 @@ {$ticket['priority']} - {$lng['ticket']['show']} + {$lng['ticket']['show']} diff --git a/templates/Froxlor/admin/ticket/tickets_tickets.tpl b/templates/Froxlor/admin/ticket/tickets_tickets.tpl index a465fec9..f4527d98 100644 --- a/templates/Froxlor/admin/ticket/tickets_tickets.tpl +++ b/templates/Froxlor/admin/ticket/tickets_tickets.tpl @@ -8,20 +8,20 @@ - {$lng['ticket']['show']} + {$lng['ticket']['show']} - {$lng['ticket']['answer']} + {$lng['ticket']['answer']}   - {$lng['ticket']['close']} + {$lng['ticket']['close']}   - {$lng['ticket']['reopen']} + {$lng['ticket']['reopen']}   diff --git a/templates/Froxlor/customer/domains/domainlist.tpl b/templates/Froxlor/customer/domains/domainlist.tpl index 6dafb306..a5a934ec 100644 --- a/templates/Froxlor/customer/domains/domainlist.tpl +++ b/templates/Froxlor/customer/domains/domainlist.tpl @@ -17,7 +17,7 @@
-   +   {$lng['domains']['subdomain_add']}
@@ -51,7 +51,7 @@
-   +   {$lng['domains']['subdomain_add']}
diff --git a/templates/Froxlor/customer/email/autoresponder.tpl b/templates/Froxlor/customer/email/autoresponder.tpl index 67f42fb7..a9fb3417 100644 --- a/templates/Froxlor/customer/email/autoresponder.tpl +++ b/templates/Froxlor/customer/email/autoresponder.tpl @@ -11,7 +11,7 @@
-   +   {$lng['autoresponder']['autoresponder_add']}
@@ -33,7 +33,7 @@
-   +   {$lng['autoresponder']['autoresponder_add']}
diff --git a/templates/Froxlor/customer/extras/htaccess.tpl b/templates/Froxlor/customer/extras/htaccess.tpl index 86bf55a8..9a1e2a19 100644 --- a/templates/Froxlor/customer/extras/htaccess.tpl +++ b/templates/Froxlor/customer/extras/htaccess.tpl @@ -17,7 +17,7 @@
-   +   {$lng['extras']['pathoptions_add']}
@@ -54,7 +54,7 @@

-   +   {$lng['extras']['pathoptions_add']}
diff --git a/templates/Froxlor/customer/extras/htpasswds.tpl b/templates/Froxlor/customer/extras/htpasswds.tpl index 3aca3a01..477828ff 100644 --- a/templates/Froxlor/customer/extras/htpasswds.tpl +++ b/templates/Froxlor/customer/extras/htpasswds.tpl @@ -17,7 +17,7 @@
-   +   {$lng['extras']['directoryprotection_add']}
@@ -50,7 +50,7 @@
-   +   {$lng['extras']['directoryprotection_add']}
diff --git a/templates/Froxlor/customer/ftp/accounts.tpl b/templates/Froxlor/customer/ftp/accounts.tpl index f54b131b..6e73f9b0 100644 --- a/templates/Froxlor/customer/ftp/accounts.tpl +++ b/templates/Froxlor/customer/ftp/accounts.tpl @@ -2,7 +2,7 @@

-   +   {$lng['menue']['ftp']['accounts']} ({$ftps_count})

@@ -17,7 +17,7 @@
-   +   {$lng['ftp']['account_add']}
@@ -51,7 +51,7 @@
-   +   {$lng['ftp']['account_add']}
diff --git a/templates/Froxlor/customer/mysql/mysqls.tpl b/templates/Froxlor/customer/mysql/mysqls.tpl index 765558e8..54641b9e 100644 --- a/templates/Froxlor/customer/mysql/mysqls.tpl +++ b/templates/Froxlor/customer/mysql/mysqls.tpl @@ -17,7 +17,7 @@
-   +   {$lng['mysql']['database_create']}
@@ -52,7 +52,7 @@
-   +   {$lng['mysql']['database_create']}
diff --git a/templates/Froxlor/customer/ticket/tickets_tickets.tpl b/templates/Froxlor/customer/ticket/tickets_tickets.tpl index 26330d4e..3a0b60fa 100644 --- a/templates/Froxlor/customer/ticket/tickets_tickets.tpl +++ b/templates/Froxlor/customer/ticket/tickets_tickets.tpl @@ -8,20 +8,20 @@ - {$lng['ticket']['show']} + {$lng['ticket']['show']} - {$lng['ticket']['answer']} + {$lng['ticket']['answer']}   - {$lng['ticket']['close']} + {$lng['ticket']['close']}   - {$lng['ticket']['reopen']} + {$lng['ticket']['reopen']} From 7a70257b951fa338a59bed92ef3ac0d80af80278 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 18:40:34 +0100 Subject: [PATCH 34/39] Forgot one file in the last commit Signed-off-by: Florian Aders (EleRas) --- lib/formfields/customer/extras/formfield.htpasswd_add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/formfields/customer/extras/formfield.htpasswd_add.php b/lib/formfields/customer/extras/formfield.htpasswd_add.php index 441f2f37..5802e040 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_add.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_add.php @@ -18,11 +18,11 @@ return array( 'htpasswd_add' => array( 'title' => $lng['extras']['directoryprotection_add'], - 'image' => 'icons/add_htpasswd.png', + 'image' => 'icons/htpasswd_add.png', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['directoryprotection_add'], - 'image' => 'icons/add_htpasswd.png', + 'image' => 'icons/htpasswd_add.png', 'fields' => array( 'path' => array( 'label' => $lng['panel']['path'], From d06b08f0208e32510c9e13c80961fed4449fd554 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 13 Feb 2011 22:28:45 +0100 Subject: [PATCH 35/39] Added configuration for gentoo / dovecot2 Signed-off-by: Florian Aders (EleRas) --- lib/configfiles/gentoo.inc.php | 23 ++++++- .../dovecot2/etc_dovecot_dovecot-sql.conf | 5 ++ .../gentoo/dovecot2/etc_dovecot_dovecot.conf | 63 +++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf create mode 100644 templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index c44a3350..c7858786 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -293,7 +293,28 @@ milter_default_action = accept" >> /etc/postfix/main.cf', ) ), 'dovecot' => Array( - 'label' => 'Dovecot', + 'label' => 'Dovecot 1', + 'commands_1' => Array( + 'emerge -av dovecot', + 'mv dovecot.conf dovecot.conf.gentoo', + 'mv dovecot-sql.conf dovecot-sql.conf.gentoo', + 'touch dovecot.conf', + 'touch dovecot-sql.conf', + ), + 'files' => Array( + 'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', + 'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf' + ), + 'commands_2' => Array( + 'chmod 0640 /etc/dovecot/dovecot-sql.conf', + 'rc-update add dovecot default' + ), + 'restart' => Array( + '/etc/init.d/dovecot restart' + ) + ), + 'dovecot2' => Array( + 'label' => 'Dovecot 2', 'commands_1' => Array( 'emerge -av dovecot', 'mv dovecot.conf dovecot.conf.gentoo', diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf new file mode 100644 index 00000000..fef2b19e --- /dev/null +++ b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf @@ -0,0 +1,5 @@ +driver = mysql +connect = host= dbname= user= password= +default_pass_scheme = CRYPT +password_query = "SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp')" +user_query = "SELECT CONCAT(homedir, maildir) AS home, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')" diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf new file mode 100644 index 00000000..b7ab0f9d --- /dev/null +++ b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf @@ -0,0 +1,63 @@ +auth_mechanisms = plain login +## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS +disable_plaintext_auth = no +listen = * +mail_access_groups = vmail +mail_debug = no + +protocols = imap pop3 + +### SSL Settings +### After setting this options, set disable_plaintext_auth to yes (see above) +#ssl_cert = .pem +#ssl_key = .key + +passdb { + args = /etc/dovecot/dovecot-sql.conf + driver = sql +} + +plugin { + quota = maildir:User Quota +} + +service auth { + unix_listener /var/spool/postfix/private/auth { + group = postfix + mode = 0660 + user = postfix + } + unix_listener auth-master { + group = vmail + mode = 0660 + user = vmail + } +} + +userdb { + driver = prefetch +} + +userdb { + args = /etc/dovecot/dovecot-sql.conf + driver = sql +} + +protocol imap { + mail_plugins = quota imap_quota +} + +protocol pop3 { + mail_plugins = quota + pop3_uidl_format = UID%u-%v +} + +lda_mailbox_autocreate = yes +protocol lda { + auth_socket_path = /var/run/dovecot/auth-master + mail_plugins = quota + # postmaster is the one in charge of the mail system. MUST be set to a valid address! + postmaster_address = admin@ + sendmail_path = /usr/sbin/sendmail + lda_mailbox_autocreate = 1 +} From 134250d1c1c274afd4c025a24b90fc3b077853c9 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Tue, 15 Feb 2011 21:14:02 +0100 Subject: [PATCH 36/39] Added icon for changetheme made by scarya Signed-off-by: Florian Aders (EleRas) --- images/Classic/changetheme.png | Bin 0 -> 19227 bytes .../Classic/customer/index/change_theme.tpl | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 images/Classic/changetheme.png diff --git a/images/Classic/changetheme.png b/images/Classic/changetheme.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7eb599a3e11cd297daf6dd1c692f35a2d53617 GIT binary patch literal 19227 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 z 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 - + From 357614992ec4fdf895c8f6aa9c82508315c8b221 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 15 Feb 2011 21:49:18 +0100 Subject: [PATCH 37/39] add missing image in 'change theme' on admin-side Signed-off-by: Michael Kaufmann (d00p) --- templates/Classic/admin/index/change_theme.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/Classic/admin/index/change_theme.tpl b/templates/Classic/admin/index/change_theme.tpl index 082089a5..34c100cd 100644 --- a/templates/Classic/admin/index/change_theme.tpl +++ b/templates/Classic/admin/index/change_theme.tpl @@ -3,6 +3,9 @@ $header
 {$lng['menue']['main']['changetheme']}
+ + + From ffed226a4f630bfd497f46ea6d5612a1cde41e10 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Tue, 22 Feb 2011 20:15:42 +0100 Subject: [PATCH 38/39] Fixing typo in paging- Signed-off-by: Florian Aders (EleRas) --- lib/classes/output/class.paging.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/output/class.paging.php b/lib/classes/output/class.paging.php index b6a5094f..e0c68e90 100644 --- a/lib/classes/output/class.paging.php +++ b/lib/classes/output/class.paging.php @@ -510,7 +510,7 @@ class paging } else { - $pagingcode.= ' ' . $i . '/nbsp;'; + $pagingcode.= ' ' . $i . ' '; } } From 656d725b582cb06ea92f2d5cacb3c0ef7673fb4f Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Tue, 22 Feb 2011 20:49:02 +0100 Subject: [PATCH 39/39] Adding admin to customer - list Signed-off-by: Florian Aders (EleRas) --- templates/Froxlor/admin/customers/customers.tpl | 1 + templates/Froxlor/admin/customers/customers_customer.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/Froxlor/admin/customers/customers.tpl b/templates/Froxlor/admin/customers/customers.tpl index 9b70d834..dea6ee51 100644 --- a/templates/Froxlor/admin/customers/customers.tpl +++ b/templates/Froxlor/admin/customers/customers.tpl @@ -29,6 +29,7 @@ $header {$lng['customer']['name']}  {$arrowcode['c.name']}  {$lng['customer']['firstname']}  {$arrowcode['c.firstname']}  {$lng['login']['username']} {$arrowcode['c.loginname']} + {$lng['admin']['admin']} {$arrowcode['a.loginname']} diff --git a/templates/Froxlor/admin/customers/customers_customer.tpl b/templates/Froxlor/admin/customers/customers_customer.tpl index b61182b4..8ae17344 100644 --- a/templates/Froxlor/admin/customers/customers_customer.tpl +++ b/templates/Froxlor/admin/customers/customers_customer.tpl @@ -7,7 +7,7 @@ {$row['company']} -  ({$row['loginname']}) +  ({$row['loginname']} | {$row['adminname']})
 {$lng['menue']['main']['changetheme']}
{$lng['panel']['options']}