From 457e378d1ee612ce6b47ef341c709e8d125c3adc Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Wed, 10 Jun 2015 14:59:38 +0200 Subject: [PATCH] Reverting HTMLform2 changes Signed-off-by: Roman Schmerold (BNoiZe) --- admin_admins.php | 97 +++- admin_cronjobs.php | 9 +- admin_customers.php | 95 +++- admin_ipsandports.php | 14 +- admin_phpsettings.php | 26 +- customer_mysql.php | 15 +- lib/classes/output/class.HTMLform2.php | 461 ------------------ .../admin/admin/formfield.admin_add.php | 232 +++++++++ .../admin/admin/formfield.admin_edit.php | 247 ++++++++++ .../cronjobs/formfield.cronjobs_edit.php | 54 ++ .../admin/customer/formfield.customer_add.php | 265 ++++++++++ .../customer/formfield.customer_edit.php | 287 +++++++++++ lib/formfields/admin/formfield.admin.php | 236 --------- lib/formfields/admin/formfield.cronjobs.php | 42 -- lib/formfields/admin/formfield.customer.php | 305 ------------ .../admin/formfield.ipsandports.php | 126 ----- lib/formfields/admin/formfield.phpconfig.php | 92 ---- .../ipsandports/formfield.ipsandports_add.php | 137 ++++++ .../formfield.ipsandports_edit.php | 146 ++++++ .../phpconfig/formfield.phpconfig_add.php | 92 ++++ .../phpconfig/formfield.phpconfig_edit.php | 95 ++++ templates/Sparkle/admin/admins/admins_add.tpl | 4 +- .../Sparkle/admin/admins/admins_edit.tpl | 2 +- .../Sparkle/admin/cronjobs/cronjob_edit.tpl | 4 +- .../Sparkle/admin/customers/customers_add.tpl | 4 +- .../admin/customers/customers_edit.tpl | 4 +- .../Sparkle/admin/domains/domains_import.tpl | 2 +- .../Sparkle/customer/mysql/mysqls_add.tpl | 4 +- .../Sparkle/customer/mysql/mysqls_edit.tpl | 4 +- templates/Sparkle/htmlform/checkbox.tpl | 1 - templates/Sparkle/htmlform/form_end.tpl | 8 - templates/Sparkle/htmlform/group_heading.tpl | 9 - templates/Sparkle/htmlform/input.tpl | 1 - templates/Sparkle/htmlform/inputul.tpl | 1 - templates/Sparkle/htmlform/select.tpl | 3 - templates/Sparkle/htmlform/skeleton.tpl | 4 - .../Sparkle/htmlform/skeleton_checkbox.tpl | 4 - templates/Sparkle/htmlform/static.tpl | 1 - templates/Sparkle/htmlform/textarea.tpl | 1 - 39 files changed, 1791 insertions(+), 1343 deletions(-) delete mode 100644 lib/classes/output/class.HTMLform2.php create mode 100644 lib/formfields/admin/admin/formfield.admin_add.php create mode 100644 lib/formfields/admin/admin/formfield.admin_edit.php create mode 100644 lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php create mode 100644 lib/formfields/admin/customer/formfield.customer_add.php create mode 100644 lib/formfields/admin/customer/formfield.customer_edit.php delete mode 100644 lib/formfields/admin/formfield.admin.php delete mode 100644 lib/formfields/admin/formfield.cronjobs.php delete mode 100644 lib/formfields/admin/formfield.customer.php delete mode 100644 lib/formfields/admin/formfield.ipsandports.php delete mode 100644 lib/formfields/admin/formfield.phpconfig.php create mode 100644 lib/formfields/admin/ipsandports/formfield.ipsandports_add.php create mode 100644 lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php create mode 100644 lib/formfields/admin/phpconfig/formfield.phpconfig_add.php create mode 100644 lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php delete mode 100644 templates/Sparkle/htmlform/checkbox.tpl delete mode 100644 templates/Sparkle/htmlform/form_end.tpl delete mode 100644 templates/Sparkle/htmlform/group_heading.tpl delete mode 100644 templates/Sparkle/htmlform/input.tpl delete mode 100644 templates/Sparkle/htmlform/inputul.tpl delete mode 100644 templates/Sparkle/htmlform/select.tpl delete mode 100644 templates/Sparkle/htmlform/skeleton.tpl delete mode 100644 templates/Sparkle/htmlform/skeleton_checkbox.tpl delete mode 100644 templates/Sparkle/htmlform/static.tpl delete mode 100644 templates/Sparkle/htmlform/textarea.tpl diff --git a/admin_admins.php b/admin_admins.php index d62520db..466581ff 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -440,6 +440,11 @@ if ($page == 'admins' } else { + $language_options = ''; + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, $userinfo['language'], true); + } + $ipaddress = makeoption($lng['admin']['allips'], "-1"); $ipsandports_stmt = Database::query(" SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip` ASC @@ -449,8 +454,24 @@ if ($page == 'admins' $ipaddress.= makeoption($row['ip'], $row['id']); } - $admin_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.admin.php'; - $admin_add_form = HTMLform2::genHTMLForm($admin_add_data); + $customers_ul = makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $domains_ul = makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + + $admin_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_add.php'; + $admin_add_form = htmlform::genHTMLForm($admin_add_data); + + $title = $admin_add_data['admin_add']['title']; + $image = $admin_add_data['admin_add']['image']; eval("echo \"" . getTemplate("admins/admins_add") . "\";"); } @@ -759,6 +780,71 @@ if ($page == 'admins' $result['diskspace'] = round($result['diskspace'] / 1024, $dec_places); $result['email'] = $idna_convert->decode($result['email']); + $customers_ul = makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, $result['customers'], true, true); + if ($result['customers'] == '-1') { + $result['customers'] = ''; + } + + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + if ($result['diskspace'] == '-1') { + $result['diskspace'] = ''; + } + + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + if ($result['traffic'] == '-1') { + $result['traffic'] = ''; + } + + $domains_ul = makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, $result['domains'], true, true); + if ($result['domains'] == '-1') { + $result['domains'] = ''; + } + + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + if ($result['subdomains'] == '-1') { + $result['subdomains'] = ''; + } + + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + if ($result['emails'] == '-1') { + $result['emails'] = ''; + } + + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + if ($result['email_accounts'] == '-1') { + $result['email_accounts'] = ''; + } + + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + if ($result['email_forwarders'] == '-1') { + $result['email_forwarders'] = ''; + } + + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + if ($result['email_quota'] == '-1') { + $result['email_quota'] = ''; + } + + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + if ($result['ftps'] == '-1') { + $result['ftps'] = ''; + } + + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, $result['tickets'], true, true); + if ($result['tickets'] == '-1') { + $result['tickets'] = ''; + } + + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + if ($result['mysqls'] == '-1') { + $result['mysqls'] = ''; + } + + $language_options = ''; + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, $result['def_language'], true); + } + $ipaddress = makeoption($lng['admin']['allips'], "-1", $result['ip']); $ipsandports_stmt = Database::query(" SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip`, `port` ASC @@ -770,8 +856,11 @@ if ($page == 'admins' $result = htmlentities_array($result); - $admin_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.admin.php'; - $admin_edit_form = HTMLform2::genHTMLForm($admin_edit_data, $result); + $admin_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_edit.php'; + $admin_edit_form = htmlform::genHTMLForm($admin_edit_data); + + $title = $admin_edit_data['admin_edit']['title']; + $image = $admin_edit_data['admin_edit']['image']; eval("echo \"" . getTemplate("admins/admins_edit") . "\";"); } diff --git a/admin_cronjobs.php b/admin_cronjobs.php index e40ee6f5..8cd17276 100644 --- a/admin_cronjobs.php +++ b/admin_cronjobs.php @@ -107,7 +107,7 @@ if ($page == 'cronjobs' || $page == 'overview') { // interval $interval_nfo = explode(' ', $result['interval']); - $result['interval_value'] = $interval_nfo[0]; + $interval_value = $interval_nfo[0]; $interval_interval = ''; $interval_interval .= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]); @@ -122,8 +122,11 @@ if ($page == 'cronjobs' || $page == 'overview') { $change_cronfile = true; } - $cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.cronjobs.php'; - $cronjobs_edit_form = HTMLform2::genHTMLForm($cronjobs_edit_data, $result); + $cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php'; + $cronjobs_edit_form = htmlform::genHTMLForm($cronjobs_edit_data); + + $title = $cronjobs_edit_data['cronjobs_edit']['title']; + $image = $cronjobs_edit_data['cronjobs_edit']['image']; eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";"); } diff --git a/admin_customers.php b/admin_customers.php index 7ddb2245..0d360b1d 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -990,8 +990,32 @@ if ($page == 'customers' } } else { - $customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.customer.php'; - $customer_add_form = HTMLform2::genHTMLform($customer_add_data); + $language_options = ''; + + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true); + } + + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + + $gender_options = makeoption($lng['gender']['undef'], 0, true, true, true); + $gender_options .= makeoption($lng['gender']['male'], 1, null, true, true); + $gender_options .= makeoption($lng['gender']['female'], 2, null, true, true); + + $customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_add.php'; + $customer_add_form = htmlform::genHTMLForm($customer_add_data); + + $title = $customer_add_data['customer_add']['title']; + $image = $customer_add_data['customer_add']['image']; eval("echo \"" . getTemplate("customers/customers_add") . "\";"); } @@ -1559,15 +1583,78 @@ if ($page == 'customers' } } else { + $language_options = ''; + + while (list($language_file, $language_name) = each($languages)) { + $language_options.= makeoption($language_name, $language_file, $result['def_language'], true); + } + $dec_places = Settings::Get('panel.decimal_places'); $result['traffic'] = round($result['traffic'] / (1024 * 1024), $dec_places); $result['diskspace'] = round($result['diskspace'] / 1024, $dec_places); $result['email'] = $idna_convert->decode($result['email']); + $diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + if ($result['diskspace'] == '-1') { + $result['diskspace'] = ''; + } + + $traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + if ($result['traffic'] == '-1') { + $result['traffic'] = ''; + } + + $subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + if ($result['subdomains'] == '-1') { + $result['subdomains'] = ''; + } + + $emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + if ($result['emails'] == '-1') { + $result['emails'] = ''; + } + + $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + if ($result['email_accounts'] == '-1') { + $result['email_accounts'] = ''; + } + + $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + if ($result['email_forwarders'] == '-1') { + $result['email_forwarders'] = ''; + } + + $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + if ($result['email_quota'] == '-1') { + $result['email_quota'] = ''; + } + + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + if ($result['ftps'] == '-1') { + $result['ftps'] = ''; + } + + $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, $result['tickets'], true, true); + if ($result['tickets'] == '-1') { + $result['tickets'] = ''; + } + + $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + if ($result['mysqls'] == '-1') { + $result['mysqls'] = ''; + } + $result = htmlentities_array($result); - $customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.customer.php'; - $customer_edit_form = HTMLform2::genHTMLform($customer_edit_data, $result); + $gender_options = makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true); + $gender_options .= makeoption($lng['gender']['male'], 1, ($result['gender'] == '1' ? true : false), true, true); + $gender_options .= makeoption($lng['gender']['female'], 2, ($result['gender'] == '2' ? true : false), true, true); + + $customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_edit.php'; + $customer_edit_form = htmlform::genHTMLForm($customer_edit_data); + + $title = $customer_edit_data['customer_edit']['title']; + $image = $customer_edit_data['customer_edit']['image']; eval("echo \"" . getTemplate("customers/customers_edit") . "\";"); } diff --git a/admin_ipsandports.php b/admin_ipsandports.php index 0b9e3c23..4465bfb0 100644 --- a/admin_ipsandports.php +++ b/admin_ipsandports.php @@ -259,10 +259,11 @@ if ($page == 'ipsandports' } else { - $ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.ipsandports.php'; - $ipsandports_add_form = HTMLform2::genHTMLForm($ipsandports_add_data); + $ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php'; + $ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data); - $title = $lng['admin']['ipsandports']['add']; + $title = $ipsandports_add_data['ipsandports_add']['title']; + $image = $ipsandports_add_data['ipsandports_add']['image']; eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";"); } @@ -419,10 +420,11 @@ if ($page == 'ipsandports' $result = htmlentities_array($result); - $ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.ipsandports.php'; - $ipsandports_edit_form = HTMLform2::genHTMLForm($ipsandports_edit_data, $result); + $ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php'; + $ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data); - $title = $lng['admin']['ipsandports']['edit']; + $title = $ipsandports_edit_data['ipsandports_edit']['title']; + $image = $ipsandports_edit_data['ipsandports_edit']['image']; eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";"); } diff --git a/admin_phpsettings.php b/admin_phpsettings.php index 348abd9f..5f10145c 100644 --- a/admin_phpsettings.php +++ b/admin_phpsettings.php @@ -121,9 +121,9 @@ if ($page == 'overview') { $fpm_reqslowtimeout = 0; } elseif (Settings::Get('phpfpm.enabled') == 1) { - $fpm_enableslowlog = isset($_POST['fpm_slowlog']) ? (int)$_POST['fpm_slowlog'] : 0; - $fpm_reqtermtimeout = validate($_POST['fpm_reqterm'], 'fpm_reqterm', '/^([0-9]+)(|s|m|h|d)$/'); - $fpm_reqslowtimeout = validate($_POST['fpm_reqslow'], 'fpm_reqslow', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0; + $fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/'); // disable fcgid stuff $binary = '/usr/bin/php-cgi'; $file_extensions = 'php'; @@ -171,10 +171,11 @@ if ($page == 'overview') { $result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1"); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.phpconfig.php'; - $phpconfig_add_form = HTMLform2::genHTMLForm($phpconfig_add_data); + $phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php'; + $phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data); - $title = $lng['admin']['phpsettings']['addsettings']; + $title = $phpconfig_add_data['phpconfig_add']['title']; + $image = $phpconfig_add_data['phpconfig_add']['image']; eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";"); } @@ -270,9 +271,9 @@ if ($page == 'overview') { $fpm_reqslowtimeout = 0; } elseif (Settings::Get('phpfpm.enabled') == 1) { - $fpm_enableslowlog = isset($_POST['fpm_slowlog']) ? (int)$_POST['fpm_slowlog'] : 0; - $fpm_reqtermtimeout = validate($_POST['fpm_reqterm'], 'fpm_reqterm', '/^([0-9]+)(|s|m|h|d)$/'); - $fpm_reqslowtimeout = validate($_POST['fpm_reqslow'], 'fpm_reqslow', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0; + $fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/'); + $fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/'); // disable fcgid stuff $binary = '/usr/bin/php-cgi'; $file_extensions = 'php'; @@ -319,10 +320,11 @@ if ($page == 'overview') { } else { - $phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/formfield.phpconfig.php'; - $phpconfig_edit_form = HTMLform2::genHTMLForm($phpconfig_edit_data, $result); + $phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php'; + $phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data); - $title = $lng['admin']['phpsettings']['editsettings']; + $title = $phpconfig_edit_data['phpconfig_edit']['title']; + $image = $phpconfig_edit_data['phpconfig_edit']['image']; eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";"); } diff --git a/customer_mysql.php b/customer_mysql.php index c92639e0..39c642da 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -283,8 +283,11 @@ if ($page == 'overview') { } Database::needRoot(false); - $mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/formfield.mysql.php'; - $mysql_add_form = HTMLform2::genHTMLForm($mysql_add_data); + $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') . "\";"); } @@ -352,9 +355,11 @@ if ($page == 'overview') { $sql_root = Database::getSqlData(); Database::needRoot(false); - $result['mysql_servers'] = isset($sql_root['caption']) ? $sql_root['caption'] : ''; - $mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/formfield.mysql.php'; - $mysql_edit_form = HTMLform2::genHTMLForm($mysql_edit_data, $result); + $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/classes/output/class.HTMLform2.php b/lib/classes/output/class.HTMLform2.php deleted file mode 100644 index 41e26aa2..00000000 --- a/lib/classes/output/class.HTMLform2.php +++ /dev/null @@ -1,461 +0,0 @@ - (2015-) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Classes - * - */ - -class HTMLform2 { - // Internal var to store form - private static $_form = ''; - - /** - * genHTMLform function. - * - * @access public - * @static - * @param array $formdata (default: array()) - * @param array $data (default: array()) - * @return void - */ - public static function genHTMLform($formdata = array(), $data = false) { - global $lng, $theme; - self::$_form = ''; - - // Parse each group - foreach ($formdata as $groupdata) { - if (!isset($groupdata['visible']) || $groupdata['visible'] !== false) { - // Output Section Heading - if (isset($groupdata['title'])) { - $grouptitle = $groupdata['title']; - eval("self::\$_form .= \"" . getTemplate("htmlform/group_heading", "1") . "\";"); - } - - // Generate Group Fields - foreach($groupdata['fields'] as $fieldname => $fielddata) { - if (isset($fielddata['visible'])) { - if ($fielddata['visible'] == false) { - continue; - } elseif ($fielddata['visible'] === 'new' && is_array($data)) { - continue; - } elseif ($fielddata['visible'] === 'edit' && !is_array($data)) { - continue; - } - } - - // Set value if given - if (!empty($data)) { - $fielddata = self::_setValue($fieldname, $fielddata, $data); - } - - $field = self::_parseDataField($fieldname, $fielddata); - - $label = $fielddata['label'] . self::_getMandatoryFlag($fielddata); - if (isset($fielddata['desc']) && $fielddata['desc'] != "") { - $desc = $fielddata['desc']; - } else { - $desc = ''; - } - - switch($fielddata['type']) { - case 'checkbox': - eval("self::\$_form .= \"" . getTemplate("htmlform/skeleton_checkbox", "1") . "\";"); - break; - default: - eval("self::\$_form .= \"" . getTemplate("htmlform/skeleton", "1") . "\";"); - break; - } - - } - } - } - - eval("self::\$_form .= \"" . getTemplate("htmlform/form_end", "1") . "\";"); - - return self::$_form; - } - - private static function _setValue($fieldname, $fielddata, $data) { - if (isset($data[$fieldname])) { - switch($fielddata['type']) { - case 'checkbox': - $fielddata['attributes']['checked'] = ($data[$fieldname] == 1) ? true : false; - break; - case 'select': - $fielddata['selected'] = $data[$fieldname]; - break; - default: - $fielddata['value'] = $data[$fieldname]; - break; - } - } - - return $fielddata; - } - - private static function _parseDataField($fieldname, $fielddata) { - switch($fielddata['type']) { - case 'button': - case 'submit': - case 'reset': - return self::_button($fieldname, $fielddata); - break; - case 'text': - case 'password': - case 'hidden': - case 'file': - case 'email': - return self::_input($fieldname, $fielddata); - break; - case 'textul': - return self::_inputUl($fieldname, $fielddata); - break; - case 'radio': - return self::_inputRadio($fieldname, $fielddata); - break; - case 'checkbox': - return self::_inputCheckbox($fieldname, $fielddata); - break; - case 'static': - return self::_static($fieldname, $fielddata); - break; - case 'select': - return self::_select($fieldname, $fielddata); - break; - case 'textarea': - return self::_textarea($fieldname, $fielddata); - break; - } - } - - /** - * _parseAttributes function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata - * @return void - */ - private static function _parseAttributes($fieldname, $fielddata) { - $attributes = array(); - - // name - $attributes['name'] = $fieldname; - $attributes['id'] = $fieldname; - - // value - if ($fielddata['type'] != 'select') { - if (isset($_SESSION['requestData'][$fieldname])) { - $attributes['value'] = $_SESSION['requestData'][$fieldname]; - } elseif (isset($fielddata['value'])) { - $attributes['value'] = $fielddata['value']; - } - } - - if (isset($fielddata['attributes'])) { - if (isset($fielddata['attributes']['checked']) && $fielddata['attributes']['checked'] !== true) { - unset($fielddata['attributes']['checked']); - } - if (isset($fielddata['attributes']['selected']) && $fielddata['attributes']['selected'] !== true) { - unset($fielddata['attributes']['selected']); - } - if (isset($fielddata['attributes']['readonly']) && $fielddata['attributes']['readonly'] !== true) { - unset($fielddata['attributes']['readonly']); - } - return array_merge($attributes, $fielddata['attributes']); - } else { - return $attributes; - } - } - - /** - * _glueAttributes function. - * - * @access private - * @static - * @param array $attributes - * @return void - */ - private static function _glueAttributes($attributes) { - $glued = array(); - foreach($attributes as $name => $value) { - $glued[] = $name . "=\"" . $value . "\""; - } - return implode(" ", $glued); - } - - /** - * _getMandatoryFlag function. - * - * @access private - * @static - * @param array $fielddata - * @return void - */ - private static function _getMandatoryFlag($fielddata) { - if (isset($fielddata['mandatory'])) { - return ' *'; - } elseif (isset($fielddata['mandatory_ex'])) { - return ' **'; - } - return ''; - } - - /** - * _button function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @param string $type (default: 'button') - * @return void - */ - private static function _button($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - eval("\$return = \"" . getTemplate("htmlform/button", "1") . "\";"); - return ""; - } - - - /** - * _input function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @param string $type (default: "text") - * @return void - */ - private static function _input($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - eval("\$return = \"" . getTemplate("htmlform/input", "1") . "\";"); - return $return; - } - - /** - * _inputUl function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _inputUl($fieldname, $fielddata = array()) { - global $lng; - - // Input - $attributes_input = self::_parseAttributes($fieldname, $fielddata); - $attributes_input['type'] = "text"; - $attributes_input['value'] = ($fielddata['value'] == '-1') ? '' : $fielddata['value']; - $attributes_input = self::_glueAttributes($attributes_input); - - // Checkbox - $checkboxdata = array( - 'label' => $lng['customer']['unlimited'], - 'type' => 'checkbox', - 'value' => '-1', - 'attributes' => array( - 'checked' => ($fielddata['value'] == '-1') ? true : false - ) - ); - $attributes_checkbox = self::_parseAttributes($fieldname . "_ul", $checkboxdata); - $attributes_checkbox['type'] = $checkboxdata['type']; - $attributes_checkbox = self::_glueAttributes($attributes_checkbox); - $label_checkbox = $checkboxdata['label']; - - eval("\$return = \"" . getTemplate("htmlform/inputul", "1") . "\";"); - - return $return; - } - - /** - * _inputRadio function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _inputRadio($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - // ToDo - - eval("\$return = \"" . getTemplate("htmlform/radio", "1") . "\";"); - return $return; - } - - /** - * _inputCheckbox function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _inputCheckbox($fieldname, $fielddata = array(), $labelHidden = true) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes['type'] = $fielddata['type']; - $attributes = self::_glueAttributes($attributes); - - $label = $fielddata['label']; - eval("\$return = \"" . getTemplate("htmlform/checkbox", "1") . "\";"); - return $return; - } - - /** - * _static function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _static($fieldname, $fielddata = array()) { - $value = $fielddata['value']; - eval("\$return = \"" . getTemplate("htmlform/static", "1") . "\";"); - return $return; - } - - /** - * _select function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _select($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - $attributes = self::_glueAttributes($attributes); - - if (isset($fielddata['generate'])) { - switch($fielddata['generate']) { - case 'genders': - $fielddata['values'] = self::_generateGenders($fielddata['selected']); - break; - case 'languages': - $fielddata['values'] = self::_generateLanguages($fielddata['selected']); - break; - } - } - - $values = ""; - if (is_array($fielddata['values'])) { - foreach($fielddata['values'] as $value) { - $selected = ""; - if ((isset($value['selected']) && $value['selected'] == true) || (isset($fielddata['value']) && $value['value'] == $fielddata['value'])) { - $selected = " selected"; - } - $values .= ""; - } - } else { - $values = $fielddata['values']; - } - eval("\$return = \"" . getTemplate("htmlform/select", "1") . "\";"); - - if (isset($fielddata['attributes']['multiple']) && $fielddata['attributes']['multiple'] == true) { - $return = str_replace("name=\"$fieldname\"", "name=\"{$fieldname}[]\"", $return); - } - return $return; - } - - /** - * _textarea function. - * - * @access private - * @static - * @param string $fieldname - * @param array $fielddata (default: array()) - * @return void - */ - private static function _textarea($fieldname, $fielddata = array()) { - $attributes = self::_parseAttributes($fieldname, $fielddata); - unset($attributes['value']); - $attributes = self::_glueAttributes($attributes); - - $value = isset($fielddata['value']) ? $fielddata['value'] : ""; - eval("\$return = \"" . getTemplate("htmlform/textarea", "1") . "\";"); - return $return; - } - - private static function _generateGenders($selected = "") { - global $lng; - - $genders = array( - array( - "value" => 0, - "label" => $lng['gender']['undef'], - ), - array( - "value" => 1, - "label" => $lng['gender']['male'] - ), - array( - "value" => 2, - "label" => $lng['gender']['female'] - ) - ); - - // Check if something is selected - if ($selected != "") { - foreach ($genders as $key => $value) { - if ($value['value'] == $selected) { - $genders[$key]['selected'] = true; - continue; - } - } - } - - return $genders; - } - - private static function _generateLanguages($selected = "") { - global $languages; - $retlanguages = array(); - while (list($language_file, $language_name) = each($languages)) { - $newlng = array( - "value" => $language_file, - "label" => $language_name - ); - - if ($language_file == $selected) { - $newlng['selected'] = true; - } - - $retlanguages[] = $newlng; - - //$language_options.= makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true); - } - - return $retlanguages; - } - -} diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php new file mode 100644 index 00000000..a89a6f9e --- /dev/null +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -0,0 +1,232 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'admin_add' => array( + 'title' => $lng['admin']['admin_add'], + 'image' => 'icons/user_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'text', + 'mandatory' => true + ), + 'admin_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + 'mandatory' => true, + 'autocomplete' => 'off' + ), + 'admin_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory' => true + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'ipaddress' => array( + 'label' => $lng['serversettings']['ipaddress']['title'], + 'type' => 'select', + 'select_var' => $ipaddress + ), + 'change_serversettings' => array( + 'label' => $lng['admin']['change_serversettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'customers' => array( + 'label' => $lng['admin']['customers'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $customers_ul + ), + 'customers_see_all' => array( + 'label' => $lng['admin']['customers_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'domains' => array( + 'label' => $lng['admin']['domains'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $domains_ul + ), + 'domains_see_all' => array( + 'label' => $lng['admin']['domains_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'caneditphpsettings' => array( + 'label' => $lng['admin']['caneditphpsettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'tickets_see_all' => array( + 'label' => $lng['admin']['tickets_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php new file mode 100644 index 00000000..4a06a81e --- /dev/null +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -0,0 +1,247 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'admin_edit' => array( + 'title' => $lng['admin']['admin_edit'], + 'image' => 'icons/user_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'label', + 'value' => $result['loginname'] + ), + 'deactivated' => array( + 'label' => $lng['admin']['deactivated_user'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['deactivated']), + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ), + 'admin_password' => array( + 'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')', + 'type' => 'password', + 'autocomplete' => 'off', + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ), + 'admin_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options, + 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory' => true, + 'value' => $result['name'] + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true, + 'value' => $result['email'] + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['custom_notes'] + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['custom_notes_show']) + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_add.png', + 'visible' => ($result['adminid'] != $userinfo['userid'] ? true : false), + 'fields' => array( + 'ipaddress' => array( + 'label' => $lng['serversettings']['ipaddress']['title'], + 'type' => 'select', + 'select_var' => $ipaddress + ), + 'change_serversettings' => array( + 'label' => $lng['admin']['change_serversettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['change_serversettings']) + ), + 'customers' => array( + 'label' => $lng['admin']['customers'], + 'type' => 'textul', + 'value' => $result['customers'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $customers_ul + ), + 'customers_see_all' => array( + 'label' => $lng['admin']['customers_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['customers_see_all']) + ), + 'domains' => array( + 'label' => $lng['admin']['domains'], + 'type' => 'textul', + 'value' => $result['domains'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $domains_ul + ), + 'domains_see_all' => array( + 'label' => $lng['admin']['domains_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['domains_see_all']) + ), + 'caneditphpsettings' => array( + 'label' => $lng['admin']['caneditphpsettings'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['caneditphpsettings']) + ), + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => $result['diskspace'], + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => $result['traffic'], + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => $result['subdomains'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => $result['emails'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => $result['email_accounts'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => $result['email_forwarders'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => $result['email_quota'], + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => $result['ftps'], + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => $result['tickets'], + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'tickets_see_all' => array( + 'label' => $lng['admin']['tickets_see_all'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['tickets_see_all']) + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => $result['mysqls'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php new file mode 100644 index 00000000..7c71dbc0 --- /dev/null +++ b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php @@ -0,0 +1,54 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'cronjobs_edit' => array( + 'title' => $lng['admin']['cronjob_edit'], + 'image' => 'icons/clock_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['cronjob']['cronjobsettings'], + 'image' => 'icons/clock_edit.png', + 'fields' => array( + 'cronfile' => array( + 'label' => 'Cronjob', + 'type' => ($change_cronfile == 1 ? 'text' : 'label'), + 'value' => $result['cronfile'] + ), + 'isactive' => array( + 'label' => $lng['admin']['activated'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['isactive']) + ), + 'interval_value' => array( + 'label' => $lng['cronjob']['cronjobintervalv'], + 'type' => 'text', + 'value' => $interval_value + ), + 'interval_interval' => array( + 'label' => $lng['cronjob']['cronjobinterval'], + 'type' => 'select', + 'select_var' => $interval_interval + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php new file mode 100644 index 00000000..54a7e863 --- /dev/null +++ b/lib/formfields/admin/customer/formfield.customer_add.php @@ -0,0 +1,265 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'customer_add' => array( + 'title' => $lng['admin']['customer_add'], + 'image' => 'icons/user_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'new_loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'text' + ), + 'createstdsubdomain' => array( + 'label' => $lng['admin']['stdsubdomain_add'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'store_defaultindex' => array( + 'label' => $lng['admin']['store_defaultindex'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'new_customer_password' => array( + 'label' => $lng['login']['password'], + 'type' => 'password', + 'autocomplete' => 'off' + ), + 'new_customer_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + ), + 'sendpassword' => array( + 'label' => $lng['admin']['sendpassword'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory_ex' => true + ), + 'firstname' => array( + 'label' => $lng['customer']['firstname'], + 'type' => 'text', + 'mandatory_ex' => true + ), + 'gender' => array( + 'label' => $lng['gender']['title'], + 'type' => 'select', + 'select_var' => $gender_options + ), + 'company' => array( + 'label' => $lng['customer']['company'], + 'type' => 'text', + 'mandatory_ex' => true + ), + 'street' => array( + 'label' => $lng['customer']['street'], + 'type' => 'text' + ), + 'zipcode' => array( + 'label' => $lng['customer']['zipcode'], + 'type' => 'text' + ), + 'city' => array( + 'label' => $lng['customer']['city'], + 'type' => 'text' + ), + 'phone' => array( + 'label' => $lng['customer']['phone'], + 'type' => 'text' + ), + 'fax' => array( + 'label' => $lng['customer']['fax'], + 'type' => 'text' + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true + ), + 'customernumber' => array( + 'label' => $lng['customer']['customernumber'], + 'type' => 'text' + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_add.png', + 'fields' => array( + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'email_imap' => array( + 'label' => $lng['customer']['email_imap'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1'), + 'mandatory' => true + ), + 'email_pop3' => array( + 'label' => $lng['customer']['email_pop3'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1'), + 'mandatory' => true + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => 0, + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ), + 'phpenabled' => array( + 'label' => $lng['admin']['phpenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'perlenabled' => array( + 'label' => $lng['admin']['perlenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ) + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php new file mode 100644 index 00000000..b7e23476 --- /dev/null +++ b/lib/formfields/admin/customer/formfield.customer_edit.php @@ -0,0 +1,287 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'customer_edit' => array( + 'title' => $lng['admin']['customer_edit'], + 'image' => 'icons/user_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['accountdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'loginname' => array( + 'label' => $lng['login']['username'], + 'type' => 'label', + 'value' => $result['loginname'] + ), + 'documentroot' => array( + 'label' => $lng['customer']['documentroot'], + 'type' => 'label', + 'value' => $result['documentroot'] + ), + 'createstdsubdomain' => array( + 'label' => $lng['admin']['stdsubdomain_add'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array(($result['standardsubdomain'] != '0') ? '1' : '0') + ), + 'deactivated' => array( + 'label' => $lng['admin']['deactivated_user'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['deactivated']) + ), + 'new_customer_password' => array( + 'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')', + 'type' => 'password', + 'autocomplete' => 'off' + ), + 'new_customer_password_suggestion' => array( + 'label' => $lng['customer']['generated_pwd'], + 'type' => 'text', + 'visible' => (Settings::Get('panel.password_regex') == ''), + 'value' => generatePassword(), + ), + 'def_language' => array( + 'label' => $lng['login']['language'], + 'type' => 'select', + 'select_var' => $language_options + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['contactdata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'name' => array( + 'label' => $lng['customer']['name'], + 'type' => 'text', + 'mandatory_ex' => true, + 'value' => $result['name'] + ), + 'firstname' => array( + 'label' => $lng['customer']['firstname'], + 'type' => 'text', + 'mandatory_ex' => true, + 'value' => $result['firstname'] + ), + 'gender' => array( + 'label' => $lng['gender']['title'], + 'type' => 'select', + 'select_var' => $gender_options + ), + 'company' => array( + 'label' => $lng['customer']['company'], + 'type' => 'text', + 'mandatory_ex' => true, + 'value' => $result['company'] + ), + 'street' => array( + 'label' => $lng['customer']['street'], + 'type' => 'text', + 'value' => $result['street'] + ), + 'zipcode' => array( + 'label' => $lng['customer']['zipcode'], + 'type' => 'text', + 'value' => $result['zipcode'] + ), + 'city' => array( + 'label' => $lng['customer']['city'], + 'type' => 'text', + 'value' => $result['city'] + ), + 'phone' => array( + 'label' => $lng['customer']['phone'], + 'type' => 'text', + 'value' => $result['phone'] + ), + 'fax' => array( + 'label' => $lng['customer']['fax'], + 'type' => 'text', + 'value' => $result['fax'] + ), + 'email' => array( + 'label' => $lng['customer']['email'], + 'type' => 'text', + 'mandatory' => true, + 'value' => $result['email'] + ), + 'customernumber' => array( + 'label' => $lng['customer']['customernumber'], + 'type' => 'text', + 'value' => $result['customernumber'] + ), + 'custom_notes' => array( + 'style' => 'align-top', + 'label' => $lng['usersettings']['custom_notes']['title'], + 'desc' => $lng['usersettings']['custom_notes']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['custom_notes'] + ), + 'custom_notes_show' => array( + 'label' => $lng['usersettings']['custom_notes']['show'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['custom_notes_show']) + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['servicedata'], + 'image' => 'icons/user_edit.png', + 'fields' => array( + 'diskspace' => array( + 'label' => $lng['customer']['diskspace'], + 'type' => 'textul', + 'value' => $result['diskspace'], + 'maxlength' => 6, + 'mandatory' => true, + 'ul_field' => $diskspace_ul + ), + 'traffic' => array( + 'label' => $lng['customer']['traffic'], + 'type' => 'textul', + 'value' => $result['traffic'], + 'maxlength' => 4, + 'mandatory' => true, + 'ul_field' => $traffic_ul + ), + 'subdomains' => array( + 'label' => $lng['customer']['subdomains'], + 'type' => 'textul', + 'value' => $result['subdomains'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $subdomains_ul + ), + 'emails' => array( + 'label' => $lng['customer']['emails'], + 'type' => 'textul', + 'value' => $result['emails'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $emails_ul + ), + 'email_accounts' => array( + 'label' => $lng['customer']['accounts'], + 'type' => 'textul', + 'value' => $result['email_accounts'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_accounts_ul + ), + 'email_forwarders' => array( + 'label' => $lng['customer']['forwarders'], + 'type' => 'textul', + 'value' => $result['email_forwarders'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $email_forwarders_ul + ), + 'email_quota' => array( + 'label' => $lng['customer']['email_quota'], + 'type' => 'textul', + 'value' => $result['email_quota'], + 'maxlength' => 9, + 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), + 'mandatory' => true, + 'ul_field' => $email_quota_ul + ), + 'email_imap' => array( + 'label' => $lng['customer']['email_imap'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['imap']), + 'mandatory' => true + ), + 'email_pop3' => array( + 'label' => $lng['customer']['email_pop3'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['pop3']), + 'mandatory' => true + ), + 'ftps' => array( + 'label' => $lng['customer']['ftps'], + 'type' => 'textul', + 'value' => $result['ftps'], + 'maxlength' => 9, + 'ul_field' => $ftps_ul + ), + 'tickets' => array( + 'label' => $lng['customer']['tickets'], + 'type' => 'textul', + 'value' => $result['tickets'], + 'maxlength' => 9, + 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), + 'ul_field' => $tickets_ul + ), + 'mysqls' => array( + 'label' => $lng['customer']['mysqls'], + 'type' => 'textul', + 'value' => $result['mysqls'], + 'maxlength' => 9, + 'mandatory' => true, + 'ul_field' => $mysqls_ul + ), + 'phpenabled' => array( + 'label' => $lng['admin']['phpenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['phpenabled']) + ), + 'perlenabled' => array( + 'label' => $lng['admin']['perlenabled'].'?', + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['perlenabled']) + ) + ) + ), + 'section_d' => array( + 'title' => $lng['admin']['movetoadmin'], + 'image' => 'icons/user_edit.png', + 'visible' => ($admin_select_cnt > 1), + 'fields' => array( + 'move_to_admin' => array( + 'label' => $lng['admin']['movecustomertoadmin'], + 'type' => 'select', + 'select_var' => $admin_select + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/formfield.admin.php b/lib/formfields/admin/formfield.admin.php deleted file mode 100644 index 0b847ac3..00000000 --- a/lib/formfields/admin/formfield.admin.php +++ /dev/null @@ -1,236 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'accountdata' => array( - 'title' => $lng['admin']['accountdata'], - 'fields' => array( - 'loginname' => array( - 'label' => $lng['login']['username'], - 'type' => (isset($result['loginname'])) ? 'static' : 'text', - 'mandatory' => true, - ), - 'deactivated' => array( - 'label' => $lng['admin']['deactivated_user'], - 'type' => 'checkbox', - 'value' => '1', - 'sublabel' => $lng['panel']['yes'], - 'visible' => (!isset($result['adminid']) || (isset($result['adminid']) && $result['adminid'] != $userinfo['userid'])), - ), - 'admin_password' => array( - 'label' => $lng['login']['password'], - 'type' => 'password', - 'mandatory' => true, - 'autocomplete' => 'off' - ), - 'admin_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], - 'type' => 'text', - 'visible' => (Settings::Get('panel.password_regex') == ''), - 'value' => generatePassword(), - 'attributes' => array( - 'readonly' => true - ) - ), - 'def_language' => array( - 'label' => $lng['login']['language'], - 'type' => 'select', - 'generate' => 'languages', - 'selected' => Settings::Get('panel.standardlanguage') - ) - ) - ), - 'contactdata' => array( - 'title' => $lng['admin']['contactdata'], - 'fields' => array( - 'name' => array( - 'label' => $lng['customer']['name'], - 'type' => 'text', - 'mandatory' => true - ), - 'email' => array( - 'label' => $lng['customer']['email'], - 'type' => 'email', - 'mandatory' => true - ), - 'custom_notes' => array( - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ), - 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ) - ) - ), - 'servicedata' => array( - 'title' => $lng['admin']['servicedata'], - 'visible' => (!isset($result['adminid']) || (isset($result['adminid']) && $result['adminid'] != $userinfo['userid'])), - 'fields' => array( - 'ipaddress' => array( - 'label' => $lng['serversettings']['ipaddress']['title'], - 'type' => 'select', - 'values' => $ipaddress - ), - 'change_serversettings' => array( - 'label' => $lng['admin']['change_serversettings'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => 1 - ), - 'customers' => array( - 'label' => $lng['admin']['customers'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'customers_see_all' => array( - 'label' => $lng['admin']['customers_see_all'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'domains' => array( - 'label' => $lng['admin']['domains'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'domains_see_all' => array( - 'label' => $lng['admin']['domains_see_all'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'caneditphpsettings' => array( - 'label' => $lng['admin']['caneditphpsettings'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 6 - ) - ), - 'traffic' => array( - 'label' => $lng['customer']['traffic'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 4 - ) - ), - 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'emails' => array( - 'label' => $lng['customer']['emails'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'email_forwarders' => array( - 'label' => $lng['customer']['forwarders'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'email_quota' => array( - 'label' => $lng['customer']['email_quota'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'ftps' => array( - 'label' => $lng['customer']['ftps'], - 'type' => 'textul', - 'value' => 0, - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'tickets' => array( - 'label' => $lng['customer']['tickets'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), - 'attributes' => array( - 'maxlength' => 9 - ) - ), - 'tickets_see_all' => array( - 'label' => $lng['admin']['tickets_see_all'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ), - 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9 - ) - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.cronjobs.php b/lib/formfields/admin/formfield.cronjobs.php deleted file mode 100644 index ae8219c0..00000000 --- a/lib/formfields/admin/formfield.cronjobs.php +++ /dev/null @@ -1,42 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'fields' => array( - 'cronfile' => array( - 'label' => 'Cronjob', - 'type' => ($change_cronfile == 1 ? 'text' : 'static'), - ), - 'isactive' => array( - 'label' => $lng['admin']['activated'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => 1, - ), - 'interval_value' => array( - 'label' => $lng['cronjob']['cronjobintervalv'], - 'type' => 'text' - ), - 'interval_interval' => array( - 'label' => $lng['cronjob']['cronjobinterval'], - 'type' => 'select', - 'values' => $interval_interval - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.customer.php b/lib/formfields/admin/formfield.customer.php deleted file mode 100644 index a7053e9b..00000000 --- a/lib/formfields/admin/formfield.customer.php +++ /dev/null @@ -1,305 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'accountdata' => array( - 'title' => $lng['admin']['accountdata'], - 'fields' => array( - 'new_loginname' => array( - 'label' => $lng['login']['username'], - 'type' => 'text', - 'visible' => 'new' - ), - 'loginname' => array( - 'label' => $lng['login']['username'], - 'type' => 'static', - 'visible' => 'edit' - ), - 'documentroot' => array( - 'label' => $lng['customer']['documentroot'], - 'type' => 'static', - 'visible' => 'edit' - ), - 'createstdsubdomain' => array( - 'label' => $lng['admin']['stdsubdomain_add'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'store_defaultindex' => array( - 'label' => $lng['admin']['store_defaultindex'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'visible' => 'new', - 'attributes' => array( - 'checked' => true - ) - ), - 'deactivated' => array( - 'label' => $lng['admin']['deactivated_user'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'visible' => 'edit' - ), - 'new_customer_password' => array( - 'label' => $lng['login']['password'], - 'type' => 'password', - 'attributes' => array( - 'autocomplete' => 'off' - ) - ), - 'new_customer_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], - 'type' => 'text', - 'visible' => (Settings::Get('panel.password_regex') == ''), - 'value' => generatePassword(), - 'attributes' => array( - 'readonly' => true - ) - ), - 'sendpassword' => array( - 'label' => $lng['admin']['sendpassword'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'visible' => 'new', - 'attributes' => array( - 'checked' => true - ) - ), - 'def_language' => array( - 'label' => $lng['login']['language'], - 'type' => 'select', - 'generate' => 'languages', - 'selected' => Settings::Get('panel.standardlanguage'), - ) - ) - ), - 'contactdata' => array( - 'title' => $lng['admin']['contactdata'], - 'fields' => array( - 'gender' => array( - 'label' => $lng['gender']['title'], - 'type' => 'select', - 'generate' => 'genders', - 'selected' => '0' - ), - 'name' => array( - 'label' => $lng['customer']['name'], - 'type' => 'text', - 'mandatory_ex' => true - ), - 'firstname' => array( - 'label' => $lng['customer']['firstname'], - 'type' => 'text', - 'mandatory_ex' => true - ), - 'company' => array( - 'label' => $lng['customer']['company'], - 'type' => 'text', - 'mandatory_ex' => true - ), - 'street' => array( - 'label' => $lng['customer']['street'], - 'type' => 'text' - ), - 'zipcode' => array( - 'label' => $lng['customer']['zipcode'], - 'type' => 'text' - ), - 'city' => array( - 'label' => $lng['customer']['city'], - 'type' => 'text' - ), - 'phone' => array( - 'label' => $lng['customer']['phone'], - 'type' => 'text' - ), - 'fax' => array( - 'label' => $lng['customer']['fax'], - 'type' => 'text' - ), - 'email' => array( - 'label' => $lng['customer']['email'], - 'type' => 'email', - 'mandatory' => true - ), - 'customernumber' => array( - 'label' => $lng['customer']['customernumber'], - 'type' => 'text' - ), - 'custom_notes' => array( - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ), - 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1' - ) - ) - ), - 'servicedata' => array( - 'title' => $lng['admin']['servicedata'], - 'fields' => array( - 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 6, - ) - ), - 'traffic' => array( - 'label' => $lng['customer']['traffic'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 4, - ) - ), - 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'emails' => array( - 'label' => $lng['customer']['emails'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_forwarders' => array( - 'label' => $lng['customer']['forwarders'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_quota' => array( - 'label' => $lng['customer']['email_quota'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'email_imap' => array( - 'label' => $lng['customer']['email_imap'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'email_pop3' => array( - 'label' => $lng['customer']['email_pop3'], - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'ftps' => array( - 'label' => $lng['customer']['ftps'], - 'type' => 'textul', - 'value' => 0, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'tickets' => array( - 'label' => $lng['customer']['tickets'], - 'type' => 'textul', - 'value' => 0, - 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false), - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], - 'type' => 'textul', - 'value' => 0, - 'mandatory' => true, - 'attributes' => array( - 'maxlength' => 9, - ) - ), - 'phpenabled' => array( - 'label' => $lng['admin']['phpenabled'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'perlenabled' => array( - 'label' => $lng['admin']['perlenabled'].'?', - 'type' => 'checkbox', - 'sublabel' => $lng['panel']['yes'], - 'value' => '1', - ) - ) - ), - 'movetoadmin' => array( - 'title' => $lng['admin']['movetoadmin'], - 'visible' => (isset($admin_select_cnt) && $admin_select_cnt > 1 && isset($result['loginname'])), - 'fields' => array( - 'move_to_admin' => array( - 'label' => $lng['admin']['movecustomertoadmin'], - 'type' => 'select', - 'values' => (isset($admin_select)) ? $admin_select : null - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.ipsandports.php b/lib/formfields/admin/formfield.ipsandports.php deleted file mode 100644 index fd09f42e..00000000 --- a/lib/formfields/admin/formfield.ipsandports.php +++ /dev/null @@ -1,126 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'title' => $lng['admin']['ipsandports']['ipandport'], - 'fields' => array( - 'ip' => array( - 'label' => $lng['admin']['ipsandports']['ip'], - 'type' => 'text' - ), - 'port' => array( - 'label' => $lng['admin']['ipsandports']['port'], - 'type' => 'text', - 'size' => 5 - ) - ) - ), - 'section_b' => array( - 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], - 'fields' => array( - 'listen_statement' => array( - 'label' => $lng['admin']['ipsandports']['create_listen_statement'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'namevirtualhost_statement' => array( - 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'vhostcontainer' => array( - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ), - 'docroot' => array( - 'label' => $lng['admin']['ipsandports']['docroot']['title'], - 'desc' => $lng['admin']['ipsandports']['docroot']['description'], - 'type' => 'text' - ), - 'specialsettings' => array( - 'label' => $lng['admin']['ownvhostsettings'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ), - 'vhostcontainer_servername_statement' => array( - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], - 'type' => 'checkbox', - 'value' => '1', - 'attributes' => array( - 'checked' => true - ) - ) - ) - ), - 'section_c' => array( - 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], - 'fields' => array( - 'default_vhostconf_domain' => array( - 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], - 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], - 'type' => 'textarea', - 'attributes' => array( - 'cols' => 60, - 'rows' => 12 - ) - ) - ) - ), - 'section_d' => array( - 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], - 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false), - 'fields' => array( - 'ssl' => array( - 'label' => $lng['admin']['ipsandports']['enable_ssl'], - 'type' => 'checkbox', - 'value' => '1' - ), - 'ssl_cert_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], - 'type' => 'text' - ), - 'ssl_key_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_key_file'], - 'type' => 'text' - ), - 'ssl_ca_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], - 'type' => 'text' - ), - 'ssl_cert_chainfile' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], - 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], - 'type' => 'text' - ) - ) - ) -); diff --git a/lib/formfields/admin/formfield.phpconfig.php b/lib/formfields/admin/formfield.phpconfig.php deleted file mode 100644 index 86f7e5cc..00000000 --- a/lib/formfields/admin/formfield.phpconfig.php +++ /dev/null @@ -1,92 +0,0 @@ - (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Formfields - * - */ - -return array( - 'section_a' => array( - 'title' => $lng['admin']['phpsettings']['addsettings'], - 'fields' => array( - 'description' => array( - 'label' => $lng['admin']['phpsettings']['description'], - 'type' => 'text', - 'attributes' => array( - 'maxlength' => 50 - ) - ), - 'binary' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['binary'], - 'type' => 'text', - 'value' => '/usr/bin/php-cgi', - 'attributes' => array( - 'maxlength' => 255 - ) - ), - 'file_extensions' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['file_extensions'], - 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], - 'type' => 'text', - 'value' => 'php', - 'attributes' => array( - 'maxlength' => 255 - ) - ), - 'mod_fcgid_starter' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_starter']['title'], - 'type' => 'text' - ), - 'mod_fcgid_maxrequests' => array( - 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], - 'type' => 'text' - ), - 'fpm_slowlog' => array( - 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['enable_slowlog'], - 'type' => 'checkbox', - 'value' => '1' - ), - 'fpm_reqterm' => array( - 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], - 'type' => 'text', - 'value' => '60s', - 'attributes' => array( - 'maxlength' => 10 - ) - ), - 'fpm_reqslow' => array( - 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], - 'type' => 'text', - 'maxlength' => 10, - 'value' => '5s' - ), - 'phpsettings' => array( - 'style' => 'align-top', - 'label' => $lng['admin']['phpsettings']['phpinisettings'], - 'type' => 'textarea', - 'value' => $result['phpsettings'], - 'attributes' => array( - 'cols' => 80, - 'rows' => 20 - ) - ) - ) - ) -); diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php new file mode 100644 index 00000000..289a30d4 --- /dev/null +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php @@ -0,0 +1,137 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'ipsandports_add' => array( + 'title' => $lng['admin']['ipsandports']['add'], + 'image' => 'icons/ipsports_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['ipsandports']['ipandport'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'ip' => array( + 'label' => $lng['admin']['ipsandports']['ip'], + 'type' => 'text' + ), + 'port' => array( + 'label' => $lng['admin']['ipsandports']['port'], + 'type' => 'text', + 'size' => 5 + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'listen_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_listen_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'namevirtualhost_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'vhostcontainer' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ), + 'docroot' => array( + 'label' => $lng['admin']['ipsandports']['docroot']['title'], + 'desc' => $lng['admin']['ipsandports']['docroot']['description'], + 'type' => 'text' + ), + 'specialsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ownvhostsettings'], + 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ), + 'vhostcontainer_servername_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'default_vhostconf_domain' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], + 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12 + ) + ) + ), + 'section_d' => array( + 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], + 'image' => 'icons/ipsports_add.png', + 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false), + 'fields' => array( + 'ssl' => array( + 'label' => $lng['admin']['ipsandports']['enable_ssl'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'ssl_cert_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], + 'type' => 'text' + ), + 'ssl_key_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_key_file'], + 'type' => 'text' + ), + 'ssl_ca_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], + 'type' => 'text' + ), + 'ssl_cert_chainfile' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], + 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], + 'type' => 'text' + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php new file mode 100644 index 00000000..49dd8bf4 --- /dev/null +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php @@ -0,0 +1,146 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'ipsandports_edit' => array( + 'title' => $lng['admin']['ipsandports']['edit'], + 'image' => 'icons/ipsports_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['ipsandports']['ipandport'], + 'image' => 'icons/ipsports_add.png', + 'fields' => array( + 'ip' => array( + 'label' => $lng['admin']['ipsandports']['ip'], + 'type' => 'text', + 'value' => $result['ip'] + ), + 'port' => array( + 'label' => $lng['admin']['ipsandports']['port'], + 'type' => 'text', + 'value' => $result['port'], + 'size' => 5 + ) + ) + ), + 'section_b' => array( + 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], + 'image' => 'icons/ipsports_edit.png', + 'fields' => array( + 'listen_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_listen_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['listen_statement']) + ), + 'namevirtualhost_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['namevirtualhost_statement']) + ), + 'vhostcontainer' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['vhostcontainer']) + ), + 'docroot' => array( + 'label' => $lng['admin']['ipsandports']['docroot']['title'], + 'desc' => $lng['admin']['ipsandports']['docroot']['description'], + 'type' => 'text', + 'value' => $result['docroot'] + ), + 'specialsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ownvhostsettings'], + 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['specialsettings'] + ), + 'vhostcontainer_servername_statement' => array( + 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['vhostcontainer_servername_statement']) + ) + ) + ), + 'section_c' => array( + 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], + 'image' => 'icons/ipsports_edit.png', + 'fields' => array( + 'default_vhostconf_domain' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], + 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], + 'type' => 'textarea', + 'cols' => 60, + 'rows' => 12, + 'value' => $result['default_vhostconf_domain'] + ) + ) + ), + 'section_d' => array( + 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], + 'image' => 'icons/ipsports_edit.png', + 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false), + 'fields' => array( + 'ssl' => array( + 'label' => $lng['admin']['ipsandports']['enable_ssl'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['ssl']) + ), + 'ssl_cert_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], + 'type' => 'text', + 'value' => $result['ssl_cert_file'] + ), + 'ssl_key_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_key_file'], + 'type' => 'text', + 'value' => $result['ssl_key_file'] + ), + 'ssl_ca_file' => array( + 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], + 'type' => 'text', + 'value' => $result['ssl_ca_file'] + ), + 'ssl_cert_chainfile' => array( + 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], + 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], + 'type' => 'text', + 'value' => $result['ssl_cert_chainfile'] + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php new file mode 100644 index 00000000..bbad9529 --- /dev/null +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php @@ -0,0 +1,92 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'phpconfig_add' => array( + 'title' => $lng['admin']['phpsettings']['addsettings'], + 'image' => 'icons/phpsettings_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['phpsettings']['addsettings'], + 'image' => 'icons/phpsettings_add.png', + 'fields' => array( + 'description' => array( + 'label' => $lng['admin']['phpsettings']['description'], + 'type' => 'text', + 'maxlength' => 50 + ), + 'binary' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['binary'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => '/usr/bin/php-cgi' + ), + 'file_extensions' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['file_extensions'], + 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => 'php' + ), + 'mod_fcgid_starter' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_starter']['title'], + 'type' => 'text' + ), + 'mod_fcgid_maxrequests' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'type' => 'text' + ), + 'phpfpm_enable_slowlog' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['enable_slowlog'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() + ), + 'phpfpm_reqtermtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => '60s' + ), + 'phpfpm_reqslowtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => '5s' + ), + 'phpsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['phpsettings']['phpinisettings'], + 'type' => 'textarea', + 'cols' => 80, + 'rows' => 20, + 'value' => $result['phpsettings'] + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php new file mode 100644 index 00000000..83dbbd44 --- /dev/null +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php @@ -0,0 +1,95 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + * + */ + +return array( + 'phpconfig_edit' => array( + 'title' => $lng['admin']['phpsettings']['editsettings'], + 'image' => 'icons/phpsettings_edit.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['admin']['phpsettings']['editsettings'], + 'image' => 'icons/phpsettings_edit.png', + 'fields' => array( + 'description' => array( + 'label' => $lng['admin']['phpsettings']['description'], + 'type' => 'text', + 'maxlength' => 50, + 'value' => $result['description'] + ), + 'binary' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['binary'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => $result['binary'] + ), + 'file_extensions' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['file_extensions'], + 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], + 'type' => 'text', + 'maxlength' => 255, + 'value' => $result['file_extensions'] + ), + 'mod_fcgid_starter' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_starter']['title'], + 'type' => 'text', + 'value' => ((int)$result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '') + ), + 'mod_fcgid_maxrequests' => array( + 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false), + 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'type' => 'text', + 'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '') + ), + 'phpfpm_enable_slowlog' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['enable_slowlog'], + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['fpm_slowlog']) + ), + 'phpfpm_reqtermtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => $result['fpm_reqterm'] + ), + 'phpfpm_reqslowtimeout' => array( + 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false), + 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], + 'type' => 'text', + 'maxlength' => 10, + 'value' => $result['fpm_reqslow'] + ), + 'phpsettings' => array( + 'style' => 'align-top', + 'label' => $lng['admin']['phpsettings']['phpinisettings'], + 'type' => 'textarea', + 'cols' => 80, + 'rows' => 20, + 'value' => $result['phpsettings'] + ) + ) + ) + ) + ) +); diff --git a/templates/Sparkle/admin/admins/admins_add.tpl b/templates/Sparkle/admin/admins/admins_add.tpl index 8b4257ed..cd03236c 100644 --- a/templates/Sparkle/admin/admins/admins_add.tpl +++ b/templates/Sparkle/admin/admins/admins_add.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['admin']['admin_add']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/admins/admins_edit.tpl b/templates/Sparkle/admin/admins/admins_edit.tpl index d170bbe5..9b58bd70 100644 --- a/templates/Sparkle/admin/admins/admins_edit.tpl +++ b/templates/Sparkle/admin/admins/admins_edit.tpl @@ -2,7 +2,7 @@ $header

-  {$lng['admin']['admin_edit']} + {$title} {$title}

diff --git a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl index 79d573ed..ed0fa55c 100644 --- a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl +++ b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['admin']['cronjob_edit']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/customers/customers_add.tpl b/templates/Sparkle/admin/customers/customers_add.tpl index affa9b24..ffabf7d9 100644 --- a/templates/Sparkle/admin/customers/customers_add.tpl +++ b/templates/Sparkle/admin/customers/customers_add.tpl @@ -2,8 +2,8 @@ $header

- {$lng['admin']['customer_add']}  - {$lng['admin']['customer_add']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/customers/customers_edit.tpl b/templates/Sparkle/admin/customers/customers_edit.tpl index 0826e57d..f9d751ec 100644 --- a/templates/Sparkle/admin/customers/customers_edit.tpl +++ b/templates/Sparkle/admin/customers/customers_edit.tpl @@ -2,8 +2,8 @@ $header

-   - {$lng['admin']['customer_edit']} + {$title}  + {$title}

diff --git a/templates/Sparkle/admin/domains/domains_import.tpl b/templates/Sparkle/admin/domains/domains_import.tpl index fb653c5e..6d24d003 100644 --- a/templates/Sparkle/admin/domains/domains_import.tpl +++ b/templates/Sparkle/admin/domains/domains_import.tpl @@ -3,7 +3,7 @@ $header

{$title}  - {$lng['domains']['domain_import']} + {$title}

diff --git a/templates/Sparkle/customer/mysql/mysqls_add.tpl b/templates/Sparkle/customer/mysql/mysqls_add.tpl index a147c78a..3fa467f7 100644 --- a/templates/Sparkle/customer/mysql/mysqls_add.tpl +++ b/templates/Sparkle/customer/mysql/mysqls_add.tpl @@ -2,8 +2,8 @@ $header

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

diff --git a/templates/Sparkle/customer/mysql/mysqls_edit.tpl b/templates/Sparkle/customer/mysql/mysqls_edit.tpl index 732f931d..7beacda2 100644 --- a/templates/Sparkle/customer/mysql/mysqls_edit.tpl +++ b/templates/Sparkle/customer/mysql/mysqls_edit.tpl @@ -2,8 +2,8 @@ $header

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

diff --git a/templates/Sparkle/htmlform/checkbox.tpl b/templates/Sparkle/htmlform/checkbox.tpl deleted file mode 100644 index ca710a8d..00000000 --- a/templates/Sparkle/htmlform/checkbox.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/Sparkle/htmlform/form_end.tpl b/templates/Sparkle/htmlform/form_end.tpl deleted file mode 100644 index 263ce363..00000000 --- a/templates/Sparkle/htmlform/form_end.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/templates/Sparkle/htmlform/group_heading.tpl b/templates/Sparkle/htmlform/group_heading.tpl deleted file mode 100644 index 8336b673..00000000 --- a/templates/Sparkle/htmlform/group_heading.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - {$grouptitle} - - - - - - diff --git a/templates/Sparkle/htmlform/input.tpl b/templates/Sparkle/htmlform/input.tpl deleted file mode 100644 index 90a84b93..00000000 --- a/templates/Sparkle/htmlform/input.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/Sparkle/htmlform/inputul.tpl b/templates/Sparkle/htmlform/inputul.tpl deleted file mode 100644 index 89b8130a..00000000 --- a/templates/Sparkle/htmlform/inputul.tpl +++ /dev/null @@ -1 +0,0 @@ -  diff --git a/templates/Sparkle/htmlform/select.tpl b/templates/Sparkle/htmlform/select.tpl deleted file mode 100644 index 0225e3e5..00000000 --- a/templates/Sparkle/htmlform/select.tpl +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/templates/Sparkle/htmlform/skeleton.tpl b/templates/Sparkle/htmlform/skeleton.tpl deleted file mode 100644 index cc6b167f..00000000 --- a/templates/Sparkle/htmlform/skeleton.tpl +++ /dev/null @@ -1,4 +0,0 @@ - -
{$desc} - {$field} - diff --git a/templates/Sparkle/htmlform/skeleton_checkbox.tpl b/templates/Sparkle/htmlform/skeleton_checkbox.tpl deleted file mode 100644 index cc6b167f..00000000 --- a/templates/Sparkle/htmlform/skeleton_checkbox.tpl +++ /dev/null @@ -1,4 +0,0 @@ - -
{$desc} - {$field} - diff --git a/templates/Sparkle/htmlform/static.tpl b/templates/Sparkle/htmlform/static.tpl deleted file mode 100644 index 3d5dc446..00000000 --- a/templates/Sparkle/htmlform/static.tpl +++ /dev/null @@ -1 +0,0 @@ -{$value} diff --git a/templates/Sparkle/htmlform/textarea.tpl b/templates/Sparkle/htmlform/textarea.tpl deleted file mode 100644 index 3e1509a8..00000000 --- a/templates/Sparkle/htmlform/textarea.tpl +++ /dev/null @@ -1 +0,0 @@ -