diff --git a/lib/Froxlor/Api/ApiCommand.php b/lib/Froxlor/Api/ApiCommand.php index 9b7dcc6e..b0fa6768 100644 --- a/lib/Froxlor/Api/ApiCommand.php +++ b/lib/Froxlor/Api/ApiCommand.php @@ -285,7 +285,7 @@ abstract class ApiCommand extends ApiParameter } } elseif (in_array($valoper['op'], $ops)) { $condition .= $field . ' ' . $valoper['op'] . ':' . $cleanfield; - $query_fields[':' . $cleanfield] = $valoper['value'] ?? ''; + $query_fields[':' . $cleanfield] = $valoper['value'] ? ''; } else { continue; } diff --git a/templates/Maketank/admin/admins/admins_admin.tpl b/templates/Maketank/admin/admins/admins_admin.tpl index 7e720a30..c009ff30 100644 --- a/templates/Maketank/admin/admins/admins_admin.tpl +++ b/templates/Maketank/admin/admins/admins_admin.tpl @@ -18,12 +18,12 @@ Webspace: - +
- +
@@ -42,12 +42,12 @@ Traffic: - +
- +
diff --git a/templates/Maketank/admin/configfiles/configfiles.tpl b/templates/Maketank/admin/configfiles/configfiles.tpl index f35b4051..d469aed3 100644 --- a/templates/Maketank/admin/configfiles/configfiles.tpl +++ b/templates/Maketank/admin/configfiles/configfiles.tpl @@ -11,25 +11,15 @@ $header
-

{$lng['admin']['configfiles']['legend']}


+

{$lng['admin']['configfiles']['legend']}

+

{$lng['admin']['configfiles']['commands']}

+

{$lng['admin']['configfiles']['files']}

- {$lng['admin']['configfiles']['commands']}
- -


-

- {$lng['admin']['configfiles']['files']}
- -

- MYSQL_PASSWORD: + FROXLOR_MYSQL_PASSWORD:
+

diff --git a/templates/Maketank/admin/configfiles/wizard.tpl b/templates/Maketank/admin/configfiles/wizard.tpl index 66fbdc0a..a20c129d 100644 --- a/templates/Maketank/admin/configfiles/wizard.tpl +++ b/templates/Maketank/admin/configfiles/wizard.tpl @@ -8,6 +8,13 @@ $header +
+
+
{$lng['admin']['warning']}
+
{$lng['panel']['settings_before_configuration']}
+
+
+
@@ -51,10 +58,25 @@ $header + + + {$lng['panel']['done_configuring']}:

{$lng['panel']['ihave_configured']}

+ + {$lng['panel']['system_is_configured']} + +
+ +


+
+

{$lng['panel']['alternative_cmdline_config']}:

+
+ +
+
$footer diff --git a/templates/Maketank/admin/customers/customers_add.tpl b/templates/Maketank/admin/customers/customers_add.tpl index ffabf7d9..472c6b54 100644 --- a/templates/Maketank/admin/customers/customers_add.tpl +++ b/templates/Maketank/admin/customers/customers_add.tpl @@ -6,6 +6,7 @@ $header {$title} +
diff --git a/templates/Maketank/admin/customers/customers_customer.tpl b/templates/Maketank/admin/customers/customers_customer.tpl index 519076c9..6a939ca3 100644 --- a/templates/Maketank/admin/customers/customers_customer.tpl +++ b/templates/Maketank/admin/customers/customers_customer.tpl @@ -25,17 +25,17 @@ Webspace: - -
+ +
- -
+ +
-
+
@@ -49,12 +49,12 @@ Traffic: - +
- +
diff --git a/templates/Maketank/admin/customers/customers_edit.tpl b/templates/Maketank/admin/customers/customers_edit.tpl index f9d751ec..5d4d1c34 100644 --- a/templates/Maketank/admin/customers/customers_edit.tpl +++ b/templates/Maketank/admin/customers/customers_edit.tpl @@ -6,6 +6,7 @@ $header {$title} +
diff --git a/templates/Maketank/admin/domains/domains_add.tpl b/templates/Maketank/admin/domains/domains_add.tpl index f760faed..ebce2ce6 100644 --- a/templates/Maketank/admin/domains/domains_add.tpl +++ b/templates/Maketank/admin/domains/domains_add.tpl @@ -6,6 +6,7 @@ $header {$title} +
diff --git a/templates/Maketank/admin/domains/domains_domain.tpl b/templates/Maketank/admin/domains/domains_domain.tpl index e9d222e4..0c85286e 100644 --- a/templates/Maketank/admin/domains/domains_domain.tpl +++ b/templates/Maketank/admin/domains/domains_domain.tpl @@ -1,13 +1,16 @@ - + - + class="disabled"> - {$row['domain']} + {$row['domain']}  ({$lng['admin']['stdsubdomain']}) + +
{$lng['domains']['registration_date']}: {$row['registration_date']} +
({$lng['domains']['termination_date_overview']} {$row['termination_date']})
 @@ -20,23 +23,23 @@ {$lng['panel']['edit']} - + + {$lng['panel']['viewlogs']} + +   {$lng['dnseditor']['edit']} -  {$lng['panel']['letsencrypt']} +  {$lng['panel']['letsencrypt']} - +   {$lng['panel']['delete']} - -  {$lng['domains']['hasaliasdomains']} - diff --git a/templates/Maketank/admin/domains/domains_edit.tpl b/templates/Maketank/admin/domains/domains_edit.tpl index 0fb4b1cd..7c8fba08 100644 --- a/templates/Maketank/admin/domains/domains_edit.tpl +++ b/templates/Maketank/admin/domains/domains_edit.tpl @@ -4,7 +4,7 @@ $header

