From b12d9abaf2c3bcc1a31a0ab7bcb58cfcba92fec4 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 15 May 2022 17:50:12 +0200 Subject: [PATCH] add more columns for custom-column selection (admin view) Signed-off-by: Michael Kaufmann --- .../admin/tablelisting.admins.php | 30 ++++++++ .../admin/tablelisting.customers.php | 72 +++++++++++++++++++ .../admin/tablelisting.domains.php | 24 +++---- .../admin/tablelisting.ipsandports.php | 63 ++++++++++++++-- .../tablelisting.sslcertificates.php | 8 --- lng/de.lng.php | 4 ++ lng/en.lng.php | 4 ++ 7 files changed, 178 insertions(+), 27 deletions(-) diff --git a/lib/tablelisting/admin/tablelisting.admins.php b/lib/tablelisting/admin/tablelisting.admins.php index 445db570..05d4aeb7 100644 --- a/lib/tablelisting/admin/tablelisting.admins.php +++ b/lib/tablelisting/admin/tablelisting.admins.php @@ -51,6 +51,14 @@ return [ 'label' => lng('customer.name'), 'field' => 'name', ], + 'email' => [ + 'label' => lng('login.email'), + 'field' => 'email', + ], + 'def_language' => [ + 'label' => lng('login.profile_lng'), + 'field' => 'def_language', + ], 'customers_used' => [ 'label' => lng('admin.customers'), 'field' => 'customers_used', @@ -66,12 +74,34 @@ return [ 'field' => 'traffic', 'callback' => [ProgressBar::class, 'traffic'], ], + 'caneditphpsettings' => [ + 'label' => lng('admin.caneditphpsettings'), + 'field' => 'caneditphpsettings', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], + 'change_serversettings' => [ + 'label' => lng('admin.change_serversettings'), + 'field' => 'change_serversettings', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], 'deactivated' => [ 'label' => lng('admin.deactivated'), 'field' => 'deactivated', 'class' => 'text-center', 'callback' => [Text::class, 'boolean'], ], + 'theme' => [ + 'label' => lng('panel.theme'), + 'field' => 'theme', + ], + 'api_allowed' => [ + 'label' => lng('usersettings.api_allowed.title'), + 'field' => 'api_allowed', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], ], 'visible_columns' => Listing::getVisibleColumnsForListing('admin_list', [ 'loginname', diff --git a/lib/tablelisting/admin/tablelisting.customers.php b/lib/tablelisting/admin/tablelisting.customers.php index 7a38c127..0e0fe011 100644 --- a/lib/tablelisting/admin/tablelisting.customers.php +++ b/lib/tablelisting/admin/tablelisting.customers.php @@ -60,6 +60,38 @@ return [ 'label' => lng('customer.email'), 'field' => 'email', ], + 'c.street' => [ + 'label' => lng('customer.street'), + 'field' => 'street', + ], + 'c.zipcode' => [ + 'label' => lng('customer.zipcode'), + 'field' => 'zipcode', + ], + 'c.city' => [ + 'label' => lng('customer.city'), + 'field' => 'city', + ], + 'c.phone' => [ + 'label' => lng('customer.phone'), + 'field' => 'phone', + ], + 'c.fax' => [ + 'label' => lng('customer.fax'), + 'field' => 'fax', + ], + 'c.customernumber' => [ + 'label' => lng('customer.customernumber'), + 'field' => 'customernumber', + ], + 'c.def_language' => [ + 'label' => lng('login.profile_lng'), + 'field' => 'def_language', + ], + 'c.guid' => [ + 'label' => 'GUID', + 'field' => 'guid', + ], 'c.diskspace' => [ 'label' => lng('customer.diskspace'), 'field' => 'diskspace', @@ -70,6 +102,46 @@ return [ 'field' => 'traffic', 'callback' => [ProgressBar::class, 'traffic'], ], + 'c.deactivated' => [ + 'label' => lng('admin.deactivated'), + 'field' => 'deactivated', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], + 'c.phpenabled' => [ + 'label' => lng('admin.phpenabled'), + 'field' => 'phpenabled', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], + 'c.perlenabled' => [ + 'label' => lng('admin.perlenabled'), + 'field' => 'perlenabled', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], + 'c.dnsenabled' => [ + 'label' => lng('admin.dnsenabled'), + 'field' => 'dnsenabled', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], + 'c.theme' => [ + 'label' => lng('panel.theme'), + 'field' => 'theme', + ], + 'c.logviewenabled' => [ + 'label' => lng('admin.logviewenabled'), + 'field' => 'logviewenabled', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], + 'api_allowed' => [ + 'label' => lng('usersettings.api_allowed.title'), + 'field' => 'api_allowed', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + ], ], 'visible_columns' => Listing::getVisibleColumnsForListing('customer_list', [ 'c.name', diff --git a/lib/tablelisting/admin/tablelisting.domains.php b/lib/tablelisting/admin/tablelisting.domains.php index c61c5f80..73adfcb1 100644 --- a/lib/tablelisting/admin/tablelisting.domains.php +++ b/lib/tablelisting/admin/tablelisting.domains.php @@ -60,7 +60,7 @@ return [ 'field' => 'aliasdomain', ], 'd.documentroot' => [ - 'label' => lng('domains.documentroot'), + 'label' => lng('customer.documentroot'), 'field' => 'documentroot', ], 'd.isbinddomain' => [ @@ -69,32 +69,32 @@ return [ 'callback' => [Text::class, 'boolean'], ], 'd.isemaildomain' => [ - 'label' => lng('domains.isemaildomain'), + 'label' => lng('admin.emaildomain'), 'field' => 'isemaildomain', 'callback' => [Text::class, 'boolean'], ], 'd.email_only' => [ - 'label' => lng('domains.email_only'), + 'label' => lng('admin.email_only'), 'field' => 'email_only', 'callback' => [Text::class, 'boolean'], ], 'd.iswildcarddomain' => [ - 'label' => lng('domains.iswildcarddomain'), + 'label' => lng('domains.serveraliasoption_wildcard'), 'field' => 'iswildcarddomain', 'callback' => [Text::class, 'boolean'], ], 'd.subcanemaildomain' => [ - 'label' => lng('domains.subcanemaildomain'), + 'label' => lng('admin.subdomainforemail'), 'field' => 'subcanemaildomain', 'callback' => [Text::class, 'boolean'], ], 'd.caneditdomain' => [ - 'label' => lng('domains.caneditdomain'), + 'label' => lng('admin.domain_editable.title'), 'field' => 'caneditdomain', 'callback' => [Text::class, 'boolean'], ], 'd.dkim' => [ - 'label' => lng('domains.dkim'), + 'label' => lng('domains.dkimenabled'), 'field' => 'dkim', 'callback' => [Text::class, 'boolean'], ], @@ -104,12 +104,12 @@ return [ 'callback' => [Text::class, 'boolean'], ], 'd.openbasedir' => [ - 'label' => lng('domains.openbasedir'), + 'label' => lng('domains.openbasedirenabled'), 'field' => 'openbasedir', 'callback' => [Text::class, 'boolean'], ], 'd.speciallogfile' => [ - 'label' => lng('domains.speciallogfile'), + 'label' => lng('admin.speciallogfile.title'), 'field' => 'speciallogfile', 'callback' => [Text::class, 'boolean'], ], @@ -119,17 +119,17 @@ return [ 'callback' => [Text::class, 'boolean'], ], 'd.http2' => [ - 'label' => lng('domains.http2'), + 'label' => lng('admin.domain_http2.title'), 'field' => 'http2', 'callback' => [Text::class, 'boolean'], ], 'd.letsencrypt' => [ - 'label' => lng('domains.letsencrypt'), + 'label' => lng('panel.letsencrypt'), 'field' => 'letsencrypt', 'callback' => [Text::class, 'boolean'], ], 'd.deactivated' => [ - 'label' => lng('domains.deactivated'), + 'label' => lng('admin.deactivated'), 'field' => 'deactivated', 'callback' => [Text::class, 'boolean'], ], diff --git a/lib/tablelisting/admin/tablelisting.ipsandports.php b/lib/tablelisting/admin/tablelisting.ipsandports.php index da6062b5..1118fcb6 100644 --- a/lib/tablelisting/admin/tablelisting.ipsandports.php +++ b/lib/tablelisting/admin/tablelisting.ipsandports.php @@ -62,25 +62,74 @@ return [ 'class' => 'text-center', 'callback' => [Text::class, 'boolean'] ], + 'servername' => [ + 'label' => lng('admin.ipsandports.create_vhostcontainer_servername_statement'), + 'field' => 'vhostcontainer_servername_statement', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'], + 'visible' => Settings::Get('system.webserver') == 'apache2' + ], 'specialsettings' => [ 'label' => 'Specialsettings', 'field' => 'specialsettings', 'class' => 'text-center', 'callback' => [Text::class, 'boolean'] ], - 'servername' => [ - 'label' => 'ServerName', - 'field' => 'vhostcontainer_servername_statement', - 'class' => 'text-center', - 'callback' => [Text::class, 'boolean'], - 'visible' => Settings::Get('system.webserver') == 'apache2' - ], 'ssl' => [ 'label' => 'SSL', 'field' => 'ssl', 'class' => 'text-center', 'callback' => [Text::class, 'boolean'] ], + 'ssl_cert_file' => [ + 'label' => lng('admin.ipsandports.ssl_cert_file'), + 'field' => 'ssl_cert_file', + 'class' => 'text-center', + ], + 'ssl_key_file' => [ + 'label' => lng('admin.ipsandports.ssl_key_file'), + 'field' => 'ssl_key_file', + 'class' => 'text-center', + ], + 'ssl_ca_file' => [ + 'label' => lng('admin.ipsandports.ssl_ca_file'), + 'field' => 'ssl_ca_file', + 'class' => 'text-center', + ], + 'ssl_cert_chainfile' => [ + 'label' => lng('admin.ipsandports.ssl_cert_chainfile.title'), + 'field' => 'ssl_cert_chainfile', + 'class' => 'text-center', + ], + 'docroot' => [ + 'label' => lng('admin.ipsandports.docroot.title'), + 'field' => 'docroot', + 'class' => 'text-center', + ], + 'ssl_specialsettings' => [ + 'label' => 'SSL Specialsettings', + 'field' => 'ssl_specialsettings', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'] + ], + 'include_specialsettings' => [ + 'label' => lng('serversettings.includedefault_sslvhostconf'), + 'field' => 'include_specialsettings', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'] + ], + 'ssl_default_vhostconf_domain' => [ + 'label' => lng('admin.ipsandports.ssl_default_vhostconf_domain'), + 'field' => 'ssl_default_vhostconf_domain', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'] + ], + 'include_default_vhostconf_domain' => [ + 'label' => '[Domains] '. lng('serversettings.includedefault_sslvhostconf'), + 'field' => 'include_default_vhostconf_domain', + 'class' => 'text-center', + 'callback' => [Text::class, 'boolean'] + ], ], 'visible_columns' => Listing::getVisibleColumnsForListing('ipsandports_list', [ 'ip', diff --git a/lib/tablelisting/tablelisting.sslcertificates.php b/lib/tablelisting/tablelisting.sslcertificates.php index b33ccf18..77aaa1c3 100644 --- a/lib/tablelisting/tablelisting.sslcertificates.php +++ b/lib/tablelisting/tablelisting.sslcertificates.php @@ -56,13 +56,6 @@ return [ 'label' => lng('ssl_certificates.valid_until'), 'field' => 'validtodate', ], - 'c.letsencrypt' => [ - 'label' => lng('panel.letsencrypt'), - 'field' => 'letsencrypt', - 'class' => 'text-center', - 'callback' => [Text::class, 'boolean'], - 'visible' => Settings::Get('system.le_froxlor_enabled'), - ], ], 'visible_columns' => Listing::getVisibleColumnsForListing('sslcertificates_list', [ 'd.domain', @@ -70,7 +63,6 @@ return [ 'c.issuer', 'c.validfromdate', 'c.validtodate', - 'c.letsencrypt', ]), 'actions' => [ 'delete' => [ diff --git a/lng/de.lng.php b/lng/de.lng.php index fe2297f4..aa94bc14 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -659,6 +659,10 @@ return [ 'ssl_certificate_error' => 'Fehler beim Lesen des Zertifikats für die Domain: %s', 'no_ssl_certificates' => 'Es wurden keine SSL-Zertifikate gefunden', 'isaliasdomainof' => 'Ist Aliasdomain für %s', + 'isbinddomain' => 'Erstelle DNS-Zone', + 'dkimenabled' => 'DKIM aktiviert', + 'openbasedirenabled' => 'Openbasedir Einschränkung', + 'hsts' => 'HSTS aktiviert', ], 'emails' => [ 'description' => 'Hier können Sie Ihre E-Mail-Adressen einrichten.
Ein Konto ist wie Ihr Briefkasten vor der Haustür. Wenn jemand eine E-Mail an Sie schreibt, wird diese in dieses Konto gelegt.

Die Zugangsdaten lauten wie folgt: (Die Angaben in kursiver Schrift sind durch die jeweiligen Einträge zu ersetzen)

Hostname: Domainname
Benutzername: Kontoname / E-Mail-Adresse
Passwort: das gewählte Passwort', diff --git a/lng/en.lng.php b/lng/en.lng.php index 9dee0886..7d9f328a 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -971,6 +971,10 @@ return [ 'ssl_certificate_error' => 'Error reading certificate for domain: %s', 'no_ssl_certificates' => 'There are no domains with SSL certificate', 'isaliasdomainof' => 'Is aliasdomain for %s', + 'isbinddomain' => 'Create DNS zone', + 'dkimenabled' => 'DKIM enabled', + 'openbasedirenabled' => 'Openbasedir restiction', + 'hsts' => 'HSTS enabled', ], 'emails' => [ 'description' => 'Here you can create and change your email addresses.
An account is like your letterbox in front of your house. If someone sends you an email, it will be dropped into the account.

To download your emails use the following settings in your mailprogram: (The data in italics has to be changed to the equivalents you typed in!)
Hostname: domainname
Username: account name / e-mail address
password: the password you\'ve chosen',