refactoring callbacks, add class for table rows

lib/tablelisting/admin/tablelisting.admins.php

@@ -17,6 +17,7 @@
  */
 
 use Froxlor\UI\Callbacks\ProgressBar;
+use Froxlor\UI\Callbacks\Style;
 use Froxlor\UI\Callbacks\Text;
 use Froxlor\UI\Listing;
 
@@ -27,36 +28,36 @@ return [
 		'columns' => [
 			'adminid' => [
 				'label' => '#',
-				'column' => 'adminid',
+				'field' => 'adminid',
 				'sortable' => true,
 			],
 			'loginname' => [
 				'label' => $lng['login']['username'],
-				'column' => 'loginname',
+				'field' => 'loginname',
 				'sortable' => true,
 			],
 			'name' => [
 				'label' => $lng['customer']['name'],
-				'column' => 'name',
+				'field' => 'name',
 			],
 			'customers_used' => [
 				'label' => $lng['admin']['customers'],
-				'column' => 'customers_used',
+				'field' => 'customers_used',
 				'class' => 'text-center',
 			],
 			'diskspace' => [
 				'label' => $lng['customer']['diskspace'],
-				'column' => 'diskspace',
+				'field' => 'diskspace',
 				'format_callback' => [ProgressBar::class, 'diskspace'],
 			],
 			'traffic' => [
 				'label' => $lng['customer']['traffic'],
-				'column' => 'traffic',
+				'field' => 'traffic',
 				'format_callback' => [ProgressBar::class, 'traffic'],
 			],
 			'deactivated' => [
 				'label' => $lng['admin']['deactivated'],
-				'column' => 'deactivated',
+				'field' => 'deactivated',
 				'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean'],
 			],
@@ -90,11 +91,10 @@ return [
                 ],
             ],
 		],
-		'contextual_class' => [
-			'deactivated' => [
-				'value' => true,
-				'return' => 'bg-secondary'
-			]
+		'format_callback' => [
+			[Style::class, 'deactivated'],
+			[Style::class, 'diskspaceWarning'],
+			[Style::class, 'trafficWarning']
 		]
 	]
 ];

lib/tablelisting/admin/tablelisting.customers.php