{$title}  {$title} - +  ({$lng['dnseditor']['edit']})

diff --git a/templates/Maketank/admin/index/index.tpl b/templates/Maketank/admin/index/index.tpl index efe000a4..858c7a5d 100644 --- a/templates/Maketank/admin/index/index.tpl +++ b/templates/Maketank/admin/index/index.tpl @@ -122,7 +122,7 @@ $header
- +

@@ -149,25 +149,10 @@ $header
- - -
- -
- {$lng['customer']['tickets']}
- - {$overview['tickets_used']} {$lng['panel']['used']}
- {$userinfo['tickets_used']} {$lng['panel']['assigned']}
- - {$userinfo['tickets']} {$lng['panel']['available']} - - -
-
- + @@ -211,6 +196,10 @@ $header + + + + @@ -227,6 +216,10 @@ $header + + + + @@ -267,15 +260,15 @@ $header - + - + + + + + + - - - - -
{$lng['admin']['hostname']}:{$system_hostname}
{$lng['admin']['serversoftware']}: {$_SERVER['SERVER_SOFTWARE']}{$lng['admin']['webserverinterface']}: $webserverinterface
{$lng['admin']['memory']}:
$memory
{$lng['admin']['sysload']}: $load$lookfornewversion_lable
{$lng['admin']['newerversionavailable']}$lookfornewversion_message
$lookfornewversion_addinfo
$lookfornewversion_addinfo
@@ -284,4 +277,3 @@ $header $footer - diff --git a/templates/Maketank/admin/ipsandports/ipsandports.tpl b/templates/Maketank/admin/ipsandports/ipsandports.tpl index 753aa1bd..4112553f 100644 --- a/templates/Maketank/admin/ipsandports/ipsandports.tpl +++ b/templates/Maketank/admin/ipsandports/ipsandports.tpl @@ -27,7 +27,7 @@ $header {$lng['admin']['ipsandports']['ip']} {$arrowcode['ip']} {$lng['admin']['ipsandports']['port']} {$arrowcode['port']} Listen - NameVirtualHost + NameVirtualHost vHost-Container Specialsettings ServerName diff --git a/templates/Maketank/admin/ipsandports/ipsandports_ipandport.tpl b/templates/Maketank/admin/ipsandports/ipsandports_ipandport.tpl index 245ba681..720c486a 100644 --- a/templates/Maketank/admin/ipsandports/ipsandports_ipandport.tpl +++ b/templates/Maketank/admin/ipsandports/ipsandports_ipandport.tpl @@ -2,7 +2,7 @@ {$row['ip']} {$row['port']} {$lng['panel']['yes']}{$lng['panel']['no']} - {$lng['panel']['yes']}{$lng['panel']['no']} + {$lng['panel']['yes']}{$lng['panel']['no']} {$lng['panel']['yes']}{$lng['panel']['no']} {$lng['panel']['yes']}{$lng['panel']['no']} {$lng['panel']['yes']}{$lng['panel']['no']} diff --git a/templates/Maketank/admin/phpconfig/fpmconfig_add.tpl b/templates/Maketank/admin/phpconfig/fpmconfig_add.tpl new file mode 100644 index 00000000..6dd46ae1 --- /dev/null +++ b/templates/Maketank/admin/phpconfig/fpmconfig_add.tpl @@ -0,0 +1,98 @@ +$header +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+ + + + + + + {$fpmconfig_add_form} +
+
+
+
+ +
+
+
+

+ {$lng['admin']['templates']['template_replace_vars']} +

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['panel']['variable']}{$lng['panel']['description']}
{PEAR_DIR}{$lng['admin']['phpconfig']['pear_dir']}
{OPEN_BASEDIR_C}{$lng['admin']['phpconfig']['open_basedir_c']}
{OPEN_BASEDIR}{$lng['admin']['phpconfig']['open_basedir']}
{OPEN_BASEDIR_GLOBAL}{$lng['admin']['phpconfig']['open_basedir_global']}
{TMP_DIR}{$lng['admin']['phpconfig']['tmp_dir']}
{CUSTOMER_EMAIL}{$lng['admin']['phpconfig']['customer_email']}
{ADMIN_EMAIL}{$lng['admin']['phpconfig']['admin_email']}
{DOMAIN}{$lng['admin']['phpconfig']['domain']}
{CUSTOMER}{$lng['admin']['phpconfig']['customer']}
{ADMIN}{$lng['admin']['phpconfig']['admin']}
{DOCUMENT_ROOT}{$lng['admin']['phpconfig']['docroot']}
{CUSTOMER_HOMEDIR}{$lng['admin']['phpconfig']['homedir']}
+ +
+ +
+ +$footer diff --git a/templates/Maketank/admin/phpconfig/fpmconfig_edit.tpl b/templates/Maketank/admin/phpconfig/fpmconfig_edit.tpl new file mode 100644 index 00000000..1fa660a7 --- /dev/null +++ b/templates/Maketank/admin/phpconfig/fpmconfig_edit.tpl @@ -0,0 +1,99 @@ +$header +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+ + + + + + + + {$fpmconfig_edit_form} +
+
+
+
+ +
+
+
+

