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/customer_email.php b/customer_email.php index adc0b8d2..a7255f90 100644 --- a/customer_email.php +++ b/customer_email.php @@ -282,6 +282,13 @@ elseif($page == 'emails') } $iscatchall = makeyesno('iscatchall', '1', '0', '0'); + + $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") . "\";"); } } @@ -321,6 +328,13 @@ elseif($page == 'emails') $destinations_count = count($result['destination']); $result = htmlentities_array($result); + + $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") . "\";"); } } @@ -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_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") . "\";"); } } @@ -543,6 +564,13 @@ elseif($page == 'accounts') { $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); + + $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") . "\";"); } } @@ -584,6 +612,13 @@ elseif($page == 'accounts') { $result['email_full'] = $idna_convert->decode($result['email_full']); $result = htmlentities_array($result); + + $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") . "\";"); } } @@ -678,6 +713,13 @@ 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/email/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") . "\";"); } } diff --git a/customer_extras.php b/customer_extras.php index a6b1d3f9..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") . "\";"); } } @@ -357,6 +371,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 +439,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/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/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/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/images/Classic/changetheme.png b/images/Classic/changetheme.png new file mode 100644 index 00000000..8f7eb599 Binary files /dev/null and b/images/Classic/changetheme.png differ 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/.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/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 . ' '; } } 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/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 new file mode 100644 index 00000000..ad88b3d3 --- /dev/null +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -0,0 +1,74 @@ + (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_add' => array( + 'title' => $lng['domains']['subdomain_add'], + 'image' => 'icons/domain_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['domains']['subdomain_add'], + 'image' => 'icons/domain_add.png', + 'fields' => 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', + 'select_var' => $aliasdomains + ), + '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 + ), + 'url' => array( + 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), + 'label' => $lng['panel']['urloverridespath'], + 'type' => 'text' + ), + '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_redirect' => array( + 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), + 'label' => 'SSL Redirect', + 'type' => 'yesno', + 'yesno_var' => $ssl_redirect + ), + '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 new file mode 100644 index 00000000..1abb0f8f --- /dev/null +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -0,0 +1,89 @@ + (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' => array( + 'visible' => ($alias_check == '0' ? true : false), + 'label' => $lng['domains']['aliasdomain'], + 'type' => 'select', + 'select_var' => $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 + ), + 'url' => array( + 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), + 'label' => $lng['panel']['urloverridespath'], + 'type' => 'text', + 'value' => $urlvalue + ), + '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 + ), + 'iswildcarddomain' => array( + 'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false), + 'label' => $lng['domains']['wildcarddomain'], + 'type' => 'yesno', + 'yesno_var' => $iswildcarddomain + ), + 'isemaildomain' => array( + 'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false), + 'label' => 'Emaildomain', + 'type' => 'yesno', + 'yesno_var' => $isemaildomain + ), + 'ssl_redirect' => array( + 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), + 'label' => 'SSL Redirect', + 'type' => 'yesno', + 'yesno_var' => $ssl_redirect + ), + 'openbasedir_path' => array( + 'label' => $lng['domain']['openbasedirpath'], + 'type' => 'select', + 'select_var' => $openbasedir + ) + ) + ) + ) + ) +); 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..e247003f --- /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/autoresponder_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['emails']['forwarder_add'], + 'image' => 'icons/autoresponder_add.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'].'' + ) + ) + ) + ) + ) +); 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..57f489cb --- /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/htpasswd_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['pathoptions_add'], + 'image' => 'icons/htpasswd_add.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..216a6114 --- /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/htpasswd_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['pathoptions_edit'], + 'image' => 'icons/htpasswd_edit.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..5802e040 --- /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/htpasswd_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['directoryprotection_add'], + 'image' => 'icons/htpasswd_add.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..a21b085a --- /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/htpasswd_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['extras']['directoryprotection_add'], + 'image' => 'icons/htpasswd_add.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'] + ) + ) + ) + ) + ) +); 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..19475ecc --- /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/user_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ftp']['account_add'], + 'image' => 'icons/user_add.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..42199ff9 --- /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/user_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ftp']['account_edit'], + 'image' => 'icons/user_edit.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 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/lib/formfields/customer/ticket/formfield.ticket_add.php b/lib/formfields/customer/ticket/formfield.ticket_add.php new file mode 100644 index 00000000..be86b2da --- /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, + ), + 'category' => 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/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', 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 + + + 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 - + @@ -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 - + @@ -181,4 +181,4 @@ $header