@@ -28,31 +28,31 @@ return [
 		'columns' => [
 			'c.name' => [
 				'label' => $lng['customer']['name'],
-				'column' => 'name',
+				'field' => 'name',
 				'format_callback' => [Text::class, 'customerfullname'],
 			],
 			'c.loginname' => [
 				'label' => $lng['login']['username'],
-				'column' => 'loginname',
+				'field' => 'loginname',
 				'format_callback' => [Impersonate::class, 'customer'],
 			],
 			'a.loginname' => [
 				'label' => $lng['admin']['admin'],
-				'column' => 'admin.loginname',
+				'field' => 'admin.loginname',
 				'format_callback' => [Impersonate::class, 'admin'],
 			],
 			'c.email' => [
 				'label' => $lng['customer']['email'],
-				'column' => 'email',
+				'field' => 'email',
 			],
 			'c.diskspace' => [
 				'label' => $lng['customer']['diskspace'],
-				'column' => 'diskspace',
+				'field' => 'diskspace',
 				'format_callback' => [ProgressBar::class, 'diskspace'],
 			],
 			'c.traffic' => [
 				'label' => $lng['customer']['traffic'],
-				'column' => 'traffic',
+				'field' => 'traffic',
 				'format_callback' => [ProgressBar::class, 'traffic'],
 			],
 		],

lib/tablelisting/admin/tablelisting.domains.php

@@ -27,21 +27,21 @@ return [
 		'columns' => [
 			'd.domain_ace' => [
 				'label' => $lng['domains']['domainname'],
-				'column' => 'domain_ace',
+				'field' => 'domain_ace',
 			],
 			'c.name' => [
 				'label' => $lng['customer']['name'],
-				'column' => 'customer.name',
+				'field' => 'customer.name',
 				'format_callback' => [Text::class, 'customerfullname'],
 			],
 			'c.loginname' => [
 				'label' => $lng['login']['username'],
-				'column' => 'customer.loginname',
+				'field' => 'customer.loginname',
 				'format_callback' => [Impersonate::class, 'customer'],
 			],
 			'd.aliasdomain' => [
 				'label' => $lng['domains']['aliasdomain'],
-				'column' => 'aliasdomain',
+				'field' => 'aliasdomain',
 			],
 		],
 		'visible_columns' => Listing::getVisibleColumnsForListing('domain_list', [

lib/tablelisting/admin/tablelisting.ipsandports.php

@@ -27,49 +27,49 @@ return [
 		'columns' => [
 			'ip' => [
 				'label' => $lng['admin']['ipsandports']['ip'],
-				'column' => 'ip',
+				'field' => 'ip',
 			],
 			'port' => [
 				'label' => $lng['admin']['ipsandports']['port'],
-				'column' => 'port',
+				'field' => 'port',
                 'class' => 'text-center',
 			],
 			'listen' => [
 				'label' => 'Listen',
-				'column' => 'listen_statement',
+				'field' => 'listen_statement',
                 'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean'],
 				'visible' => Settings::Get('system.webserver') != 'nginx'
 			],
 			'namevirtualhost' => [
 				'label' => 'NameVirtualHost',
-				'column' => 'namevirtualhost_statement',
+				'field' => 'namevirtualhost_statement',
                 'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean'],
 				'visible' => Settings::Get('system.webserver') == 'apache2' && (int) Settings::Get('system.apache24') == 0
 			],
 			'vhostcontainer' => [
 				'label' => 'vHost-Container',
-				'column' => 'vhostcontainer',
+				'field' => 'vhostcontainer',
                 'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean']
 			],
 			'specialsettings' => [
 				'label' => 'Specialsettings',
-				'column' => 'specialsettings',
+				'field' => 'specialsettings',
                 'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean']
 			],
 			'servername' => [
 				'label' => 'ServerName',
-				'column' => 'vhostcontainer_servername_statement',
+				'field' => 'vhostcontainer_servername_statement',
                 'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean'],
 				'visible' => Settings::Get('system.webserver') == 'apache2'
 			],
 			'ssl' => [
 				'label' => 'SSL',
-				'column' => 'ssl',
+				'field' => 'ssl',
                 'class' => 'text-center',
 				'format_callback' => [Text::class, 'boolean']
 			],

lib/tablelisting/admin/tablelisting.plans.php

@@ -26,19 +26,19 @@ return [
 		'columns' => [
             'p.name' => [
                 'label' => $lng['admin']['plans']['name'],
-                'column' => 'name',
+                'field' => 'name',
             ],
             'p.description' => [
                 'label' => $lng['admin']['plans']['description'],
-                'column' => 'description',
+                'field' => 'description',
             ],
             'p.adminname' => [
                 'label' => $lng['admin']['admin'],
-                'column' => 'adminname',
+                'field' => 'adminname',
             ],
             'p.ts' => [
                 'label' => $lng['admin']['plans']['last_update'],
-                'column' => 'ts',
+                'field' => 'ts',
             ],
 		],
 		'visible_columns' => Listing::getVisibleColumnsForListing('sslcertificates_list', [

lib/tablelisting/admin/tablelisting.sslcertificates.php

@@ -17,6 +17,7 @@
  */
 
 use Froxlor\Settings;
+use Froxlor\UI\Callbacks\SSLCertificates;
 use Froxlor\UI\Callbacks\Text;
 use Froxlor\UI\Listing;
 
@@ -27,28 +28,28 @@ return [
 		'columns' => [
             'd.domain' => [
                 'label' => $lng['domains']['domainname'],
-                'column' => 'domain',
+                'field' => 'domain',
             ],
             'c.domain' => [
                 'label' => $lng['ssl_certificates']['certificate_for'],
-                'column' => 'domain',
-                'format_callback' => [Text::class, 'domainWithSan'],
+                'field' => 'domain',
+                'format_callback' => [SSLCertificates::class, 'domainWithSan'],
             ],
             'c.issuer' => [
                 'label' => $lng['ssl_certificates']['issuer'],
-                'column' => 'issuer',
+                'field' => 'issuer',
             ],
             'c.validfromdate' => [
                 'label' => $lng['ssl_certificates']['valid_from'],
-                'column' => 'validfromdate',
+                'field' => 'validfromdate',
             ],
             'c.validtodate' => [
                 'label' => $lng['ssl_certificates']['valid_until'],
-                'column' => 'validtodate',
+                'field' => 'validtodate',
             ],
             'c.letsencrypt' => [
                 'label' => $lng['panel']['letsencrypt'],
-                'column' => 'letsencrypt',
+                'field' => 'letsencrypt',
                 'class' => 'text-center',
                 'format_callback' => [Text::class, 'boolean'],
                 'visible' => Settings::Get('system.le_froxlor_enabled'),

lib/tablelisting/customer/tablelisting.mysqls.php

@@ -27,20 +27,20 @@ return [
 		'columns' => [
 			'databasename' => [
 				'label' => $lng['mysql']['databasename'],
-				'column' => 'databasename',
+				'field' => 'databasename',
 			],
 			'description' => [
 				'label' => $lng['mysql']['databasedescription'],
-				'column' => 'description'
+				'field' => 'description'
 			],
 			'size' => [
 				'label' => $lng['mysql']['size'],
-				'column' => 'size',
+				'field' => 'size',
 				'format_callback' => [Text::class, 'size']
 			],
 			'dbserver' => [
 				'label' => $lng['mysql']['mysql_server'],
-				'column' => 'dbserver',
+				'field' => 'dbserver',
 				'format_callback' => [Mysql::class, 'dbserver'],
 				'visible' => $count_mysqlservers > 1
 			]