+ {$lng['admin']['templates']['template_replace_vars']} +

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['panel']['variable']}{$lng['panel']['description']}
{PEAR_DIR}{$lng['admin']['phpconfig']['pear_dir']}
{OPEN_BASEDIR_C}{$lng['admin']['phpconfig']['open_basedir_c']}
{OPEN_BASEDIR}{$lng['admin']['phpconfig']['open_basedir']}
{OPEN_BASEDIR_GLOBAL}{$lng['admin']['phpconfig']['open_basedir_global']}
{TMP_DIR}{$lng['admin']['phpconfig']['tmp_dir']}
{CUSTOMER_EMAIL}{$lng['admin']['phpconfig']['customer_email']}
{ADMIN_EMAIL}{$lng['admin']['phpconfig']['admin_email']}
{DOMAIN}{$lng['admin']['phpconfig']['domain']}
{CUSTOMER}{$lng['admin']['phpconfig']['customer']}
{ADMIN}{$lng['admin']['phpconfig']['admin']}
{DOCUMENT_ROOT}{$lng['admin']['phpconfig']['docroot']}
{CUSTOMER_HOMEDIR}{$lng['admin']['phpconfig']['homedir']}
+ +
+ +
+ +$footer diff --git a/templates/Maketank/admin/phpconfig/fpmdaemons.tpl b/templates/Maketank/admin/phpconfig/fpmdaemons.tpl new file mode 100644 index 00000000..2bb01e10 --- /dev/null +++ b/templates/Maketank/admin/phpconfig/fpmdaemons.tpl @@ -0,0 +1,42 @@ +$header +
+
+

+   + {$lng['menue']['phpsettings']['fpmdaemons']} +

+
+ +
+ +
+   + {$lng['admin']['fpmsettings']['addnew']} +
+ + + + + + + + + + + + + $tablecontent + +
{$lng['admin']['phpsettings']['description']}{$lng['admin']['phpsettings']['activephpconfigs']}{$lng['serversettings']['phpfpm_settings']['reload']}{$lng['serversettings']['phpfpm_settings']['configdir']}{$lng['serversettings']['phpfpm_settings']['pm']}{$lng['panel']['options']}
+ + +
+   + {$lng['admin']['fpmsettings']['addnew']} +
+ + +
+ +
+$footer diff --git a/templates/Maketank/admin/phpconfig/fpmdaemons_overview.tpl b/templates/Maketank/admin/phpconfig/fpmdaemons_overview.tpl new file mode 100644 index 00000000..fe2d894a --- /dev/null +++ b/templates/Maketank/admin/phpconfig/fpmdaemons_overview.tpl @@ -0,0 +1,17 @@ + + {$row['description']} + {$configs} + {$row['reload_cmd']} + {$row['config_dir']} + {$row['pm']} + + + {$lng['panel']['edit']} + + +   + {$lng['panel']['delete']} + + + + diff --git a/templates/Maketank/admin/phpconfig/overview.tpl b/templates/Maketank/admin/phpconfig/overview.tpl index 6fcfc428..b23cc62f 100644 --- a/templates/Maketank/admin/phpconfig/overview.tpl +++ b/templates/Maketank/admin/phpconfig/overview.tpl @@ -1,34 +1,37 @@ $header -
-
-

-   - {$lng['menue']['phpsettings']['maintitle']} -

-
+
+
+

+   {$lng['menue']['phpsettings']['maintitle']} +

+
-
+
-
-   - {$lng['admin']['phpsettings']['addnew']} -
+
+   + {$lng['admin']['phpsettings']['addnew']} +
- - - - - - - - - - - $tablecontent - -
{$lng['admin']['phpsettings']['description']}{$lng['admin']['phpsettings']['activedomains']}{$lng['admin']['phpsettings']['binary']}{$lng['admin']['phpsettings']['file_extensions']}{$lng['panel']['options']}
- - + + + + + + + + + + + + + $tablecontent + +
{$lng['admin']['phpsettings']['description']}{$lng['admin']['phpsettings']['activedomains']}{$lng['admin']['phpsettings']['fpmdesc']}{$lng['admin']['phpsettings']['binary']}{$lng['admin']['phpsettings']['file_extensions']}{$lng['panel']['options']}
+ +
  {$lng['admin']['phpsettings']['addnew']} @@ -37,5 +40,5 @@ $header
-
+
$footer diff --git a/templates/Maketank/admin/phpconfig/overview_add.tpl b/templates/Maketank/admin/phpconfig/overview_add.tpl index f11be390..9a1fa9c8 100644 --- a/templates/Maketank/admin/phpconfig/overview_add.tpl +++ b/templates/Maketank/admin/phpconfig/overview_add.tpl @@ -88,6 +88,10 @@ $header {DOCUMENT_ROOT} {$lng['admin']['phpconfig']['docroot']} + + {CUSTOMER_HOMEDIR} + {$lng['admin']['phpconfig']['homedir']} + diff --git a/templates/Maketank/admin/phpconfig/overview_edit.tpl b/templates/Maketank/admin/phpconfig/overview_edit.tpl index b5d73071..6f712b68 100644 --- a/templates/Maketank/admin/phpconfig/overview_edit.tpl +++ b/templates/Maketank/admin/phpconfig/overview_edit.tpl @@ -84,6 +84,10 @@ $header {DOCUMENT_ROOT} {$lng['admin']['phpconfig']['docroot']} + + {CUSTOMER_HOMEDIR} + {$lng['admin']['phpconfig']['homedir']} + diff --git a/templates/Maketank/admin/phpconfig/overview_overview.tpl b/templates/Maketank/admin/phpconfig/overview_overview.tpl index 2df5fd6f..18059d57 100644 --- a/templates/Maketank/admin/phpconfig/overview_overview.tpl +++ b/templates/Maketank/admin/phpconfig/overview_overview.tpl @@ -1,7 +1,11 @@ {$row['description']} - {$domains} - {$row['binary']} + {$domains}+ {$subdomains_count} {$lng['customer']['subdomains']} + + {$row['fpmdesc']} + + {$row['binary']} + {$row['file_extensions']} diff --git a/templates/Maketank/admin/plans/plans.tpl b/templates/Maketank/admin/plans/plans.tpl new file mode 100644 index 00000000..ed9c4432 --- /dev/null +++ b/templates/Maketank/admin/plans/plans.tpl @@ -0,0 +1,59 @@ +$header +
+
+