-$footer \ No newline at end of file +$footer 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 - + 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
 {$lng['menue']['main']['changetheme']}
{$lng['admin']['templates']['PASSWORD']}
{$lng['admin']['templates']['trafficninetypercent']}{$lng['admin']['templates']['trafficmaxpercent']}
{TRAFFIC}: {$lng['admin']['templates']['PASSWORD']}
{$lng['admin']['templates']['trafficninetypercent']}{$lng['admin']['templates']['trafficmaxpercent']}
{TRAFFIC}:
{$lng['panel']['urloverridespath']}:
- - - - - - - - - - - - - - - - - - - - - - - - + + {$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/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}

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 - - - - - - - - - - - - - - - - - - - - - - - - - - + + {$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/Classic/customer/index/change_theme.tpl b/templates/Classic/customer/index/change_theme.tpl index d72c63a8..0af3f1ea 100644 --- a/templates/Classic/customer/index/change_theme.tpl +++ b/templates/Classic/customer/index/change_theme.tpl @@ -4,7 +4,7 @@ $header - + 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
 {$lng['menue']['main']['changetheme']}
- - - - - - - - - - - - - - - - - - - - - - + + {$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}

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/Classic/footer.tpl b/templates/Classic/footer.tpl index d98325a4..c5a9491c 100644 --- a/templates/Classic/footer.tpl +++ b/templates/Classic/footer.tpl @@ -8,7 +8,7 @@ {$version}{$branding} - © 2009-2010 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/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..dea6ee51 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']}
@@ -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']} {$lng['panel']['options']} @@ -54,7 +55,7 @@ $header
-   +   {$lng['admin']['customer_add']}
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']}) 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/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']} 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/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/account_add.tpl b/templates/Froxlor/customer/email/account_add.tpl index d2b25f2b..35c9f233 100644 --- a/templates/Froxlor/customer/email/account_add.tpl +++ b/templates/Froxlor/customer/email/account_add.tpl @@ -1,52 +1,33 @@ $header -
-
-

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

-
- -
+
+
+

+ {$title}  + {$title} +

+
+ +
- Froxlor - {$lng['emails']['emails_add']} + Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - - - + {$account_add_form}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):
{$lng['emails']['alternative_emailaddress']}:

+

-
-
+ +
+ +
$footer diff --git a/templates/Froxlor/customer/email/account_changepw.tpl b/templates/Froxlor/customer/email/account_changepw.tpl index 1c42a6d9..3a5a7ea7 100644 --- a/templates/Froxlor/customer/email/account_changepw.tpl +++ b/templates/Froxlor/customer/email/account_changepw.tpl @@ -1,26 +1,33 @@ $header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$account_changepw_form} +
+ +

+ + + + + +

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

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$quota_edit_form} +
+ +

+ + + + + +

+
+
+ +
+ +
+$footer 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/email/autoresponder_add.tpl b/templates/Froxlor/customer/email/autoresponder_add.tpl index d3df8fae..7268a1c9 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']}:
-
-
-
+
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$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..2ccddbaf 100644 --- a/templates/Froxlor/customer/email/emails_add.tpl +++ b/templates/Froxlor/customer/email/emails_add.tpl @@ -1,49 +1,39 @@ $header
-
-
-
{$lng['admin']['warning']}
-

{$lng['emails']['noemaildomainaddedyet']}
-
+
+
+
{$lng['admin']['warning']}
+

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

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

- +
-
-
- Froxlor - {$lng['emails']['emails_add']} + +
+ Froxlor - {$title} - - - - - - - - - - - - -
{$lng['emails']['emailaddress']}: @
{$lng['emails']['iscatchall']}$iscatchall
+ + {$email_add_form} +
-

- - - - -

-
- +

+ + + + +

+
+
$footer diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl index 9e702951..81f78645 100644 --- a/templates/Froxlor/customer/email/emails_edit.tpl +++ b/templates/Froxlor/customer/email/emails_edit.tpl @@ -2,65 +2,30 @@ $header

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

- +
-
-
- Froxlor - {$lng['emails']['emails_edit']} + +
+ Froxlor - {$title} - - - - - - - - - - - - - - - - - - - - - - - -
{$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']}
+ + {$email_edit_form} +
+ +

+ + + + +

+
+ -

- - - - -

-
-
$footer diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl index 4d60a9f7..90cb5861 100644 --- a/templates/Froxlor/customer/email/forwarder_add.tpl +++ b/templates/Froxlor/customer/email/forwarder_add.tpl @@ -2,39 +2,30 @@ $header

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

- +
+ +
+
+ Froxlor - {$title} - -
- Froxlor - {$lng['emails']['forwarder_add']} + + {$forwarder_add_form} +
- - - - - - - - - - - - -
{$lng['emails']['from']}:{$result['email_full']}
{$lng['emails']['to']}:
 
+

+ + + + +

+
+ -

- - - - -

-
-
$footer 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/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 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/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 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/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..f6158a18 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']}

@@ -46,9 +22,11 @@ $header +

-
-
+ +
+
$footer 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/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 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..1b1dc4de 100644 --- a/templates/Froxlor/customer/ticket/tickets_reply.tpl +++ b/templates/Froxlor/customer/ticket/tickets_reply.tpl @@ -1,51 +1,41 @@ $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 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']} 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}
+
+
+
diff --git a/templates/Froxlor/footer.tpl b/templates/Froxlor/footer.tpl index 60ffa9d5..634ea4c7 100644 --- a/templates/Froxlor/footer.tpl +++ b/templates/Froxlor/footer.tpl @@ -4,7 +4,7 @@ {$version}{$branding} - © 2009-2010 by the Froxlor Team + © 2009-{$current_year} by the Froxlor Team
{$lng['panel']['translator']}: {$lng['translator']} 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 +} 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