diff --git a/admin_domains.php b/admin_domains.php index 5f9208e2..d3da78d7 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -570,8 +570,6 @@ if($page == 'domains' $ssl_ipsandports.= makeoption($row_ssl_ipandport['ip'] . ':' . $row_ssl_ipandport['port'], $row_ssl_ipandport['id'], $settings['system']['defaultip']); } - $ssl = makeyesno('ssl', '1', '0', $result['ssl']); - $ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']); $standardsubdomains = array(); $result_standardsubdomains = $db->query('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`, `' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`id`=`c`.`standardsubdomain`'); @@ -615,6 +613,8 @@ if($page == 'domains' $openbasedir = makeyesno('openbasedir', '1', '0', '1'); $safemode = makeyesno('safemode', '1', '0', '1'); $speciallogfile = makeyesno('speciallogfile', '1', '0', '0'); + $ssl = makeyesno('ssl', '1', '0', '0'); + $ssl_redirect = makeyesno('ssl_redirect', '1', '0', '0'); $add_date = date('Y-m-d'); eval("echo \"" . getTemplate("domains/domains_add") . "\";"); diff --git a/lng/english.lng.php b/lng/english.lng.php index b6a1a96b..ba9e6833 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1290,4 +1290,10 @@ $lng['tasks']['noneoutstanding'] = 'There are currently no outstanding tasks for $lng['ticket']['nonexistingcustomer'] = '(deleted customer)'; $lng['admin']['ticket_nocustomeraddingavailable'] = 'It\'s not possible to open a new support-ticket currently. You first need to add at least one customer.'; +// ADDED IN FROXLOR 0.9.1 + +$lng['admin']['accountdata'] = 'Account Data'; +$lng['admin']['contactdata'] = 'Contact Data'; +$lng['admin']['servicedata'] = 'Service Data'; + ?> diff --git a/lng/german.lng.php b/lng/german.lng.php index e398efb8..a23e786e 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1270,4 +1270,10 @@ $lng['tasks']['noneoutstanding'] = 'Zur Zeit gibt es keine ausstehenden Aufgaben $lng['ticket']['nonexistingcustomer'] = '(gelöschter Kunde)'; $lng['admin']['ticket_nocustomeraddingavailable'] = 'Es können derzeit keine neuen Support-Tickets eröffnet werden. Sie müssen zuerst einen Kunden anlegen'; +// ADDED IN FROXLOR 0.9.1 + +$lng['admin']['accountdata'] = 'Benutzerdaten'; +$lng['admin']['contactdata'] = 'Kontaktdaten'; +$lng['admin']['servicedata'] = 'Dienstleistungsdaten'; + ?> diff --git a/templates/admin/ticket/categories.tpl b/templates/admin/ticket/categories.tpl index f1c8673d..04fe6c68 100644 --- a/templates/admin/ticket/categories.tpl +++ b/templates/admin/ticket/categories.tpl @@ -15,7 +15,7 @@ $header