+   + {$lng['admin']['plans']['plans']} +

+
+ +
+ +
+ + +
+ {$searchcode} +
+ +
+   + {$lng['admin']['plans']['add']} +
+ + + + + + + + + + + + + + + + + + + + + + $plans + +
{$lng['admin']['plans']['name']} {$arrowcode['p.name']}{$lng['admin']['plans']['description']} {$arrowcode['p.description']}{$lng['admin']['admin']} {$arrowcode['adminname']}{$lng['admin']['plans']['last_update']} {$arrowcode['p.ts']}{$lng['panel']['options']}
{$pagingcode}
+
+ + +
+   + {$lng['admin']['plans']['add']} +
+ + +
+ +
+$footer diff --git a/templates/Maketank/admin/tickets/tickets_new.tpl b/templates/Maketank/admin/plans/plans_add.tpl similarity index 61% rename from templates/Maketank/admin/tickets/tickets_new.tpl rename to templates/Maketank/admin/plans/plans_add.tpl index 499f28b8..ac434237 100644 --- a/templates/Maketank/admin/tickets/tickets_new.tpl +++ b/templates/Maketank/admin/plans/plans_add.tpl @@ -2,21 +2,21 @@ $header

- {$title}  + {$title}  {$title}

-
+ - {$ticket_new_form} + {$plans_add_form}
diff --git a/templates/Maketank/admin/tickets/tickets_editcategory.tpl b/templates/Maketank/admin/plans/plans_edit.tpl similarity index 63% rename from templates/Maketank/admin/tickets/tickets_editcategory.tpl rename to templates/Maketank/admin/plans/plans_edit.tpl index 95ae405d..a812f803 100644 --- a/templates/Maketank/admin/tickets/tickets_editcategory.tpl +++ b/templates/Maketank/admin/plans/plans_edit.tpl @@ -2,14 +2,14 @@ $header

- {$title}  + {$title}  {$title}

-
+ @@ -17,7 +17,7 @@ $header - {$category_edit_form} + {$plans_edit_form}
diff --git a/templates/Maketank/admin/plans/plans_plan.tpl b/templates/Maketank/admin/plans/plans_plan.tpl new file mode 100644 index 00000000..a49c703c --- /dev/null +++ b/templates/Maketank/admin/plans/plans_plan.tpl @@ -0,0 +1,14 @@ + + {$row['name']} + {$row['description']} + {$row['adminname']} + {$row['ts_format']} + + + {$lng['panel']['edit']} +   + + {$lng['panel']['delete']} + + + diff --git a/templates/Maketank/admin/settings/importexport/index.tpl b/templates/Maketank/admin/settings/importexport/index.tpl new file mode 100644 index 00000000..41da2dfb --- /dev/null +++ b/templates/Maketank/admin/settings/importexport/index.tpl @@ -0,0 +1,26 @@ +$header +
+
+

+   + {$lng['admin']['configfiles']['importexport']} +

+
+ +
+ + + +
+

+
+
+ + + + + +
+
+
+$footer diff --git a/templates/Maketank/admin/settings/settings.tpl b/templates/Maketank/admin/settings/settings.tpl index 7a3075ed..12082722 100644 --- a/templates/Maketank/admin/settings/settings.tpl +++ b/templates/Maketank/admin/settings/settings.tpl @@ -3,7 +3,8 @@

  {$lng['admin']['serversettings']}   - [{$lng['admin']['configfiles']['compactoverview']}] + [{$lng['admin']['configfiles']['compactoverview']}]   + [{$lng['admin']['configfiles']['importexport']}]

diff --git a/templates/Maketank/admin/settings/settings_overview.tpl b/templates/Maketank/admin/settings/settings_overview.tpl index c1cd32ac..4a59c4c7 100644 --- a/templates/Maketank/admin/settings/settings_overview.tpl +++ b/templates/Maketank/admin/settings/settings_overview.tpl @@ -3,7 +3,8 @@

  {$lng['admin']['serversettings']}   - [{$lng['admin']['configfiles']['overview']}] + [{$lng['admin']['configfiles']['overview']}]   + [{$lng['admin']['configfiles']['importexport']}]

diff --git a/templates/Maketank/admin/settings/testmail.tpl b/templates/Maketank/admin/settings/testmail.tpl new file mode 100644 index 00000000..3b2f1243 --- /dev/null +++ b/templates/Maketank/admin/settings/testmail.tpl @@ -0,0 +1,48 @@ +$header +
+
+

+   + {$lng['admin']['testmail']} +

+
+ + +
+
+
{$lng['admin']['warning']}
+
{$mailerr_msg}
+
+
+ + +
+ + + + + + + + + + + + + + + +
{$lng['serversettings']['mail_smtp_user']}HostPortSMTP AuthTLS
{$mail_smtp_user}{$mail_smtp_host}{$mail_smtp_port}
+
+
+ + + + + + + +
+
+
+$footer diff --git a/templates/Maketank/admin/settings/updatecounters_row_admin.tpl b/templates/Maketank/admin/settings/updatecounters_row_admin.tpl index 88482e85..decb7caf 100644 --- a/templates/Maketank/admin/settings/updatecounters_row_admin.tpl +++ b/templates/Maketank/admin/settings/updatecounters_row_admin.tpl @@ -14,12 +14,9 @@ {$lng['customer']['emails']}: class="green"class="red">{$admin['emails_used']} -> {$admin['emails_used_new']}
{$lng['customer']['accounts']}: class="green"class="red">{$admin['email_accounts_used']} -> {$admin['email_accounts_used_new']}
{$lng['customer']['forwarders']}: class="green"class="red">{$admin['email_forwarders_used']} -> {$admin['email_forwarders_used_new']}
- + {$lng['customer']['email_quota']}: class="green"class="red">{$admin['email_quota_used']} -> {$admin['email_quota_used_new']}
 {$lng['customer']['ftps']}: class="green"class="red">{$admin['ftps_used']} -> {$admin['ftps_used_new']}
- - {$lng['customer']['tickets']}: class="green"class="red">{$admin['tickets_used']} -> {$admin['tickets_used_new']}
- diff --git a/templates/Maketank/admin/settings/updatecounters_row_customer.tpl b/templates/Maketank/admin/settings/updatecounters_row_customer.tpl index ed076452..e318a109 100644 --- a/templates/Maketank/admin/settings/updatecounters_row_customer.tpl +++ b/templates/Maketank/admin/settings/updatecounters_row_customer.tpl @@ -10,12 +10,9 @@ {$lng['customer']['forwarders']}: class="green"class="red">{$customer['email_forwarders_used']} -> {$customer['email_forwarders_used_new']}
- + {$lng['customer']['email_quota']}: class="green"class="red">{$customer['email_quota_used']} -> {$customer['email_quota_used_new']}
 {$lng['customer']['ftps']}: class="green"class="red">{$customer['ftps_used']} -> {$customer['ftps_used_new']}
- - {$lng['customer']['tickets']}: class="green"class="red">{$customer['tickets_used']} -> {$customer['tickets_used_new']}
- diff --git a/templates/Maketank/admin/templates/templates_add_2.tpl b/templates/Maketank/admin/templates/templates_add_2.tpl index e00dab52..6f197624 100644 --- a/templates/Maketank/admin/templates/templates_add_2.tpl +++ b/templates/Maketank/admin/templates/templates_add_2.tpl @@ -71,7 +71,7 @@ $header {EMAIL} {$lng['admin']['templates']['EMAIL']} - + {$lng['admin']['templates']['pop_success_alternative']} @@ -137,29 +137,6 @@ $header {$lng['admin']['templates']['USAGE_PERCENT']} - - - {SUBJECT} - {$lng['admin']['templates']['SUBJECT']} - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {FIRSTNAME} - {$lng['admin']['templates']['FIRSTNAME']} - - - {NAME} - {$lng['admin']['templates']['NAME']} - - - {COMPANY} - {$lng['admin']['templates']['COMPANY']} - - {SALUTATION} diff --git a/templates/Maketank/admin/templates/templates_edit.tpl b/templates/Maketank/admin/templates/templates_edit.tpl index 59661d42..d9a12501 100644 --- a/templates/Maketank/admin/templates/templates_edit.tpl +++ b/templates/Maketank/admin/templates/templates_edit.tpl @@ -73,7 +73,7 @@ $header {EMAIL} {$lng['admin']['templates']['EMAIL']} - + {$lng['admin']['templates']['pop_success_alternative']} @@ -139,29 +139,6 @@ $header {$lng['admin']['templates']['USAGE_PERCENT']} - - - {SUBJECT} - {$lng['admin']['templates']['SUBJECT']} - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {FIRSTNAME} - {$lng['admin']['templates']['FIRSTNAME']} - - - {NAME} - {$lng['admin']['templates']['NAME']} - - - {COMPANY} - {$lng['admin']['templates']['COMPANY']} - - {SALUTATION} diff --git a/templates/Maketank/admin/tickets/archive.tpl b/templates/Maketank/admin/tickets/archive.tpl deleted file mode 100644 index 0ee79bdd..00000000 --- a/templates/Maketank/admin/tickets/archive.tpl +++ /dev/null @@ -1,86 +0,0 @@ -$header -
-
-

-   - {$lng['ticket']['lastarchived']} -

-
- -
- - - - - - - - - - - - - - $tickets - -
{$lng['ticket']['archivedtime']}{$lng['ticket']['ticket_answers']}{$lng['ticket']['subject']}{$lng['ticket']['lastreplier']}{$lng['ticket']['priority']}{$lng['panel']['options']}
- -
- -
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lng['ticket']['search']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:{$priorities_options}
{$lng['ticket']['category']}:{$category_options}
{$lng['ticket']['lastchange']}: - - -
{$lng['ticket']['message']}:
{$lng['ticket']['customer']}:
- -
-
- -
-$footer diff --git a/templates/Maketank/admin/tickets/archived_tickets.tpl b/templates/Maketank/admin/tickets/archived_tickets.tpl deleted file mode 100644 index 7e328d1e..00000000 --- a/templates/Maketank/admin/tickets/archived_tickets.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - {$ticket['lastchange']} - {$ticket['ticket_answers']} - {$ticket['subject']} - {$ticket['lastreplier']} - {$ticket['priority']} - - - {$lng['ticket']['show']} - - - diff --git a/templates/Maketank/admin/tickets/archivesearch.tpl b/templates/Maketank/admin/tickets/archivesearch.tpl deleted file mode 100644 index 265220de..00000000 --- a/templates/Maketank/admin/tickets/archivesearch.tpl +++ /dev/null @@ -1,31 +0,0 @@ -$header -
-
-

 {$lng['ticket']['archivesearch']}

-
-
- - - - - - - - - - - - - - $tickets - - - - - - - -
{$lng['ticket']['archivedtime']}{$lng['ticket']['ticket_answers']}{$lng['ticket']['subject']}{$lng['ticket']['lastreplier']}{$lng['ticket']['priority']} 
{$lng['ticket']['noresults']}
-
-
-$footer diff --git a/templates/Maketank/admin/tickets/categories.tpl b/templates/Maketank/admin/tickets/categories.tpl deleted file mode 100644 index c6f0062c..00000000 --- a/templates/Maketank/admin/tickets/categories.tpl +++ /dev/null @@ -1,60 +0,0 @@ -$header -
-
-

-   - {$lng['menue']['ticket']['categories']} -

-
- -
- -
- - - - -
- {$searchcode} -
- -
-   - {$lng['ticket']['ticket_newcateory']} -
- - - - - - - - - - - - - - - - - - - - $ticketcategories - -
{$lng['ticket']['category']} {$arrowcode['name']}{$lng['ticket']['logicalorder']} {$arrowcode['logicalorder']}{$lng['ticket']['ticketcount']} {$arrowcode['ticketcount']}{$lng['panel']['options']}
{$pagingcode}
-
- - -
-   - {$lng['ticket']['ticket_newcateory']} -
- - -
- -
-$footer - diff --git a/templates/Maketank/admin/tickets/tickets.tpl b/templates/Maketank/admin/tickets/tickets.tpl deleted file mode 100644 index f41e9c5a..00000000 --- a/templates/Maketank/admin/tickets/tickets.tpl +++ /dev/null @@ -1,74 +0,0 @@ -$header -
-
-

-   - {$lng['menue']['ticket']['ticket']} -

-
- -
- -
- - - - -
- {$searchcode} -
- - -
-   - {$lng['ticket']['ticket_new']} -
- - - - - - - - - - - - - - - - - - - - - - - - {$tickets} - -
{$lng['ticket']['lastchange']} {$arrowcode['lastchange']}{$lng['ticket']['ticket_answers']}{$lng['ticket']['subject']} {$arrowcode['subject']}{$lng['ticket']['status']} {$arrowcode['status']}{$lng['ticket']['lastreplier']} {$arrowcode['lastreplier']}{$lng['ticket']['priority']}{$lng['panel']['options']}
{$pagingcode}
-
- - -
-   - {$lng['ticket']['ticket_new']} -
- - - -
-
{$lng['admin']['warning']}
-
- {$lng['admin']['ticket_nocustomeraddingavailable']} -
-
- - -
- -
-$footer - diff --git a/templates/Maketank/admin/tickets/tickets_categories.tpl b/templates/Maketank/admin/tickets/tickets_categories.tpl deleted file mode 100644 index 5c25edf5..00000000 --- a/templates/Maketank/admin/tickets/tickets_categories.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - {$row['name']} - {$row['logicalorder']} - {$row['ticketcount']} ({$row['ticketcountnotclosed']} {$lng['ticket']['open']} | {$closedtickets_count} {$lng['ticket']['closed']}) - - - {$lng['panel']['edit']} -   - - {$lng['panel']['delete']} - - - - diff --git a/templates/Maketank/admin/tickets/tickets_customer.tpl b/templates/Maketank/admin/tickets/tickets_customer.tpl deleted file mode 100644 index cdcd8dd7..00000000 --- a/templates/Maketank/admin/tickets/tickets_customer.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - {$customer} ({$customerloginname}) - diff --git a/templates/Maketank/admin/tickets/tickets_newcategory.tpl b/templates/Maketank/admin/tickets/tickets_newcategory.tpl deleted file mode 100644 index 23940418..00000000 --- a/templates/Maketank/admin/tickets/tickets_newcategory.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header -
-
-

- {$title}  - {$title} -

-
- -
- -
- - - - - - - {$category_new_form} -
-
- -
- -
-$footer diff --git a/templates/Maketank/admin/tickets/tickets_reply.tpl b/templates/Maketank/admin/tickets/tickets_reply.tpl deleted file mode 100644 index f36dc972..00000000 --- a/templates/Maketank/admin/tickets/tickets_reply.tpl +++ /dev/null @@ -1,40 +0,0 @@ -$header -
-
-

- {$title}  - {$title} -

-
- - -
-
-
{$lng['ticket']['ticket_reopen']}
-

{$lng['ticket']['ticket_reopen']}
-
-
- - - - $ticket_replies - - -
- -
- - - - - - - - {$ticket_reply_form} -
-
- -
- -
-$footer diff --git a/templates/Maketank/admin/tickets/tickets_tickets.tpl b/templates/Maketank/admin/tickets/tickets_tickets.tpl deleted file mode 100644 index a0618b4b..00000000 --- a/templates/Maketank/admin/tickets/tickets_tickets.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - {$row['lastchange']} - {$row['ticket_answers']} - {$row['subject']} - {$row['status']} - {$row['lastreplier']} - {$row['priority']} - - - - {$lng['ticket']['show']} - - - {$lng['ticket']['answer']} - - - -   - {$lng['ticket']['close']} - - - -   - {$lng['ticket']['reopen']} - - -   - {$lng['ticket']['archive']} - -   - {$lng['panel']['delete']} - - - diff --git a/templates/Maketank/admin/tickets/tickets_tickets_list.tpl b/templates/Maketank/admin/tickets/tickets_tickets_list.tpl deleted file mode 100644 index 3e76d797..00000000 --- a/templates/Maketank/admin/tickets/tickets_tickets_list.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
- - - - - - - - - - -
{$lastchange} {$lng['ticket']['by']} {$by}
{$subject}
{$message}
-

-
-
diff --git a/templates/Maketank/admin/tickets/tickets_tickets_main.tpl b/templates/Maketank/admin/tickets/tickets_tickets_main.tpl deleted file mode 100644 index eb15ffaf..00000000 --- a/templates/Maketank/admin/tickets/tickets_tickets_main.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
- - - - - - - - - - -
{$dt} {$lng['ticket']['by']} {$by} ({$status})
{$subject}
{$message}
-
-
-
diff --git a/templates/Maketank/admin/tickets/tickets_view.tpl b/templates/Maketank/admin/tickets/tickets_view.tpl deleted file mode 100644 index 92041a41..00000000 --- a/templates/Maketank/admin/tickets/tickets_view.tpl +++ /dev/null @@ -1,17 +0,0 @@ -$header - -$footer diff --git a/templates/Maketank/customer/domains/domains_domain.tpl b/templates/Maketank/customer/domains/domains_domain.tpl index 7cb703d4..321b45b9 100644 --- a/templates/Maketank/customer/domains/domains_domain.tpl +++ b/templates/Maketank/customer/domains/domains_domain.tpl @@ -5,7 +5,10 @@ - {$row['domain']} + {$row['domain']} + +
{$lng['domains']['registration_date']}: {$row['registration_date']} +
({$lng['domains']['termination_date_overview']} {$row['termination_date']})
 @@ -20,12 +23,17 @@ {$lng['panel']['edit']}   + + + {$lng['panel']['viewlogs']} + + {$lng['panel']['delete']}   - + {$lng['dnseditor']['edit']}   @@ -36,7 +44,7 @@   - {$lng['panel']['letsencrypt']} + {$lng['panel']['letsencrypt']} ({$lng['domains']['isassigneddomain']})  diff --git a/templates/Maketank/customer/domains/domains_edit.tpl b/templates/Maketank/customer/domains/domains_edit.tpl index 1732d73d..4435ba66 100644 --- a/templates/Maketank/customer/domains/domains_edit.tpl +++ b/templates/Maketank/customer/domains/domains_edit.tpl @@ -4,7 +4,7 @@ $header

{$title}  {$title} - +  ({$lng['dnseditor']['edit']})

diff --git a/templates/Maketank/customer/email/emails.tpl b/templates/Maketank/customer/email/emails.tpl index c4408788..3ee17e54 100644 --- a/templates/Maketank/customer/email/emails.tpl +++ b/templates/Maketank/customer/email/emails.tpl @@ -30,8 +30,8 @@ {$lng['emails']['emailaddress']} {$arrowcode['m.email_full']} {$lng['emails']['forwarders']} {$arrowcode['m.destination']} {$lng['emails']['account']} - {$lng['emails']['catchall']} - + {$lng['emails']['catchall']} + {$lng['emails']['quota']} {$lng['panel']['options']} diff --git a/templates/Maketank/customer/email/emails_email.tpl b/templates/Maketank/customer/email/emails_email.tpl index 8e002763..18522ef0 100644 --- a/templates/Maketank/customer/email/emails_email.tpl +++ b/templates/Maketank/customer/email/emails_email.tpl @@ -2,8 +2,8 @@ {$row['email_full']}  {$row['destination']} {$lng['panel']['yes']} ({$row['mboxsize']}){$lng['panel']['no']} - {$lng['panel']['yes']}{$lng['panel']['no']} - {$lng['emails']['noquota']}{$row['quota']} MiB + {$lng['panel']['yes']}{$lng['panel']['no']} + {$lng['emails']['noquota']}{$row['quota']} MiB {$lng['panel']['edit']} diff --git a/templates/Maketank/customer/ftp/accounts.tpl b/templates/Maketank/customer/ftp/accounts.tpl index e6a2c263..ce431599 100644 --- a/templates/Maketank/customer/ftp/accounts.tpl +++ b/templates/Maketank/customer/ftp/accounts.tpl @@ -30,6 +30,9 @@ {$lng['login']['username']} {$arrowcode['username']} {$lng['panel']['ftpdesc']} {$arrowcode['description']} {$lng['panel']['path']} {$arrowcode['homedir']} + + {$lng['panel']['shell']} + {$lng['panel']['options']} @@ -58,4 +61,3 @@
$footer - diff --git a/templates/Maketank/customer/ftp/accounts_account.tpl b/templates/Maketank/customer/ftp/accounts_account.tpl index 8038e719..cca5a11c 100644 --- a/templates/Maketank/customer/ftp/accounts_account.tpl +++ b/templates/Maketank/customer/ftp/accounts_account.tpl @@ -2,6 +2,9 @@ {$row['username']} {$row['description']} {$row['documentroot']} + + {$row['shell']} + {$lng['panel']['edit']} diff --git a/templates/Maketank/customer/index/change_password.tpl b/templates/Maketank/customer/index/change_password.tpl index f878195d..e4ba62c3 100644 --- a/templates/Maketank/customer/index/change_password.tpl +++ b/templates/Maketank/customer/index/change_password.tpl @@ -36,8 +36,8 @@ $header   - - + + diff --git a/templates/Maketank/customer/index/index.tpl b/templates/Maketank/customer/index/index.tpl index 168c009e..0f128703 100644 --- a/templates/Maketank/customer/index/index.tpl +++ b/templates/Maketank/customer/index/index.tpl @@ -7,6 +7,20 @@ $header
+ +
+ +
+ {$lng['customer']['total_diskspace']}
+ + {$userinfo['total_used']} {$lng['panel']['used']}
+ + {$userinfo['diskspace']} {$lng['panel']['available']} + + +
+ +
@@ -71,8 +85,9 @@ $header {$userinfo['email_accounts_used']} {$lng['panel']['used']}
- {$userinfo['email_accounts']} {$lng['panel']['available']} + {$userinfo['email_accounts']} {$lng['panel']['available']}
 + {$userinfo['mailspace_used']} {$lng['customer']['mib']}
@@ -91,7 +106,7 @@ $header
- +

@@ -113,8 +128,9 @@ $header {$userinfo['mysqls_used']} {$lng['panel']['used']}
- {$userinfo['mysqls']} {$lng['panel']['available']} + {$userinfo['mysqls']} {$lng['panel']['available']}
 + {$userinfo['dbspace_used']} {$lng['customer']['mib']}
@@ -132,24 +148,10 @@ $header
- - -
- -
- {$lng['customer']['tickets']}
- - {$userinfo['tickets_used']} {$lng['panel']['used']}
- - {$userinfo['tickets']} {$lng['panel']['available']} - - -
-
- + @@ -248,4 +250,3 @@ $header $footer - diff --git a/templates/Maketank/customer/tickets/ticket.tpl b/templates/Maketank/customer/tickets/ticket.tpl deleted file mode 100644 index 4e50bb11..00000000 --- a/templates/Maketank/customer/tickets/ticket.tpl +++ /dev/null @@ -1,8 +0,0 @@ -$header -
-
-
{$lng['menue']['ticket']['ticket']}
-
{$lng['ticket']['description']}
-
-
-$footer diff --git a/templates/Maketank/customer/tickets/tickets.tpl b/templates/Maketank/customer/tickets/tickets.tpl deleted file mode 100644 index 0bae4fb9..00000000 --- a/templates/Maketank/customer/tickets/tickets.tpl +++ /dev/null @@ -1,80 +0,0 @@ -$header -
-
-

-   - {$lng['menue']['ticket']['ticket']} -

-
- -
- -
- - - - - -
-
{$lng['ticket']['supportstatus']}
-
{$lng['ticket']['supportavailable']}
-
- - - -
-
{$lng['ticket']['supportstatus']}
-
{$lng['ticket']['supportnotavailable']}
-
- - -
- {$searchcode} -
- - -
-   - {$lng['ticket']['ticket_new']} -
- - -
- - - - - - - - - - - - - - - - - - - - - - {$tickets} - -
{$lng['ticket']['lastchange']} {$arrowcode['lastchange']}{$lng['ticket']['ticket_answers']}{$lng['ticket']['subject']} {$arrowcode['subject']}{$lng['ticket']['status']} {$arrowcode['status']}{$lng['ticket']['lastreplier']} {$arrowcode['lastreplier']}{$lng['ticket']['priority']}{$lng['panel']['options']}
{$pagingcode}
- - - -
-   - {$lng['ticket']['ticket_new']} -
- - -
- - -$footer - diff --git a/templates/Maketank/customer/tickets/tickets_new.tpl b/templates/Maketank/customer/tickets/tickets_new.tpl deleted file mode 100644 index 14b48601..00000000 --- a/templates/Maketank/customer/tickets/tickets_new.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header -
-
-

- {$title}  - {$title} -

-
- -
- -
- - - - - - - {$ticket_add_form} -
-
- -
-
-$footer diff --git a/templates/Maketank/customer/tickets/tickets_reply.tpl b/templates/Maketank/customer/tickets/tickets_reply.tpl deleted file mode 100644 index c5bc4854..00000000 --- a/templates/Maketank/customer/tickets/tickets_reply.tpl +++ /dev/null @@ -1,36 +0,0 @@ -$header - -$footer diff --git a/templates/Maketank/customer/tickets/tickets_tickets.tpl b/templates/Maketank/customer/tickets/tickets_tickets.tpl deleted file mode 100644 index 7f10b8d9..00000000 --- a/templates/Maketank/customer/tickets/tickets_tickets.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - {$row['lastchange']} - {$row['ticket_answers']} - {$row['subject']} - {$row['status']} - {$row['lastreplier']} - {$row['priority']} - - - - {$lng['ticket']['show']} - - - {$lng['ticket']['answer']} - - - -   - {$lng['ticket']['close']} - - - -   - {$lng['ticket']['reopen']} - - - - diff --git a/templates/Maketank/customer/tickets/tickets_tickets_list.tpl b/templates/Maketank/customer/tickets/tickets_tickets_list.tpl deleted file mode 100644 index 1ac0d48d..00000000 --- a/templates/Maketank/customer/tickets/tickets_tickets_list.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
- - - - - - - - - - -
{$lastchange} {$lng['ticket']['by']} {$by}
{$subject}
{$message}
-

-
-
diff --git a/templates/Maketank/customer/tickets/tickets_tickets_main.tpl b/templates/Maketank/customer/tickets/tickets_tickets_main.tpl deleted file mode 100644 index 8dd09536..00000000 --- a/templates/Maketank/customer/tickets/tickets_tickets_main.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
- - - - - - - - - - -
{$dt} {$lng['ticket']['by']} {$by} ({$status})
{$subject}
{$message}
-
-
-
diff --git a/templates/Maketank/customer/traffic/traffic.tpl b/templates/Maketank/customer/traffic/traffic.tpl index fd4d9ef9..14a2c683 100644 --- a/templates/Maketank/customer/traffic/traffic.tpl +++ b/templates/Maketank/customer/traffic/traffic.tpl @@ -37,15 +37,15 @@ $header