From b35a2585186f31c5a1aae92d13c31a28712305df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn?= <b.heggemann@neonaut.de>
Date: Wed, 18 Oct 2017 14:36:00 +0200
Subject: [PATCH 01/83] [FEATURE] Show extension dependencies of installed
 version

---
 Resources/Private/Templates/Client/Show.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 69c7ac9..8d00f7a 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -123,6 +123,7 @@ <h1>
 					<th>{f:translate(key:'found.in.ter')}</th>
 				</tr>
 				</thead>
+
 				<f:for each="{client.extensions}" as="extension">
 
 					<monitor:additionalExtensionData as="extra" client="{client.uid}" extension="{extension.uid}">
@@ -132,7 +133,9 @@ <h1>
 									<f:link.action action="show" controller="Extension" arguments="{extension:'{extension.name}'}">{extension.name}</f:link.action>
 								</span>
 							</td>
-							<td>{extension.version}</td>
+							<td>
+								<span class="badge" data-toggle="tooltip" data-title='<div class="dep"><div class="panel panel-default"><div class="panel-heading">{extension.version} release</div>{extension.serializedDependencies -> monitor:format.dependencies()}</div></div>' data-html="true">{extension.version}</span>
+							</td>
 							<td>
 								<span class="label label-{extension.state -> monitor:format.extensionState()}">{extension.state -> monitor:format.extensionState()}</span>
 							</td>

From 3ed91de68340cad8246f2d73bb4adb08fc1f1152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20Ko=CC=88hnlein?= <ak@koehnlein.eu>
Date: Mon, 30 Apr 2018 15:36:00 +0200
Subject: [PATCH 02/83] [BUGFIX] Use QueryBilder instances only once to avoid
 problems with non-unique aliases

---
 Classes/Service/DataIntegrity.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index 670b6f1..1d96179 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -255,10 +255,8 @@ protected function usedExtensions()
             ->execute()
             ->fetchAll();
 
-        $queryBuilder = $connection->createQueryBuilder();
-        $queryBuilder2 = $connection->createQueryBuilder();
         foreach ($clients as $client) {
-            $countInsecure = $queryBuilder
+            $countInsecure = $connection->createQueryBuilder()
                 ->count('uid')
                 ->from('tx_t3monitoring_client_extension_mm')
                 ->leftJoin(
@@ -274,7 +272,7 @@ protected function usedExtensions()
                 )->execute()->fetchColumn(0);
 
             // count outdated extensions
-            $countOutdated = $queryBuilder2
+            $countOutdated = $connection->createQueryBuilder()
                 ->count('uid')
                 ->from('tx_t3monitoring_client_extension_mm')
                 ->leftJoin(

From 6416ac412b66853b72282d74774231fc8fd1eed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20Ko=CC=88hnlein?= <ak@koehnlein.eu>
Date: Mon, 30 Apr 2018 16:02:05 +0200
Subject: [PATCH 03/83] [BUGFIX] Use QueryBilder instances only once

---
 Classes/Service/DataIntegrity.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index 1d96179..629271f 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -256,7 +256,8 @@ protected function usedExtensions()
             ->fetchAll();
 
         foreach ($clients as $client) {
-            $countInsecure = $connection->createQueryBuilder()
+            $queryBuilder = $connection->createQueryBuilder();
+            $countInsecure = $queryBuilder
                 ->count('uid')
                 ->from('tx_t3monitoring_client_extension_mm')
                 ->leftJoin(
@@ -272,7 +273,8 @@ protected function usedExtensions()
                 )->execute()->fetchColumn(0);
 
             // count outdated extensions
-            $countOutdated = $connection->createQueryBuilder()
+            $queryBuilder2 = $connection->createQueryBuilder();
+            $countOutdated = $queryBuilder2
                 ->count('uid')
                 ->from('tx_t3monitoring_client_extension_mm')
                 ->leftJoin(

From 4f260434f19abb9fca0d1e738088f0f94c5f7995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20Ko=CC=88hnlein?= <ak@koehnlein.eu>
Date: Tue, 1 May 2018 11:26:26 +0200
Subject: [PATCH 04/83] [TASK] Include extra dangers in report emails

---
 Classes/Domain/Repository/ClientRepository.php           | 1 +
 Resources/Private/Templates/Notification/AdminEmail.txt  | 2 ++
 Resources/Private/Templates/Notification/ClientEmail.txt | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/Classes/Domain/Repository/ClientRepository.php b/Classes/Domain/Repository/ClientRepository.php
index c400515..acff50b 100644
--- a/Classes/Domain/Repository/ClientRepository.php
+++ b/Classes/Domain/Repository/ClientRepository.php
@@ -68,6 +68,7 @@ public function getAllForReport($emailAddressRequired = false)
         $demand = $this->getFilterDemand();
         $demand->setWithInsecureCore(true);
         $demand->setWithInsecureExtensions(true);
+        $demand->setWithExtraDanger(true);
 
         $constraints[] = $query->logicalOr(
             $this->getConstraints($demand, $query)
diff --git a/Resources/Private/Templates/Notification/AdminEmail.txt b/Resources/Private/Templates/Notification/AdminEmail.txt
index f30dee1..68303c5 100644
--- a/Resources/Private/Templates/Notification/AdminEmail.txt
+++ b/Resources/Private/Templates/Notification/AdminEmail.txt
@@ -8,5 +8,7 @@ Monitoring report of your clients
 Insecure core: {f:if(condition:client.core.insecure,then:client.core.version)}
 Insecure extensions: <f:for each="{client.extensions}" as="e"><f:if condition="{e.insecure}">
  - {e.name} {e.version}</f:if></f:for>
+Extra dangers: <f:for each="{client.extraDangerAsArray}" as="value" key="key">
+ - {key}: {value}</f:for>
 
 </f:for>
\ No newline at end of file
diff --git a/Resources/Private/Templates/Notification/ClientEmail.txt b/Resources/Private/Templates/Notification/ClientEmail.txt
index ab348eb..4c4363b 100644
--- a/Resources/Private/Templates/Notification/ClientEmail.txt
+++ b/Resources/Private/Templates/Notification/ClientEmail.txt
@@ -5,3 +5,5 @@ This is an automatically generated report for {client.domain}:
 Insecure core: {f:if(condition:client.core.insecure,then:client.core.version)}
 Insecure extensions: <f:for each="{client.extensions}" as="e"><f:if condition="{e.insecure}">
  - {e.name} {e.version}</f:if></f:for>
+Extra dangers: <f:for each="{client.extraDangerAsArray}" as="value" key="key">
+ - {key}: {value}</f:for>

From 1a553992d40d44d6b238d9975c1ee1ae61c5205e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20Ko=CC=88hnlein?= <ak@koehnlein.eu>
Date: Tue, 1 May 2018 11:42:45 +0200
Subject: [PATCH 05/83] [BUGFIX] Update security news URLs after typo3.org
 relaunch

---
 Classes/Controller/StatisticController.php       | 4 ++--
 Resources/Private/Templates/Statistic/Index.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Classes/Controller/StatisticController.php b/Classes/Controller/StatisticController.php
index 5eeb578..125665d 100644
--- a/Classes/Controller/StatisticController.php
+++ b/Classes/Controller/StatisticController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -78,8 +79,7 @@ public function indexAction(ClientFilterDemand $filter = null)
         $feedItems = null;
         if ($this->emConfiguration->getLoadBulletins()) {
             /** @var BulletinImport $bulletinImport */
-            $bulletinImport = GeneralUtility::makeInstance(BulletinImport::class,
-                'https://typo3.org/xml-feeds/security/1/rss.xml', 5);
+            $bulletinImport = GeneralUtility::makeInstance(BulletinImport::class, 'https://typo3.org/?type=101', 5);
             $feedItems = $bulletinImport->start();
         }
 
diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index e4083fe..29cb003 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -206,7 +206,7 @@
                             </f:if>
                             </div>
                             <div class="panel-footer">
-                                <a href="https://typo3.org/teams/security/security-bulletins/" target="_blank"
+                                <a href="https://typo3.org/help/security-advisories/security/all/" target="_blank"
                                     class="t3-link">{f:translate(key:'bulletins.all')}</a>
                             </div>
                         </div>

From 03ea0796f98b08a1f3ae3b3fa6aaa5fa73f38a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20Ko=CC=88hnlein?= <ak@koehnlein.eu>
Date: Tue, 1 May 2018 11:52:48 +0200
Subject: [PATCH 06/83] [BUGFIX] Use <a> tag instead of <f:link.external> to
 not have problems with HTTPS links

---
 Resources/Private/Templates/Statistic/Index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index e4083fe..81a3efb 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -181,9 +181,9 @@
                                             <ul>
                                                 <f:for each="{feedItems}" as="item">
                                                     <li>
-                                                        <f:link.external target="_blank" uri="{item.link}">
+                                                        <a target="_blank" href="{item.link}">
                                                             {item.title}
-                                                        </f:link.external>
+                                                        </a>
                                                         <f:if condition="{item.date}">
                                                             <i>{item.date -> f:format.date(format:'d.m.Y')}</i>
                                                         </f:if>

From 1c9aa4752fe1d9c37b19e856a52d7abe5ab21f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20K=C3=B6hnlein?= <ak@koehnlein.eu>
Date: Fri, 27 Jul 2018 11:51:24 +0200
Subject: [PATCH 07/83] [BUGFIX] Update IP hint formatting in Administration
 view

---
 Resources/Private/Templates/Statistic/Administration.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Private/Templates/Statistic/Administration.html b/Resources/Private/Templates/Statistic/Administration.html
index ae5cd60..27d0930 100644
--- a/Resources/Private/Templates/Statistic/Administration.html
+++ b/Resources/Private/Templates/Statistic/Administration.html
@@ -6,7 +6,7 @@
 	<h1>{f:translate(key:'view.administration')}</h1>
 	<f:if condition="{emConfiguration.ipHint}">
 		<div class="alert alert-info">
-			<f:translate key="administration.ipHint" arguments="{0:emConfiguration.ipHint}" />
+			<f:format.raw><f:translate key="administration.ipHint" arguments="{0:emConfiguration.ipHint}" /></f:format.raw>
 		</div>
 	</f:if>
 
@@ -51,4 +51,4 @@ <h3>{f:translate(key:'administration.sponsors.headline')}</h3>
 			</p>
 		</div>
 	</div>
-</f:section>
\ No newline at end of file
+</f:section>

From e999d82f3400d53b874c79c1aff132f92c7ad1ee Mon Sep 17 00:00:00 2001
From: Tim Horstmann <thorstmann@medienwerft.de>
Date: Tue, 18 Sep 2018 08:40:50 +0200
Subject: [PATCH 08/83] [BUGFIX] Update all fields of already existing existing
 cores when importing cores

---
 Classes/Service/Import/CoreImport.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Classes/Service/Import/CoreImport.php b/Classes/Service/Import/CoreImport.php
index 081061e..ac0c94d 100644
--- a/Classes/Service/Import/CoreImport.php
+++ b/Classes/Service/Import/CoreImport.php
@@ -64,10 +64,7 @@ public function run()
                 if (isset($previousCoreVersions[$version])) {
                     $connection->update(
                         $table,
-                        [
-                            'tstamp' => $GLOBALS['EXEC_TIME'],
-                            'pid' => $this->emConfiguration->getPid()
-                        ],
+                        $item,
                         [
                             'uid' => $previousCoreVersions[$version]['uid']
                         ]

From 68475ffc1ae4a35cecd347e2eeb576c59fd8829b Mon Sep 17 00:00:00 2001
From: Tim Horstmann <thorstmann@medienwerft.de>
Date: Thu, 11 Oct 2018 08:38:42 +0200
Subject: [PATCH 09/83] [CLEANUP] Dummy Commit to check if travis now builds
 successfully

---
 Classes/Service/Import/CoreImport.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Classes/Service/Import/CoreImport.php b/Classes/Service/Import/CoreImport.php
index ac0c94d..57cc116 100644
--- a/Classes/Service/Import/CoreImport.php
+++ b/Classes/Service/Import/CoreImport.php
@@ -45,6 +45,7 @@ public function run()
             ->from($table)
             ->execute()
             ->fetchAll();
+
         $previousCoreVersions = [];
         foreach ($rows as $row) {
             $previousCoreVersions[$row['version']] = $row;

From a85983f4b98fdbbb204292d1037f40f8f1d8ef60 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <post@christophlehmann.eu>
Date: Wed, 21 Nov 2018 16:21:03 +0100
Subject: [PATCH 10/83] [BUGFIX] hidden field twice in TCA

Clients can be deactivated now
---
 Configuration/TCA/tx_t3monitoring_domain_model_client.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 2c86b0b..0124cb2 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -29,7 +29,7 @@
         ],
     ],
     'palettes' => [
-        'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, hidden'],
+        'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password'],
         'paletteVersions' => ['showitem' => 'php_version, mysql_version'],
         'paletteDiskSpace' => ['showitem' => 'disk_total_space, disk_free_space'],
     ],

From c78512a4759382bdc3c570d726bc9e9c0847bb36 Mon Sep 17 00:00:00 2001
From: Florian Wessels <f.wessels@bitmotion.de>
Date: Thu, 29 Nov 2018 16:09:56 +0100
Subject: [PATCH 11/83] [BUGFIX] Let extension filter work again

Resolves #140
---
 .../Domain/Repository/ExtensionRepository.php | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/Classes/Domain/Repository/ExtensionRepository.php b/Classes/Domain/Repository/ExtensionRepository.php
index f5158ff..3493479 100644
--- a/Classes/Domain/Repository/ExtensionRepository.php
+++ b/Classes/Domain/Repository/ExtensionRepository.php
@@ -10,6 +10,10 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\ExtensionFilterDemand;
+use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
+use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
 /**
@@ -47,55 +51,43 @@ public function findAllVersionsByName($name)
      */
     public function findByDemand(ExtensionFilterDemand $demand)
     {
-        $connection = $this->getDatabaseConnection();
-        $qb = $connection->createQueryBuilder();
-        $qb->select('client.title', 'client.uid as clientUid', 'ext.name', 'ext.version', 'ext.insecure')
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_t3monitoring_domain_model_extension');
+        $expressionBuilder = $queryBuilder->expr();
+        $queryBuilder
+            ->select('client.title', 'client.uid as clientUid', 'ext.name', 'ext.version', 'ext.insecure')
             ->from('tx_t3monitoring_domain_model_extension', 'ext')
             ->rightJoin('ext', 'tx_t3monitoring_client_extension_mm', 'mm', 'mm.uid_foreign = ext.uid')
-            ->rightJoin('mm', 'tx_t3monitoring_domain_model_client', 'client', 'mm.uid_local=client.uid');
-        $eb = $qb->expr();
-        $conditions = $eb->andX(
-            $eb->isNotNull('ext.name'),
-            $eb->eq('client.deleted', 0),
-            $eb->eq('client.hidden', 0)
-            //$this->extendWhereClause($demand)
-        );
-        $qb->orderBy('ext.name', 'ASC');
-        $qb->orderBy('ext.version_integer', 'DESC');
-        $qb->orderBy('client.title', 'ASC');
-        $qb->andWhere($conditions);
+            ->rightJoin('mm', 'tx_t3monitoring_domain_model_client', 'client', 'mm.uid_local=client.uid')
+            ->where($expressionBuilder->isNotNull('ext.name'))
+            ->andWhere($expressionBuilder->eq('client.hidden', 0))
+            ->andWhere($expressionBuilder->eq('client.deleted',0))
+            ->orderBy('ext.name', 'ASC')
+            ->orderBy('ext.version_integer', 'DESC')
+            ->orderBy('client.title', 'ASC');
+        $this->extendWhereClause($demand, $queryBuilder, $expressionBuilder);
 
-        $rows = $qb->execute()->fetchAll();
-        foreach ($rows as $row) {
+        $result = [];
+        foreach ($queryBuilder->execute()->fetchAll() as $row) {
             $result[$row['name']][$row['version']]['insecure'] = $row['insecure'];
             $result[$row['name']][$row['version']]['clients'][] = $row;
         }
+
         return $result;
     }
 
     /**
      * @param ExtensionFilterDemand $demand
-     * @return string
+     * @param QueryBuilder          $queryBuilder
+     * @param ExpressionBuilder     $expressionBuilder
      */
-    protected function extendWhereClause(ExtensionFilterDemand $demand)
+    protected function extendWhereClause(ExtensionFilterDemand $demand, QueryBuilder &$queryBuilder, ExpressionBuilder $expressionBuilder)
     {
-        $table = 'tx_t3monitoring_domain_model_extension';
-        $constraints = [];
-        // name
         if ($demand->getName()) {
-            $searchString = $this->getDatabaseConnection()->quoteStr($demand->getName(), $table);
-
             if ($demand->isExactSearch()) {
-                $constraints[] = 'ext . name = "' . $searchString . '"';
+                $queryBuilder->andWhere($expressionBuilder->eq('ext.name', $queryBuilder->createNamedParameter($demand->getName())));
             } else {
-                $constraints[] = 'ext . name LIKE "%' .
-                    $this->getDatabaseConnection()->escapeStrForLike($searchString, $table) . '%"';
+                $queryBuilder->andWhere($expressionBuilder->like('ext.name', $queryBuilder->createNamedParameter('%' . $demand->getName() . '%')));
             }
         }
-
-        if (!empty($constraints)) {
-            return ' AND ' . implode(' AND ', $constraints);
-        }
-        return '';
     }
 }

From b1c2a65f8e7d69a57354dcb5e600939142b5e166 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Sat, 1 Dec 2018 12:45:35 +0000
Subject: [PATCH 12/83] Apply fixes from StyleCI

---
 Classes/Domain/Repository/ExtensionRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Domain/Repository/ExtensionRepository.php b/Classes/Domain/Repository/ExtensionRepository.php
index 3493479..782b772 100644
--- a/Classes/Domain/Repository/ExtensionRepository.php
+++ b/Classes/Domain/Repository/ExtensionRepository.php
@@ -60,7 +60,7 @@ public function findByDemand(ExtensionFilterDemand $demand)
             ->rightJoin('mm', 'tx_t3monitoring_domain_model_client', 'client', 'mm.uid_local=client.uid')
             ->where($expressionBuilder->isNotNull('ext.name'))
             ->andWhere($expressionBuilder->eq('client.hidden', 0))
-            ->andWhere($expressionBuilder->eq('client.deleted',0))
+            ->andWhere($expressionBuilder->eq('client.deleted', 0))
             ->orderBy('ext.name', 'ASC')
             ->orderBy('ext.version_integer', 'DESC')
             ->orderBy('client.title', 'ASC');

From 361cf6deb969672203d154b9efe0a85aa80d54b6 Mon Sep 17 00:00:00 2001
From: Heiko Bihlmaier <hbihlmaier@tagwork-one.de>
Date: Mon, 14 Jan 2019 09:55:53 +0100
Subject: [PATCH 13/83] =?UTF-8?q?Fix=20error=20"Attempt=20to=20insert=20re?=
 =?UTF-8?q?cord=20on=20page=20=E2=80=A6=20where=20table=20tx=5Ft3monitorin?=
 =?UTF-8?q?g*=20is=20not=20allowed"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ext_tables.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext_tables.php b/ext_tables.php
index cf88a98..06ccb34 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -23,6 +23,12 @@ function () {
                     'labels' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_t3monitor.xlf',
                 ]
             );
+
+            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_client');
+            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_core');
+            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_extension');
+            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_sla');
+            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_tag');
         }
     }
 );

From 2b0cba5599fe7cc572a02ef693e02e32c26036c7 Mon Sep 17 00:00:00 2001
From: Tim Horstmann <thorstmann@medienwerft.de>
Date: Fri, 18 Jan 2019 09:39:03 +0100
Subject: [PATCH 14/83] Revert "[CLEANUP] Dummy Commit to check if travis now
 builds successfully"

This reverts commit 68475ffc1ae4a35cecd347e2eeb576c59fd8829b.
---
 Classes/Service/Import/CoreImport.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Classes/Service/Import/CoreImport.php b/Classes/Service/Import/CoreImport.php
index 57cc116..ac0c94d 100644
--- a/Classes/Service/Import/CoreImport.php
+++ b/Classes/Service/Import/CoreImport.php
@@ -45,7 +45,6 @@ public function run()
             ->from($table)
             ->execute()
             ->fetchAll();
-
         $previousCoreVersions = [];
         foreach ($rows as $row) {
             $previousCoreVersions[$row['version']] = $row;

From 914d72e1b305bcecf94f36ea61fcf544f6436b01 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 26 Jan 2019 16:29:07 +0100
Subject: [PATCH 15/83] [TASK] Update the path for the core unit tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ca6dacb..c28a029 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
   - >
     echo;
     echo "Running unit tests";
-    .Build/bin/phpunit --colors  -c .Build/vendor/typo3/cms/typo3/sysext/core/Build/UnitTests.xml Tests/Unit/
+    .Build/bin/phpunit --colors  -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/Unit/
 
   - >
     echo;

From 81916e3a03b90de2597545c7eab276c763b35f78 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 26 Jan 2019 16:49:54 +0100
Subject: [PATCH 16/83] [TASK] Add typo3/testing-framework for Travis CI builds

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c28a029..5dd1a77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ before_install:
 
 before_script:
   - composer require typo3/cms=$TYPO3_VERSION
+  - composer require typo3/testing-framework:1.* --dev
   # Restore composer.json
   - git checkout composer.json
   - export TYPO3_PATH_WEB=$PWD/.Build/Web

From 99a1807903799b4f38fa14b7a544d44b8ceed9ea Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 26 Jan 2019 17:08:16 +0100
Subject: [PATCH 17/83] [TASK] Upgrade mikey179/vfsStream

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9a14623..c0b34f4 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "typo3/cms-core": "^8.7 || ^9.2"
   },
   "require-dev": {
-    "mikey179/vfsStream": "1.4.*@dev",
+    "mikey179/vfsStream": "~1.6.0",
     "phpunit/phpunit": "~4.8.0"
   },
   "autoload": {

From 16c31fbacd9b818653baa8399686daa28e207cbd Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel@daniel-ruf.de>
Date: Sat, 26 Jan 2019 17:11:59 +0100
Subject: [PATCH 18/83] [TASK] Upgrade phpunit/phpunit

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c0b34f4..0a5d92c 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
   },
   "require-dev": {
     "mikey179/vfsStream": "~1.6.0",
-    "phpunit/phpunit": "~4.8.0"
+    "phpunit/phpunit": "^5.6 || ^6.2"
   },
   "autoload": {
     "psr-4": {

From 7caf9233ac212b2fc4571bd1839b757bab11f0b1 Mon Sep 17 00:00:00 2001
From: Luca Kredel <luca.kredel@cyperfection.de>
Date: Fri, 8 Feb 2019 15:16:22 +0100
Subject: [PATCH 19/83] Update client model to support multiple tags

---
 Classes/Domain/Model/Client.php                        |  2 +-
 .../TCA/tx_t3monitoring_domain_model_client.php        | 10 ++++------
 Resources/Private/Language/locallang.xlf               |  2 +-
 Resources/Private/Templates/Client/Show.html           |  4 +++-
 Resources/Private/Templates/Statistic/Index.html       | 10 ++++++----
 ext_tables.sql                                         |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index b2ecbe2..8453f2a 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -134,7 +134,7 @@ class Client extends AbstractEntity
     protected $sla = null;
 
     /**
-     * @var \T3Monitor\T3monitoring\Domain\Model\Tag
+     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Tag>
      * @lazy
      */
     protected $tag = null;
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 2c86b0b..3243260 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -119,15 +119,13 @@
             'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.tag',
             'config' => [
+                'enableMultiSelectFilterTextfield' => 1,
                 'type' => 'select',
-                'renderType' => 'selectSingle',
+                'default' => '',
+                'renderType' => 'selectMultipleSideBySide',
                 'foreign_table' => 'tx_t3monitoring_domain_model_tag',
                 'minitems' => 0,
-                'maxitems' => 1,
-                'default' => 0,
-                'items' => [
-                    ['', 0]
-                ]
+                'maxitems' => 10,
             ],
         ],
         'php_version' => [
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index ab97fcd..0f0bbe8 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -211,7 +211,7 @@
 				<source>Description</source>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_tag">
-				<source>Tag</source>
+				<source>Tags</source>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_tag.title">
 				<source>Title</source>
diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 8d00f7a..5cb2c1a 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -60,7 +60,9 @@ <h1>
 						<tr>
 							<th><i class="fa fa-tags fa-fw"></i> {f:translate(key:'tx_t3monitoring_domain_model_tag')}</th>
 							<td>
-								<f:link.action action="show" controller="Tag" arguments="{tag:client.tag}">{client.tag.title}</f:link.action>
+								<f:for each="{client.tag}" as="single_tag" iteration="iter">
+									<f:link.action action="show" controller="Tag" arguments="{tag:single_tag}">{single_tag.title}<f:if condition="!{iter.isLast}">,</f:if></f:link.action>
+								</f:for>
 							</td>
 						</tr>
 					</f:if>
diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index 550f353..80c3725 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -378,10 +378,12 @@
                                                         <td class="text-nowrap">
                                                             <f:if condition="{client.tag}">
                                                                 <f:then>
-                                                                    <f:link.action action="show" controller="Tag"
-                                                                                   arguments="{tag:client.tag}">
-                                                                        {client.tag.title}
-                                                                    </f:link.action>
+                                                                    <f:for each="{client.tag}" as="single_tag" iteration="iter">
+                                                                        <f:link.action action="show" controller="Tag"
+                                                                                       arguments="{tag:single_tag}">
+                                                                            {single_tag.title}<f:if condition="!{iter.isLast}">,</f:if>
+                                                                        </f:link.action>
+                                                                    </f:for>
                                                                 </f:then>
                                                                 <f:else>-</f:else>
                                                             </f:if>
diff --git a/ext_tables.sql b/ext_tables.sql
index b7cc1bd..5ce55ae 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -28,7 +28,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	extensions int(11) unsigned DEFAULT '0' NOT NULL,
 	core int(11) unsigned DEFAULT '0',
 	sla int(11) unsigned DEFAULT '0',
-	tag int(11) unsigned DEFAULT '0',
+	tag tinytext,
 
 	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
 	crdate int(11) unsigned DEFAULT '0' NOT NULL,

From 0bab40db7cc1f2698ba2e8bd2d086c174837cb2b Mon Sep 17 00:00:00 2001
From: Georg Ringer <georgringer@users.noreply.github.com>
Date: Thu, 7 Mar 2019 13:21:00 +0100
Subject: [PATCH 20/83] [BUGFIX] Add missing execute

---
 Classes/Service/DataIntegrity.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index 629271f..d9b138f 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -160,7 +160,8 @@ protected function getLatestExtensionVersion()
         $queryBuilder = $connection->createQueryBuilder();
         $queryBuilder->update($table)
             ->set('is_latest', 1)
-            ->where('version=last_major_release');
+            ->where('version=last_major_release')
+            ->execute();
     }
 
     /**

From 496910a5bb0fedd4b86ce40af626ebabf6f36004 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georgringer@users.noreply.github.com>
Date: Thu, 7 Mar 2019 13:27:41 +0100
Subject: [PATCH 21/83] [BUGFIX] Set default value for property

Resolves: #147
---
 Classes/Domain/Model/Dto/EmMonitoringConfiguration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
index c0912dd..972a938 100644
--- a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
+++ b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
@@ -33,7 +33,7 @@ class EmMonitoringConfiguration implements SingletonInterface
     protected $ipHint = '';
 
     /** @var string */
-    protected $emailForFailedClient;
+    protected $emailForFailedClient = '';
 
     public function __construct()
     {

From 61ac0a847a4936c93200b61eef626fa467c78fb6 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Mon, 8 Apr 2019 20:19:48 +0200
Subject: [PATCH 22/83] [BUGFIX] Improve model loading

---
 Classes/Domain/Model/Client.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index 8453f2a..6ffc442 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -9,6 +9,7 @@
  */
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
+use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
 /**
@@ -599,7 +600,7 @@ public function removeExtension(Extension $extensionToRemove)
      */
     public function getExtensions()
     {
-        return $this->extensions;
+        return ($this->extensions instanceof LazyLoadingProxy ? $this->extensions->_loadRealInstance() : $this->extensions);
     }
 
     /**
@@ -620,7 +621,7 @@ public function setExtensions(ObjectStorage $extensions)
      */
     public function getCore()
     {
-        return $this->core;
+        return ($this->core instanceof LazyLoadingProxy ? $this->core->_loadRealInstance() : $this->core);
     }
 
     /**
@@ -641,7 +642,7 @@ public function setCore(Core $core)
      */
     public function getSla()
     {
-        return $this->sla;
+        return ($this->sla instanceof LazyLoadingProxy ? $this->sla->_loadRealInstance() : $this->sla);
     }
 
     /**
@@ -662,7 +663,7 @@ public function setSla(Sla $sla)
      */
     public function getTag()
     {
-        return $this->tag;
+        return ($this->tag instanceof LazyLoadingProxy ? $this->tag->_loadRealInstance() : $this->tag);
     }
 
     /**

From e10adaadbed81fef0836de27cd9cd77364478e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:12:07 +0200
Subject: [PATCH 23/83] [BUGFIX] use `break` instead of `continue` in loop

---
 Classes/Service/Import/ClientImport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index eb140af..ab5f5a1 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -244,7 +244,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
             foreach ($existingExtensions as $existingExtension) {
                 if ($existingExtension['name'] === $key && $existingExtension['version'] === $data['version']) {
                     $found = $existingExtension;
-                    continue;
+                    break;
                 }
             }
 

From a545baeae1af36868302e2452870a20a9ff8d596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:36:14 +0200
Subject: [PATCH 24/83] [CLEANUP] Update ExtensionCategoryViewHelper for TYPO3
 9LTS

---
 Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
index acb72f1..48674d7 100644
--- a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
+++ b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
@@ -9,15 +9,14 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
  * Class ExtensionCategoryViewHelper
  */
-class ExtensionCategoryViewHelper extends AbstractViewHelper implements CompilableInterface
+class ExtensionCategoryViewHelper extends AbstractViewHelper
 {
     use CompileWithRenderStatic;
 

From a517509b960c6c3fd9efab81944dab81cc960e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:40:14 +0200
Subject: [PATCH 25/83] [BUGFIX] Move $defaultCategories to Model\Extension for
 consistency like $defaultStates

---
 Classes/Domain/Model/Extension.php            | 19 +++++++++++++++
 .../Format/ExtensionCategoryViewHelper.php    | 23 +++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Classes/Domain/Model/Extension.php b/Classes/Domain/Model/Extension.php
index 495a3f1..86ea885 100644
--- a/Classes/Domain/Model/Extension.php
+++ b/Classes/Domain/Model/Extension.php
@@ -32,6 +32,25 @@ class Extension extends AbstractEntity
         999 => 'n/a'
     ];
 
+
+    /**
+     * Contains default categories.
+     *
+     * @var array
+     */
+    public static $defaultCategories = [
+        0 => 'be',
+        1 => 'module',
+        2 => 'fe',
+        3 => 'plugin',
+        4 => 'misc',
+        5 => 'services',
+        6 => 'templates',
+        8 => 'doc',
+        9 => 'example',
+        10 => 'distribution'
+    ];
+
     /**
      * @var string
      * @validate NotEmpty
diff --git a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
index 48674d7..53062f6 100644
--- a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
+++ b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
@@ -9,6 +9,7 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use T3Monitor\T3monitoring\Domain\Model\Extension;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
@@ -35,27 +36,9 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
     {
         $category = $arguments['category'] ?: $renderChildrenClosure();
         $categoryString = '';
-        if (isset(self::$defaultCategories[$category])) {
-            $categoryString = self::$defaultCategories[$category];
+        if (isset(Extension::$defaultCategories[$category])) {
+            $categoryString = Extension::$defaultCategories[$category];
         }
         return $categoryString;
     }
-
-    /**
-     * Contains default categories.
-     *
-     * @var array
-     */
-    private static $defaultCategories = [
-        0 => 'be',
-        1 => 'module',
-        2 => 'fe',
-        3 => 'plugin',
-        4 => 'misc',
-        5 => 'services',
-        6 => 'templates',
-        8 => 'doc',
-        9 => 'example',
-        10 => 'distribution'
-    ];
 }

From 480c545173c43f35fec193c9b54ad9a967d951e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:49:34 +0200
Subject: [PATCH 26/83] [FEATURE] Add category of user extensions if is set to
 a default category

---
 Classes/Service/Import/ClientImport.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index ab5f5a1..15418bf 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -259,6 +259,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                     'title' => (string)$data['title'],
                     'description' => (string)$data['description'],
                     'state' => array_search($data['state'], Extension::$defaultStates, true),
+                    'category' => (int)array_search($data['category'], Extension::$defaultCategories),
                     'is_official' => 0,
                     'tstamp' => $GLOBALS['EXEC_TIME'],
                 ];

From 5a1d7a1c5c0be3ee7cbf12dbf1ae0bd7e27c73ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:52:59 +0200
Subject: [PATCH 27/83] [BUGFIX] add crdate to user extensions on import

---
 Classes/Service/Import/ClientImport.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 15418bf..bd0fcd3 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -252,6 +252,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                 $relationId = $found['uid'];
             } else {
                 $insert = [
+                    'crdate' => $GLOBALS['EXEC_TIME'],
                     'pid' => $this->emConfiguration->getPid(),
                     'name' => $key,
                     'version' => (string)$data['version'],

From e8b6dcd48b90aa0fe5b8fcf969a335cc18ec5322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:54:48 +0200
Subject: [PATCH 28/83] [FEATURE] add major- and minor_version number and
 author of user extensions on import

---
 Classes/Service/Import/ClientImport.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index bd0fcd3..b832b36 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -251,14 +251,19 @@ protected function handleExtensionRelations($client, array $extensions = [])
             if ($found) {
                 $relationId = $found['uid'];
             } else {
+                $versionSplit = explode('.', $data['version'], 3);
+
                 $insert = [
                     'crdate' => $GLOBALS['EXEC_TIME'],
                     'pid' => $this->emConfiguration->getPid(),
                     'name' => $key,
                     'version' => (string)$data['version'],
                     'version_integer' => VersionNumberUtility::convertVersionNumberToInteger($data['version']),
+                    'major_version' => (int)$versionSplit[0],
+                    'minor_version' => (int)$versionSplit[1],
                     'title' => (string)$data['title'],
                     'description' => (string)$data['description'],
+                    'author_name' => (string)$data['author'],
                     'state' => array_search($data['state'], Extension::$defaultStates, true),
                     'category' => (int)array_search($data['category'], Extension::$defaultCategories),
                     'is_official' => 0,

From 3d0e0ceaaf09c1fd52d153900e4037557fe88d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 22:55:47 +0200
Subject: [PATCH 29/83] [FEATURE] add serialized_dependencies of user
 extensions on import

---
 Classes/Service/Import/ClientImport.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index b832b36..182f11f 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -268,6 +268,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                     'category' => (int)array_search($data['category'], Extension::$defaultCategories),
                     'is_official' => 0,
                     'tstamp' => $GLOBALS['EXEC_TIME'],
+                    'serialized_dependencies' => $this->serializeDependencies($data['constraints']),
                 ];
 
                 $connection = $this->getConnectionTableFor($table);
@@ -293,6 +294,20 @@ protected function handleExtensionRelations($client, array $extensions = [])
         return count($extensions);
     }
 
+    /**
+     * @param array $constraints
+     * @return string|null
+     */
+    protected function serializeDependencies(array $constraints)
+    {
+        foreach ($constraints as $key => $constraint) {
+            if (!is_array($constraint) || $constraint === []) {
+                unset($constraints[$key]);
+            }
+        }
+        return $constraints !== [] ? serialize($constraints) : null;
+    }
+
     /**
      * @param string $version
      * @return int

From d5b97ef469bd07c2efae682f556886ef2dd68ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=B6nig?= <david@hausformat.com>
Date: Wed, 1 May 2019 23:52:23 +0200
Subject: [PATCH 30/83] fix for continuous-integration

---
 Classes/Domain/Model/Extension.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Classes/Domain/Model/Extension.php b/Classes/Domain/Model/Extension.php
index 86ea885..b5f62bb 100644
--- a/Classes/Domain/Model/Extension.php
+++ b/Classes/Domain/Model/Extension.php
@@ -32,7 +32,6 @@ class Extension extends AbstractEntity
         999 => 'n/a'
     ];
 
-
     /**
      * Contains default categories.
      *

From ff61fee0a1fb83fe0b151eee6a68d5ae54f50a74 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Thu, 2 May 2019 02:50:47 +0000
Subject: [PATCH 31/83] Apply fixes from StyleCI

---
 Classes/Domain/Model/Client.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index 6ffc442..9ee2d71 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -600,7 +600,7 @@ public function removeExtension(Extension $extensionToRemove)
      */
     public function getExtensions()
     {
-        return ($this->extensions instanceof LazyLoadingProxy ? $this->extensions->_loadRealInstance() : $this->extensions);
+        return $this->extensions instanceof LazyLoadingProxy ? $this->extensions->_loadRealInstance() : $this->extensions;
     }
 
     /**
@@ -621,7 +621,7 @@ public function setExtensions(ObjectStorage $extensions)
      */
     public function getCore()
     {
-        return ($this->core instanceof LazyLoadingProxy ? $this->core->_loadRealInstance() : $this->core);
+        return $this->core instanceof LazyLoadingProxy ? $this->core->_loadRealInstance() : $this->core;
     }
 
     /**
@@ -642,7 +642,7 @@ public function setCore(Core $core)
      */
     public function getSla()
     {
-        return ($this->sla instanceof LazyLoadingProxy ? $this->sla->_loadRealInstance() : $this->sla);
+        return $this->sla instanceof LazyLoadingProxy ? $this->sla->_loadRealInstance() : $this->sla;
     }
 
     /**
@@ -663,7 +663,7 @@ public function setSla(Sla $sla)
      */
     public function getTag()
     {
-        return ($this->tag instanceof LazyLoadingProxy ? $this->tag->_loadRealInstance() : $this->tag);
+        return $this->tag instanceof LazyLoadingProxy ? $this->tag->_loadRealInstance() : $this->tag;
     }
 
     /**

From 7d902a5c87c50d5b0ab819e6d58eb0dad5a5f943 Mon Sep 17 00:00:00 2001
From: Sebastian Fischer <typo3@evoweb.de>
Date: Sat, 8 Jun 2019 08:26:55 +0200
Subject: [PATCH 32/83] Change what is provided by the extension

The t3monitoring_client provides the data not the day. On first read it was a bit confusing.
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 793ade2..cf4326a 100644
--- a/README.rst
+++ b/README.rst
@@ -52,7 +52,7 @@ Screenshots
 How to start
 ------------
 Before you can actually monitor any installation, you need to install the extension *t3monitoring_client* on every installation (called "client").
-This extension provides the day which will be fetched by the master installation. You can find this extension on github (https://github.com/georgringer/t3monitoring_client) or later in the TER.
+This extension provides the data which will be fetched by the master installation. You can find this extension on github (https://github.com/georgringer/t3monitoring_client) or later in the TER.
 
 .. important:: Please secure the installation as much as possible, as it contains data of all your clients. Restrict access by running it in your intranet only, or at least use a *Basic HTTP Authentication*.
 

From f5befe5ac47f0c288037f71575e62209aed63982 Mon Sep 17 00:00:00 2001
From: Johannes <schugabe@gmx.at>
Date: Fri, 30 Aug 2019 12:39:31 +0200
Subject: [PATCH 33/83] [BUGFIX] change update_comment to text to prevent data
 too long error (#155)

---
 Configuration/TCA/tx_t3monitoring_domain_model_extension.php | 5 +++--
 ext_tables.sql                                               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index 21c6302..9c5c33f 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -102,8 +102,9 @@
             'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.update_comment',
             'config' => [
-                'type' => 'input',
-                'size' => 30,
+                'type' => 'text',
+                'cols' => 40,
+                'rows' => 15,
                 'eval' => 'trim'
             ],
         ],
diff --git a/ext_tables.sql b/ext_tables.sql
index 5ce55ae..ce4a1ea 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -56,7 +56,7 @@ CREATE TABLE tx_t3monitoring_domain_model_extension (
 	description text NOT NULL,
 	last_updated datetime DEFAULT NULL,
 	author_name varchar(255) DEFAULT '' NOT NULL,
-	update_comment varchar(255) DEFAULT '' NOT NULL,
+	update_comment text NOT NULL,
 	state int(11) DEFAULT '0' NOT NULL,
 	category int(11) DEFAULT '0' NOT NULL,
 	version_integer int(11) DEFAULT '0' NOT NULL,

From ddd215895f414c3cb8b2728d533a3e92e08bd310 Mon Sep 17 00:00:00 2001
From: Johannes <schugabe@gmx.at>
Date: Fri, 30 Aug 2019 12:40:45 +0200
Subject: [PATCH 34/83] [BUGFIX] wrap inline js in cdata to prevent fluid
 parsing error (#154)

---
 Resources/Private/Templates/Statistic/Index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index 80c3725..eb3e997 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -136,6 +136,7 @@
                                 <div id="chart_core_versions"></div>
                                 <script type="text/javascript">
                                     var dataSet = {coreVersionUsageJson -> f:format.raw()};
+                                    <![CDATA[
                                     // Load the Visualization API and the corechart package.
                                     google.charts.load('current', {'packages':['corechart']});
 
@@ -164,6 +165,7 @@
                                         var chart = new google.visualization.PieChart(document.getElementById('chart_core_versions'));
                                         chart.draw(data, options);
                                     }
+                                    ]]>
                                 </script>
                             </f:if>
                         </div>
@@ -483,4 +485,4 @@ <h3>{f:translate(key:'lastImport.header')}</h3>
             </f:be.infobox>
         </f:else>
     </f:if>
-</f:section>
\ No newline at end of file
+</f:section>

From 669be7058055ba60b60f6c66060308ef5ae69689 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Wed, 11 Sep 2019 15:19:05 +0200
Subject: [PATCH 35/83] [FEATURE] Extend connection options for clients (#164)

This patch extends the client with three properties:
- host_header: add an optional "Host: yourdomain.com" header
- ignore_cert_errors: force ignoring certificate errors
- force_ip_resolve: force IPv4/-6 resolving of the client

In order to make this possible, the TYPO3 core wrapper
RequestFactory::class for guzzle is used instead of
GeneralUtility::getUrl().

In addition, the following bugs are fixed:

- empty update_comment field on client update
- handle missing disk_total_space (fallback to 0)
- handle missing disk_free_space (fallback to 0)
- handle extensions with not allowed "state" values (fallback to 999 => n/a)
- handle extensions without dependencies

Fixes: #159
Fixes: #160
Fixes: #161
Fixes: #162
Fixes: #163
---
 Classes/Domain/Model/Client.php               | 63 +++++++++++++++++++
 Classes/Service/Import/ClientImport.php       | 44 +++++++++----
 .../tx_t3monitoring_domain_model_client.php   | 48 ++++++++++++--
 README.rst                                    |  8 ++-
 Resources/Private/Language/locallang.xlf      | 14 ++++-
 ext_tables.sql                                |  5 +-
 6 files changed, 159 insertions(+), 23 deletions(-)

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index 9ee2d71..decf83d 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -30,6 +30,21 @@ class Client extends AbstractEntity
      */
     protected $domain = '';
 
+    /**
+     * @var string
+     */
+    protected $hostHeader = '';
+
+    /**
+     * @var bool
+     */
+    protected $ignoreCertErrors = false;
+
+    /**
+     * @var string
+     */
+    protected $forceIpResolve = '';
+
     /**
      * @var string
      */
@@ -236,6 +251,54 @@ public function setBasicAuthPassword($basicAuthPassword)
         $this->basicAuthPassword = $basicAuthPassword;
     }
 
+    /**
+     * @return string
+     */
+    public function getHostHeader()
+    {
+        return $this->hostHeader;
+    }
+
+    /**
+     * @param string $hostHeader
+     */
+    public function setHostHeader(string $hostHeader)
+    {
+        $this->hostHeader = $hostHeader;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isIgnoreCertErrors()
+    {
+        return $this->ignoreCertErrors;
+    }
+
+    /**
+     * @param bool $ignoreCertErrors
+     */
+    public function setIgnoreCertErrors(bool $ignoreCertErrors)
+    {
+        $this->ignoreCertErrors = $ignoreCertErrors;
+    }
+
+    /**
+     * @return string
+     */
+    public function getForceIpResolve()
+    {
+        return $this->forceIpResolve;
+    }
+
+    /**
+     * @param string $forceIpResolve
+     */
+    public function setForceIpResolve(string $forceIpResolve)
+    {
+        $this->forceIpResolve = $forceIpResolve;
+    }
+
     /**
      * Returns the secret
      *
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 182f11f..58cf76e 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -15,6 +15,7 @@
 use T3Monitor\T3monitoring\Service\DataIntegrity;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Http\RequestFactory;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
@@ -112,8 +113,8 @@ protected function importSingleClient(array $row)
                 'error_message' => '',
                 'php_version' => $json['core']['phpVersion'],
                 'mysql_version' => $json['core']['mysqlClientVersion'],
-                'disk_total_space' => $json['core']['diskTotalSpace'],
-                'disk_free_space' => $json['core']['diskFreeSpace'],
+                'disk_total_space' => $json['core']['diskTotalSpace'] ?: 0,
+                'disk_free_space' => $json['core']['diskFreeSpace'] ?: 0,
                 'core' => $this->getUsedCore($json['core']['typo3Version']),
                 'extensions' => $this->handleExtensionRelations($row['uid'], (array)$json['extensions']),
             ];
@@ -181,18 +182,33 @@ protected function requestClientData(array $row)
     {
         $domain = $this->unifyDomain($row['domain']);
         $url = $domain . '/index.php?eID=t3monitoring&secret=' . rawurlencode($row['secret']);
-        $report = [];
         $headers = [
-            'User-Agent: TYPO3-Monitoring/' . ExtensionManagementUtility::getExtensionVersion('t3monitoring'),
-            'Accept: application/json'
+            'User-Agent' => 'TYPO3-Monitoring/' . ExtensionManagementUtility::getExtensionVersion('t3monitoring'),
+            'Accept' => 'application/json',
+        ];
+        if (!empty($row['host_header'])) {
+            $headers['Host'] = trim($row['host_header']);
+        }
+        $requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
+        $additionalOptions = [
+            'headers' => $headers,
+            'allow_redirects' => true,
+            'verify' => (bool)!$row['ignore_cert_errors'],
         ];
         if (!empty($row['basic_auth_username']) && !empty($row['basic_auth_password'])) {
-            $headers[] = 'Authorization: Basic ' . base64_encode($row['basic_auth_username'] . ':' . $row['basic_auth_password']);
+            $additionalOptions['auth'] = [ $row['basic_auth_username'], $row['basic_auth_password'] ];
+        }
+        if (!empty($row['force_ip_resolve'])) {
+            $additionalOptions['force_ip_resolve'] = $row['force_ip_resolve'];
+        }
+        $response = $requestFactory->request($url, 'GET', $additionalOptions);
+        if (!empty($response->getReasonPhrase()) && $response->getReasonPhrase() !== 'OK') {
+            throw new \RuntimeException($response->getReasonPhrase());
         }
-        $response = GeneralUtility::getUrl($url, 0, $headers, $report);
-        if (!empty($report['message']) && $report['message'] !== 'OK') {
-            throw new \RuntimeException($report['message']);
+        if (in_array($response->getStatusCode(), [ 200, 301, 302 ], true)) {
+            $response = $response->getBody()->getContents();
         }
+
         return $response;
     }
 
@@ -264,13 +280,17 @@ protected function handleExtensionRelations($client, array $extensions = [])
                     'title' => (string)$data['title'],
                     'description' => (string)$data['description'],
                     'author_name' => (string)$data['author'],
-                    'state' => array_search($data['state'], Extension::$defaultStates, true),
+                    'state' => array_search($data['state'], Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
                     'category' => (int)array_search($data['category'], Extension::$defaultCategories),
                     'is_official' => 0,
                     'tstamp' => $GLOBALS['EXEC_TIME'],
-                    'serialized_dependencies' => $this->serializeDependencies($data['constraints']),
+                    'update_comment' => '',
                 ];
 
+                if ($data['constraints'] !== null) {
+                    $insert['serialized_dependencies'] = $this->serializeDependencies($data['constraints']);
+                }
+
                 $connection = $this->getConnectionTableFor($table);
                 $connection->insert('tx_t3monitoring_domain_model_extension', $insert);
                 $relationId = $connection->lastInsertId('tx_t3monitoring_domain_model_extension');
@@ -280,7 +300,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                 $client,
                 $relationId,
                 $data['title'],
-                array_search($data['state'], Extension::$defaultStates, true),
+                array_search($data['state'], Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
                 $data['isLoaded'],
             ];
 
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 3243260..a3eef22 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -14,12 +14,12 @@
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.gif'
     ],
     'interface' => [
-        'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
+        'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, host_header, ignore_cert_errors, force_ip_resolve, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
     ],
     'types' => [
         '1' => [
             'showitem' => '
-        --div--;General,title, --palette--;;paletteDomain,email,sla,tag,
+        --div--;General,--palette--;;paletteTitle, --palette--;;paletteDomain,email,sla,tag,
         --div--;Readonly information,last_successful_import,error_message,core, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,extensions,
                 insecure_core, outdated_core, insecure_extensions, outdated_extensions,
         --div--;Extra,extra_info,extra_warning,extra_danger,
@@ -29,7 +29,8 @@
         ],
     ],
     'palettes' => [
-        'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, hidden'],
+        'paletteTitle' => ['showitem' => 'title, hidden'],
+        'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, host_header, --linebreak--, ignore_cert_errors, force_ip_resolve'],
         'paletteVersions' => ['showitem' => 'php_version, mysql_version'],
         'paletteDiskSpace' => ['showitem' => 'disk_total_space, disk_free_space'],
     ],
@@ -56,7 +57,7 @@
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.domain',
             'config' => [
                 'type' => 'input',
-                'size' => 30,
+                'size' => 50,
                 'eval' => 'trim,required',
                 'placeholder' => 'http://yourdomain.com/'
             ],
@@ -66,7 +67,7 @@
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.secret',
             'config' => [
                 'type' => 'input',
-                'size' => 30,
+                'size' => 50,
                 'eval' => 'trim,required',
                 'min' => 5,
                 'max' => 255
@@ -90,6 +91,40 @@
                 'eval' => 'trim,password'
             ],
         ],
+        'host_header' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.hostHeader',
+            'config' => [
+                'type' => 'input',
+                'size' => 30,
+                'eval' => 'trim',
+                'placeholder' => 'app.myproject.com'
+            ],
+        ],
+        'ignore_cert_errors' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.ignoreCertErrors',
+            'config' => [
+                'type' => 'check',
+            ],
+        ],
+        'force_ip_resolve' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.forceIpResolve',
+            'config' => [
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'minitems' => 1,
+                'maxitems' => 1,
+                'default' => 'v4',
+                'items' => [
+                    ['', ''],
+                    ['IPv4', 'v4'],
+                    ['IPv6', 'v6'],
+                ],
+                'default' => '',
+            ],
+        ],
         'email' => [
             'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.email',
@@ -213,7 +248,8 @@
                 'readOnly' => true,
                 'type' => 'input',
                 'size' => 30,
-                'eval' => 'trim'
+                'eval' => 'trim',
+                'default' => ''
             ],
         ],
         'extra_info' => [
diff --git a/README.rst b/README.rst
index cf4326a..f4e1c15 100644
--- a/README.rst
+++ b/README.rst
@@ -11,7 +11,7 @@ This extensions provides the possibility to monitor all of your TYPO3 installati
 
 **Requirements**
 
-- At least TYPO3 CMS 7 LTS (monitoring works also for 6.2 installations)
+- At least TYPO3 CMS 8 LTS (monitoring works also for 6.2 installations)
 - The host must have access to every client to be able to fetch the data
 
 Important: This extension is still beta and things might change!
@@ -63,6 +63,10 @@ Create a record "**Client**" on any sys folder and fill out at least the followi
 - Title
 - Domain. Include ``http://`` or ``https://``.
 - Secret: This is the same secret as defined in the configuration of *t3monitoring_client* in the client installation. Please don't reuse any secrets twice.
+- (Optional) BasicAuth username and password: (if your client is secured via HTTP Basic Auth)
+- (Optional) Host Header: (if you want to monitor a client which can't be resolved via public DNS services) (
+- (Optional) Ignore Certificate Errors: Ignores certificate errors (mostly necessary if you use the previous field "Host Header" in conjunction with Let's Encrypt)
+- (Optional) Force IP Resolve: IPv4 or IPv6
 
 Create an optional record "**SLA**" to group your clients. Examples could be:
 
@@ -85,5 +89,3 @@ Especially the import of extensions can take a while, therefore you can use diff
 - ``./typo3/cli_dispatch.phpsh extbase monitoring:importCore`` to fetch latest core versions
 - ``./typo3/cli_dispatch.phpsh extbase monitoring:importExtensions`` to fetch the extensions
 - ``./typo3/cli_dispatch.phpsh extbase monitoring:importClients`` to fetch the client data
-
-
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 0f0bbe8..882165d 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -27,6 +27,18 @@
 			<trans-unit id="tx_t3monitoring_domain_model_client.basic_auth_password">
 				<source>BasicAuth password</source>
 			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.hostHeader">
+				<source>Host Header</source>
+				<context context-type="context">Label for field host header (type input). It's an optional field.</context>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.ignoreCertErrors">
+				<source>Ignore Certificate Errors</source>
+				<context context-type="context">Label for field Ignore Certificate Errors (type checkbox). It's an optional field.</context>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.forceIpResolve">
+				<source>Force IP Resolve</source>
+				<context context-type="context">Label for field Force IP Resolve (type select).</context>
+			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
 				<source>Secret</source>
 			</trans-unit>
@@ -484,4 +496,4 @@
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/ext_tables.sql b/ext_tables.sql
index ce4a1ea..7cd15d1 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -10,6 +10,9 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	domain varchar(255) DEFAULT '' NOT NULL,
 	basic_auth_username varchar(255) DEFAULT '' NOT NULL,
 	basic_auth_password varchar(255) DEFAULT '' NOT NULL,
+	host_header varchar(255) DEFAULT '' NOT NULL,
+	force_ip_resolve enum('', 'v4', 'v6') DEFAULT '' NOT NULL,
+	ignore_cert_errors tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	secret varchar(255) DEFAULT '' NOT NULL,
 	email varchar(255) DEFAULT '' NOT NULL,
 	php_version varchar(255) DEFAULT '' NOT NULL,
@@ -20,7 +23,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	outdated_core tinyint(1) unsigned DEFAULT '0' NOT NULL,
 	insecure_extensions int(11) DEFAULT '0' NOT NULL,
 	outdated_extensions int(11) DEFAULT '0' NOT NULL,
-	error_message varchar(255) DEFAULT '' NOT NULL,
+	error_message text DEFAULT '' NOT NULL,
 	extra_info text NOT NULL,
 	extra_warning text NOT NULL,
 	extra_danger text NOT NULL,

From 6264d80b29aef8073084b569c88595c55cf914a0 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Thu, 12 Sep 2019 07:55:38 +0200
Subject: [PATCH 36/83] [FOLLOWUP][FEATURE] Extend connection options for
 clients (#166)

Remove duplicate TCA option `tx_t3monitoring_domain_model_client.force_ip_resolve.config.default`

Related: #160
---
 Configuration/TCA/tx_t3monitoring_domain_model_client.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index a3eef22..329f754 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -116,7 +116,6 @@
                 'renderType' => 'selectSingle',
                 'minitems' => 1,
                 'maxitems' => 1,
-                'default' => 'v4',
                 'items' => [
                     ['', ''],
                     ['IPv4', 'v4'],

From 15c4bcc69a14e9da4a648cfb01a0fd0fe93f3184 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Thu, 12 Sep 2019 07:56:02 +0200
Subject: [PATCH 37/83] [TASK] TCA: remove 'exclude' => true (#167)

This patch removes all exclude options of
TCA columns.

Fixes: #165
---
 .../tx_t3monitoring_domain_model_client.php   | 27 -------------------
 .../TCA/tx_t3monitoring_domain_model_core.php | 13 ---------
 ...tx_t3monitoring_domain_model_extension.php | 20 --------------
 .../TCA/tx_t3monitoring_domain_model_sla.php  |  3 ---
 .../TCA/tx_t3monitoring_domain_model_tag.php  |  3 ---
 5 files changed, 66 deletions(-)

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 329f754..7ce7a5a 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -36,14 +36,12 @@
     ],
     'columns' => [
         'hidden' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
             ],
         ],
         'title' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.title',
             'config' => [
                 'type' => 'input',
@@ -53,7 +51,6 @@
             ],
         ],
         'domain' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.domain',
             'config' => [
                 'type' => 'input',
@@ -63,7 +60,6 @@
             ],
         ],
         'secret' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.secret',
             'config' => [
                 'type' => 'input',
@@ -74,7 +70,6 @@
             ],
         ],
         'basic_auth_username' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.basic_auth_username',
             'config' => [
                 'type' => 'input',
@@ -83,7 +78,6 @@
             ],
         ],
         'basic_auth_password' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.basic_auth_password',
             'config' => [
                 'type' => 'input',
@@ -92,7 +86,6 @@
             ],
         ],
         'host_header' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.hostHeader',
             'config' => [
                 'type' => 'input',
@@ -102,14 +95,12 @@
             ],
         ],
         'ignore_cert_errors' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.ignoreCertErrors',
             'config' => [
                 'type' => 'check',
             ],
         ],
         'force_ip_resolve' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.forceIpResolve',
             'config' => [
                 'type' => 'select',
@@ -125,7 +116,6 @@
             ],
         ],
         'email' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.email',
             'config' => [
                 'type' => 'input',
@@ -135,7 +125,6 @@
             ],
         ],
         'sla' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.sla',
             'config' => [
                 'type' => 'select',
@@ -150,7 +139,6 @@
             ],
         ],
         'tag' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.tag',
             'config' => [
                 'enableMultiSelectFilterTextfield' => 1,
@@ -163,7 +151,6 @@
             ],
         ],
         'php_version' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.php_version',
             'config' => [
                 'readOnly' => true,
@@ -173,7 +160,6 @@
             ],
         ],
         'mysql_version' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.mysql_version',
             'config' => [
                 'readOnly' => true,
@@ -183,7 +169,6 @@
             ],
         ],
         'disk_total_space' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.disk_total_space',
             'config' => [
                 'readOnly' => true,
@@ -193,7 +178,6 @@
             ],
         ],
         'disk_free_space' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.disk_free_space',
             'config' => [
                 'readOnly' => true,
@@ -203,7 +187,6 @@
             ],
         ],
         'insecure_core' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.insecure_core',
             'config' => [
                 'readOnly' => true,
@@ -212,7 +195,6 @@
             ],
         ],
         'outdated_core' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.outdated_core',
             'config' => [
                 'readOnly' => true,
@@ -221,7 +203,6 @@
             ],
         ],
         'insecure_extensions' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.insecure_extensions',
             'config' => [
                 'readOnly' => true,
@@ -231,7 +212,6 @@
             ],
         ],
         'outdated_extensions' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.outdated_extensions',
             'config' => [
                 'readOnly' => true,
@@ -241,7 +221,6 @@
             ],
         ],
         'error_message' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.error_message',
             'config' => [
                 'readOnly' => true,
@@ -252,7 +231,6 @@
             ],
         ],
         'extra_info' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_db.xlf:tx_t3monitoring_domain_model_client.extra_info',
             'config' => [
                 'readOnly' => true,
@@ -263,7 +241,6 @@
             ],
         ],
         'extra_warning' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_db.xlf:tx_t3monitoring_domain_model_client.extra_warning',
             'config' => [
                 'readOnly' => true,
@@ -274,7 +251,6 @@
             ],
         ],
         'extra_danger' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_db.xlf:tx_t3monitoring_domain_model_client.extra_danger',
             'config' => [
                 'readOnly' => true,
@@ -285,7 +261,6 @@
             ],
         ],
         'last_successful_import' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.last_successful_import',
             'config' => [
                 'readOnly' => true,
@@ -297,7 +272,6 @@
             ],
         ],
         'extensions' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.extensions',
             'config' => [
                 'readOnly' => true,
@@ -314,7 +288,6 @@
             ],
         ],
         'core' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.core',
             'config' => [
                 'readOnly' => true,
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_core.php b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
index f98f136..961010c 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_core.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
@@ -25,7 +25,6 @@
     ],
     'columns' => [
         'version' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.version',
             'config' => [
                 'type' => 'input',
@@ -34,7 +33,6 @@
             ],
         ],
         'insecure' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.insecure',
             'config' => [
                 'type' => 'check',
@@ -42,7 +40,6 @@
             ],
         ],
         'next_secure_version' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.next_secure_version',
             'config' => [
                 'type' => 'input',
@@ -51,7 +48,6 @@
             ],
         ],
         'type' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type',
             'config' => [
                 'type' => 'select',
@@ -69,7 +65,6 @@
             ],
         ],
         'release_date' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.release_date',
             'config' => [
                 'dbType' => 'datetime',
@@ -80,7 +75,6 @@
             ],
         ],
         'latest' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.latest',
             'config' => [
                 'type' => 'input',
@@ -89,7 +83,6 @@
             ],
         ],
         'stable' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.stable',
             'config' => [
                 'type' => 'input',
@@ -98,7 +91,6 @@
             ],
         ],
         'is_stable' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.is_stable',
             'config' => [
                 'type' => 'check',
@@ -106,7 +98,6 @@
             ],
         ],
         'is_active' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.is_active',
             'config' => [
                 'type' => 'check',
@@ -114,7 +105,6 @@
             ],
         ],
         'is_latest' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.is_latest',
             'config' => [
                 'type' => 'check',
@@ -122,7 +112,6 @@
             ],
         ],
         'version_integer' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.version_integer',
             'config' => [
                 'type' => 'input',
@@ -131,7 +120,6 @@
             ],
         ],
         'is_used' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.is_used',
             'config' => [
                 'type' => 'check',
@@ -140,7 +128,6 @@
             ],
         ],
         'is_official' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.is_official',
             'config' => [
                 'type' => 'check',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index 9c5c33f..38de424 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -25,7 +25,6 @@
     ],
     'columns' => [
         'name' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.name',
             'config' => [
                 'type' => 'input',
@@ -34,7 +33,6 @@
             ],
         ],
         'version' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.version',
             'config' => [
                 'type' => 'input',
@@ -43,7 +41,6 @@
             ],
         ],
         'insecure' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.insecure',
             'config' => [
                 'type' => 'check',
@@ -51,7 +48,6 @@
             ],
         ],
         'next_secure_version' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.next_secure_version',
             'config' => [
                 'type' => 'input',
@@ -60,7 +56,6 @@
             ],
         ],
         'title' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.title',
             'config' => [
                 'type' => 'input',
@@ -69,7 +64,6 @@
             ],
         ],
         'description' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.description',
             'config' => [
                 'type' => 'text',
@@ -79,7 +73,6 @@
             ],
         ],
         'last_updated' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.last_updated',
             'config' => [
                 'type' => 'input',
@@ -90,7 +83,6 @@
             ],
         ],
         'author_name' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.author_name',
             'config' => [
                 'type' => 'input',
@@ -99,7 +91,6 @@
             ],
         ],
         'update_comment' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.update_comment',
             'config' => [
                 'type' => 'text',
@@ -109,7 +100,6 @@
             ],
         ],
         'state' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.state',
             'config' => [
                 'type' => 'select',
@@ -123,7 +113,6 @@
             ],
         ],
         'category' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.category',
             'config' => [
                 'type' => 'select',
@@ -137,7 +126,6 @@
             ],
         ],
         'version_integer' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.version_integer',
             'config' => [
                 'type' => 'input',
@@ -146,7 +134,6 @@
             ],
         ],
         'is_used' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.is_used',
             'config' => [
                 'type' => 'check',
@@ -154,7 +141,6 @@
             ],
         ],
         'is_official' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.is_official',
             'config' => [
                 'type' => 'check',
@@ -162,7 +148,6 @@
             ],
         ],
         'is_modified' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.is_modified',
             'config' => [
                 'type' => 'check',
@@ -170,7 +155,6 @@
             ],
         ],
         'is_latest' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.is_latest',
             'config' => [
                 'type' => 'check',
@@ -178,7 +162,6 @@
             ],
         ],
         'last_bugfix_release' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.last_bugfix_release',
             'config' => [
                 'type' => 'input',
@@ -187,7 +170,6 @@
             ],
         ],
         'last_minor_release' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.last_minor_release',
             'config' => [
                 'type' => 'input',
@@ -196,7 +178,6 @@
             ],
         ],
         'last_major_release' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.last_major_release',
             'config' => [
                 'type' => 'input',
@@ -205,7 +186,6 @@
             ],
         ],
         'serialized_dependencies' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.serialized_dependencies',
             'config' => [
                 'type' => 'text',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
index 25486e2..bb7f50d 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
@@ -25,14 +25,12 @@
     ],
     'columns' => [
         'hidden' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
             ],
         ],
         'title' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_sla.title',
             'config' => [
                 'type' => 'input',
@@ -41,7 +39,6 @@
             ],
         ],
         'description' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_sla.description',
             'config' => [
                 'type' => 'text',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
index e1e46e0..6d6f13f 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
@@ -25,14 +25,12 @@
     ],
     'columns' => [
         'hidden' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
             ],
         ],
         'title' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_tag.title',
             'config' => [
                 'type' => 'input',
@@ -42,7 +40,6 @@
             ],
         ],
         'description' => [
-            'exclude' => true,
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_tag.description',
             'config' => [
                 'type' => 'text',

From 85f6cbb23429cd93121225b45cb294cfb88c8ebb Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Tue, 17 Sep 2019 21:51:22 +0200
Subject: [PATCH 38/83] [BUGFIX] Remove emConfiguration link

due to the TYPO3 Install Tool rewrite in TYPO3 9.5 LTS
it's not possible anymore to directly link to the extension
configuration.

Fixes: #156
---
 Classes/Controller/BaseController.php       |   15 -
 Resources/Private/Language/de.locallang.xlf |    6 +-
 Resources/Private/Language/locallang.xlf    |    3 -
 Resources/Private/Language/nl.locallang.xlf | 1156 +++++++++----------
 4 files changed, 577 insertions(+), 603 deletions(-)

diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index 7d3ca78..7c3dd72 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -205,21 +205,6 @@ protected function getButtons()
                     Icon::SIZE_SMALL));
             $buttonBar->addButton($downloadClientDataButton, ButtonBar::BUTTON_POSITION_LEFT);
         }
-
-        // Configuration
-        $configurationLink = BackendUtility::getModuleUrl('tools_ExtensionmanagerExtensionmanager', [
-            'tx_extensionmanager_tools_extensionmanagerextensionmanager' => [
-                'action' => 'showConfigurationForm',
-                'controller' => 'Configuration',
-                'extension' => ['key' => 't3monitoring']
-            ]
-        ]);
-        $configurationButton = $buttonBar->makeLinkButton()
-            ->setHref($configurationLink . '&returnUrl=' . $returnUrl)
-            ->setTitle($this->getLabel('emConfiguration.link'))
-            ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-system-extension-configure',
-                Icon::SIZE_SMALL));
-        $buttonBar->addButton($configurationButton, ButtonBar::BUTTON_POSITION_RIGHT);
     }
 
     /**
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index f6cc7ad..e518b02 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -575,10 +575,6 @@
 				<source>http://*********.***</source>
 				<target>http://*********.***</target>
 			</trans-unit>
-			<trans-unit id="emConfiguration.link">
-				<source>Configuration</source>
-				<target>Konfiguration</target>
-			</trans-unit>
 			<trans-unit id="noInsecureClients">
 				<source>No insecure clients found!</source>
 				<target>Keine unsicheren Clients gefunden!</target>
@@ -593,4 +589,4 @@
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 882165d..0ff62c8 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -482,9 +482,6 @@
 			<trans-unit id="presentationMode.client.domain">
 				<source>http://*********.***</source>
 			</trans-unit>
-			<trans-unit id="emConfiguration.link">
-				<source>Configuration</source>
-			</trans-unit>
 			<trans-unit id="noInsecureClients">
 				<source>No insecure clients found!</source>
 			</trans-unit>
diff --git a/Resources/Private/Language/nl.locallang.xlf b/Resources/Private/Language/nl.locallang.xlf
index 81eeac1..a3f4126 100644
--- a/Resources/Private/Language/nl.locallang.xlf
+++ b/Resources/Private/Language/nl.locallang.xlf
@@ -1,580 +1,576 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="nl" datatype="plaintext" original="messages" date="2016-05-20T20:48:29Z" product-name="t3monitoring">
-		<header/>
-		<body>
-			<trans-unit id="tx_t3monitoring_domain_model_client">
-				<source>Client</source>
-				<target>Klant</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.title">
-				<source>Title</source>
-				<target>Titel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
-				<source>Domain</source>
-				<target>Domein</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
-				<source>Secret</source>
-				<target>Geheim</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.email">
-				<source>Email</source>
-				<target>E-mail</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.php_version">
-				<source>Php Version</source>
-				<target>PHP versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Mysql Version</source>
-				<target>MySQL versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
-				<source>Disk Total Space</source>
-				<target>Disk Total Space</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space">
-				<source>Disk Free Space</source>
-				<target>Disk Free Space</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
-				<source>Insecure Core</source>
-				<target>Onveilige core</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core">
-				<source>Outdated Core</source>
-				<target>Verouderde core</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions">
-				<source>Insecure Extensions</source>
-				<target>Onveilige extensies</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
-				<source>Outdated Extensions</source>
-				<target>Verouderde extensies</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
-				<source>Error Message</source>
-				<target>Foutmelding</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info">
-				<source>Extra Info</source>
-				<target>Extra informatie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning">
-				<source>Extra Warning</source>
-				<target>Extra waarschuwing</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger">
-				<source>Extra Danger</source>
-				<target>Extra gevaar</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import">
-				<source>Last Successful Import</source>
-				<target>Laatste succesvolle import</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extensions">
-				<source>Extensions</source>
-				<target>Extensies</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.core">
-				<source>Core</source>
-				<target>Core</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.sla">
-				<source>Sla</source>
-				<target>Sla</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension">
-				<source>Extension</source>
-				<target>Extensie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.name">
-				<source>Name</source>
-				<target>Naam</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version">
-				<source>Version</source>
-				<target>Versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure">
-				<source>Insecure</source>
-				<target>Onveilig</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version">
-				<source>Next Secure Version</source>
-				<target>Eerst volgende veilige versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.title">
-				<source>Title</source>
-				<target>Titel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.description">
-				<source>Description</source>
-				<target>Beschrijving</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated">
-				<source>Last Updated</source>
-				<target>Laatste update</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name">
-				<source>Author Name</source>
-				<target>Auteur naam</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment">
-				<source>Update Comment</source>
-				<target>Update beschrijving</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.state">
-				<source>State</source>
-				<target>Status</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.category">
-				<source>Category</source>
-				<target>Categorie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer">
-				<source>Version Integer</source>
-				<target>Versie Integer</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used">
-				<source>Is Used</source>
-				<target>Is gebruikt</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official">
-				<source>Is Official</source>
-				<target>Is officieel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified">
-				<source>Is Modified</source>
-				<target>Verändert</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest">
-				<source>Is Latest</source>
-				<target>Is laatste</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release">
-				<source>Last Bugfix Release</source>
-				<target>Laatste bugfix release</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release">
-				<source>Last Minor Release</source>
-				<target>Laatste Minor-Release</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release">
-				<source>Last Major Release</source>
-				<target>Laatste Major-Release</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
-				<source>Serialized Dependencies</source>
-				<target>serialized afhankelijkheden</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core">
-				<source>Core</source>
-				<target>Core</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version">
-				<source>Version</source>
-				<target>Versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.insecure">
-				<source>Insecure</source>
-				<target>Onvelig</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version">
-				<source>Next Secure Version</source>
-				<target>Volgende veilige versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type">
-				<source>Type</source>
-				<target>Type</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.release_date">
-				<source>Release Date</source>
-				<target>Datum van publicatie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.latest">
-				<source>Latest</source>
-				<target>Laatste</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.stable">
-				<source>Stable</source>
-				<target>Stabiel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable">
-				<source>Is Stable</source>
-				<target>Is stabiel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_active">
-				<source>Is Active</source>
-				<target>Actief</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest">
-				<source>Is Latest</source>
-				<target>Is de nieuwste</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer">
-				<source>Version Integer</source>
-				<target>Versie Integer</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_used">
-				<source>Is Used</source>
-				<target>Is gebruikt</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_official">
-				<source>Is Official</source>
-				<target>Is officieel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla">
-				<source>Sla</source>
-				<target>Sla</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag">
-				<source>Tag</source>
-				<target>Tag</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.title">
-				<source>Title</source>
-				<target>Titel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.description">
-				<source>Description</source>
-				<target>Beschrijving</target>
-			</trans-unit>
-			<trans-unit id="update.available">
-				<source>Update available</source>
-				<target>Update beschikbaar</target>
-			</trans-unit>
-			<trans-unit id="secure">
-				<source>Secure</source>
-				<target>Veilig</target>
-			</trans-unit>
-			<trans-unit id="loaded">
-				<source>Loaded</source>
-				<target>Geladen</target>
-			</trans-unit>
-			<trans-unit id="found.in.ter">
-				<source>Found in TER</source>
-				<target>In TER gevonden</target>
-			</trans-unit>
-			<trans-unit id="next.secure.version">
-				<source>Next secure version:</source>
-				<target>Volgende veilige versie:</target>
-			</trans-unit>
-			<trans-unit id="no.official.update">
-				<source>No official update available</source>
-				<target>Geen officiele versie beschikbaar</target>
-			</trans-unit>
-			<trans-unit id="yes">
-				<source>yes</source>
-				<target>ja</target>
-			</trans-unit>
-			<trans-unit id="no">
-				<source>no</source>
-				<target>nee</target>
-			</trans-unit>
-			<trans-unit id="unknown">
-				<source>unknown</source>
-				<target>onbekend</target>
-			</trans-unit>
-			<trans-unit id="no.cores.imported">
-				<source>No cores yet imported</source>
-				<target>Nog geen core versies geïmporteerd</target>
-			</trans-unit>
-			<trans-unit id="no.versions.available">
-				<source>No versions available</source>
-				<target>Geen versies beschikbaar</target>
-			</trans-unit>
-			<trans-unit id="view.administration">
-				<source>Administration</source>
-				<target>Administratie</target>
-			</trans-unit>
-			<trans-unit id="view.usedExtensions">
-				<source>Used extensions</source>
-				<target>Gebruikte extensies</target>
-			</trans-unit>
-			<trans-unit id="view.core">
-				<source>Used core versions</source>
-				<target>Gebruikte Core versies</target>
-			</trans-unit>
-			<trans-unit id="administration.import.headline">
-				<source>Start an import</source>
-				<target>Import starten</target>
-			</trans-unit>
-			<trans-unit id="administration.import.success">
-				<source>The import was successful!</source>
-				<target>De import was succesvol!</target>
-			</trans-unit>
-			<trans-unit id="administration.import.description">
-				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
-				<target>Wees ervan bewust dat de import een tijdje kan duren. Als er een time-out optreedt de CLI gebruiken!</target>
-			</trans-unit>
-			<trans-unit id="createNew.client">
-				<source>Create new client</source>
-				<target>Nieuwe klant aanmaken</target>
-			</trans-unit>
-			<trans-unit id="edit.client">
-				<source>Edit client</source>
-				<target>Bewerk klant</target>
-			</trans-unit>
-			<trans-unit id="home">
-				<source>Home</source>
-				<target>Home</target>
-			</trans-unit>
-			<trans-unit id="extensionList">
-				<source>Extension List</source>
-				<target>Lijst van extensies</target>
-			</trans-unit>
-			<trans-unit id="coreVersions">
-				<source>Core Versions</source>
-				<target>Core-versies</target>
-			</trans-unit>
-			<trans-unit id="sla">
-				<source>SLA</source>
-				<target>SLA</target>
-			</trans-unit>
-			<trans-unit id="administration">
-				<source>Administration</source>
-				<target>Administratie</target>
-			</trans-unit>
-			<trans-unit id="available.extensions">
-				<source>Available extensions</source>
-				<target>Beschikbare extensies</target>
-			</trans-unit>
-			<trans-unit id="count">
-				<source>Count</source>
-				<target>Aantal</target>
-			</trans-unit>
-			<trans-unit id="search">
-				<source>Search</source>
-				<target>Zoeken</target>
-			</trans-unit>
-			<trans-unit id="search.introHelp">
-				<source>Use the search on the left to filter the clients for specific properties.</source>
-				<target>Gebruik de zoekfunctie aan de linkerkant om de klanten voor specifieke eigenschappen te filteren.</target>
-			</trans-unit>
-			<trans-unit id="bulletins.headline">
-				<source>Latest security bulletins</source>
-				<target>Laatste security bulletins</target>
-			</trans-unit>
-			<trans-unit id="bulletins.errorFetch">
-				<source>Sorry, the bulletins could not be fetched!</source>
-				<target>Sorry, de bulletins konden niet opgehaald worden!</target>
-			</trans-unit>
-			<trans-unit id="bulletins.disabled">
-				<source>Loading the bulletins is disabled.</source>
-				<target>Het ophalen van bulletins is uitgeschakeld.</target>
-			</trans-unit>
-			<trans-unit id="bulletins.all">
-				<source>All bulletins</source>
-				<target>Alle bulletins</target>
-			</trans-unit>
-			<trans-unit id="clients.total">
-				<source>Clients (%s)</source>
-				<target>Klanten (%s)</target>
-			</trans-unit>
-			<trans-unit id="clients.listAll">
-				<source>List all</source>
-				<target>Alles bekijken</target>
-			</trans-unit>
-			<trans-unit id="clients.notFound">
-				<source>No clients found</source>
-				<target>Geen klanten gevonden</target>
-			</trans-unit>
-			<trans-unit id="coreVersions.header">
-				<source>Core versions</source>
-				<target>Core-versies</target>
-			</trans-unit>
-			<trans-unit id="sla.header">
-				<source>Service level agreements</source>
-				<target>Service Level Agreements</target>
-			</trans-unit>
-			<trans-unit id="tag.header">
-				<source>Tags</source>
-				<target>Tags</target>
-			</trans-unit>
-			<trans-unit id="total">
-				<source>total</source>
-				<target>totaal</target>
-			</trans-unit>
-			<trans-unit id="core.totalUsed">
-				<source>Used core versions (%s)</source>
-				<target>Gebruikte Core-versies (%s)</target>
-			</trans-unit>
-			<trans-unit id="clients.notReachable">
-				<source>Not reachable</source>
-				<target>Niet bereikbaar</target>
-			</trans-unit>
-			<trans-unit id="clients.numberOfExtensions">
-				<source>Number of extensions</source>
-				<target>Aantal extensies</target>
-			</trans-unit>
-			<trans-unit id="client.facts">
-				<source>Facts</source>
-				<target>Feiten</target>
-			</trans-unit>
-			<trans-unit id="client.noSuccessfulImport">
-				<source>No successful import until now!</source>
-				<target>Geen succesvolle import tot nu toe!</target>
-			</trans-unit>
-			<trans-unit id="client.extra">
-				<source>Extra</source>
-				<target>Extras</target>
-			</trans-unit>
-			<trans-unit id="client.extra.warning">
-				<source>Additional warnings</source>
-				<target>Additionele waarschuwingen</target>
-			</trans-unit>
-			<trans-unit id="client.extra.danger">
-				<source>Additional error messages</source>
-				<target>Additionele foutmeldingen</target>
-			</trans-unit>
-			<trans-unit id="filter.connectionErrors">
-				<source>Connection errors</source>
-				<target>Verbindings foutmeldingen</target>
-			</trans-unit>
-			<trans-unit id="client.domainNotPingAble">
-				<source>The domain "%s" could not not be contacted (maybe invalid or not reachable)!</source>
-				<target>Het domein "%s" kon niet bereikt worden (misschien ongeldig of niet bereikbaar)!</target>
-			</trans-unit>
-			<trans-unit id="filter.withExtraWarning">
-				<source>Additional warnings</source>
-				<target>Additionele waarschuwingen</target>
-			</trans-unit>
-			<trans-unit id="filter.withExtraDanger">
-				<source>Additional errors</source>
-				<target>Additionele foutmeldingen</target>
-			</trans-unit>
-			<trans-unit id="filter.fieldset.core">
-				<source>Core</source>
-				<target>Core</target>
-			</trans-unit>
-			<trans-unit id="filter.fieldset.extensions">
-				<source>Extensions</source>
-				<target>Extensies</target>
-			</trans-unit>
-			<trans-unit id="filter.fieldset.misc">
-				<source>Misc</source>
-				<target>Diverse</target>
-			</trans-unit>
-			<trans-unit id="lastImport.header">
-				<source>Last imports</source>
-				<target>Laatste import</target>
-			</trans-unit>
-			<trans-unit id="lastImport.client">
-				<source>Import clients</source>
-				<target>Importeer klanten</target>
-			</trans-unit>
-			<trans-unit id="lastImport.core">
-				<source>Import core</source>
-				<target>Importeer klanten</target>
-			</trans-unit>
-			<trans-unit id="lastImport.extension">
-				<source>Import extensions</source>
-				<target>Importeer extensies</target>
-			</trans-unit>
-			<trans-unit id="lastImport.none">
-				<source>No import yet!</source>
-				<target>Nog geen import!</target>
-			</trans-unit>
-			<trans-unit id="sla.total">
-				<source>SLA (%s)</source>
-				<target>SLA (%s)</target>
-			</trans-unit>
-			<trans-unit id="sla.notFound">
-				<source>No SLA records found!</source>
-				<target>Geen SLA records gevonden!</target>
-			</trans-unit>
-			<trans-unit id="sla.clients">
-				<source>List all clients with this SLA</source>
-				<target>Toon alle klanten met deze SLA</target>
-			</trans-unit>
-			<trans-unit id="sla.noClients">
-				<source>This SLA is not used by any client!</source>
-				<target>Deze SLA wordt door geen enkele klant gebruikt!</target>
-			</trans-unit>
-			<trans-unit id="extension.total">
-				<source>Extensions (%s)</source>
-				<target>Extensies (%s)</target>
-			</trans-unit>
-			<trans-unit id="extension.notFound">
-				<source>No extensions found</source>
-				<target>Geen extensies gevonden</target>
-			</trans-unit>
-			<trans-unit id="extensionFilter.name">
-				<source>Name</source>
-				<target>Naam</target>
-			</trans-unit>
-			<trans-unit id="extensionFilter.exactSearch">
-				<source>Exact search</source>
-				<target>Exact zoeken</target>
-			</trans-unit>
-			<trans-unit id="extension.by">
-				<source>by %s</source>
-				<target>door %s</target>
-			</trans-unit>
-			<trans-unit id="coreFilter.usage">
-				<source>Usage</source>
-				<target>Gebruik</target>
-			</trans-unit>
-			<trans-unit id="coreFilter.usage.1">
-				<source>Used</source>
-				<target>Gebruikt</target>
-			</trans-unit>
-			<trans-unit id="coreFilter.usage.0">
-				<source>All</source>
-				<target>Alle</target>
-			</trans-unit>
-			<trans-unit id="administration.sponsors.headline">
-				<source>Sponsors</source>
-				<target>Sponsoren</target>
-			</trans-unit>
-			<trans-unit id="administration.sponsors.description">
-				<source>This extension has been sponsored by</source>
-				<target>Deze extensie is gesponsord door</target>
-			</trans-unit>
-			<trans-unit id="administration.ipHint">
-				<source><![CDATA[
-				Set the allowed IP(s) for the client to <code>%s</code>.
-				]]></source>
-				<target><![CDATA[
-				Zet de toegestane IP(s) voor de klant op <code>%s</code>.
-				]]></target>
-			</trans-unit>
-			<trans-unit id="noClients.title">
-				<source>No clients created!</source>
-				<target>Geen klanten aangemaakt!</target>
-			</trans-unit>
-			<trans-unit id="noClients.description">
-				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
-				<target>Schön, dass Sie t3monitoring ausprobieren wollen! Um zu beginnen, erstellen Sie einen Client mit dem + Icon oben!</target>
-			</trans-unit>
-			<trans-unit id="presentationMode.client.title">
-				<source>Client with uid %s</source>
-				<target>Client mit der uid %s</target>
-			</trans-unit>
-			<trans-unit id="presentationMode.client.domain">
-				<source>http://*********.***</source>
-				<target>http://*********.***</target>
-			</trans-unit>
-			<trans-unit id="emConfiguration.link">
-				<source>Configuration</source>
-				<target>Configuratie</target>
-			</trans-unit>
-			<trans-unit id="noInsecureClients">
-				<source>No insecure clients found!</source>
-				<target>Geen onveilige klanten gevonden!</target>
-			</trans-unit>
-			<trans-unit id="fetchClient.link">
-				<source>Fetch single client</source>
-				<target>Haal enkele klant op</target>
-			</trans-unit>
-			<trans-unit id="fetchClient.success">
-				<source>The data of the client has been successfully fetched!</source>
-				<target>De data voor de klant is succesvol opgehaald!</target>
-			</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" target-language="nl" datatype="plaintext" original="messages" date="2016-05-20T20:48:29Z" product-name="t3monitoring">
+		<header/>
+		<body>
+			<trans-unit id="tx_t3monitoring_domain_model_client">
+				<source>Client</source>
+				<target>Klant</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.title">
+				<source>Title</source>
+				<target>Titel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
+				<source>Domain</source>
+				<target>Domein</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
+				<source>Secret</source>
+				<target>Geheim</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.email">
+				<source>Email</source>
+				<target>E-mail</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.php_version">
+				<source>Php Version</source>
+				<target>PHP versie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
+				<source>Mysql Version</source>
+				<target>MySQL versie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
+				<source>Disk Total Space</source>
+				<target>Disk Total Space</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space">
+				<source>Disk Free Space</source>
+				<target>Disk Free Space</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
+				<source>Insecure Core</source>
+				<target>Onveilige core</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core">
+				<source>Outdated Core</source>
+				<target>Verouderde core</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions">
+				<source>Insecure Extensions</source>
+				<target>Onveilige extensies</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
+				<source>Outdated Extensions</source>
+				<target>Verouderde extensies</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
+				<source>Error Message</source>
+				<target>Foutmelding</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info">
+				<source>Extra Info</source>
+				<target>Extra informatie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning">
+				<source>Extra Warning</source>
+				<target>Extra waarschuwing</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger">
+				<source>Extra Danger</source>
+				<target>Extra gevaar</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import">
+				<source>Last Successful Import</source>
+				<target>Laatste succesvolle import</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extensions">
+				<source>Extensions</source>
+				<target>Extensies</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.core">
+				<source>Core</source>
+				<target>Core</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.sla">
+				<source>Sla</source>
+				<target>Sla</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension">
+				<source>Extension</source>
+				<target>Extensie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.name">
+				<source>Name</source>
+				<target>Naam</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version">
+				<source>Version</source>
+				<target>Versie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure">
+				<source>Insecure</source>
+				<target>Onveilig</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version">
+				<source>Next Secure Version</source>
+				<target>Eerst volgende veilige versie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.title">
+				<source>Title</source>
+				<target>Titel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.description">
+				<source>Description</source>
+				<target>Beschrijving</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated">
+				<source>Last Updated</source>
+				<target>Laatste update</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name">
+				<source>Author Name</source>
+				<target>Auteur naam</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment">
+				<source>Update Comment</source>
+				<target>Update beschrijving</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.state">
+				<source>State</source>
+				<target>Status</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.category">
+				<source>Category</source>
+				<target>Categorie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer">
+				<source>Version Integer</source>
+				<target>Versie Integer</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used">
+				<source>Is Used</source>
+				<target>Is gebruikt</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official">
+				<source>Is Official</source>
+				<target>Is officieel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified">
+				<source>Is Modified</source>
+				<target>Verändert</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest">
+				<source>Is Latest</source>
+				<target>Is laatste</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release">
+				<source>Last Bugfix Release</source>
+				<target>Laatste bugfix release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release">
+				<source>Last Minor Release</source>
+				<target>Laatste Minor-Release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release">
+				<source>Last Major Release</source>
+				<target>Laatste Major-Release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
+				<source>Serialized Dependencies</source>
+				<target>serialized afhankelijkheden</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core">
+				<source>Core</source>
+				<target>Core</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version">
+				<source>Version</source>
+				<target>Versie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.insecure">
+				<source>Insecure</source>
+				<target>Onvelig</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version">
+				<source>Next Secure Version</source>
+				<target>Volgende veilige versie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type">
+				<source>Type</source>
+				<target>Type</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.release_date">
+				<source>Release Date</source>
+				<target>Datum van publicatie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.latest">
+				<source>Latest</source>
+				<target>Laatste</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.stable">
+				<source>Stable</source>
+				<target>Stabiel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable">
+				<source>Is Stable</source>
+				<target>Is stabiel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_active">
+				<source>Is Active</source>
+				<target>Actief</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest">
+				<source>Is Latest</source>
+				<target>Is de nieuwste</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer">
+				<source>Version Integer</source>
+				<target>Versie Integer</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_used">
+				<source>Is Used</source>
+				<target>Is gebruikt</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_official">
+				<source>Is Official</source>
+				<target>Is officieel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_sla">
+				<source>Sla</source>
+				<target>Sla</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_tag">
+				<source>Tag</source>
+				<target>Tag</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.title">
+				<source>Title</source>
+				<target>Titel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.description">
+				<source>Description</source>
+				<target>Beschrijving</target>
+			</trans-unit>
+			<trans-unit id="update.available">
+				<source>Update available</source>
+				<target>Update beschikbaar</target>
+			</trans-unit>
+			<trans-unit id="secure">
+				<source>Secure</source>
+				<target>Veilig</target>
+			</trans-unit>
+			<trans-unit id="loaded">
+				<source>Loaded</source>
+				<target>Geladen</target>
+			</trans-unit>
+			<trans-unit id="found.in.ter">
+				<source>Found in TER</source>
+				<target>In TER gevonden</target>
+			</trans-unit>
+			<trans-unit id="next.secure.version">
+				<source>Next secure version:</source>
+				<target>Volgende veilige versie:</target>
+			</trans-unit>
+			<trans-unit id="no.official.update">
+				<source>No official update available</source>
+				<target>Geen officiele versie beschikbaar</target>
+			</trans-unit>
+			<trans-unit id="yes">
+				<source>yes</source>
+				<target>ja</target>
+			</trans-unit>
+			<trans-unit id="no">
+				<source>no</source>
+				<target>nee</target>
+			</trans-unit>
+			<trans-unit id="unknown">
+				<source>unknown</source>
+				<target>onbekend</target>
+			</trans-unit>
+			<trans-unit id="no.cores.imported">
+				<source>No cores yet imported</source>
+				<target>Nog geen core versies geïmporteerd</target>
+			</trans-unit>
+			<trans-unit id="no.versions.available">
+				<source>No versions available</source>
+				<target>Geen versies beschikbaar</target>
+			</trans-unit>
+			<trans-unit id="view.administration">
+				<source>Administration</source>
+				<target>Administratie</target>
+			</trans-unit>
+			<trans-unit id="view.usedExtensions">
+				<source>Used extensions</source>
+				<target>Gebruikte extensies</target>
+			</trans-unit>
+			<trans-unit id="view.core">
+				<source>Used core versions</source>
+				<target>Gebruikte Core versies</target>
+			</trans-unit>
+			<trans-unit id="administration.import.headline">
+				<source>Start an import</source>
+				<target>Import starten</target>
+			</trans-unit>
+			<trans-unit id="administration.import.success">
+				<source>The import was successful!</source>
+				<target>De import was succesvol!</target>
+			</trans-unit>
+			<trans-unit id="administration.import.description">
+				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
+				<target>Wees ervan bewust dat de import een tijdje kan duren. Als er een time-out optreedt de CLI gebruiken!</target>
+			</trans-unit>
+			<trans-unit id="createNew.client">
+				<source>Create new client</source>
+				<target>Nieuwe klant aanmaken</target>
+			</trans-unit>
+			<trans-unit id="edit.client">
+				<source>Edit client</source>
+				<target>Bewerk klant</target>
+			</trans-unit>
+			<trans-unit id="home">
+				<source>Home</source>
+				<target>Home</target>
+			</trans-unit>
+			<trans-unit id="extensionList">
+				<source>Extension List</source>
+				<target>Lijst van extensies</target>
+			</trans-unit>
+			<trans-unit id="coreVersions">
+				<source>Core Versions</source>
+				<target>Core-versies</target>
+			</trans-unit>
+			<trans-unit id="sla">
+				<source>SLA</source>
+				<target>SLA</target>
+			</trans-unit>
+			<trans-unit id="administration">
+				<source>Administration</source>
+				<target>Administratie</target>
+			</trans-unit>
+			<trans-unit id="available.extensions">
+				<source>Available extensions</source>
+				<target>Beschikbare extensies</target>
+			</trans-unit>
+			<trans-unit id="count">
+				<source>Count</source>
+				<target>Aantal</target>
+			</trans-unit>
+			<trans-unit id="search">
+				<source>Search</source>
+				<target>Zoeken</target>
+			</trans-unit>
+			<trans-unit id="search.introHelp">
+				<source>Use the search on the left to filter the clients for specific properties.</source>
+				<target>Gebruik de zoekfunctie aan de linkerkant om de klanten voor specifieke eigenschappen te filteren.</target>
+			</trans-unit>
+			<trans-unit id="bulletins.headline">
+				<source>Latest security bulletins</source>
+				<target>Laatste security bulletins</target>
+			</trans-unit>
+			<trans-unit id="bulletins.errorFetch">
+				<source>Sorry, the bulletins could not be fetched!</source>
+				<target>Sorry, de bulletins konden niet opgehaald worden!</target>
+			</trans-unit>
+			<trans-unit id="bulletins.disabled">
+				<source>Loading the bulletins is disabled.</source>
+				<target>Het ophalen van bulletins is uitgeschakeld.</target>
+			</trans-unit>
+			<trans-unit id="bulletins.all">
+				<source>All bulletins</source>
+				<target>Alle bulletins</target>
+			</trans-unit>
+			<trans-unit id="clients.total">
+				<source>Clients (%s)</source>
+				<target>Klanten (%s)</target>
+			</trans-unit>
+			<trans-unit id="clients.listAll">
+				<source>List all</source>
+				<target>Alles bekijken</target>
+			</trans-unit>
+			<trans-unit id="clients.notFound">
+				<source>No clients found</source>
+				<target>Geen klanten gevonden</target>
+			</trans-unit>
+			<trans-unit id="coreVersions.header">
+				<source>Core versions</source>
+				<target>Core-versies</target>
+			</trans-unit>
+			<trans-unit id="sla.header">
+				<source>Service level agreements</source>
+				<target>Service Level Agreements</target>
+			</trans-unit>
+			<trans-unit id="tag.header">
+				<source>Tags</source>
+				<target>Tags</target>
+			</trans-unit>
+			<trans-unit id="total">
+				<source>total</source>
+				<target>totaal</target>
+			</trans-unit>
+			<trans-unit id="core.totalUsed">
+				<source>Used core versions (%s)</source>
+				<target>Gebruikte Core-versies (%s)</target>
+			</trans-unit>
+			<trans-unit id="clients.notReachable">
+				<source>Not reachable</source>
+				<target>Niet bereikbaar</target>
+			</trans-unit>
+			<trans-unit id="clients.numberOfExtensions">
+				<source>Number of extensions</source>
+				<target>Aantal extensies</target>
+			</trans-unit>
+			<trans-unit id="client.facts">
+				<source>Facts</source>
+				<target>Feiten</target>
+			</trans-unit>
+			<trans-unit id="client.noSuccessfulImport">
+				<source>No successful import until now!</source>
+				<target>Geen succesvolle import tot nu toe!</target>
+			</trans-unit>
+			<trans-unit id="client.extra">
+				<source>Extra</source>
+				<target>Extras</target>
+			</trans-unit>
+			<trans-unit id="client.extra.warning">
+				<source>Additional warnings</source>
+				<target>Additionele waarschuwingen</target>
+			</trans-unit>
+			<trans-unit id="client.extra.danger">
+				<source>Additional error messages</source>
+				<target>Additionele foutmeldingen</target>
+			</trans-unit>
+			<trans-unit id="filter.connectionErrors">
+				<source>Connection errors</source>
+				<target>Verbindings foutmeldingen</target>
+			</trans-unit>
+			<trans-unit id="client.domainNotPingAble">
+				<source>The domain "%s" could not not be contacted (maybe invalid or not reachable)!</source>
+				<target>Het domein "%s" kon niet bereikt worden (misschien ongeldig of niet bereikbaar)!</target>
+			</trans-unit>
+			<trans-unit id="filter.withExtraWarning">
+				<source>Additional warnings</source>
+				<target>Additionele waarschuwingen</target>
+			</trans-unit>
+			<trans-unit id="filter.withExtraDanger">
+				<source>Additional errors</source>
+				<target>Additionele foutmeldingen</target>
+			</trans-unit>
+			<trans-unit id="filter.fieldset.core">
+				<source>Core</source>
+				<target>Core</target>
+			</trans-unit>
+			<trans-unit id="filter.fieldset.extensions">
+				<source>Extensions</source>
+				<target>Extensies</target>
+			</trans-unit>
+			<trans-unit id="filter.fieldset.misc">
+				<source>Misc</source>
+				<target>Diverse</target>
+			</trans-unit>
+			<trans-unit id="lastImport.header">
+				<source>Last imports</source>
+				<target>Laatste import</target>
+			</trans-unit>
+			<trans-unit id="lastImport.client">
+				<source>Import clients</source>
+				<target>Importeer klanten</target>
+			</trans-unit>
+			<trans-unit id="lastImport.core">
+				<source>Import core</source>
+				<target>Importeer klanten</target>
+			</trans-unit>
+			<trans-unit id="lastImport.extension">
+				<source>Import extensions</source>
+				<target>Importeer extensies</target>
+			</trans-unit>
+			<trans-unit id="lastImport.none">
+				<source>No import yet!</source>
+				<target>Nog geen import!</target>
+			</trans-unit>
+			<trans-unit id="sla.total">
+				<source>SLA (%s)</source>
+				<target>SLA (%s)</target>
+			</trans-unit>
+			<trans-unit id="sla.notFound">
+				<source>No SLA records found!</source>
+				<target>Geen SLA records gevonden!</target>
+			</trans-unit>
+			<trans-unit id="sla.clients">
+				<source>List all clients with this SLA</source>
+				<target>Toon alle klanten met deze SLA</target>
+			</trans-unit>
+			<trans-unit id="sla.noClients">
+				<source>This SLA is not used by any client!</source>
+				<target>Deze SLA wordt door geen enkele klant gebruikt!</target>
+			</trans-unit>
+			<trans-unit id="extension.total">
+				<source>Extensions (%s)</source>
+				<target>Extensies (%s)</target>
+			</trans-unit>
+			<trans-unit id="extension.notFound">
+				<source>No extensions found</source>
+				<target>Geen extensies gevonden</target>
+			</trans-unit>
+			<trans-unit id="extensionFilter.name">
+				<source>Name</source>
+				<target>Naam</target>
+			</trans-unit>
+			<trans-unit id="extensionFilter.exactSearch">
+				<source>Exact search</source>
+				<target>Exact zoeken</target>
+			</trans-unit>
+			<trans-unit id="extension.by">
+				<source>by %s</source>
+				<target>door %s</target>
+			</trans-unit>
+			<trans-unit id="coreFilter.usage">
+				<source>Usage</source>
+				<target>Gebruik</target>
+			</trans-unit>
+			<trans-unit id="coreFilter.usage.1">
+				<source>Used</source>
+				<target>Gebruikt</target>
+			</trans-unit>
+			<trans-unit id="coreFilter.usage.0">
+				<source>All</source>
+				<target>Alle</target>
+			</trans-unit>
+			<trans-unit id="administration.sponsors.headline">
+				<source>Sponsors</source>
+				<target>Sponsoren</target>
+			</trans-unit>
+			<trans-unit id="administration.sponsors.description">
+				<source>This extension has been sponsored by</source>
+				<target>Deze extensie is gesponsord door</target>
+			</trans-unit>
+			<trans-unit id="administration.ipHint">
+				<source><![CDATA[
+				Set the allowed IP(s) for the client to <code>%s</code>.
+				]]></source>
+				<target><![CDATA[
+				Zet de toegestane IP(s) voor de klant op <code>%s</code>.
+				]]></target>
+			</trans-unit>
+			<trans-unit id="noClients.title">
+				<source>No clients created!</source>
+				<target>Geen klanten aangemaakt!</target>
+			</trans-unit>
+			<trans-unit id="noClients.description">
+				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
+				<target>Schön, dass Sie t3monitoring ausprobieren wollen! Um zu beginnen, erstellen Sie einen Client mit dem + Icon oben!</target>
+			</trans-unit>
+			<trans-unit id="presentationMode.client.title">
+				<source>Client with uid %s</source>
+				<target>Client mit der uid %s</target>
+			</trans-unit>
+			<trans-unit id="presentationMode.client.domain">
+				<source>http://*********.***</source>
+				<target>http://*********.***</target>
+			</trans-unit>
+			<trans-unit id="noInsecureClients">
+				<source>No insecure clients found!</source>
+				<target>Geen onveilige klanten gevonden!</target>
+			</trans-unit>
+			<trans-unit id="fetchClient.link">
+				<source>Fetch single client</source>
+				<target>Haal enkele klant op</target>
+			</trans-unit>
+			<trans-unit id="fetchClient.success">
+				<source>The data of the client has been successfully fetched!</source>
+				<target>De data voor de klant is succesvol opgehaald!</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>

From 35fbf83eb37cd5d53d93d122a552b7987c2850b5 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Tue, 17 Sep 2019 22:08:44 +0200
Subject: [PATCH 39/83] [TASK] Update sponsor logo

---
 .../Templates/Statistic/Administration.html      |   7 ++-----
 Resources/Public/Img/logo-sup7even.png           | Bin 4238 -> 0 bytes
 Resources/Public/Img/logo_supseven.svg           |   1 +
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 Resources/Public/Img/logo-sup7even.png
 create mode 100644 Resources/Public/Img/logo_supseven.svg

diff --git a/Resources/Private/Templates/Statistic/Administration.html b/Resources/Private/Templates/Statistic/Administration.html
index 27d0930..4f02ac8 100644
--- a/Resources/Private/Templates/Statistic/Administration.html
+++ b/Resources/Private/Templates/Statistic/Administration.html
@@ -44,11 +44,8 @@ <h3>{f:translate(key:'administration.sponsors.headline')}</h3>
 	<p>{f:translate(key:'administration.sponsors.description')}</p>
 	<div class="row">
 		<div class="col-md-2">
-			<a href="http://www.sup7even.digital/" rel=nofollow” target="_blank" class="thumbnail">
-				<img src="{f:uri.resource(path:'Img/logo-sup7even.png')}" /> </a>
-			<p class="caption">
-				<a class="t3-link" href="http://www.sup7even.digital/" rel=nofollow” target="_blank">Sup7even Digital Solutions</a>
-			</p>
+			<a href="https://www.supseven.at/" rel=nofollow” target="_blank" class="thumbnail">
+				<img src="{f:uri.resource(path:'Img/logo_supseven.svg')}" /> </a>
 		</div>
 	</div>
 </f:section>
diff --git a/Resources/Public/Img/logo-sup7even.png b/Resources/Public/Img/logo-sup7even.png
deleted file mode 100644
index 2cc967e7410f2ba1f96481ced1ac54cea29db809..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4238
zcmV;95OME`P)<h;3K|Lk000e1NJLTq006!K001-y1^@s6G+%-v00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU?AW1|)RCwC#
zT?v#G#T9*@nPHrfQ4m)U*+h^if(G0`zzuOpjQfV1cr*#d4HsgFBF1O}Y5*4yS44sf
zxDc1%0&&H-Afg6Akws8Y1OX$4VVFtX^KYFgitg&_ng3^|P2Y3g`7{65@2;+T_3FM?
zuj*$Ci_0Vg9h4lW<S-?jmF%b_Ln&9XLdj=J-cm9{$y_CyCD}Ms$xtN+C~2&uss`6+
zq~tp#)0Nz)WT~WRaL5EGemf;MD><H>?~7SV&gEc8B2H2AC>1wX_)<wfB_E}#*05lA
z@=;1&Q*u&Fr3VgC(le<BK*?1(R(ha?lCivgiUz9qCn|Y{omCT*llCML7_dF^bnRXV
zHV8j@#XnHVgc?|R6Q3(tlF)Y8C*jvmQA5T5tCH<&d96>B{5PTP@NL4cpCTp-l^jfd
z?!r1H?<rZs@9d_elalR>GBXq04sY<;cF4oE*YNr&8kpio@lVi~69OU=@C6X+JWok?
zB`-9f=V~U|=u}h5h9tj`Y_zE&r2H}^Q<VHV4|N&O>jz<1C2f`L#J<4H@G0wC)d1SD
ziIVn8S}G|~vfgORjX84u+w$5!C|NAoNLZaHe*1_r<0Lp7hYCJIg=tF5CI)pnB7pjo
zDtS!F4c7a+D48hPwStO(?~LQXnxv#aNu~AqSeC(h!!RXBDrs(%*`#E?l82~>>jR$W
zYCgy5Ic(oWN^Y^<LxiUv2N~MPjwgSw<bAfsLsST0PbCj1*~WT);d^f?`AtYYu2=F4
z<60U8oXrO+S#CMxs9#?WPBRFynZ^)xxjmpQyDGUWqMv@Q<YM}kO{`}}fMm3ir}L@!
zh~wW!s~v_H8S&ZRdCelpE@tf=^7%}5xQT<<abcLI<PO#)2=6F)ot;(c;e-#7Y|LH)
zlyZO8J!k<719>oKI3GaSo-+PNhyR`(?gLo=L6Th{?8E_498wl_MP%w->wVDD4`@_^
zu$s!coYwcxN=_5M5G>kq1QlB2w2-z1X48lc^td+q`*Iqsyjc8Y5oHkDe_qM&B)drE
zgSgXlWz+zTXn^i9lyMIw4=P#9=d$ZPn-YZG*&#ldXes?=N=C(Omkyj!`_mHsgGMN<
zjrs>Deou$e3+o7_??x-zGDiK-mUnVi7{>S3JIWtG@xevx^UL!U)$wt>deWl4s$>8u
zL0zLfhu4DDyq_Hx2LnAF;I$T=>k>fk;`l2QX{0837%3Y^M0{tmWFvZ0V=BFgYdM?c
zx}PqUY#K>k6#o@clSo=b?l+Nqd5F|L1X`bHLGJ5|b}_6EIPOA&N8fI7*|^wC$u&y;
zPUq5PQQKNGdM`(L<P^<g{o2*CJ+C)-dM@>IP`(r&BlM3kzqbpy-G@rfsRJc#6yTV-
zuu1$9=FXr)?1O7Ot^G!e;|^f-D-6@=n_Qt}fur2{G(Jx{%9L7)-kH8Z7-rC)84%%T
zfaYF8Un&gy@m}BOxbN*iMa~ooc!CNX*O6$&$OGt7n>;Ijg-4lnjLM)h_f_(Ti0>g9
z@=K5Fp6yu<xQ<S!FidxqqwIO)<##g@2CDK^NLkR3lj&o)e4<l~zfTZ%{?Xlxu7u$U
z4xW*m6?!-vSKv5L9eSJ3-IdOMMTC*<nlHr%{-)$-O1`eabq?Y8Gm^j5WS=MltP;Yd
zh%<kz<R%Yp-6!I6_%p*j>j;Iv&5Blq%_v_|0XncuXFAvKI<9{-XN9*T`eJ9Jd>9tc
ziFYa0R64G@esJzzc9iesh&pL3r-MG76#Fld%@K2<eLfXmPrHYUJGAI(@bf()H2DG)
z{gHt8ACIsoZ6YWPc>SI+ti4IeT#gwOY7RN}Tngg;{T$!v$k*A9GR+y`YQ{)S7+|>@
zQ<;N+L5NuWVxxZedrX8Mq!$gtfb8ED0eu%`eDbRJz`r?iF)C+zQVdf`wwL<Zkg_Nw
zq5#Xf#__!}2Z!v$$bt`^qVp*h$9A=S5gkx1`hS;F1209?r7t5%We%mD%;zg|%&^5)
z{R+jM$cVwVZG`a)%IEqf;(1EzLh*%)JB^{R{W!`ONpyU^69>%?^`Q709gz!H!xlI?
z6JfgTJnsD+t$h$b%_U0cm%Kph8-||ZUe|b)RA-MI*RP26%k?^r)Rp3!z*Kx0x#$2o
zkS-i54QmTxly6WK(oqNvp6YoIq&s|22hXyBN`lu19pzx{U17kx_*$6b`jyk@HTaD;
zjbe^UIIvenlxr68;3Xl-S6hTx?QJ8%VVHW?2E0GaK?6*Hr{5FuS*}BS-xzdms)L4>
zNO)Wx&ZS<lUZ02h{YP@YlP%{cG<a^A_+`dLIU*Giij1&a6E=`JSZa$Fj{CV3f2Cye
zRZN`72$v7wB!-3XTyzA3;#u}V#xWZeljDLyOt5^h*U0DN0Dg$x9}tzU@*>-&IATUE
zV;vtR?aL%Z@sXH>%)aroUhg};6SZLVSw#2=ys|etUE|ywJPVS`j$vfV#OV=J`UjSO
zfDRn)dCyM_+7LDyxMsflW$S#QIC!iEif_i@7jh6Zb3ETgF|Xf45&#`ZIGj%2g-R}<
z;v*?)sWDw6T63(pm%z1^*gK*O7DHOI(Ys6TQi1Q4?4s3tTA^b+qB3^+>tH(cJ{TI|
z^URR&4KAPq2(^x*<z6P$8-38$$kE@Kjw<dkB;Xp;I7oe+=vlm%2G(qrI28Z4l1+h_
z#6hr{vrrl9)`9_z&ZNMLBq2Z}?_()yk;Kb(H1SW#rk%dY0Tc!_=AC(Xo|YCJhyn)4
z6w4nt-}AfoQE^>Z#`;|D@IS7kRMOvQL~4<-qDHsLmO1ml3fAF5&pJPD(NO%2wGUUk
z|5!>D>!;~gL4d&<mlVZEBOjc@>)m7wfb|J@{##_reFn{GX`=wk_b1PLjFPPvY{L3N
zb9tL1!@}<6L0zKoUch_f=r8z0$4Xeof`HGvN`ipKJ}gJqLh_VeSXmOYL!z*a<UaH^
zl~&t!I5&6>m?fU~ft9{E2led|^8Op*7fPKk!7K9L(Z8#01ZrQtRwhO9f0~2qz)`h#
zaSfN;9iLYeVr6QIIU!VRwM6ev_=rAA9DrhstYw|U`f0NV<<bK^Y>^LpEl!f?H5wN>
zayHnU6ve-RogKHrRdn9qm|}~a9ScWj^i=UXQt&16;3@|fjym%P7AtBK#70J8PL$x-
zJ#e+dNy9w`)zCU3wYMJ~(ztD1PUq6)pu0lI2pvz1xCd5)v1m6&YIaP_9K%P6i#iW~
z>a#O5baIgv+n3YUj^uRuK{k=MV~R(1;Dh3Ka#}Mg3v%B(khTaZ1v+yw8@n-I!LchW
znlqDr!@Chy^>%XaZX7JS-cV$O4H2%L=TYa@bS6(QIt6*@S4eI)L3g3S=+ApKG1|F;
z0}Ja53s~=G#J$FXHbPo+E7^KY0iV4bbH>?=MyoHQHqANfRvAwCN`pRO(C9;ho3k!W
z0|t002jFDueFRdjW%(*=Korq;oRts7w^2gH-$AN(^+V}bNj3yola*F*^xX~T5qald
z#ISxnA_m%%oUYMWyHSc*-^CJtOI(Hq0P7A2`(e{fu5*wY(J*Mm5-QcVq#X@`Ho$=F
zEY*o(6|CDD$?Z17da?LPfUn}GNa1C1Qlv-~KShdE@l&Ko6+cCaRPh^PUDH9F!W)GN
zsw-Ai5rapl)eiF^<o0peohf{gq;MwSN?kxqxian26h0_uR9Kv(`a-cQLZqsJ*L^1n
za_yUvn%SuV$dttjCKB6LMqCfMQ8?rZxkEL{ghl!U4xz>B@Mj^^5v#U(6?~QFb+MP>
zWyx+vs_7;h<oVyoK3$kPx5)-hC0k5cLgmH|s-IZO_$vuN5m^J)3OPl{`s~g3u$c%u
z*?iCF#40*cNLmGahQawbsU^}8ko|d&=XINN!1$&q<5|v<Eq88p=d)dqa{Po-O35Bm
zf>-3JASD4itB?<KBn7$hSbg5e0pSA5VDkzNy3$)Mk<W4<eVunaXHN;ChgWm(A@L0P
zPrW!u@--9U5CiN5)+a8{;`6<pD*lf{`Gr&X$839S&c<1nI7aVisouC<XiWLo{)eQt
zWu!m&{5H<k+mjC98hWG3rL@raRT1p9!0st*4Mg%968-M=phnvIB9$4ZsZEeA52tEP
znspHA8U`A6vIS+3A{nm_>jPTVj!KQhLuB_3WjTFD=M<LPPPW|Sjv4I?QYf^=t27YE
zJUx!jI*n!8NOp^*{`DIehykRMFd9=*s#AXhpn`)yX#JtYIFks6sOlf%!?r-AYky7}
zgrm6eizAIm1BS6vp{RP_EHX+@Cgpg5im;B9=2pq3M@K;)HZWYW2g|lM1`CoGkw$(U
zX%%P<GGd?RVAPql+UGh`vKw7Ar9=5a9IWtlbbeJUmTN~EHjK|9oC#)dhOFc>ViVCd
z{2W=uLpZR{<o_e3dY|$=yxuYn)N@kBuU{;uLY2_MZ8joQWuzFl((3D992rSxRG&{&
z!VcEwY4#`OS;fCwNp%WzrBrV<bp-=%qD3y^0DDiWj}kwdgKY!{Y!`lx8K<Lcov~RN
za=*s(cXWMTWE(tc_$m6kgAE_(C|Y<i{2N{FHBzU+Mz8?bm6rY%4xaw0;@2-=@k&WU
zHW;%3`UP78m$I`DF)ZWikZV;LGl_oPKpF*wcrHdTV>Ry!C3%a35LUCTR3D%_*BGRl
zi<e3KkaC5?*U*LlgX>GF{t?1C3=p)n$~|MvSel-_PTDk=zQn#M$FF;smajMY{HIj5
zLMz&aP~H(#Tqwv`+458f*Y#UdX?I|RM*qlLCWb;zH3YQd07F4D0nx##fa_-h$^?C0
z<%m2M1blANs!Yg$(eLAjH?Vo?64Im&sl~5*g~#TWZtR2+d~Y;g3yi2u8!G(^<j|PD
z$4L0*6s-jNlZSWX>+|#r?hR2A8=y}3@d>OG>_G~%D?h^w^r1niN_ih0eqCV<UVR_^
zdkZJgR~QhWq?^g>J6e=a|70j=TuWX9*B{8b&9Mem&|oT{fq8(w5JI%AQ^l`)#ebBX
zc#Of%$66g$%&B}HqdnmFcQV>>pG6IHAL>mycTpjh8$2IdFJB4yUM64w_2GS%@}7q>
zLh=qBZdlKA=%37{(vIUj?G;h|(?w@-2J2%*6jyREVK$jh=k$B4j`*o6?0$QQ&gpp4
z!|_%*`?Zqoeh2G1pV6Z^Nn5#1GS*OWrqhv|#E8vw%lfTjm~MZD{cff*AZl_vmGEH>
zj78+`@CRlww6}`N`4k;gbpBd8tj}^#=wlQ0`JJmQXB1rdD=OvttiuQ@Q8}s4dOp*?
zsF<Vq`6iZmj+}fUud#_C$ic=yoX79zbA4u0xxZ#Tp5t>a;othlrLp3CkyM`ww~<tC
z8tYun_w=u>EHHc*wB698<?8%D;aVyboYPU9rXORcA~g6#+C()+s`w2Th<8um>n4W(
kz9#K?IBlNV;eP@Q0Ir+EyswSbz5oCK07*qoM6N<$f^j1Xm;e9(

diff --git a/Resources/Public/Img/logo_supseven.svg b/Resources/Public/Img/logo_supseven.svg
new file mode 100644
index 0000000..201eb33
--- /dev/null
+++ b/Resources/Public/Img/logo_supseven.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 701.1 180.9"><path d="M211.9 95.1c-7.5-2.6-8.1-3.7-8.1-4.8 0-2.3 3.4-2.5 4.8-2.5 4.8 0 9.7 2 11.8 3.1.6.3 1.3.4 2 .1.6-.3 1.1-.8 1.3-1.5l3.2-12.8c.2-1-.2-2-1.2-2.5-4.7-2.4-11.3-3.8-17.6-3.8-15.5 0-26.4 9-26.4 21.7-.1 6.3 3 14.8 18.5 20 7.1 2.4 7.1 3.5 7.1 4.8 0 .7 0 2.6-5.7 2.6-4.8 0-11.5-2.1-14.8-4.1-.6-.4-1.3-.4-2-.2-.7.3-1.1.8-1.3 1.5l-3.3 13.1c-.2 1 .2 2 1.1 2.5 5.3 2.9 12.7 4.5 20.2 4.5 17.2 0 28.6-8.2 28.6-21.6-.1-9.5-6.4-16-18.2-20.1zm82.8-21c0-1.2-1-2.2-2.2-2.2H274c-1.2 0-2.2 1-2.2 2.2v35.3c0 1.3-.2 2.3-.5 3.1v.1c-.9 2.3-3.3 5-7.2 5-2 0-7.1 0-7.1-11.6V74.1c0-1.2-1-2.2-2.2-2.2h-18.5c-1.2 0-2.2 1-2.2 2.2V109c0 17.8 8.4 28.1 23.1 28.1 8.4 0 13.9-3.5 17.2-6.8l.4 3.5c.1 1.1 1.1 2 2.2 2h16c.6 0 1.2-.2 1.6-.7.4-.4.6-1 .6-1.6-.2-4.6-.5-10.9-.5-19V74.1zm45.9-3.5c-7.4 0-13.6 2.3-18.3 6.7l-.4-3.4c-.1-1.1-1.1-2-2.2-2h-16c-.6 0-1.2.2-1.6.7-.4.4-.6 1-.6 1.6.3 5.8.5 12.2.5 19.8v56.1c0 1.2 1 2.2 2.2 2.2h18.5c1.2 0 2.2-1 2.2-2.2V133c3.5 2.5 8.2 3.9 13.5 3.9 14.1 0 29.2-10.7 29.2-34-.1-21.2-13.7-32.3-27-32.3zm-6.8 47.8c-4.1 0-7.6-2.8-8.6-7-.2-1.1-.3-2.1-.3-3.4v-8.1c0-1 .1-2 .3-2.8 1-4.4 4.7-7.6 8.9-7.6 2.4 0 10.3 1 10.3 14.4-.1 9.1-4 14.5-10.6 14.5zm67.4-23.3c-7.5-2.6-8.1-3.7-8.1-4.8 0-2.3 3.4-2.5 4.8-2.5 4.8 0 9.7 2 11.8 3.1.6.3 1.3.4 2 .1.6-.3 1.1-.8 1.3-1.5l3.2-12.8c.2-1-.2-2-1.2-2.5-4.7-2.4-11.3-3.8-17.6-3.8-15.5 0-26.4 9-26.4 21.7-.2 12 11.5 17.7 18.5 20 7.1 2.4 7.1 3.5 7.1 4.8 0 .7 0 2.6-5.7 2.6-4.8 0-11.5-2.1-14.8-4.1-.6-.4-1.3-.4-2-.2-.7.3-1.1.8-1.3 1.5l-3.3 13.1c-.2 1 .2 2 1.1 2.5 5.3 2.9 12.7 4.5 20.2 4.5 17.2 0 27.8-8.2 27.8-21.6 0-9.5-5.6-16-17.4-20.1zm53-24.5c-10.1 0-18.6 3.8-24.5 11-4.9 6.1-7.8 14.4-7.8 22.9 0 20 13 32.5 33.9 32.5 8.6 0 16.1-1.3 22.4-3.9 1-.4 1.5-1.4 1.3-2.5l-2.4-12.5c-.1-.6-.5-1.2-1.1-1.5-.6-.3-1.2-.4-1.8-.2-4.9 1.7-9.8 2.4-15.7 2.4-5.6 0-12.2-1.8-14.1-6.9H480c1.1 0 2-.8 2.2-1.8.3-1.7.6-4.6.6-7.7 0-8.4-2.3-16.1-6.5-21.7-4.9-6.6-12.6-10.1-22.1-10.1zm-9.8 24.3c1-3.5 3.5-7.6 8.7-7.6 5.9 0 7.6 4.5 8.1 7.6h-16.8zm103.2-22c-.4-.6-1.1-1-1.8-1h-19.4c-1 0-1.9.7-2.1 1.6l-7.7 27.6c-.5 1.9-.9 3.7-1.3 5.4-.4-1.8-.9-3.6-1.4-5.5l-8-27.6c-.3-.9-1.1-1.6-2.1-1.6h-20c-.7 0-1.4.4-1.8.9-.4.6-.5 1.3-.3 2l21.6 59.4c.3.9 1.2 1.5 2.1 1.5h18.5c.9 0 1.8-.6 2.1-1.4l22.1-59.4c.1-.6 0-1.3-.5-1.9zm30.2-2.3c-10.1 0-18.6 3.8-24.5 11-4.9 6.1-7.8 14.4-7.8 22.9 0 20 13 32.5 33.9 32.5 8.6 0 16.1-1.3 22.4-3.9 1-.4 1.5-1.4 1.3-2.5l-2.4-12.5c-.1-.6-.5-1.2-1.1-1.5-.6-.3-1.2-.4-1.8-.2-4.9 1.7-9.8 2.4-15.7 2.4-5.6 0-12.2-1.8-14.1-6.9h35.6c1.1 0 2-.8 2.2-1.8.3-1.7.6-4.6.6-7.7 0-8.4-2.3-16.1-6.5-21.7-5-6.6-12.6-10.1-22.1-10.1zm-9.9 24.3c1-3.5 3.5-7.6 8.7-7.6 5.9 0 7.6 4.5 8.1 7.6h-16.8zm80.8-24.3c-8.3 0-13.8 3.6-17 6.7l-.3-3.4c-.1-1.1-1.1-2-2.2-2h-16c-.6 0-1.2.2-1.6.7s-.6 1-.6 1.6c.3 5.5.5 11.6.5 18.8v40.4c0 1.2 1 2.2 2.2 2.2h18.5c1.2 0 2.2-1 2.2-2.2V99.3c0-1.8.2-3 .5-3.8.7-1.7 2.7-5.5 7.4-5.5 1.8 0 7.1 0 7.1 10.7v32.9c0 1.2 1 2.2 2.2 2.2H670c1.2 0 2.2-1 2.2-2.2V98.4c0-17.4-8.8-27.8-23.5-27.8zM139.1 41.4c.3-.6.7-1.2 1-1.8l.3-.6c.3-.6.5-1.2.8-1.9.1-.2.2-.5.3-.7.2-.6.4-1.3.5-1.9.1-.3.1-.5.2-.8.1-.7.2-1.3.3-2 0-.2.1-.4.1-.7v-.2c.1-.6.1-1.1.1-1.7 0-.4.1-.8.1-1.2v-.2c0-.4 0-.8-.1-1.1 0-.5 0-1-.1-1.4 0-.5-.1-.9-.2-1.4-.1-.4-.1-.9-.2-1.3l-.3-1.5c-.1-.4-.2-.8-.3-1.1-.2-.5-.3-1-.5-1.6l-.3-.9c-.2-.5-.5-1.1-.7-1.6-.1-.3-.3-.6-.4-.8l-.9-1.5c-.2-.3-.3-.5-.5-.8-.3-.5-.6-.9-1-1.4-.2-.3-.4-.5-.6-.8-.3-.4-.7-.8-1-1.2-.2-.3-.5-.6-.7-.8-.3-.4-.7-.7-1.1-1-.3-.3-.6-.6-.9-.8-.4-.3-.7-.6-1.1-.9-.3-.3-.7-.5-1-.8-.4-.3-.8-.5-1.2-.8-.4-.2-.7-.5-1.1-.7-.4-.2-.9-.5-1.3-.7-.4-.2-.7-.4-1.1-.5l-1.5-.6c-.3-.1-.6-.2-1-.4-.6-.2-1.2-.3-1.8-.5-.3-.1-.6-.2-.9-.2-.6-.1-1.2-.2-1.9-.3-.3 0-.5-.1-.8-.1h-.2c-.2 0-.5 0-.7-.1-.7-.1-1.3-.1-2-.1H27.6C12.4 0 0 12.4 0 27.6c0 15.3 12.4 27.6 27.6 27.6h39.5l-48.7 84.1c-7.6 13.2-3 30.1 10.2 37.7 13.2 7.6 30.1 3 37.7-10.2L139 41.6c0-.1 0-.1.1-.2z"/></svg>

From b3b4c9227ae6a08ece59c500b48ee8b8c1a3b3a7 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Tue, 17 Sep 2019 22:10:49 +0200
Subject: [PATCH 40/83] [TASK] ext_localconf.php: remove disabled code

---
 ext_localconf.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ext_localconf.php b/ext_localconf.php
index fce7d3f..2d651aa 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -4,11 +4,6 @@
 call_user_func(
     function ($extKey) {
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerTypeConverter(\T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverter::class);
-//
-//        $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbBackend::class]
-//            = array(
-//            'className' => \T3Monitor\T3monitoring\Xclass\Typo3DbBackendXclassed::class
-//        );
 
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][]
             = \T3Monitor\T3monitoring\Command\MonitoringCommandController::class;

From ad7f3b1b91b7bc21f3287f75694b6ecc8de9f3c9 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Tue, 17 Sep 2019 22:16:08 +0200
Subject: [PATCH 41/83] [TASK] Follow guidelines for extension files

according to https://forge.typo3.org/issues/82692 and other
guidelines from TYPO3 core.
---
 ext_localconf.php |  2 +-
 ext_tables.php    | 50 +++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/ext_localconf.php b/ext_localconf.php
index 2d651aa..49fcb53 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -12,5 +12,5 @@ function ($extKey) {
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][$extKey]
             = \T3Monitor\T3monitoring\Hooks\DataHandlerHook::class;
     },
-    $_EXTKEY
+    't3monitoring'
 );
diff --git a/ext_tables.php b/ext_tables.php
index 06ccb34..b90636b 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -3,32 +3,30 @@
 
 call_user_func(
     function () {
-        if (TYPO3_MODE === 'BE') {
-            \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-                'T3Monitor.t3monitoring',
-                'tools',
-                't3monitor',
-                'top',
-                [
-                    'Statistic' => 'index,administration',
-                    'Core' => 'list',
-                    'Client' => 'show,fetch',
-                    'Extension' => 'list, show',
-                    'Sla' => 'list, show',
-                    'Tag' => 'list, show',
-                ],
-                [
-                    'access' => 'user,group',
-                    'icon' => 'EXT:t3monitoring/Resources/Public/Icons/module.svg',
-                    'labels' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_t3monitor.xlf',
-                ]
-            );
+        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
+            'T3Monitor.t3monitoring',
+            'tools',
+            't3monitor',
+            'top',
+            [
+                'Statistic' => 'index,administration',
+                'Core' => 'list',
+                'Client' => 'show,fetch',
+                'Extension' => 'list, show',
+                'Sla' => 'list, show',
+                'Tag' => 'list, show',
+            ],
+            [
+                'access' => 'user,group',
+                'icon' => 'EXT:t3monitoring/Resources/Public/Icons/module.svg',
+                'labels' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_t3monitor.xlf',
+            ]
+        );
 
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_client');
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_core');
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_extension');
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_sla');
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_tag');
-        }
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_client');
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_core');
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_extension');
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_sla');
+        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_tag');
     }
 );

From a8d06e19678eb637babcc9b8a0be909376d94ea3 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Tue, 17 Sep 2019 22:48:05 +0200
Subject: [PATCH 42/83] [BUGFIX] Fix Google Charts for used core versions in
 TYPO3 9.5 LTS

Fixes: #170
---
 .../Private/Templates/Statistic/Index.html    | 60 +++++++++----------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index eb3e997..43d0eea 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -132,42 +132,40 @@
                                 </f:for>
                                 </tbody>
                             </table>
-                            <f:if condition="{emConfiguration.useGoogleCharts}">
-                                <div id="chart_core_versions"></div>
-                                <script type="text/javascript">
-                                    var dataSet = {coreVersionUsageJson -> f:format.raw()};
-                                    <![CDATA[
-                                    // Load the Visualization API and the corechart package.
-                                    google.charts.load('current', {'packages':['corechart']});
+                          <f:if condition="{emConfiguration.useGoogleCharts}">
+                            <div style="width: 100%; overflow: hidden;" id="chart_core_versions"></div>
+                            <script type="text/javascript">
+                                var dataSet = {coreVersionUsageJson -> f:format.raw()};
+                                // Load the Visualization API and the corechart package.
+                                google.charts.load('current', {'packages':['corechart']});
 
-                                    // Set a callback to run when the Google Visualization API is loaded.
-                                    google.charts.setOnLoadCallback(drawChart);
+                                // Set a callback to run when the Google Visualization API is loaded.
+                                google.charts.setOnLoadCallback(drawChart);
 
-                                    // Callback that creates and populates a data table,
-                                    // instantiates the pie chart, passes in the data and
-                                    // draws it.
-                                    function drawChart() {
+                                // Callback that creates and populates a data table,
+                                // instantiates the pie chart, passes in the data and
+                                // draws it.
+                                function drawChart() {
 
-                                        // Create the data table.
-                                        var data = new google.visualization.DataTable();
-                                        data.addColumn('string', 'Core Version');
-                                        data.addColumn('number', 'Amount');
-                                        data.addRows(dataSet);
+                                    // Create the data table.
+                                    var data = new google.visualization.DataTable();
+                                    data.addColumn('string', 'Core Version');
+                                    data.addColumn('number', 'Amount');
+                                    data.addRows(dataSet);
 
-                                        // Set chart options
-                                        var options = {
-                                            is3D: true,
-                                            'chartArea': {'width': '100%', 'height': '80%'},
-                                            'legend': {'position': 'bottom'}
-                                        };
+                                    // Set chart options
+                                    var options = {
+                                        is3D: true,
+                                        'chartArea': {'width': '100%', 'height': '80%'},
+                                        'legend': {'position': 'bottom'}
+                                    };
 
-                                        // Instantiate and draw our chart, passing in some options.
-                                        var chart = new google.visualization.PieChart(document.getElementById('chart_core_versions'));
-                                        chart.draw(data, options);
-                                    }
-                                    ]]>
-                                </script>
-                            </f:if>
+                                    // Instantiate and draw our chart, passing in some options.
+                                    var chart = new google.visualization.PieChart(document.getElementById('chart_core_versions'));
+                                    chart.draw(data, options);
+                                }
+                            </script>
+                          </f:if>
                         </div>
                     </div>
                     <div class="col-md-6">

From 5ec77e967675663f13bba6ce8bc5fa82a33830b7 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <lehmann@networkteam.com>
Date: Wed, 18 Sep 2019 14:03:15 +0200
Subject: [PATCH 43/83] [FEATURE] Add configuration option to delay unreachable
 email

---
 .../Model/Dto/EmMonitoringConfiguration.php   | 11 +++++++++
 Classes/Service/Import/ClientImport.php       | 23 +++++++++++++++++--
 ext_conf_template.txt                         |  5 +++-
 ext_tables.sql                                |  1 +
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
index 972a938..6c20c0e 100644
--- a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
+++ b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
@@ -35,6 +35,9 @@ class EmMonitoringConfiguration implements SingletonInterface
     /** @var string */
     protected $emailForFailedClient = '';
 
+    /** @var int */
+    protected $emailAllowedAmountOfFailures = 0;
+
     public function __construct()
     {
         $settings = (array)unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['t3monitoring']);
@@ -92,4 +95,12 @@ public function getEmailForFailedClient(): string
     {
         return $this->emailForFailedClient;
     }
+
+    /**
+     * @return int
+     */
+    public function getEmailAllowedAmountOfFailures(): int
+    {
+        return $this->emailAllowedAmountOfFailures;
+    }
 }
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 58cf76e..131ea1f 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -75,7 +75,10 @@ public function run(int $clientId = 0)
         }
 
         if ($this->responseCount['error'] > 0) {
-            $this->emailNotification->sendClientFailedEmail($this->failedClients);
+            $clientsForMailNotification = $this->getClientsForMailNotification();
+            if (count($clientsForMailNotification) > 0) {
+                $this->emailNotification->sendClientFailedEmail($clientsForMailNotification);
+            }
         }
 
         $dataIntegrity = GeneralUtility::makeInstance(DataIntegrity::class);
@@ -117,6 +120,7 @@ protected function importSingleClient(array $row)
                 'disk_free_space' => $json['core']['diskFreeSpace'] ?: 0,
                 'core' => $this->getUsedCore($json['core']['typo3Version']),
                 'extensions' => $this->handleExtensionRelations($row['uid'], (array)$json['extensions']),
+                'error_count' => 0
             ];
 
             $this->addExtraData($json, $update, 'info');
@@ -163,7 +167,8 @@ protected function handleError(array $client, Exception $error)
             ->getConnectionForTable(self::TABLE);
         $connection->update(self::TABLE,
             [
-                'error_message' => $error->getMessage()
+                'error_message' => $error->getMessage(),
+                'error_count' => $client['error_count'] + 1
             ],
             [
                 'uid' => (int)$client['uid']
@@ -380,4 +385,18 @@ private function getConnectionTableFor(string $table) : Connection
         return GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable($table);
     }
+
+    protected function getClientsForMailNotification() : array
+    {
+        $allowedAmountOfFailures = $this->emConfiguration->getEmailAllowedAmountOfFailures();
+        $clientsForMailNotification = [];
+
+        foreach ($this->failedClients as $client) {
+            if ($client['error_count'] +1 > $allowedAmountOfFailures) {
+                $clientsForMailNotification[] = $client;
+            }
+        }
+
+        return $clientsForMailNotification;
+    }
 }
diff --git a/ext_conf_template.txt b/ext_conf_template.txt
index 04e6a47..cbd539f 100644
--- a/ext_conf_template.txt
+++ b/ext_conf_template.txt
@@ -8,7 +8,10 @@ loadBulletins = 1
 # cat=records/enable/103; type=string; label=Mail for failed client:Define an email address which gets an email if a client could not be reached
 emailForFailedClient =
 
-# cat=records/enable/104; type=boolean; label=Use google charts
+# cat=records/enable/104; type=string; label=Delay email notifications:How many times a client import may fail before a notification email is sent (temporary service outages)
+emailAllowedAmountOfFailures = 0
+
+# cat=records/enable/110; type=boolean; label=Use google charts
 useGoogleCharts = 1
 
 # cat=records/enable/120; type=boolean; label=Presentation mode:If set, sensitive client information is obfuscated
diff --git a/ext_tables.sql b/ext_tables.sql
index 7cd15d1..59c43cf 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -24,6 +24,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	insecure_extensions int(11) DEFAULT '0' NOT NULL,
 	outdated_extensions int(11) DEFAULT '0' NOT NULL,
 	error_message text DEFAULT '' NOT NULL,
+	error_count int(11) DEFAULT '0' NOT NULL,
 	extra_info text NOT NULL,
 	extra_warning text NOT NULL,
 	extra_danger text NOT NULL,

From 5d75e4efff47f5469dae7abaf8949989668700fa Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Wed, 18 Sep 2019 13:09:14 +0200
Subject: [PATCH 44/83] [TASK] Add .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store

From 8b8991f90b5e414dcc05f5125b9aadb20e8f472c Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Wed, 18 Sep 2019 18:00:12 +0200
Subject: [PATCH 45/83] [TASK] TCA: add icons

- Core: classic TYPO3 icon
- Extension: TYPO3 extension manager icon (adopted)

Fixes: #105
---
 .../TCA/tx_t3monitoring_domain_model_client.php   |   2 +-
 .../TCA/tx_t3monitoring_domain_model_core.php     |   2 +-
 .../tx_t3monitoring_domain_model_extension.php    |   2 +-
 .../TCA/tx_t3monitoring_domain_model_sla.php      |   2 +-
 .../TCA/tx_t3monitoring_domain_model_tag.php      |   2 +-
 .../Icons/tx_t3monitoring_domain_model_client.gif | Bin 533 -> 0 bytes
 .../Icons/tx_t3monitoring_domain_model_client.svg |   1 +
 .../Icons/tx_t3monitoring_domain_model_core.gif   | Bin 230 -> 0 bytes
 .../Icons/tx_t3monitoring_domain_model_core.svg   |   1 +
 .../tx_t3monitoring_domain_model_extension.gif    | Bin 230 -> 0 bytes
 .../tx_t3monitoring_domain_model_extension.svg    |   1 +
 .../Icons/tx_t3monitoring_domain_model_sla.gif    | Bin 533 -> 0 bytes
 .../Icons/tx_t3monitoring_domain_model_sla.svg    |   1 +
 .../Icons/tx_t3monitoring_domain_model_tag.gif    | Bin 533 -> 0 bytes
 .../Icons/tx_t3monitoring_domain_model_tag.svg    |   1 +
 15 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_client.gif
 create mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg
 delete mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_core.gif
 create mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg
 delete mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_extension.gif
 create mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg
 delete mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_sla.gif
 create mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg
 delete mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_tag.gif
 create mode 100644 Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 1cfc5b2..9c53ac7 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -11,7 +11,7 @@
             'disabled' => 'hidden',
         ],
         'searchFields' => 'title,domain,secret,email,php_version,mysql_version,disk_total_space,disk_free_space,insecure_core,outdated_core,insecure_extensions,outdated_extensions,error_message,extensions,core,sla,tag',
-        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.gif'
+        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg '
     ],
     'interface' => [
         'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, host_header, ignore_cert_errors, force_ip_resolve, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_core.php b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
index 961010c..1e96df3 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_core.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
@@ -9,7 +9,7 @@
         'enablecolumns' => [
         ],
         'searchFields' => 'version,insecure,next_secure_version,type,release_date,latest,stable,is_stable,is_active,is_latest,version_integer,is_used,is_official,',
-        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_core.gif'
+        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg'
     ],
     'interface' => [
         'showRecordFieldList' => 'version, insecure, next_secure_version, type, release_date, latest, stable, is_stable, is_active, is_latest, version_integer, is_used, is_official',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index 38de424..e03f0db 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -12,7 +12,7 @@
         'enablecolumns' => [
         ],
         'searchFields' => 'name,version,insecure,next_secure_version,title,description,last_updated,author_name,update_comment,state,category,version_integer,is_used,is_official,is_modified,is_latest,last_bugfix_release,last_minor_release,last_major_release,serialized_dependencies,',
-        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.gif'
+        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg'
     ],
     'interface' => [
         'showRecordFieldList' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest, last_bugfix_release, last_minor_release, last_major_release, serialized_dependencies',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
index bb7f50d..206a9cb 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
@@ -12,7 +12,7 @@
             'disabled' => 'hidden',
         ],
         'searchFields' => 'title,description,',
-        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.gif'
+        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg'
     ],
     'interface' => [
         'showRecordFieldList' => 'hidden, title, description',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
index 6d6f13f..049d5f8 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
@@ -12,7 +12,7 @@
             'disabled' => 'hidden',
         ],
         'searchFields' => 'title,description,',
-        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.gif'
+        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg'
     ],
     'interface' => [
         'showRecordFieldList' => 'hidden, title, description',
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_client.gif b/Resources/Public/Icons/tx_t3monitoring_domain_model_client.gif
deleted file mode 100644
index 6cc5f16355d84652db5ce39fcbc7256b7ea457cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmZ?wbhEHb6krfwc;>^PT&ti`uNc2IM6Fr5d*_GlT^}Mg`l>Z4?cBL@{mqr@Zmft{
z7wEdsHlXM1p|kH6En2i~+qT*bFHc_i5WY6x!0ESfTY`5SewDjFA!B!R!NKH=-7#5v
z<8pIzr=96jYgDqIV-eVU&ToZld3pKFnKKjS+;FNpvSrJblpPUfQw-u~UN@U;5Wc}@
z$BrEa{W=>rZk&4HOZ}!-d-m*!-W0Ir`qGWJ*7TfcZfa@@UE^PKph&A-&32ZV$71`A
zWAz0q9tEs&-?wjHUteGDl80Iy>iRueDs>7`>w{xsV{`V!C+`Sfvt~_7N=o9k(EtDc
zGYnRs_>+Z^fx(AC2joCdoG`E#HTX0&x3sqT=(8Hwwzskf@u~E-2#Sa)Om246<W-$H
zzgIwSvb`aPnkT=qgPD?ySBuU}w*_sI;?fdLOl)@6O}b9Za_%Oa9!=V^rt(deuH1}L
mT*gdIiZ&J+P3*$v4C>yZMom0cTFy<3E({D?-?uh0SOWmDq@H{L

diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg
new file mode 100644
index 0000000..eb2a477
--- /dev/null
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.04px;}</style></defs><polyline class="cls-1" points="2.52 36.61 20.91 36.61 23.94 44.23 29.97 28.14 35.32 54.33 41.07 17.77 47.68 41.59 61.48 9.64"/></svg>
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_core.gif b/Resources/Public/Icons/tx_t3monitoring_domain_model_core.gif
deleted file mode 100644
index 37ba37b9b3a220018e3a291bf2ee413d0da30ce0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmZ?wbh9u|6krfwIKlt|GBPr{y1EAX`lY3%Jv}|Mz+f2|Yy*R1U~nA_UV_1QFaYW;
z2AhC~Q2fcl$iN`NpaW6^vXg-|S;5tE3G-Y5<#kHRdp8`B$dNv*cXpRhl~&t>ccvU1
zeHPQ2GIn^1cr6p&73IaoD$=91iK~a{(6rVH&ROOxH+%Y4hNqsq`BO~MkEuZ}q3Mby
Zn_ZKDm69U|7Z(ptCx?^igb9ia)&LfwP0|1W

diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg
new file mode 100644
index 0000000..6f27b70
--- /dev/null
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M11.1 10.3c-.2 0-.3.1-.5.1C9 10.4 6.8 5 6.8 3.2c0-.7.2-.9.4-1.1-2 .2-4.2.9-4.9 1.8-.2.2-.3.6-.3 1 0 2.8 3 9.2 5.1 9.2 1 0 2.6-1.6 4-3.8m-1-8.4c1.9 0 3.9.3 3.9 1.4 0 2.2-1.4 4.9-2.1 4.9C10.6 8.3 9 4.7 9 2.9c0-.8.3-1 1.1-1" class="icon-color"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.gif b/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.gif
deleted file mode 100644
index 37ba37b9b3a220018e3a291bf2ee413d0da30ce0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmZ?wbh9u|6krfwIKlt|GBPr{y1EAX`lY3%Jv}|Mz+f2|Yy*R1U~nA_UV_1QFaYW;
z2AhC~Q2fcl$iN`NpaW6^vXg-|S;5tE3G-Y5<#kHRdp8`B$dNv*cXpRhl~&t>ccvU1
zeHPQ2GIn^1cr6p&73IaoD$=91iK~a{(6rVH&ROOxH+%Y4hNqsq`BO~MkEuZ}q3Mby
Zn_ZKDm69U|7Z(ptCx?^igb9ia)&LfwP0|1W

diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg
new file mode 100644
index 0000000..52b92ec
--- /dev/null
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:#565656;fill-rule:evenodd;}</style></defs><path class="cls-1" d="M32,23.42l20.52-7.07a1.89,1.89,0,0,1,2.44,1,1.85,1.85,0,0,1-1.05,2.41l-.07,0-20,6.88V51.3a1.88,1.88,0,1,1-3.76,0V26.68L10,19.6a1.87,1.87,0,0,1-1.1-2.4,1.89,1.89,0,0,1,2.42-1.09Zm.86-22.3a3.36,3.36,0,0,0-1.78,0L.89,10.63A1.33,1.33,0,0,0,0,11.83V50.17a1.35,1.35,0,0,0,.89,1.2l30.22,9.52a3.58,3.58,0,0,0,1.78,0l30.22-9.52a1.33,1.33,0,0,0,.89-1.2V11.83a1.36,1.36,0,0,0-.89-1.2L32.89,1.12Z"/></svg>
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.gif b/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.gif
deleted file mode 100644
index 6cc5f16355d84652db5ce39fcbc7256b7ea457cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmZ?wbhEHb6krfwc;>^PT&ti`uNc2IM6Fr5d*_GlT^}Mg`l>Z4?cBL@{mqr@Zmft{
z7wEdsHlXM1p|kH6En2i~+qT*bFHc_i5WY6x!0ESfTY`5SewDjFA!B!R!NKH=-7#5v
z<8pIzr=96jYgDqIV-eVU&ToZld3pKFnKKjS+;FNpvSrJblpPUfQw-u~UN@U;5Wc}@
z$BrEa{W=>rZk&4HOZ}!-d-m*!-W0Ir`qGWJ*7TfcZfa@@UE^PKph&A-&32ZV$71`A
zWAz0q9tEs&-?wjHUteGDl80Iy>iRueDs>7`>w{xsV{`V!C+`Sfvt~_7N=o9k(EtDc
zGYnRs_>+Z^fx(AC2joCdoG`E#HTX0&x3sqT=(8Hwwzskf@u~E-2#Sa)Om246<W-$H
zzgIwSvb`aPnkT=qgPD?ySBuU}w*_sI;?fdLOl)@6O}b9Za_%Oa9!=V^rt(deuH1}L
mT*gdIiZ&J+P3*$v4C>yZMom0cTFy<3E({D?-?uh0SOWmDq@H{L

diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg
new file mode 100644
index 0000000..c5c4dad
--- /dev/null
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg id="Layer_1" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M8,8c0,4.682,3.894,5.148,5.295,4.926s5.062-0.803,5.062-0.803l6.066,5.472l-11.68,8.958L3.606,17h-1.59L2,5h10.5  c0,0-2.06,0.717-2.742,0.968C9.075,6.218,8,6.542,8,8z"/><circle cx="23" cy="19" r="2"/><path d="M15,8.5c0,1.381-1.119,2.5-2.5,2.5S10,9.881,10,8.5V8h3.146L15,8.5z"/><circle cx="19" cy="7" r="2"/><circle cx="20" cy="21" r="2"/><circle cx="17" cy="23" r="2"/><circle cx="14" cy="25" r="2"/><path d="M29,19V7l-4,1l-5.144-2.808l-1.378-0.123L10,8l2.753,2.987L19,9.996c0,0,5.25,4.699,6.167,5.616  c0.88,0.88,1.75,1.543,1.819,3.388H29z"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.gif b/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.gif
deleted file mode 100644
index 6cc5f16355d84652db5ce39fcbc7256b7ea457cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmZ?wbhEHb6krfwc;>^PT&ti`uNc2IM6Fr5d*_GlT^}Mg`l>Z4?cBL@{mqr@Zmft{
z7wEdsHlXM1p|kH6En2i~+qT*bFHc_i5WY6x!0ESfTY`5SewDjFA!B!R!NKH=-7#5v
z<8pIzr=96jYgDqIV-eVU&ToZld3pKFnKKjS+;FNpvSrJblpPUfQw-u~UN@U;5Wc}@
z$BrEa{W=>rZk&4HOZ}!-d-m*!-W0Ir`qGWJ*7TfcZfa@@UE^PKph&A-&32ZV$71`A
zWAz0q9tEs&-?wjHUteGDl80Iy>iRueDs>7`>w{xsV{`V!C+`Sfvt~_7N=o9k(EtDc
zGYnRs_>+Z^fx(AC2joCdoG`E#HTX0&x3sqT=(8Hwwzskf@u~E-2#Sa)Om246<W-$H
zzgIwSvb`aPnkT=qgPD?ySBuU}w*_sI;?fdLOl)@6O}b9Za_%Oa9!=V^rt(deuH1}L
mT*gdIiZ&J+P3*$v4C>yZMom0cTFy<3E({D?-?uh0SOWmDq@H{L

diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg
new file mode 100644
index 0000000..3cf98b9
--- /dev/null
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M6.657 1H1v5.656l8.485 8.485 5.657-5.657L6.657 1zM1.99 6.232V1.99h4.243l7.495 7.494-4.243 4.243L1.99 6.232z"/><path d="M3.475 3.475A1.75 1.75 0 1 0 5.952 5.95a1.75 1.75 0 0 0-2.477-2.475zm.707.707a.75.75 0 1 1 1.061 1.06.75.75 0 0 1-1.061-1.06zM6.126 8.602l2.475-2.475 3.535 3.536-2.475 2.474z"/></g></svg>
\ No newline at end of file

From e296e43c8c2cd1d201b3c115c4750e1af90f8d52 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Wed, 18 Sep 2019 18:10:41 +0200
Subject: [PATCH 46/83] [TASK] Clean SVG icons

---
 Resources/Public/Icons/Extension.svg                        | 6 +-----
 Resources/Public/Icons/module.svg                           | 6 +-----
 .../Public/Icons/tx_t3monitoring_domain_model_client.svg    | 2 +-
 .../Public/Icons/tx_t3monitoring_domain_model_extension.svg | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Resources/Public/Icons/Extension.svg b/Resources/Public/Icons/Extension.svg
index e031252..322bab1 100644
--- a/Resources/Public/Icons/Extension.svg
+++ b/Resources/Public/Icons/Extension.svg
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="37px" height="37px" viewBox="0 0 37 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
-    <title>module-extensionmanager</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="module-extensionmanager" fill="#FF8700">
             <path d="M3.89289007,0 C1.75180053,0 0,1.79761937 0,3.99470971 L0,16.4592027 L11.9716102,16.4592027 L14.5876323,9.59129801 C14.8864116,8.80733623 15.6523378,8.29401603 16.4503802,8.321979 C17.2698336,8.3439499 17.989045,8.89022646 18.2479222,9.68816972 L21.9490875,21.1100435 L25.9431927,11.3599557 C26.2371059,10.643904 26.9086294,10.1675349 27.6657965,10.1385732 C28.446321,10.1046182 29.1275767,10.5340495 29.4711243,11.226133 L32.0754678,16.4602014 L33.7211607,16.4602014 C34.7955984,16.4602014 35.6676058,17.3550163 35.6676058,18.4575562 C35.6676058,19.5600961 34.7955984,20.4549111 33.7211607,20.4549111 L30.8832702,20.4549111 C30.1514068,20.4549111 29.482803,20.0344679 29.1499609,19.3663527 L27.9091022,16.8706578 L23.530574,27.5565062 C23.2259554,28.2995223 22.5174494,28.7798861 21.7369249,28.7798861 C20.8503192,28.7469297 20.1447329,28.2026505 19.8887754,27.4126967 L16.2528161,16.1925558 L15.1141457,19.1835947 C14.822179,19.9495803 14.1029675,20.4539124 13.3010322,20.4539124 L0,20.4539124 L0,33.0052903 C0,35.2023806 1.75180053,37 3.89289007,37 L33.1071099,37 C35.2481995,37 37,35.2023806 37,33.0052903 L37,3.99371103 C37,1.79761937 35.2481995,0 33.1071099,0 L3.89289007,0 Z" id="Shape"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/Resources/Public/Icons/module.svg b/Resources/Public/Icons/module.svg
index e031252..322bab1 100644
--- a/Resources/Public/Icons/module.svg
+++ b/Resources/Public/Icons/module.svg
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="37px" height="37px" viewBox="0 0 37 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
-    <title>module-extensionmanager</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="module-extensionmanager" fill="#FF8700">
             <path d="M3.89289007,0 C1.75180053,0 0,1.79761937 0,3.99470971 L0,16.4592027 L11.9716102,16.4592027 L14.5876323,9.59129801 C14.8864116,8.80733623 15.6523378,8.29401603 16.4503802,8.321979 C17.2698336,8.3439499 17.989045,8.89022646 18.2479222,9.68816972 L21.9490875,21.1100435 L25.9431927,11.3599557 C26.2371059,10.643904 26.9086294,10.1675349 27.6657965,10.1385732 C28.446321,10.1046182 29.1275767,10.5340495 29.4711243,11.226133 L32.0754678,16.4602014 L33.7211607,16.4602014 C34.7955984,16.4602014 35.6676058,17.3550163 35.6676058,18.4575562 C35.6676058,19.5600961 34.7955984,20.4549111 33.7211607,20.4549111 L30.8832702,20.4549111 C30.1514068,20.4549111 29.482803,20.0344679 29.1499609,19.3663527 L27.9091022,16.8706578 L23.530574,27.5565062 C23.2259554,28.2995223 22.5174494,28.7798861 21.7369249,28.7798861 C20.8503192,28.7469297 20.1447329,28.2026505 19.8887754,27.4126967 L16.2528161,16.1925558 L15.1141457,19.1835947 C14.822179,19.9495803 14.1029675,20.4539124 13.3010322,20.4539124 L0,20.4539124 L0,33.0052903 C0,35.2023806 1.75180053,37 3.89289007,37 L33.1071099,37 C35.2481995,37 37,35.2023806 37,33.0052903 L37,3.99371103 C37,1.79761937 35.2481995,0 33.1071099,0 L3.89289007,0 Z" id="Shape"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg
index eb2a477..1a0f22a 100644
--- a/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg
@@ -1 +1 @@
-<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.04px;}</style></defs><polyline class="cls-1" points="2.52 36.61 20.91 36.61 23.94 44.23 29.97 28.14 35.32 54.33 41.07 17.77 47.68 41.59 61.48 9.64"/></svg>
+<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.04px;}</style></defs><polyline class="cls-1" points="2.52 36.61 20.91 36.61 23.94 44.23 29.97 28.14 35.32 54.33 41.07 17.77 47.68 41.59 61.48 9.64"/></svg>
diff --git a/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg b/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg
index 52b92ec..3f42167 100644
--- a/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg
+++ b/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg
@@ -1 +1 @@
-<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:#565656;fill-rule:evenodd;}</style></defs><path class="cls-1" d="M32,23.42l20.52-7.07a1.89,1.89,0,0,1,2.44,1,1.85,1.85,0,0,1-1.05,2.41l-.07,0-20,6.88V51.3a1.88,1.88,0,1,1-3.76,0V26.68L10,19.6a1.87,1.87,0,0,1-1.1-2.4,1.89,1.89,0,0,1,2.42-1.09Zm.86-22.3a3.36,3.36,0,0,0-1.78,0L.89,10.63A1.33,1.33,0,0,0,0,11.83V50.17a1.35,1.35,0,0,0,.89,1.2l30.22,9.52a3.58,3.58,0,0,0,1.78,0l30.22-9.52a1.33,1.33,0,0,0,.89-1.2V11.83a1.36,1.36,0,0,0-.89-1.2L32.89,1.12Z"/></svg>
+<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:#565656;fill-rule:evenodd;}</style></defs><path class="cls-1" d="M32,23.42l20.52-7.07a1.89,1.89,0,0,1,2.44,1,1.85,1.85,0,0,1-1.05,2.41l-.07,0-20,6.88V51.3a1.88,1.88,0,1,1-3.76,0V26.68L10,19.6a1.87,1.87,0,0,1-1.1-2.4,1.89,1.89,0,0,1,2.42-1.09Zm.86-22.3a3.36,3.36,0,0,0-1.78,0L.89,10.63A1.33,1.33,0,0,0,0,11.83V50.17a1.35,1.35,0,0,0,.89,1.2l30.22,9.52a3.58,3.58,0,0,0,1.78,0l30.22-9.52a1.33,1.33,0,0,0,.89-1.2V11.83a1.36,1.36,0,0,0-.89-1.2L32.89,1.12Z"/></svg>

From b277f1cf33b3dfbf4ca10a5740f0fc970bf5b494 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Wed, 18 Sep 2019 19:15:32 +0200
Subject: [PATCH 47/83] [TASK] TCA: optimize view of client in formEngine

Introduce new palettes to make the client view more compact.
---
 Configuration/TCA/tx_t3monitoring_domain_model_client.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 9c53ac7..c3a660e 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -20,8 +20,7 @@
         '1' => [
             'showitem' => '
         --div--;General,--palette--;;paletteTitle, --palette--;;paletteDomain,email,sla,tag,
-        --div--;Readonly information,last_successful_import,error_message,core, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,extensions,
-                insecure_core, outdated_core, insecure_extensions, outdated_extensions,
+        --div--;Readonly information,last_successful_import,error_message,--palette--;;paletteCore, --palette--;;paletteExtensions, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,
         --div--;Extra,extra_info,extra_warning,extra_danger,
         --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                 hidden,
@@ -30,6 +29,8 @@
     ],
     'palettes' => [
         'paletteTitle' => ['showitem' => 'title'],
+        'paletteCore' => ['showitem' => 'core, insecure_core, outdated_core,'],
+        'paletteExtensions' => ['showitem' => 'extensions, --linebreak--, insecure_extensions, outdated_extensions,'],
         'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, host_header, --linebreak--, ignore_cert_errors, force_ip_resolve'],
         'paletteVersions' => ['showitem' => 'php_version, mysql_version'],
         'paletteDiskSpace' => ['showitem' => 'disk_total_space, disk_free_space'],

From 1142483d17b7a26d1cc2e648406c3c7b3a6cfdfb Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Wed, 11 Dec 2019 05:36:53 +0100
Subject: [PATCH 48/83] [FEATURE] Respect TYPO3 min/max version for extension

---
 Classes/Domain/Model/Extension.php            | 38 +++++++++++++++++++
 Classes/Service/Import/ExtensionImport.php    | 20 ++++++++++
 .../AvailableUpdatesViewHelper.php            | 35 ++++++++++++++---
 ...tx_t3monitoring_domain_model_extension.php | 18 ++++++++-
 Resources/Private/Language/locallang.xlf      |  6 +++
 Resources/Private/Templates/Client/Show.html  | 11 +++++-
 ext_tables.sql                                |  2 +
 7 files changed, 121 insertions(+), 9 deletions(-)

diff --git a/Classes/Domain/Model/Extension.php b/Classes/Domain/Model/Extension.php
index b5f62bb..1346170 100644
--- a/Classes/Domain/Model/Extension.php
+++ b/Classes/Domain/Model/Extension.php
@@ -151,6 +151,12 @@ class Extension extends AbstractEntity
      */
     protected $serializedDependencies = '';
 
+    /** @var int */
+    protected $typo3MinVersion = 0;
+
+    /** @var int */
+    protected $typo3MaxVersion = 0;
+
     /**
      * Returns the name
      *
@@ -620,4 +626,36 @@ public function setSerializedDependencies($serializedDependencies)
     {
         $this->serializedDependencies = $serializedDependencies;
     }
+
+    /**
+     * @return int
+     */
+    public function getTypo3MinVersion()
+    {
+        return $this->typo3MinVersion;
+    }
+
+    /**
+     * @param int $typo3MinVersion
+     */
+    public function setTypo3MinVersion($typo3MinVersion)
+    {
+        $this->typo3MinVersion = $typo3MinVersion;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTypo3MaxVersion()
+    {
+        return $this->typo3MaxVersion;
+    }
+
+    /**
+     * @param int $typo3MaxVersion
+     */
+    public function setTypo3MaxVersion($typo3MaxVersion)
+    {
+        $this->typo3MaxVersion = $typo3MaxVersion;
+    }
 }
diff --git a/Classes/Service/Import/ExtensionImport.php b/Classes/Service/Import/ExtensionImport.php
index 39807c6..23861fc 100644
--- a/Classes/Service/Import/ExtensionImport.php
+++ b/Classes/Service/Import/ExtensionImport.php
@@ -13,6 +13,7 @@
 use T3Monitor\T3monitoring\Service\DataIntegrity;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
 use TYPO3\CMS\Extensionmanager\Utility\Repository\Helper;
 
@@ -82,6 +83,8 @@ protected function insertExtensionsInCustomTable()
                 'tstamp' => $GLOBALS['EXEC_TIME'],
             ];
 
+            $this->addCoreDependenciesToFields($fields);
+
             $exists = $queryBuilder
                 ->select('uid', 'version', 'name')
                 ->from($table)
@@ -110,6 +113,23 @@ protected function insertExtensionsInCustomTable()
         }
     }
 
+    protected function addCoreDependenciesToFields(array &$fields)
+    {
+        $fields['typo3_min_version'] = 0;
+        $fields['typo3_max_version'] = 0;
+        if (!$fields['serialized_dependencies']) {
+            return;
+        }
+        $dependencies = unserialize($fields['serialized_dependencies']);
+        if (!is_array($dependencies) || !is_array($dependencies['depends']) || !isset($dependencies['depends']['typo3'])) {
+            return;
+        }
+
+        $split = VersionNumberUtility::splitVersionRange($dependencies['depends']['typo3']);
+        $fields['typo3_min_version'] = VersionNumberUtility::convertVersionNumberToInteger($split[0]);
+        $fields['typo3_max_version'] = VersionNumberUtility::convertVersionNumberToInteger($split[1]);
+    }
+
     /**
      * @return bool TRUE if the extension list was successfully update, FALSE if no update necessary
      * @throws ExtensionManagerException
diff --git a/Classes/ViewHelpers/AvailableUpdatesViewHelper.php b/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
index 2982593..433f847 100644
--- a/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
+++ b/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
@@ -9,6 +9,7 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use T3Monitor\T3monitoring\Domain\Model\Core;
 use T3Monitor\T3monitoring\Domain\Model\Extension;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -30,6 +31,7 @@ class AvailableUpdatesViewHelper extends AbstractViewHelper implements Compilabl
     public function initializeArguments()
     {
         $this->registerArgument('extension', Extension::class, 'Extension', true);
+        $this->registerArgument('core', Core::class, 'Core', true);
         $this->registerArgument('as', 'string', 'Output variable', false, 'list');
     }
 
@@ -43,6 +45,8 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
     {
         /** @var Extension $extension */
         $extension = $arguments['extension'];
+        /** @var Core $core */
+        $core = $arguments['core'];
 
         $versions = [
             'bugfix' => $extension->getLastBugfixRelease(),
@@ -53,10 +57,16 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
         $result = [];
         foreach ($versions as $name => $version) {
             if (!empty($version) && $extension->getVersion() !== $version && !isset($result[$version])) {
+                $extDetails = self::getExtDetails($extension->getName(), $version);
                 $result[$version] = [
                     'name' => $name,
                     'version' => $version,
-                    'serializedDependencies' => self::getDependenciesOfExtensionVersion($extension->getName(), $version),
+                    'identifier' => 'id-' . md5($name . $version),
+                    'typo3MinVersion' => $extDetails['typo3_min_version'],
+                    'typo3MaxVersion' => $extDetails['typo3_max_version'],
+                    'coreVersion' => $core->getVersionInteger(),
+                    'extCompatibility' => self::getCompatibility($extDetails['typo3_min_version'], $extDetails['typo3_max_version'], $core),
+                    'serializedDependencies' => $extDetails['serialized_dependencies'],
                 ];
             }
         }
@@ -68,19 +78,32 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
         return $output;
     }
 
+    protected static function getCompatibility(int $extMin, int $extMax, Core $core): int
+    {
+        $coreVersion = $core->getVersionInteger();
+        if (!$coreVersion || !$extMin || !$extMax) {
+            return -1;
+        }
+
+        if ($coreVersion >= $extMin && $coreVersion <= $extMax) {
+            return 1;
+        }
+        return 0;
+    }
+
     /**
      * @param string $name
      * @param string $version
-     * @return string
+     * @return array
      */
-    protected static function getDependenciesOfExtensionVersion(string $name, string $version): string
+    protected static function getExtDetails(string $name, string $version): array
     {
         $table = 'tx_t3monitoring_domain_model_extension';
 
         $queryBuilderCoreExtensions = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($table);
         $row = $queryBuilderCoreExtensions
-            ->select('serialized_dependencies')
+            ->select('serialized_dependencies', 'typo3_min_version', 'typo3_max_version')
             ->from($table)
             ->where(
                 $queryBuilderCoreExtensions->expr()->eq('name', $queryBuilderCoreExtensions->createNamedParameter($name)),
@@ -90,8 +113,8 @@ protected static function getDependenciesOfExtensionVersion(string $name, string
             ->execute()->fetch();
 
         if ($row) {
-            return (string)$row['serialized_dependencies'];
+            return $row;
         }
-        return '';
+        return [];
     }
 }
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index e03f0db..9c272df 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -18,7 +18,7 @@
         'showRecordFieldList' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest, last_bugfix_release, last_minor_release, last_major_release, serialized_dependencies',
     ],
     'types' => [
-        '1' => ['showitem' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest,last_bugfix_release, last_minor_release, last_major_release, serialized_dependencies'],
+        '1' => ['showitem' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest,last_bugfix_release, last_minor_release, last_major_release, typo3_min_version,typo3_max_version,serialized_dependencies'],
     ],
     'palettes' => [
         '1' => ['showitem' => ''],
@@ -194,5 +194,21 @@
                 'eval' => 'trim'
             ]
         ],
+        'typo3_min_version' => [
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.typo3_min_version',
+            'config' => [
+                'type' => 'input',
+                'size' => 30,
+                'eval' => 'trim'
+            ],
+        ],
+        'typo3_max_version' => [
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.typo3_max_version',
+            'config' => [
+                'type' => 'input',
+                'size' => 30,
+                'eval' => 'trim'
+            ],
+        ],
     ],
 ];
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 0ff62c8..a1824c2 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -159,6 +159,12 @@
 			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
 				<source>Serialized Dependencies</source>
 			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.typo3_min_version">
+				<source>TYPO3 minimum version</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.typo3_max_version">
+				<source>TYPO3 maximum version</source>
+			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_core">
 				<source>Core</source>
 			</trans-unit>
diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 5cb2c1a..1039f79 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -155,10 +155,17 @@ <h1>
 										</f:if>
 									</f:then>
 									<f:else>
-										<monitor:availableUpdates extension="{extension}" as="list">
+										<monitor:availableUpdates core="{client.core}" extension="{extension}" as="list">
 											<f:if condition="{list}">
 												<f:for each="{list}" as="version">
-													<span class="badge" data-toggle="tooltip" data-title='<div class="dep"><div class="panel panel-default"><div class="panel-heading">{version.name} release</div>{version.serializedDependencies -> monitor:format.dependencies()}</div></div>' data-html="true">{version.version}</span>
+													<span class="badge" data-toggle="tooltip" data-title='<div class="dep"><div class="panel panel-default"><div class="panel-heading">{version.name} release</div>{version.serializedDependencies -> monitor:format.dependencies()}</div></div>' data-html="true">
+														{version.version}
+														<f:switch expression="{version.extCompatibility}">
+															<f:case value="-1"><core:icon identifier="actions-system-help-open" alternativeMarkupIdentifier="inline" /></f:case>
+															<f:case value="0"><core:icon identifier="actions-close" alternativeMarkupIdentifier="inline" /></f:case>
+															<f:case value="1"><core:icon identifier="actions-check" alternativeMarkupIdentifier="inline" /></f:case>
+														</f:switch>
+													</span>
 												</f:for>
 											</f:if>
 										</monitor:availableUpdates>
diff --git a/ext_tables.sql b/ext_tables.sql
index 59c43cf..1e1d422 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -73,6 +73,8 @@ CREATE TABLE tx_t3monitoring_domain_model_extension (
 	last_bugfix_release varchar(255) DEFAULT '' NOT NULL,
 	last_minor_release varchar(255) DEFAULT '' NOT NULL,
 	last_major_release varchar(255) DEFAULT '' NOT NULL,
+	typo3_min_version int(11) unsigned DEFAULT '0' NOT NULL,
+	typo3_max_version int(11) unsigned DEFAULT '0' NOT NULL,
 	serialized_dependencies text,
 
 	tstamp int(11) unsigned DEFAULT '0' NOT NULL,

From a41dfbe6c4c54963e02d7afe5bf32071e2546a8b Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Wed, 11 Dec 2019 12:02:30 +0100
Subject: [PATCH 49/83] [BUGFIX] Replace table tooltip with custom solution

Tooltip removes tables, no clue why
---
 Resources/Private/Templates/Client/Show.html | 12 ++--
 Resources/Public/JavaScript/Main.js          | 69 +++++++++++---------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 1039f79..a47dec5 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -158,14 +158,16 @@ <h1>
 										<monitor:availableUpdates core="{client.core}" extension="{extension}" as="list">
 											<f:if condition="{list}">
 												<f:for each="{list}" as="version">
-													<span class="badge" data-toggle="tooltip" data-title='<div class="dep"><div class="panel panel-default"><div class="panel-heading">{version.name} release</div>{version.serializedDependencies -> monitor:format.dependencies()}</div></div>' data-html="true">
+													<button type="button" class="btn btn-default dependency-toggle-js" data-toggle="{version.identifier}">
 														{version.version}
 														<f:switch expression="{version.extCompatibility}">
-															<f:case value="-1"><core:icon identifier="actions-system-help-open" alternativeMarkupIdentifier="inline" /></f:case>
-															<f:case value="0"><core:icon identifier="actions-close" alternativeMarkupIdentifier="inline" /></f:case>
-															<f:case value="1"><core:icon identifier="actions-check" alternativeMarkupIdentifier="inline" /></f:case>
+														<f:case value="-1"><span class="label label-default"><core:icon identifier="actions-system-help-open" /></span></f:case>
+														<f:case value="0"><span class="label label-warning"><core:icon identifier="actions-close" /></span></f:case>
+														<f:case value="1"><span class="label label-success"><core:icon identifier="actions-check" /></span></f:case>
 														</f:switch>
-													</span>
+
+													</button>
+													<div class="dependency-info-js" id="{version.identifier}" style="display: none"><div class="panel panel-default"><div class="panel-heading">{version.name} release</div>{version.serializedDependencies -> monitor:format.dependencies()}</div></div>
 												</f:for>
 											</f:if>
 										</monitor:availableUpdates>
diff --git a/Resources/Public/JavaScript/Main.js b/Resources/Public/JavaScript/Main.js
index f3f95ac..c3b4815 100644
--- a/Resources/Public/JavaScript/Main.js
+++ b/Resources/Public/JavaScript/Main.js
@@ -6,38 +6,45 @@
  */
 
 define([
-	'jquery',
-	'TYPO3/CMS/Backend/Modal',
-	'TYPO3/CMS/Backend/Tooltip',
-	'datatables'
+    'jquery',
+    'TYPO3/CMS/Backend/Modal',
+    'TYPO3/CMS/Backend/Tooltip',
+    'datatables'
 ], function ($, Modal, Tooltip) {
-	'use strict';
+    'use strict';
 
-	$(document).ready(function () {
-		var clientList = $('.client-list');
-		if (clientList.length > 0) {
-			clientList.DataTable({
-				"order": [[0, "desc"]],
-				paging: false,
-				lengthChange: false,
-				stateSave: true,
-				searching: false,
-				dom: 'tir',
-				ordering: true
-			});
-		}
-		var extensionList = $('.extension-list');
-		if (extensionList.length > 0) {
-				extensionList.DataTable({
-				"order": [[5, "asc"], [6, "asc"]],
-				paging: false,
-				lengthChange: false,
-				stateSave: false,
-				searching: false,
-				dom: 'tir',
-				ordering: true
-			});
-		}
-	});
+    $(document).ready(function () {
+
+
+        $('.dependency-toggle-js').click(function () {
+            $('.dependency-info-js').hide();
+            $('#' + $(this).attr('data-toggle')).toggle();
+        });
+
+        var clientList = $('.client-list');
+        if (clientList.length > 0) {
+            clientList.DataTable({
+                "order": [[0, "desc"]],
+                paging: false,
+                lengthChange: false,
+                stateSave: true,
+                searching: false,
+                dom: 'tir',
+                ordering: true
+            });
+        }
+        var extensionList = $('.extension-list');
+        if (extensionList.length > 0) {
+            extensionList.DataTable({
+                "order": [[5, "asc"], [6, "asc"]],
+                paging: false,
+                lengthChange: false,
+                stateSave: false,
+                searching: false,
+                dom: 'tir',
+                ordering: true
+            });
+        }
+    });
 
 });

From 0b8a2f608438a5942256cfae498e62c3b97814b1 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Wed, 11 Dec 2019 12:05:57 +0100
Subject: [PATCH 50/83] [TASK] Allow closing dep info

---
 Resources/Public/JavaScript/Main.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Resources/Public/JavaScript/Main.js b/Resources/Public/JavaScript/Main.js
index c3b4815..9505019 100644
--- a/Resources/Public/JavaScript/Main.js
+++ b/Resources/Public/JavaScript/Main.js
@@ -18,7 +18,12 @@ define([
 
         $('.dependency-toggle-js').click(function () {
             $('.dependency-info-js').hide();
-            $('#' + $(this).attr('data-toggle')).toggle();
+
+            if (!$(this).hasClass('active')) {
+                $('#' + $(this).attr('data-toggle')).toggle();
+            }
+
+            $(this).toggleClass('active');
         });
 
         var clientList = $('.client-list');

From 605fc1d198c1091d5692790770de7dfa459f9712 Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Mon, 20 Apr 2020 20:29:57 +0200
Subject: [PATCH 51/83] V10 compat (#174)

* [BUGFIX] Make composer.json compatible

* [TASK] Rename TS files

* [TASK] Cleanup emconf

* [TASK] Cleanup localconf

* [TASK] TCA adoptions

* [TASK] Update viewhelpers

* [TASK] Remove unneeded xclass

* [TASK] Cleanup Services

* [TASK] Make classes v10 compatible

* [TASK] Cleanup controllers

* [TASK] Migrate cli to symfony

* [TASK] Update tests for v10

* [TASK] Update tests infrastructure on travis

* [TASK] Remove useless tests

The commands contain only a very small amount of code.
Having tests that only check if PHP executes in the right order is
not useful.

* [TASK] Use proper API for extension settings

* [BUGFIX] Correctly tearDown instances in GeneralUtility during tests

* [TASK] Remove tests for EmMonitoringConfiguration

Those cover TYPO3 base functionality only.

* [BUGFIX] Set singleton instance correctly in ReportAdminCommandTest

* [TASK] Remove dependency on EmMonitoringConfiguration for EmailNotification

* [BUGFIX] Use correct command in ReportAdminCommandTest

* [TASK] Decouple execute of command from objectManager init
---
 .travis.yml                                   |  13 +-
 Classes/Command/ImportAllCommand.php          |  56 ++++++++
 Classes/Command/ImportClientsCommand.php      |  52 ++++++++
 Classes/Command/ImportCoreCommand.php         |  45 +++++++
 Classes/Command/ImportExtensionsCommand.php   |  44 ++++++
 .../Command/MonitoringCommandController.php   |  63 ---------
 Classes/Command/ReportAdminCommand.php        | 109 +++++++++++++++
 Classes/Command/ReportClientCommand.php       |  59 ++++++++
 Classes/Command/ReportCommandController.php   | 126 ------------------
 Classes/Controller/BaseController.php         |  12 +-
 Classes/Controller/ClientController.php       |   4 +-
 Classes/Domain/Model/Client.php               |  14 +-
 .../Model/Dto/EmMonitoringConfiguration.php   |   4 +-
 Classes/Domain/Model/Extension.php            |   2 +-
 Classes/Domain/Model/Sla.php                  |   2 +-
 Classes/Domain/Model/Tag.php                  |   2 +-
 .../ClientFilterDemandConverterV10.php        |  82 ++++++++++++
 ....php => ClientFilterDemandConverterV9.php} |   8 +-
 Classes/Hooks/DataHandlerHook.php             |   2 +-
 Classes/Notification/EmailNotification.php    |  62 +++++----
 Classes/Service/BulletinImport.php            |   5 +-
 Classes/Service/DataIntegrity.php             |  22 +--
 Classes/Service/Import/BaseImport.php         |   9 --
 Classes/Service/Import/ClientImport.php       |   2 +-
 .../AdditionalExtensionDataViewHelper.php     |  17 +--
 .../AvailableUpdatesViewHelper.php            |  17 +--
 Classes/ViewHelpers/EditRecordViewHelper.php  |  32 ++---
 .../Format/DateTimeAgeViewHelper.php          |  22 +--
 .../Format/DependenciesViewHelper.php         |  17 +--
 .../Format/ExtensionCategoryViewHelper.php    |  10 +-
 .../Format/ExtensionStateViewHelper.php       |  17 +--
 .../Format/MysqlVersionViewHelper.php         |  18 +--
 Classes/Xclass/Typo3DbBackendXclassed.php     |  48 -------
 Configuration/Commands.php                    |  22 +++
 .../tx_t3monitoring_domain_model_client.php   |   9 +-
 .../TCA/tx_t3monitoring_domain_model_core.php |   4 -
 ...tx_t3monitoring_domain_model_extension.php |  14 +-
 .../TCA/tx_t3monitoring_domain_model_sla.php  |   3 +-
 .../TCA/tx_t3monitoring_domain_model_tag.php  |   3 +-
 .../{constants.txt => constants.typoscript}   |   0
 .../{setup.txt => setup.typoscript}           |   0
 .../MonitioringCommandControllerTest.php      |  95 -------------
 Tests/Unit/Command/ReportAdminCommandTest.php |  48 +++++++
 .../Command/ReportCommandControllerTest.php   |  45 -------
 Tests/Unit/Domain/Model/ClientTest.php        |   7 +-
 .../Domain/Model/Dto/CoreFilterDemandTest.php |   5 +-
 .../Dto/EmMonitoringConfigurationTest.php     |  49 -------
 .../Model/Dto/ExtensionFilterDemandTest.php   |   5 +-
 .../Service/Import/ClientImportTest.php       |   4 +-
 .../Notification/EmailNotificationTest.php    |   8 +-
 composer.json                                 |  12 +-
 ext_emconf.php                                |   3 +-
 ext_localconf.php                             |  19 +--
 53 files changed, 661 insertions(+), 691 deletions(-)
 create mode 100644 Classes/Command/ImportAllCommand.php
 create mode 100644 Classes/Command/ImportClientsCommand.php
 create mode 100644 Classes/Command/ImportCoreCommand.php
 create mode 100644 Classes/Command/ImportExtensionsCommand.php
 delete mode 100644 Classes/Command/MonitoringCommandController.php
 create mode 100644 Classes/Command/ReportAdminCommand.php
 create mode 100644 Classes/Command/ReportClientCommand.php
 delete mode 100644 Classes/Command/ReportCommandController.php
 create mode 100644 Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php
 rename Classes/Domain/TypeConverter/{ClientFilterDemandConverter.php => ClientFilterDemandConverterV9.php} (92%)
 delete mode 100644 Classes/Xclass/Typo3DbBackendXclassed.php
 create mode 100644 Configuration/Commands.php
 rename Configuration/TypoScript/{constants.txt => constants.typoscript} (100%)
 rename Configuration/TypoScript/{setup.txt => setup.typoscript} (100%)
 delete mode 100644 Tests/Unit/Command/MonitioringCommandControllerTest.php
 create mode 100644 Tests/Unit/Command/ReportAdminCommandTest.php
 delete mode 100644 Tests/Unit/Command/ReportCommandControllerTest.php
 delete mode 100644 Tests/Unit/Domain/Model/Dto/EmMonitoringConfigurationTest.php

diff --git a/.travis.yml b/.travis.yml
index 5dd1a77..6338c04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,9 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
-
-env:
-  matrix:
-    - TYPO3_VERSION=8.7.*
+  - 7.3
+  - 7.4
 
 sudo: false
 
@@ -26,11 +22,8 @@ before_install:
   - composer --version
 
 before_script:
-  - composer require typo3/cms=$TYPO3_VERSION
-  - composer require typo3/testing-framework:1.* --dev
-  # Restore composer.json
-  - git checkout composer.json
   - export TYPO3_PATH_WEB=$PWD/.Build/Web
+  - composer install
 
 script:
   - >
diff --git a/Classes/Command/ImportAllCommand.php b/Classes/Command/ImportAllCommand.php
new file mode 100644
index 0000000..f1d2890
--- /dev/null
+++ b/Classes/Command/ImportAllCommand.php
@@ -0,0 +1,56 @@
+<?php
+namespace T3Monitor\T3monitoring\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use T3Monitor\T3monitoring\Service\Import\ClientImport;
+use T3Monitor\T3monitoring\Service\Import\CoreImport;
+use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+/**
+ * Monitoring command controller
+ */
+class ImportAllCommand extends Command
+{
+
+    /**
+     * Configure the command by defining the name, options and arguments
+     */
+    protected function configure()
+    {
+        $this->setDescription('Import all: core, extensions, clients');
+    }
+
+    /**
+     * Executes the command for adding the lock file
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \Doctrine\DBAL\ConnectionException
+     * @throws \TYPO3\CMS\Extbase\Object\Exception
+     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $objectManager->get(CoreImport::class)->run();
+        $objectManager->get(ExtensionImport::class)->run();
+        $import = $objectManager->get(ClientImport::class);
+        $import->run();
+
+        $result = $import->getResponseCount();
+        foreach ($result as $label => $count) {
+            $output->writeln(sprintf('%s: %s', $label, $count));
+        }
+    }
+}
diff --git a/Classes/Command/ImportClientsCommand.php b/Classes/Command/ImportClientsCommand.php
new file mode 100644
index 0000000..4dd6529
--- /dev/null
+++ b/Classes/Command/ImportClientsCommand.php
@@ -0,0 +1,52 @@
+<?php
+namespace T3Monitor\T3monitoring\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use T3Monitor\T3monitoring\Service\Import\ClientImport;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+/**
+ * Monitoring command controller
+ */
+class ImportClientsCommand extends Command
+{
+
+    /**
+     * Configure the command by defining the name, options and arguments
+     */
+    protected function configure()
+    {
+        $this->setDescription('Import clients');
+    }
+
+    /**
+     * Executes the command for adding the lock file
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \Doctrine\DBAL\ConnectionException
+     * @throws \TYPO3\CMS\Extbase\Object\Exception
+     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $import = $objectManager->get(ClientImport::class);
+        $import->run();
+
+        $result = $import->getResponseCount();
+        foreach ($result as $label => $count) {
+            $output->writeln(sprintf('%s: %s', $label, $count));
+        }
+    }
+}
diff --git a/Classes/Command/ImportCoreCommand.php b/Classes/Command/ImportCoreCommand.php
new file mode 100644
index 0000000..4894779
--- /dev/null
+++ b/Classes/Command/ImportCoreCommand.php
@@ -0,0 +1,45 @@
+<?php
+namespace T3Monitor\T3monitoring\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use T3Monitor\T3monitoring\Service\Import\CoreImport;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+/**
+ * Monitoring command controller
+ */
+class ImportCoreCommand extends Command
+{
+
+    /**
+     * Configure the command by defining the name, options and arguments
+     */
+    protected function configure()
+    {
+        $this->setDescription('Import core');
+    }
+
+    /**
+     * Executes the command for adding the lock file
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \Doctrine\DBAL\ConnectionException
+     * @throws \TYPO3\CMS\Extbase\Object\Exception
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $objectManager->get(CoreImport::class)->run();
+    }
+}
diff --git a/Classes/Command/ImportExtensionsCommand.php b/Classes/Command/ImportExtensionsCommand.php
new file mode 100644
index 0000000..c763908
--- /dev/null
+++ b/Classes/Command/ImportExtensionsCommand.php
@@ -0,0 +1,44 @@
+<?php
+namespace T3Monitor\T3monitoring\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+/**
+ * Monitoring command controller
+ */
+class ImportExtensionsCommand extends Command
+{
+    /**
+     * Configure the command by defining the name, options and arguments
+     */
+    protected function configure()
+    {
+        $this->setDescription('Import extensions');
+    }
+
+    /**
+     * Executes the command for adding the lock file
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \TYPO3\CMS\Extbase\Object\Exception
+     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $objectManager->get(ExtensionImport::class)->run();
+    }
+}
diff --git a/Classes/Command/MonitoringCommandController.php b/Classes/Command/MonitoringCommandController.php
deleted file mode 100644
index 7c987b1..0000000
--- a/Classes/Command/MonitoringCommandController.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-namespace T3Monitor\T3monitoring\Command;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use T3Monitor\T3monitoring\Service\Import\ClientImport;
-use T3Monitor\T3monitoring\Service\Import\CoreImport;
-use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
-use TYPO3\CMS\Extbase\Mvc\Controller\CommandController;
-
-/**
- * Monitoring command controller
- */
-class MonitoringCommandController extends CommandController
-{
-
-    /**
-     * Import core versions
-     */
-    public function importCoreCommand()
-    {
-        $import = $this->objectManager->get(CoreImport::class);
-        $import->run();
-    }
-
-    /**
-     * Import extensions
-     */
-    public function importExtensionsCommand()
-    {
-        $import = $this->objectManager->get(ExtensionImport::class);
-        $import->run();
-    }
-
-    /**
-     * Import clients
-     */
-    public function importClientsCommand()
-    {
-        $import = $this->objectManager->get(ClientImport::class);
-        $import->run();
-
-        $result = $import->getResponseCount();
-        foreach ($result as $label => $count) {
-            $this->outputLine(sprintf('%s: %s', $label, $count));
-        }
-    }
-
-    /**
-     * Import all: core, extensions, clients
-     */
-    public function importAllCommand()
-    {
-        $this->importCoreCommand();
-        $this->importExtensionsCommand();
-        $this->importClientsCommand();
-    }
-}
diff --git a/Classes/Command/ReportAdminCommand.php b/Classes/Command/ReportAdminCommand.php
new file mode 100644
index 0000000..690bf70
--- /dev/null
+++ b/Classes/Command/ReportAdminCommand.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace T3Monitor\T3monitoring\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use T3Monitor\T3monitoring\Domain\Model\Client;
+use T3Monitor\T3monitoring\Domain\Model\Extension;
+use T3Monitor\T3monitoring\Domain\Repository\ClientRepository;
+use T3Monitor\T3monitoring\Notification\EmailNotification;
+use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+/**
+ * Report command controller
+ */
+class ReportAdminCommand extends Command
+{
+    /** @var Client[] */
+    protected $clients = [];
+
+    /**
+     * Configure the command by defining the name, options and arguments
+     */
+    protected function configure()
+    {
+        $this->addArgument('email', InputArgument::OPTIONAL, 'Email address to send report to', '');
+        $this->setDescription('Generate collective report for all insecure clients (core or extensions)');
+    }
+
+    protected function initialize(InputInterface $input, OutputInterface $output)
+    {
+        parent::initialize($input, $output);
+
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $this->clients = $objectManager->get(ClientRepository::class)->getAllForReport();
+    }
+
+    /**
+     * Executes the command for adding the lock file
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \TYPO3\CMS\Extbase\Object\Exception
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        if (count($this->clients) === 0) {
+            $output->writeln($this->getLabel('noInsecureClients'));
+            return;
+        }
+
+        $email = $input->getArgument('email');
+
+        if ($email !== '') {
+            if (GeneralUtility::validEmail($email)) {
+                GeneralUtility::makeInstance(EmailNotification::class)->sendAdminEmail($email, $this->clients);
+            } else {
+                throw new \UnexpectedValueException(sprintf('Email address "%s" is invalid!', $email));
+            }
+        } else {
+            $collectedClientData = [];
+            foreach ($this->clients as $client) {
+                $insecureExtensions = [];
+                if ($client->getInsecureExtensions()) {
+                    $extensions = $client->getExtensions();
+                    foreach ($extensions as $extension) {
+                        /** @var Extension $extension */
+                        if ($extension->isInsecure()) {
+                            $insecureExtensions[] = sprintf('%s (%s)', $extension->getName(), $extension->getVersion());
+                        }
+                    }
+                }
+
+                $collectedClientData[] = [
+                    $client->getTitle(),
+                    $client->getCore()->isInsecure() ? $client->getCore()->getVersion() : '✓',
+                    $insecureExtensions ? implode(', ', $insecureExtensions) : ''
+                ];
+            }
+
+            $header = [
+                $this->getLabel('tx_t3monitoring_domain_model_client'),
+                $this->getLabel('tx_t3monitoring_domain_model_client.insecure_core'),
+                $this->getLabel('tx_t3monitoring_domain_model_client.insecure_extensions'),
+            ];
+            $style = new SymfonyStyle($input, $output);
+            $style->table($header, $collectedClientData);
+        }
+    }
+
+    protected function getLabel(string $key): string
+    {
+        /** @var LanguageService $languageService */
+        $languageService = $GLOBALS['LANG'];
+        return $languageService->sL('LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:' . $key);
+    }
+}
diff --git a/Classes/Command/ReportClientCommand.php b/Classes/Command/ReportClientCommand.php
new file mode 100644
index 0000000..0204a41
--- /dev/null
+++ b/Classes/Command/ReportClientCommand.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace T3Monitor\T3monitoring\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use T3Monitor\T3monitoring\Domain\Repository\ClientRepository;
+use T3Monitor\T3monitoring\Notification\EmailNotification;
+use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+/**
+ * Report command controller
+ */
+class ReportClientCommand extends Command
+{
+    /**
+     * Configure the command by defining the name, options and arguments
+     */
+    protected function configure()
+    {
+        $this->setDescription('Report clients');
+    }
+
+    /**
+     * Executes the command for adding the lock file
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \TYPO3\CMS\Extbase\Object\Exception
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $clients = $objectManager->get(ClientRepository::class)->getAllForReport(true);
+        if (count($clients) === 0) {
+            $output->writeln($this->getLabel('noInsecureClients'));
+            return;
+        }
+
+        GeneralUtility::makeInstance(EmailNotification::class)->sendClientEmail($clients);
+    }
+
+    protected function getLabel(string $key): string
+    {
+        /** @var LanguageService $languageService */
+        $languageService = $GLOBALS['LANG'];
+        return $languageService->sL('LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:' . $key);
+    }
+}
diff --git a/Classes/Command/ReportCommandController.php b/Classes/Command/ReportCommandController.php
deleted file mode 100644
index a110449..0000000
--- a/Classes/Command/ReportCommandController.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace T3Monitor\T3monitoring\Command;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use T3Monitor\T3monitoring\Domain\Model\Extension;
-use T3Monitor\T3monitoring\Domain\Repository\ClientRepository;
-use T3Monitor\T3monitoring\Notification\EmailNotification;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Mvc\Controller\CommandController;
-use TYPO3\CMS\Lang\LanguageService;
-use UnexpectedValueException;
-
-/**
- * Report command controller
- */
-class ReportCommandController extends CommandController
-{
-
-    /** @var EmailNotification */
-    protected $emailNotification;
-
-    /** @var LanguageService */
-    protected $languageService;
-
-    /** @var ClientRepository */
-    protected $clientRepository;
-
-    /**
-     * @param \T3Monitor\T3monitoring\Domain\Repository\ClientRepository $clientRepository
-     */
-    public function injectClientRepository(ClientRepository $clientRepository)
-    {
-        $this->clientRepository = $clientRepository;
-    }
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->emailNotification = GeneralUtility::makeInstance(EmailNotification::class);
-        $this->languageService = $GLOBALS['LANG'];
-    }
-
-    /**
-     * Generate collective report for all insecure clients (core or extensions)
-     *
-     * @param string $email Send email to this email address
-     * @throws \UnexpectedValueException
-     */
-    public function adminCommand(string $email = '')
-    {
-        $clients = $this->clientRepository->getAllForReport();
-
-        if (count($clients) === 0) {
-            $this->outputLine($this->getLabel('noInsecureClients'));
-            return;
-        }
-
-        if (!empty($email)) {
-            if (GeneralUtility::validEmail($email)) {
-                $this->emailNotification->sendAdminEmail($email, $clients);
-            } else {
-                throw new UnexpectedValueException(sprintf('Email address "%s" is invalid!', $email));
-            }
-        } else {
-            $collectedClientData = [];
-            foreach ($clients as $client) {
-                $insecureExtensions = [];
-                if ($client->getInsecureExtensions()) {
-                    $extensions = $client->getExtensions();
-                    foreach ($extensions as $extension) {
-                        /** @var Extension $extension */
-                        if ($extension->isInsecure()) {
-                            $insecureExtensions[] = sprintf('%s (%s)', $extension->getName(), $extension->getVersion());
-                        }
-                    }
-                }
-
-                $collectedClientData[] = [
-                    $client->getTitle(),
-                    $client->getCore()->isInsecure() ? $client->getCore()->getVersion() : '✓',
-                    $insecureExtensions ? implode(', ', $insecureExtensions) : ''
-                ];
-            }
-
-            $header = [
-                $this->getLabel('tx_t3monitoring_domain_model_client'),
-                $this->getLabel('tx_t3monitoring_domain_model_client.insecure_core'),
-                $this->getLabel('tx_t3monitoring_domain_model_client.insecure_extensions'),
-            ];
-            $this->output->outputTable($collectedClientData, $header);
-        }
-    }
-
-    /**
-     * Client command
-     */
-    public function clientCommand()
-    {
-        $clients = $this->clientRepository->getAllForReport(true);
-
-        if (count($clients) === 0) {
-            $this->outputLine($this->getLabel('noInsecureClients'));
-            return;
-        }
-
-        $this->emailNotification->sendClientEmail($clients);
-    }
-
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getLabel($key): string
-    {
-        return $this->languageService->sL('LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:' . $key);
-    }
-}
diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index 7c3dd72..47c40b3 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -15,17 +15,16 @@
 use T3Monitor\T3monitoring\Domain\Repository\CoreRepository;
 use T3Monitor\T3monitoring\Domain\Repository\StatisticRepository;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
-use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Class BaseController
@@ -163,8 +162,10 @@ protected function getButtons()
             $buttonBar->addButton($viewButton);
         }
 
+        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+
         // Buttons for new records
-        $returnUrl = rawurlencode(BackendUtility::getModuleUrl('tools_T3monitoringT3monitor', [
+        $returnUrl = rawurlencode($uriBuilder->buildUriFromRoute('tools_T3monitoringT3monitor', [
             'tx_t3monitoring_tools_t3monitoringt3monitor' => [
                 'action' => $this->request->getControllerActionName(),
                 'controller' => $this->request->getControllerName()
@@ -175,7 +176,7 @@ protected function getButtons()
         // new client
         $parameters = GeneralUtility::explodeUrl2Array('edit[tx_t3monitoring_domain_model_client][' . $pid . ']=new&returnUrl=' . $returnUrl);
         $addUserGroupButton = $buttonBar->makeLinkButton()
-            ->setHref(BackendUtility::getModuleUrl('record_edit', $parameters))
+            ->setHref($uriBuilder->buildUriFromRoute('record_edit', $parameters))
             ->setTitle($this->getLabel('createNew.client'))
             ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-document-new',
                 Icon::SIZE_SMALL));
@@ -190,14 +191,13 @@ protected function getButtons()
             $clientId = (int)$arguments['client'];
             $parameters = GeneralUtility::explodeUrl2Array('edit[tx_t3monitoring_domain_model_client][' . $clientId . ']=edit&returnUrl=' . $returnUrl);
             $editClientButton = $buttonBar->makeLinkButton()
-                ->setHref(BackendUtility::getModuleUrl('record_edit', $parameters))
+                ->setHref($uriBuilder->buildUriFromRoute('record_edit', $parameters))
                 ->setTitle($this->getLabel('edit.client'))
                 ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-open',
                     Icon::SIZE_SMALL));
             $buttonBar->addButton($editClientButton, ButtonBar::BUTTON_POSITION_LEFT);
 
             // fetch client data
-            $arguments = $this->request->getArguments();
             $downloadClientDataButton = $buttonBar->makeLinkButton()
                 ->setHref($this->getUriBuilder()->reset()->uriFor('fetch', ['client' => $clientId], 'Client'))
                 ->setTitle($this->getLabel('fetchClient.link'))
diff --git a/Classes/Controller/ClientController.php b/Classes/Controller/ClientController.php
index 8319f33..de8a0c7 100644
--- a/Classes/Controller/ClientController.php
+++ b/Classes/Controller/ClientController.php
@@ -23,7 +23,7 @@ class ClientController extends BaseController
      * Show client
      *
      * @param Client $client
-     * @ignorevalidation $client
+     * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation $client
      * @return void
      */
     public function showAction(Client $client = null)
@@ -42,7 +42,7 @@ public function showAction(Client $client = null)
      * Fetch client
      *
      * @param Client $client
-     * @ignorevalidation $client
+     * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation $client
      */
     public function fetchAction(Client $client = null)
     {
diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index decf83d..dbcef66 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -20,13 +20,13 @@ class Client extends AbstractEntity
 
     /**
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $title = '';
 
     /**
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $domain = '';
 
@@ -57,7 +57,7 @@ class Client extends AbstractEntity
 
     /**
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $secret = '';
 
@@ -133,25 +133,25 @@ class Client extends AbstractEntity
 
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Extension>
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $extensions = null;
 
     /**
      * @var \T3Monitor\T3monitoring\Domain\Model\Core
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $core = null;
 
     /**
      * @var \T3Monitor\T3monitoring\Domain\Model\Sla
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $sla = null;
 
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Tag>
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $tag = null;
 
diff --git a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
index 6c20c0e..a13ee83 100644
--- a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
+++ b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
@@ -9,7 +9,9 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\SingletonInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Extension configuration
@@ -40,7 +42,7 @@ class EmMonitoringConfiguration implements SingletonInterface
 
     public function __construct()
     {
-        $settings = (array)unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['t3monitoring']);
+        $settings = (array)GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('t3monitoring');
         foreach ($settings as $key => $value) {
             if (property_exists(__CLASS__, $key)) {
                 $this->$key = $value;
diff --git a/Classes/Domain/Model/Extension.php b/Classes/Domain/Model/Extension.php
index 1346170..100fc8f 100644
--- a/Classes/Domain/Model/Extension.php
+++ b/Classes/Domain/Model/Extension.php
@@ -52,7 +52,7 @@ class Extension extends AbstractEntity
 
     /**
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $name = '';
 
diff --git a/Classes/Domain/Model/Sla.php b/Classes/Domain/Model/Sla.php
index faf4d2b..cc415d8 100644
--- a/Classes/Domain/Model/Sla.php
+++ b/Classes/Domain/Model/Sla.php
@@ -18,7 +18,7 @@ class Sla extends AbstractEntity
 
     /**
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $title = '';
 
diff --git a/Classes/Domain/Model/Tag.php b/Classes/Domain/Model/Tag.php
index 3da9af6..b31b1c5 100644
--- a/Classes/Domain/Model/Tag.php
+++ b/Classes/Domain/Model/Tag.php
@@ -18,7 +18,7 @@ class Tag extends AbstractEntity
 
     /**
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $title = '';
 
diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php
new file mode 100644
index 0000000..df02612
--- /dev/null
+++ b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace T3Monitor\T3monitoring\Domain\TypeConverter;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface;
+use TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter;
+
+/**
+ * Class ClientFilterDemandConverter
+ */
+class ClientFilterDemandConverterV10 extends AbstractTypeConverter
+{
+    /**
+     * @var array<string>
+     */
+    protected $sourceTypes = ['array', 'string'];
+
+    /**
+     * @var string
+     */
+    protected $targetType = ClientFilterDemand::class;
+
+    /**
+     * @var int
+     */
+    protected $priority = 10;
+
+    /**
+     * Actually convert from $source to $targetType, by doing a typecast.
+     *
+     * @param mixed $source
+     * @param string $targetType
+     * @param array $convertedChildProperties
+     * @param PropertyMappingConfigurationInterface $configuration
+     * @return float|\TYPO3\CMS\Extbase\Error\Error
+     * @api
+     */
+    public function convertFrom(
+        $source,
+        $targetType,
+        array $convertedChildProperties = [],
+        PropertyMappingConfigurationInterface $configuration = null
+    ) {
+        if (!$this->isAllowed()) {
+            return null;
+        }
+        $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
+        $properties = $vars['filter'];
+
+        $object = GeneralUtility::makeInstance($this->targetType);
+        foreach ($properties as $key => $value) {
+            if (property_exists($object, $key)) {
+                $setter = 'set' . ucfirst($key);
+                $object->$setter($value);
+            }
+        }
+        return $object;
+    }
+
+    public function canConvertFrom($source, string $targetType): bool
+    {
+        return $this->isAllowed();
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAllowed()
+    {
+        $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
+        return isset($vars) && is_array($vars['filter']);
+    }
+}
diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
similarity index 92%
rename from Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
rename to Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
index 88d0aec..c902684 100644
--- a/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
+++ b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
@@ -17,7 +17,7 @@
 /**
  * Class ClientFilterDemandConverter
  */
-class ClientFilterDemandConverter extends AbstractTypeConverter
+class ClientFilterDemandConverterV9 extends AbstractTypeConverter
 {
     /**
      * @var array<string>
@@ -82,10 +82,6 @@ public function canConvertFrom($source, $targetType)
     protected function isAllowed()
     {
         $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
-        if (!isset($vars) || !is_array($vars['filter'])) {
-            return false;
-        }
-
-        return true;
+        return isset($vars) && is_array($vars['filter']);
     }
 }
diff --git a/Classes/Hooks/DataHandlerHook.php b/Classes/Hooks/DataHandlerHook.php
index 6c84c06..5ec1cdd 100644
--- a/Classes/Hooks/DataHandlerHook.php
+++ b/Classes/Hooks/DataHandlerHook.php
@@ -95,7 +95,7 @@ protected function addFlashMessage($message, $severity = FlashMessage::INFO)
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
diff --git a/Classes/Notification/EmailNotification.php b/Classes/Notification/EmailNotification.php
index 64a7ba9..e05520f 100644
--- a/Classes/Notification/EmailNotification.php
+++ b/Classes/Notification/EmailNotification.php
@@ -8,32 +8,26 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Symfony\Component\Mime\Address;
 use T3Monitor\T3monitoring\Domain\Model\Client;
-use T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration;
 use TYPO3\CMS\Core\Mail\MailMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use UnexpectedValueException;
 
 /**
  * Class EmailNotification
  */
-class EmailNotification
+class EmailNotification implements LoggerAwareInterface
 {
+    use LoggerAwareTrait;
+
     const DEFAULT_EMAIL_NAME = 'EXT:t3monitoring';
     const DEFAULT_EMAIL_ADDRESS = 'no-reply@example.com';
 
-    /** @var  EmMonitoringConfiguration */
-    protected $emConfiguration;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->emConfiguration = GeneralUtility::makeInstance(EmMonitoringConfiguration::class);
-    }
-
     /**
      * @param string $email
      * @param \T3Monitor\T3monitoring\Domain\Model\Client[] $clients
@@ -77,22 +71,13 @@ public function sendClientEmail($clients, $subject = 'Monitoring Report')
         }
     }
 
-    /**
-     * @param array $clients
-     * @param string $subject
-     */
-    public function sendClientFailedEmail(array $clients, $subject = 'Monitoring Client Connection Failure')
+    public function sendClientFailedEmail(array $clients, string $emailAddress, $subject = 'Monitoring Client Connection Failure')
     {
-        $emailAddress = $this->emConfiguration->getEmailForFailedClient();
         if (empty($emailAddress)) {
             return;
         }
         if (!GeneralUtility::validEmail($emailAddress)) {
-            GeneralUtility::sysLog(
-                sprintf('The email address "%s" is not valid, no notification sent', $emailAddress),
-                't3monitoring',
-                GeneralUtility::SYSLOG_SEVERITY_WARNING
-            );
+            $this->logger->warning(sprintf('The email address "%s" is not valid, no notification sent', $emailAddress));
         }
         $arguments = [
             'clients' => $clients,
@@ -109,18 +94,31 @@ public function sendClientFailedEmail(array $clients, $subject = 'Monitoring Cli
      * @param string $htmlContent
      * @return int
      */
-    protected function sendMail($to, $subject, $plainContent, $htmlContent = '')
+    protected function sendMail(string $to, string $subject, string $plainContent, string $htmlContent = '')
     {
         /** @var MailMessage $mailMessage */
         $mailMessage = GeneralUtility::makeInstance(MailMessage::class);
-        $mailMessage
-            ->setSubject($subject)
-            ->addFrom($this->getSenderEmailAddress(), $this->getSenderEmailName())
-            ->setTo($to)
-            ->setBody($plainContent)->setContentType('text/plain');
-        if (!empty($htmlContent)) {
-            $mailMessage->addPart($htmlContent, 'text/emailText');
+        $isv10 = VersionNumberUtility::convertVersionNumberToInteger('10.0') <= VersionNumberUtility::convertVersionNumberToInteger(TYPO3_branch);
+        if ($isv10) {
+            $mailMessage
+                ->setTo($to)
+                ->setSubject($subject)
+                ->text($plainContent)
+                ->addFrom(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()));
+            if (!empty($htmlContent)) {
+                $mailMessage->html($htmlContent);
+            }
+        } else {
+            $mailMessage
+                ->setTo($to)
+                ->setSubject($subject)
+                ->setBody($plainContent)->setContentType('text/plain')
+                ->addFrom($this->getSenderEmailAddress(), $this->getSenderEmailName());
+            if (!empty($htmlContent)) {
+                $mailMessage->addPart($htmlContent, 'text/html');
+            }
         }
+
         return $mailMessage->send();
     }
 
diff --git a/Classes/Service/BulletinImport.php b/Classes/Service/BulletinImport.php
index db41dac..0cc0b93 100644
--- a/Classes/Service/BulletinImport.php
+++ b/Classes/Service/BulletinImport.php
@@ -8,8 +8,6 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use DOMDocument;
-
 /**
  * Class BulletinImport
  */
@@ -38,8 +36,9 @@ public function start()
     {
         $feed = [];
         try {
-            $rss = new DOMDocument();
+            $rss = new \DOMDocument();
             $rss->load($this->url);
+            /** @var \DOMElement $node */
             foreach ($rss->getElementsByTagName('item') as $node) {
                 $feed[] = [
                     'title' => $node->getElementsByTagName('title')->item(0)->nodeValue,
diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index d9b138f..2ac6856 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -10,7 +10,6 @@
  */
 
 use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -54,8 +53,7 @@ protected function getLatestExtensionVersion()
         $table = 'tx_t3monitoring_domain_model_extension';
 
         // Patch release
-        $connection = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getConnectionForTable($table);
+        $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($table);
 
         $queryBuilder = $connection->createQueryBuilder();
         $eb = $queryBuilder->expr();
@@ -101,8 +99,7 @@ protected function getLatestExtensionVersion()
         }
 
         // Minor release
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($table);
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
         $res = $queryBuilder
             ->select('name', 'major_version')
             ->from($table)
@@ -171,8 +168,7 @@ protected function getNextSecureExtensionVersion()
     {
         $table = 'tx_t3monitoring_domain_model_extension';
 
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($table);
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
         $insecureExtensions = $queryBuilder
             ->select('uid', 'name', 'version_integer')
             ->from($table)
@@ -209,8 +205,7 @@ protected function getNextSecureExtensionVersion()
     protected function usedCore()
     {
         $table = 'tx_t3monitoring_domain_model_core';
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($table);
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
         $rows = $queryBuilder
             ->select('tx_t3monitoring_domain_model_core.uid')
             ->from($table)
@@ -227,8 +222,7 @@ protected function usedCore()
             $coreRows[$row['uid']] = $row;
         }
 
-        $connection = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getConnectionForTable($table);
+        $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($table);
         $qb = $connection->createQueryBuilder();
         $qb->update($table)
             ->set('is_used', 0)
@@ -314,10 +308,4 @@ protected function usedExtensions()
             ->set('is_used', 1)
             ->where($queryBuilder->expr()->in('uid', $subSelect));
     }
-
-    protected function getQueryBuilderFor(string $table): QueryBuilder
-    {
-        return GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($table);
-    }
 }
diff --git a/Classes/Service/Import/BaseImport.php b/Classes/Service/Import/BaseImport.php
index faff856..c78db4c 100644
--- a/Classes/Service/Import/BaseImport.php
+++ b/Classes/Service/Import/BaseImport.php
@@ -9,7 +9,6 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration;
-use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -41,12 +40,4 @@ protected function setImportTime($action)
     {
         $this->registry->set('t3monitoring', 'import' . ucfirst($action), $GLOBALS['EXEC_TIME']);
     }
-
-    /**
-     * @return DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
 }
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 131ea1f..e88f1da 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -77,7 +77,7 @@ public function run(int $clientId = 0)
         if ($this->responseCount['error'] > 0) {
             $clientsForMailNotification = $this->getClientsForMailNotification();
             if (count($clientsForMailNotification) > 0) {
-                $this->emailNotification->sendClientFailedEmail($clientsForMailNotification);
+                $this->emailNotification->sendClientFailedEmail($clientsForMailNotification, $this->emConfiguration->getEmailForFailedClient());
             }
         }
 
diff --git a/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php b/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php
index 90263b0..89c8497 100644
--- a/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php
+++ b/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php
@@ -11,34 +11,25 @@
 
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class AdditionalExtensionDataViewHelper
  */
-class AdditionalExtensionDataViewHelper extends AbstractViewHelper implements CompilableInterface
+class AdditionalExtensionDataViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /** @var bool */
     protected $escapeOutput = false;
 
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('client', 'int', 'Client', true);
         $this->registerArgument('extension', 'int', 'Extension', true);
         $this->registerArgument('as', 'string', 'Output variable', true);
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $queryBuilderCoreExtensions = GeneralUtility::makeInstance(ConnectionPool::class)
diff --git a/Classes/ViewHelpers/AvailableUpdatesViewHelper.php b/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
index 433f847..dfdb9ba 100644
--- a/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
+++ b/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
@@ -13,34 +13,25 @@
 use T3Monitor\T3monitoring\Domain\Model\Extension;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class AvailableUpdatesViewHelper
  */
-class AvailableUpdatesViewHelper extends AbstractViewHelper implements CompilableInterface
+class AvailableUpdatesViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /** @var bool */
     protected $escapeOutput = false;
 
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('extension', Extension::class, 'Extension', true);
         $this->registerArgument('core', Core::class, 'Core', true);
         $this->registerArgument('as', 'string', 'Output variable', false, 'list');
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         /** @var Extension $extension */
diff --git a/Classes/ViewHelpers/EditRecordViewHelper.php b/Classes/ViewHelpers/EditRecordViewHelper.php
index 213f64f..792b8f9 100644
--- a/Classes/ViewHelpers/EditRecordViewHelper.php
+++ b/Classes/ViewHelpers/EditRecordViewHelper.php
@@ -9,40 +9,25 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Edit Record ViewHelper, see FormEngine logic
  */
-class EditRecordViewHelper extends AbstractViewHelper implements CompilableInterface
+class EditRecordViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
-    /**
-     */
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('parameters', 'string', 'parameters', true);
     }
 
-    /**
-     * @param array $arguments
-     * @param callable|\Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public static function renderStatic(
-        array $arguments,
-        \Closure $renderChildrenClosure,
-        RenderingContextInterface $renderingContext
-    ) {
+    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    {
         $parameters = GeneralUtility::explodeUrl2Array($arguments['parameters']);
 
         $parameters['returnUrl'] = 'index.php?M=tools_T3monitoringT3monitor&moduleToken='
@@ -50,6 +35,7 @@ public static function renderStatic(
             . GeneralUtility::implodeArrayForUrl(
                 'tx_t3monitoring_tools_t3monitoringt3monitor',
                 GeneralUtility::_GPmerged('tx_t3monitoring_tools_t3monitoringt3monitor'));
-        return BackendUtility::getModuleUrl('record_edit', $parameters);
+        $uriBuild = GeneralUtility::makeInstance(UriBuilder::class);
+        return $uriBuild->buildUriFromRoute('record_edit', $parameters);
     }
 }
diff --git a/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php b/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php
index 364e74f..7b74fa6 100644
--- a/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php
+++ b/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php
@@ -9,34 +9,24 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use DateTime;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class DateTimeAgeViewHelper
  */
-class DateTimeAgeViewHelper extends AbstractViewHelper implements CompilableInterface
+class DateTimeAgeViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     public function initializeArguments()
     {
-        $this->registerArgument('date', DateTime::class, 'date', true);
+        parent::initializeArguments();
+        $this->registerArgument('date', \DateTime::class, 'date', true);
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
-        /** @var DateTime $date */
+        /** @var \DateTime $date */
         $date = $arguments['date'];
         if ($date === null) {
             return '';
diff --git a/Classes/ViewHelpers/Format/DependenciesViewHelper.php b/Classes/ViewHelpers/Format/DependenciesViewHelper.php
index ec220c4..042a81d 100644
--- a/Classes/ViewHelpers/Format/DependenciesViewHelper.php
+++ b/Classes/ViewHelpers/Format/DependenciesViewHelper.php
@@ -9,18 +9,14 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class DependenciesViewHelper
  */
-class DependenciesViewHelper extends AbstractViewHelper implements CompilableInterface
+class DependenciesViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     /** @var bool */
     protected $escapeOutput = false;
 
@@ -29,15 +25,10 @@ class DependenciesViewHelper extends AbstractViewHelper implements CompilableInt
 
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('dependencies', 'string', 'dependencies');
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $dependencies = $arguments['dependencies'] ?: $renderChildrenClosure();
diff --git a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
index 53062f6..9a7fc3c 100644
--- a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
+++ b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
@@ -12,26 +12,18 @@
 use T3Monitor\T3monitoring\Domain\Model\Extension;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
  * Class ExtensionCategoryViewHelper
  */
 class ExtensionCategoryViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('category', 'int', 'category', false, 0);
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $category = $arguments['category'] ?: $renderChildrenClosure();
diff --git a/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php b/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php
index 5139cc4..deda291 100644
--- a/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php
+++ b/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php
@@ -10,29 +10,20 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Extension;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class ExtensionStateViewHelper
  */
-class ExtensionStateViewHelper extends AbstractViewHelper implements CompilableInterface
+class ExtensionStateViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('state', 'int', 'state', false, 0);
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $state = $arguments['state'] ?: $renderChildrenClosure();
diff --git a/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php b/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php
index acf6a46..e4671b3 100644
--- a/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php
+++ b/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php
@@ -9,30 +9,20 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use T3Monitor\T3monitoring\Domain\Model\Extension;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class MysqlVersionViewHelper
  */
-class MysqlVersionViewHelper extends AbstractViewHelper implements CompilableInterface
+class MysqlVersionViewHelper extends AbstractViewHelper
 {
-    use CompileWithRenderStatic;
-
     public function initializeArguments()
     {
+        parent::initializeArguments();
         $this->registerArgument('version', 'string', 'state', false, '');
     }
 
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $version = $arguments['version'] ?: $renderChildrenClosure();
diff --git a/Classes/Xclass/Typo3DbBackendXclassed.php b/Classes/Xclass/Typo3DbBackendXclassed.php
deleted file mode 100644
index b74afa5..0000000
--- a/Classes/Xclass/Typo3DbBackendXclassed.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-namespace T3Monitor\T3monitoring\Xclass;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbBackend;
-
-/**
- * Xclassed Typo3DbBackend
- */
-class Typo3DbBackendXclassed extends Typo3DbBackend
-{
-
-    /**
-     * Fetches the rows directly from the database, not using prepared statement
-     *
-     * @param array $statementParts
-     * @return array the result
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException
-     */
-    protected function getRowsFromDatabase(array $statementParts)
-    {
-        $queryCommandParameters = $this->createQueryCommandParametersFromStatementParts($statementParts);
-
-        // Xclass start
-        if ($queryCommandParameters['orderBy'] === 'tx_t3monitoring_client_extension_mm.sorting ASC' && $queryCommandParameters['selectFields'] === ' tx_t3monitoring_domain_model_extension.*') {
-            $queryCommandParameters['orderBy'] = 'tx_t3monitoring_domain_model_extension.insecure DESC, tx_t3monitoring_client_extension_mm.is_loaded ASC, tx_t3monitoring_domain_model_extension.name asc';
-        }
-        // Xclass end
-
-        $rows = $this->databaseHandle->exec_SELECTgetRows(
-            $queryCommandParameters['selectFields'],
-            $queryCommandParameters['fromTable'],
-            $queryCommandParameters['whereClause'],
-            '',
-            $queryCommandParameters['orderBy'],
-            $queryCommandParameters['limit']
-        );
-        $this->checkSqlErrors();
-
-        return $rows;
-    }
-}
diff --git a/Configuration/Commands.php b/Configuration/Commands.php
new file mode 100644
index 0000000..af2376e
--- /dev/null
+++ b/Configuration/Commands.php
@@ -0,0 +1,22 @@
+<?php
+
+return [
+    'monitoring:importCore' => [
+        'class' => T3Monitor\T3monitoring\Command\ImportCoreCommand::class,
+    ],
+    'monitoring:importExtensions' => [
+        'class' => T3Monitor\T3monitoring\Command\ImportExtensionsCommand::class,
+    ],
+    'monitoring:importClients' => [
+        'class' => T3Monitor\T3monitoring\Command\ImportClientsCommand::class,
+    ],
+    'monitoring:importAll' => [
+        'class' => T3Monitor\T3monitoring\Command\ImportAllCommand::class,
+    ],
+    'reporting:admin' => [
+        'class' => T3Monitor\T3monitoring\Command\ReportAdminCommand::class,
+    ],
+    'reporting:client' => [
+        'class' => T3Monitor\T3monitoring\Command\ReportClientCommand::class,
+    ],
+];
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index c3a660e..180eb2e 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -11,13 +11,13 @@
             'disabled' => 'hidden',
         ],
         'searchFields' => 'title,domain,secret,email,php_version,mysql_version,disk_total_space,disk_free_space,insecure_core,outdated_core,insecure_extensions,outdated_extensions,error_message,extensions,core,sla,tag',
-        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg '
+        'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg'
     ],
     'interface' => [
         'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, host_header, ignore_cert_errors, force_ip_resolve, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
     ],
     'types' => [
-        '1' => [
+        1 => [
             'showitem' => '
         --div--;General,--palette--;;paletteTitle, --palette--;;paletteDomain,email,sla,tag,
         --div--;Readonly information,last_successful_import,error_message,--palette--;;paletteCore, --palette--;;paletteExtensions, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,
@@ -40,6 +40,7 @@
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
+                'default' => 0,
             ],
         ],
         'title' => [
@@ -106,8 +107,6 @@
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'minitems' => 1,
-                'maxitems' => 1,
                 'items' => [
                     ['', ''],
                     ['IPv4', 'v4'],
@@ -132,7 +131,6 @@
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_t3monitoring_domain_model_sla',
                 'minitems' => 0,
-                'maxitems' => 1,
                 'default' => 0,
                 'items' => [
                     ['', 0]
@@ -296,7 +294,6 @@
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_t3monitoring_domain_model_core',
                 'minitems' => 0,
-                'maxitems' => 1,
             ],
         ],
     ],
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_core.php b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
index 1e96df3..a6a0628 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_core.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
@@ -59,9 +59,6 @@
                     ['LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.4', 4],
                 ],
                 'default' => 0,
-                'size' => 1,
-                'maxitems' => 1,
-                'eval' => ''
             ],
         ],
         'release_date' => [
@@ -71,7 +68,6 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime',
-                'default' => '0000-00-00 00:00:00'
             ],
         ],
         'latest' => [
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index 9c272df..46521d8 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -9,8 +9,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'enablecolumns' => [
-        ],
+        'enablecolumns' => [],
         'searchFields' => 'name,version,insecure,next_secure_version,title,description,last_updated,author_name,update_comment,state,category,version_integer,is_used,is_official,is_modified,is_latest,last_bugfix_release,last_minor_release,last_major_release,serialized_dependencies,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg'
     ],
@@ -18,10 +17,10 @@
         'showRecordFieldList' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest, last_bugfix_release, last_minor_release, last_major_release, serialized_dependencies',
     ],
     'types' => [
-        '1' => ['showitem' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest,last_bugfix_release, last_minor_release, last_major_release, typo3_min_version,typo3_max_version,serialized_dependencies'],
+        1 => ['showitem' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest,last_bugfix_release, last_minor_release, last_major_release, typo3_min_version,typo3_max_version,serialized_dependencies'],
     ],
     'palettes' => [
-        '1' => ['showitem' => ''],
+        1 => ['showitem' => ''],
     ],
     'columns' => [
         'name' => [
@@ -79,7 +78,6 @@
                 'dbType' => 'datetime',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime',
-                'default' => '0000-00-00 00:00:00'
             ],
         ],
         'author_name' => [
@@ -107,9 +105,6 @@
                 'items' => [
                     ['-- Label --', 0],
                 ],
-                'size' => 1,
-                'maxitems' => 1,
-                'eval' => ''
             ],
         ],
         'category' => [
@@ -120,9 +115,6 @@
                 'items' => [
                     ['-- Label --', 0],
                 ],
-                'size' => 1,
-                'maxitems' => 1,
-                'eval' => ''
             ],
         ],
         'version_integer' => [
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
index 206a9cb..171061d 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
@@ -18,7 +18,7 @@
         'showRecordFieldList' => 'hidden, title, description',
     ],
     'types' => [
-        '1' => ['showitem' => 'title, description,
+        1 => ['showitem' => 'title, description,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                 hidden,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,'],
@@ -28,6 +28,7 @@
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
+                'default' => 0,
             ],
         ],
         'title' => [
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
index 049d5f8..a74af2b 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
@@ -18,7 +18,7 @@
         'showRecordFieldList' => 'hidden, title, description',
     ],
     'types' => [
-        '1' => ['showitem' => 'title, description, 
+        1 => ['showitem' => 'title, description, 
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                 hidden,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,'],
@@ -28,6 +28,7 @@
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.hidden',
             'config' => [
                 'type' => 'check',
+                'default' => 0,
             ],
         ],
         'title' => [
diff --git a/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.typoscript
similarity index 100%
rename from Configuration/TypoScript/constants.txt
rename to Configuration/TypoScript/constants.typoscript
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.typoscript
similarity index 100%
rename from Configuration/TypoScript/setup.txt
rename to Configuration/TypoScript/setup.typoscript
diff --git a/Tests/Unit/Command/MonitioringCommandControllerTest.php b/Tests/Unit/Command/MonitioringCommandControllerTest.php
deleted file mode 100644
index 1d616bb..0000000
--- a/Tests/Unit/Command/MonitioringCommandControllerTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-namespace T3Monitor\T3monitoring\Tests\Unit\Command;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use T3Monitor\T3monitoring\Command\MonitoringCommandController;
-use T3Monitor\T3monitoring\Service\Import\ClientImport;
-use T3Monitor\T3monitoring\Service\Import\CoreImport;
-use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
-
-/**
- * Class MonitoringCommandControllerTest
- */
-class MonitioringCommandControllerTest extends UnitTestCase
-{
-
-    /**
-     * @test
-     */
-    public function coreImportCommandWillTriggerCoreImport()
-    {
-        $mockedCommand = $this->getAccessibleMock(MonitoringCommandController::class, ['dummy'], [], '', false);
-        $mockedCoreImport = $this->prophesize(CoreImport::class);
-        $mockedCoreImport->run()->shouldBeCalled();
-
-        $objectManager = $this->prophesize(ObjectManager::class);
-        $objectManager->get(CoreImport::class)->willReturn($mockedCoreImport);
-
-        $mockedCommand->_set('objectManager', $objectManager->reveal());
-        $mockedCommand->_call('importCoreCommand');
-    }
-
-    /**
-     * @test
-     */
-    public function extensionImportCommandWillTriggerExtensionImport()
-    {
-        $mockedCommand = $this->getAccessibleMock(MonitoringCommandController::class, ['dummy'], [], '', false);
-        $mockedImportExtensions = $this->prophesize(ExtensionImport::class);
-        $mockedImportExtensions->run()->shouldBeCalled();
-
-        $objectManager = $this->prophesize(ObjectManager::class);
-        $objectManager->get(ExtensionImport::class)->willReturn($mockedImportExtensions);
-
-        $mockedCommand->_set('objectManager', $objectManager->reveal());
-        $mockedCommand->_call('importExtensionsCommand');
-    }
-
-    /**
-     * @test
-     */
-    public function clientImportCommandWillTriggerClientImport()
-    {
-        $mockedCommand = $this->getAccessibleMock(MonitoringCommandController::class, ['dummy'], [], '', false);
-        $mockedImport = $this->prophesize(ClientImport::class);
-        $mockedImport->getResponseCount()->willReturn([]);
-        $mockedImport->run()->shouldBeCalled();
-
-        $objectManager = $this->prophesize(ObjectManager::class);
-        $objectManager->get(ClientImport::class)->willReturn($mockedImport);
-
-        $mockedCommand->_set('objectManager', $objectManager->reveal());
-        $mockedCommand->_call('importClientsCommand');
-    }
-
-    /**
-     * @test
-     */
-    public function allImportCommandWillTriggerAllImports()
-    {
-        $mockedCommand = $this->getAccessibleMock(MonitoringCommandController::class, ['dummy'], [], '', false);
-        $mockedImportClient = $this->prophesize(ClientImport::class);
-        $mockedImportClient->getResponseCount()->willReturn([]);
-        $mockedImportClient->run()->shouldBeCalled();
-        $mockedCoreImport = $this->prophesize(CoreImport::class);
-        $mockedCoreImport->run()->shouldBeCalled();
-        $mockedImportExtensions = $this->prophesize(ExtensionImport::class);
-        $mockedImportExtensions->run()->shouldBeCalled();
-
-        $objectManager = $this->prophesize(ObjectManager::class);
-        $objectManager->get(ClientImport::class)->willReturn($mockedImportClient);
-        $objectManager->get(CoreImport::class)->willReturn($mockedCoreImport);
-        $objectManager->get(ExtensionImport::class)->willReturn($mockedImportExtensions);
-
-        $mockedCommand->_set('objectManager', $objectManager->reveal());
-        $mockedCommand->_call('importAllCommand');
-    }
-}
diff --git a/Tests/Unit/Command/ReportAdminCommandTest.php b/Tests/Unit/Command/ReportAdminCommandTest.php
new file mode 100644
index 0000000..6e4c580
--- /dev/null
+++ b/Tests/Unit/Command/ReportAdminCommandTest.php
@@ -0,0 +1,48 @@
+<?php
+namespace T3Monitor\T3monitoring\Tests\Unit\Command;
+
+/*
+ * This file is part of the t3monitoring extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+use Prophecy\Prophecy\ObjectProphecy;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use T3Monitor\T3monitoring\Command\ReportAdminCommand;
+use T3Monitor\T3monitoring\Notification\EmailNotification;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * Class ReportCommandControllerTest
+ */
+class ReportAdminCommandTest extends UnitTestCase
+{
+    /**
+     * @test
+     */
+    public function executeWillTriggerEmailNotification()
+    {
+        $dummyClients = ['123', '456'];
+        $emailAddress = 'fo@bar.com';
+
+        /** @var ReportAdminCommand|AccessibleObjectInterface $mockedClientImport */
+        $mockedClientImport = $this->getAccessibleMock(ReportAdminCommand::class, ['dummy'], [], '', false);
+        $mockedClientImport->_set('clients', $dummyClients);
+
+        /** @var EmailNotification|ObjectProphecy $emailNotification */
+        $emailNotification = $this->prophesize(EmailNotification::class);
+        $emailNotification->sendAdminEmail($emailAddress, $dummyClients)->shouldBeCalled();
+        GeneralUtility::addInstance(EmailNotification::class, $emailNotification->reveal());
+
+        /** @var InputInterface|ObjectProphecy $input */
+        $input = $this->prophesize(InputInterface::class);
+        $input->getArgument('email')->willReturn($emailAddress);
+
+        $mockedClientImport->_call('execute', $input->reveal(), $this->prophesize(OutputInterface::class)->reveal());
+    }
+}
diff --git a/Tests/Unit/Command/ReportCommandControllerTest.php b/Tests/Unit/Command/ReportCommandControllerTest.php
deleted file mode 100644
index 8429051..0000000
--- a/Tests/Unit/Command/ReportCommandControllerTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace T3Monitor\T3monitoring\Tests\Unit\Command;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use T3Monitor\T3monitoring\Command\ReportCommandController;
-use T3Monitor\T3monitoring\Domain\Repository\ClientRepository;
-use T3Monitor\T3monitoring\Notification\EmailNotification;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
-use TYPO3\CMS\Lang\LanguageService;
-
-/**
- * Class ReportCommandControllerTest
- */
-class ReportCommandControllerTest extends UnitTestCase
-{
-
-    /**
-     * @test
-     * @throws \InvalidArgumentException
-     */
-    public function reportCommandWillTriggerEmailNotification()
-    {
-        $dummyClients = ['123', '456'];
-        $emailAddress = 'fo@bar.com';
-        $mockedClientImport = $this->getAccessibleMock(ReportCommandController::class, ['outputLine'], [], '', false);
-
-        $emailNotification = $this->prophesize(EmailNotification::class);
-
-        $repository = $this->prophesize(ClientRepository::class);
-        $repository->getAllForReport()->willReturn($dummyClients);
-        $languageService = $this->prophesize(LanguageService::class);
-        $mockedClientImport->_set('languageService', $languageService->reveal());
-        $mockedClientImport->_set('clientRepository', $repository->reveal());
-        $mockedClientImport->_set('emailNotification', $emailNotification->reveal());
-        $emailNotification->sendAdminEmail($emailAddress, $dummyClients)->shouldBeCalled();
-
-        $mockedClientImport->_call('adminCommand', 'fo@bar.com');
-    }
-}
diff --git a/Tests/Unit/Domain/Model/ClientTest.php b/Tests/Unit/Domain/Model/ClientTest.php
index f1d86f6..e3aa56b 100644
--- a/Tests/Unit/Domain/Model/ClientTest.php
+++ b/Tests/Unit/Domain/Model/ClientTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Model\Dto;
+namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Model;
 
 /*
  * This file is part of the t3monitoring extension for TYPO3 CMS.
@@ -10,7 +10,7 @@
 
 use T3Monitor\T3monitoring\Domain\Model\Client;
 use T3Monitor\T3monitoring\Domain\Model\Sla;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Class ClientTest
@@ -26,8 +26,9 @@ class ClientTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->instance = new Client();
     }
 
diff --git a/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php b/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php
index 8b9666c..a8604fa 100644
--- a/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php
+++ b/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php
@@ -9,7 +9,7 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\CoreFilterDemand;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Class CoreFilterDemandTest
@@ -25,8 +25,9 @@ class CoreFilterDemandTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->instance = new CoreFilterDemand();
     }
 
diff --git a/Tests/Unit/Domain/Model/Dto/EmMonitoringConfigurationTest.php b/Tests/Unit/Domain/Model/Dto/EmMonitoringConfigurationTest.php
deleted file mode 100644
index 5f677a2..0000000
--- a/Tests/Unit/Domain/Model/Dto/EmMonitoringConfigurationTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Model\Dto;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
-
-/**
- * Class EmMonitoringConfigurationTest
- */
-class EmMonitoringConfigurationTest extends UnitTestCase
-{
-
-    /**
-     * @test
-     */
-    public function pidCanBeRead()
-    {
-        $subject = 123;
-        $this->setGlobalData(['pid' => $subject]);
-        $instance = new EmMonitoringConfiguration();
-        $this->assertEquals($subject, $instance->getPid());
-    }
-
-    /**
-     * @test
-     */
-    public function loadBulletinsCanBeRead()
-    {
-        $subject = false;
-        $this->setGlobalData(['loadBulletins' => $subject]);
-        $instance = new EmMonitoringConfiguration();
-        $this->assertEquals($subject, $instance->getLoadBulletins());
-    }
-
-    /**
-     * @param array $data
-     */
-    protected function setGlobalData(array $data)
-    {
-        $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['t3monitoring'] = serialize($data);
-    }
-}
diff --git a/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php b/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php
index e7c77b8..0c25d22 100644
--- a/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php
+++ b/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php
@@ -9,7 +9,7 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\ExtensionFilterDemand;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Class ExtensionFilterDemandTest
@@ -25,8 +25,9 @@ class ExtensionFilterDemandTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->instance = new ExtensionFilterDemand();
     }
 
diff --git a/Tests/Unit/Domain/Service/Import/ClientImportTest.php b/Tests/Unit/Domain/Service/Import/ClientImportTest.php
index 9993540..d0cabb0 100644
--- a/Tests/Unit/Domain/Service/Import/ClientImportTest.php
+++ b/Tests/Unit/Domain/Service/Import/ClientImportTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace T3Monitor\T3monitoring\Tests\Unit\Service\Import;
+namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Service\Import;
 
 /*
  * This file is part of the t3monitoring extension for TYPO3 CMS.
@@ -9,7 +9,7 @@
  */
 
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Class ClientImportTest
diff --git a/Tests/Unit/Notification/EmailNotificationTest.php b/Tests/Unit/Notification/EmailNotificationTest.php
index 6b8657b..85452e1 100644
--- a/Tests/Unit/Notification/EmailNotificationTest.php
+++ b/Tests/Unit/Notification/EmailNotificationTest.php
@@ -9,31 +9,31 @@
  */
 
 use T3Monitor\T3monitoring\Notification\EmailNotification;
-use TYPO3\CMS\Core\Tests\UnitTestCase;
-use UnexpectedValueException;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Class EmailNotificationTest
  */
 class EmailNotificationTest extends UnitTestCase
 {
+    protected $resetSingletonInstances = true;
 
     /**
      * @test
-     * @expectedException UnexpectedValueException
      */
     public function sendAdminEmailThrowsExceptionForInvalidEmailAddress()
     {
+        $this->expectException(\UnexpectedValueException::class);
         $notification = new EmailNotification();
         $notification->sendAdminEmail('invalid', ['client']);
     }
 
     /**
      * @test
-     * @expectedException UnexpectedValueException
      */
     public function sendAdminEmailThrowsExceptionForNoClients()
     {
+        $this->expectException(\UnexpectedValueException::class);
         $notification = new EmailNotification();
         $notification->sendAdminEmail('john@doe.com', []);
     }
diff --git a/composer.json b/composer.json
index 0a5d92c..70ab4dd 100644
--- a/composer.json
+++ b/composer.json
@@ -6,11 +6,14 @@
     "GPL-2.0-or-later"
   ],
   "require": {
-    "typo3/cms-core": "^8.7 || ^9.2"
+    "ext-json": "*",
+    "typo3/cms-core": "^9 || ^10",
+    "typo3/cms-backend": "^9 || ^10",
+    "typo3/cms-extbase": "^9 || ^10"
   },
   "require-dev": {
-    "mikey179/vfsStream": "~1.6.0",
-    "phpunit/phpunit": "^5.6 || ^6.2"
+    "typo3/minimal": "^10",
+    "typo3/testing-framework": "*"
   },
   "autoload": {
     "psr-4": {
@@ -24,9 +27,6 @@
       "TYPO3\\CMS\\Fluid\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/fluid/Tests/"
     }
   },
-  "replace": {
-    "t3monitoring": "*"
-  },
   "config": {
     "vendor-dir": ".Build/vendor",
     "bin-dir": ".Build/bin"
diff --git a/ext_emconf.php b/ext_emconf.php
index a141529..43caa04 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -7,11 +7,10 @@
     'author' => 'Georg Ringer',
     'author_email' => '',
     'state' => 'beta',
-    'clearCacheOnLoad' => 1,
     'version' => '2.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '8.7.6-9.9.99',
+            'typo3' => '9.5.0-10.4.99',
         ],
         'conflicts' => [],
         'suggests' => [],
diff --git a/ext_localconf.php b/ext_localconf.php
index 49fcb53..1fc98fe 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -2,15 +2,16 @@
 defined('TYPO3_MODE') || die('Access denied.');
 
 call_user_func(
-    function ($extKey) {
-        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerTypeConverter(\T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverter::class);
+    function () {
+        $isv10 = \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger('10.0')
+            <= \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_branch);
+        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerTypeConverter(
+            $isv10
+            ? \T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverterV10::class
+            : \T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverterV9::class
+        );
 
-        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][]
-            = \T3Monitor\T3monitoring\Command\MonitoringCommandController::class;
-        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][]
-            = \T3Monitor\T3monitoring\Command\ReportCommandController::class;
-        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][$extKey]
+        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['t3monitoring']
             = \T3Monitor\T3monitoring\Hooks\DataHandlerHook::class;
-    },
-    't3monitoring'
+    }
 );

From faa3723430dab2d3e977542a730535b421d5a3f0 Mon Sep 17 00:00:00 2001
From: wrock <wrock@users.noreply.github.com>
Date: Sat, 25 Apr 2020 23:46:25 +0200
Subject: [PATCH 52/83] [BUGFIX] Wrong Namespace of Backend-UriBuilder (#179)

Backend-Error when opening Module.
---
 Classes/Controller/BaseController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index 47c40b3..dda9826 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -162,7 +162,7 @@ protected function getButtons()
             $buttonBar->addButton($viewButton);
         }
 
-        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+        $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
 
         // Buttons for new records
         $returnUrl = rawurlencode($uriBuilder->buildUriFromRoute('tools_T3monitoringT3monitor', [

From 408b6ebdfa55ced3079e3b61215a0f39ad99bc41 Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Wed, 3 Jun 2020 13:13:13 +0200
Subject: [PATCH 53/83] [BUGFIX] Add missing return status code for CLi
 commands (#185)

---
 Classes/Command/ImportAllCommand.php        | 1 +
 Classes/Command/ImportClientsCommand.php    | 1 +
 Classes/Command/ImportCoreCommand.php       | 1 +
 Classes/Command/ImportExtensionsCommand.php | 1 +
 Classes/Command/ReportAdminCommand.php      | 3 ++-
 Classes/Command/ReportClientCommand.php     | 3 ++-
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Classes/Command/ImportAllCommand.php b/Classes/Command/ImportAllCommand.php
index f1d2890..5ad3df1 100644
--- a/Classes/Command/ImportAllCommand.php
+++ b/Classes/Command/ImportAllCommand.php
@@ -52,5 +52,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($result as $label => $count) {
             $output->writeln(sprintf('%s: %s', $label, $count));
         }
+        return 0;
     }
 }
diff --git a/Classes/Command/ImportClientsCommand.php b/Classes/Command/ImportClientsCommand.php
index 4dd6529..a950430 100644
--- a/Classes/Command/ImportClientsCommand.php
+++ b/Classes/Command/ImportClientsCommand.php
@@ -48,5 +48,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($result as $label => $count) {
             $output->writeln(sprintf('%s: %s', $label, $count));
         }
+        return 0;
     }
 }
diff --git a/Classes/Command/ImportCoreCommand.php b/Classes/Command/ImportCoreCommand.php
index 4894779..b8e89b1 100644
--- a/Classes/Command/ImportCoreCommand.php
+++ b/Classes/Command/ImportCoreCommand.php
@@ -41,5 +41,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $objectManager->get(CoreImport::class)->run();
+        return 0;
     }
 }
diff --git a/Classes/Command/ImportExtensionsCommand.php b/Classes/Command/ImportExtensionsCommand.php
index c763908..ff44fa2 100644
--- a/Classes/Command/ImportExtensionsCommand.php
+++ b/Classes/Command/ImportExtensionsCommand.php
@@ -40,5 +40,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $objectManager->get(ExtensionImport::class)->run();
+        return 0;
     }
 }
diff --git a/Classes/Command/ReportAdminCommand.php b/Classes/Command/ReportAdminCommand.php
index 690bf70..ac01ff0 100644
--- a/Classes/Command/ReportAdminCommand.php
+++ b/Classes/Command/ReportAdminCommand.php
@@ -58,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         if (count($this->clients) === 0) {
             $output->writeln($this->getLabel('noInsecureClients'));
-            return;
+            return 0;
         }
 
         $email = $input->getArgument('email');
@@ -98,6 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $style = new SymfonyStyle($input, $output);
             $style->table($header, $collectedClientData);
         }
+        return 0;
     }
 
     protected function getLabel(string $key): string
diff --git a/Classes/Command/ReportClientCommand.php b/Classes/Command/ReportClientCommand.php
index 0204a41..f7f8a2d 100644
--- a/Classes/Command/ReportClientCommand.php
+++ b/Classes/Command/ReportClientCommand.php
@@ -44,10 +44,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $clients = $objectManager->get(ClientRepository::class)->getAllForReport(true);
         if (count($clients) === 0) {
             $output->writeln($this->getLabel('noInsecureClients'));
-            return;
+            return 0;
         }
 
         GeneralUtility::makeInstance(EmailNotification::class)->sendClientEmail($clients);
+        return 0;
     }
 
     protected function getLabel(string $key): string

From ba65a3cf4217e99018e76f68c17ef9a80bb59e2b Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Wed, 3 Jun 2020 14:07:51 +0200
Subject: [PATCH 54/83] [BUGFIX] Fix returnUrls used in Backend (#186)

Fixes: #181
---
 Classes/Controller/BaseController.php        |  5 +----
 Classes/ViewHelpers/EditRecordViewHelper.php | 15 +++++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index dda9826..e5e110e 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -166,10 +166,7 @@ protected function getButtons()
 
         // Buttons for new records
         $returnUrl = rawurlencode($uriBuilder->buildUriFromRoute('tools_T3monitoringT3monitor', [
-            'tx_t3monitoring_tools_t3monitoringt3monitor' => [
-                'action' => $this->request->getControllerActionName(),
-                'controller' => $this->request->getControllerName()
-            ]
+            'tx_t3monitoring_tools_t3monitoringt3monitor' => GeneralUtility::_GPmerged('tx_t3monitoring_tools_t3monitoringt3monitor')
         ]));
         $pid = $this->emConfiguration->getPid();
 
diff --git a/Classes/ViewHelpers/EditRecordViewHelper.php b/Classes/ViewHelpers/EditRecordViewHelper.php
index 792b8f9..feb44b1 100644
--- a/Classes/ViewHelpers/EditRecordViewHelper.php
+++ b/Classes/ViewHelpers/EditRecordViewHelper.php
@@ -10,7 +10,6 @@
  */
 
 use TYPO3\CMS\Backend\Routing\UriBuilder;
-use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -28,14 +27,14 @@ public function initializeArguments()
 
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
+        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+
         $parameters = GeneralUtility::explodeUrl2Array($arguments['parameters']);
 
-        $parameters['returnUrl'] = 'index.php?M=tools_T3monitoringT3monitor&moduleToken='
-            . FormProtectionFactory::get()->generateToken('moduleCall', 'tools_T3monitoringT3monitor')
-            . GeneralUtility::implodeArrayForUrl(
-                'tx_t3monitoring_tools_t3monitoringt3monitor',
-                GeneralUtility::_GPmerged('tx_t3monitoring_tools_t3monitoringt3monitor'));
-        $uriBuild = GeneralUtility::makeInstance(UriBuilder::class);
-        return $uriBuild->buildUriFromRoute('record_edit', $parameters);
+        $parameters['returnUrl'] = (string)$uriBuilder->buildUriFromRoute('tools_T3monitoringT3monitor', [
+            'tx_t3monitoring_tools_t3monitoringt3monitor' => GeneralUtility::_GPmerged('tx_t3monitoring_tools_t3monitoringt3monitor')
+        ]);
+
+        return $uriBuilder->buildUriFromRoute('record_edit', $parameters);
     }
 }

From 5921e6f6ffb59a4feb44d424507367819a9568ee Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Wed, 3 Jun 2020 16:02:36 +0200
Subject: [PATCH 55/83] [BUGFIX] Ship datatables for v10 compatibility (#187)

---
 Classes/Controller/BaseController.php         |    20 +
 .../Private/Templates/Statistic/Index.html    |    19 +-
 .../Public/JavaScript/dataTables.bootstrap.js |   206 +
 .../JavaScript/dataTables.bootstrap.min.js    |     8 +
 .../Public/JavaScript/jquery.dataTables.js    | 15095 ++++++++++++++++
 .../JavaScript/jquery.dataTables.min.js       |   163 +
 6 files changed, 15499 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Public/JavaScript/dataTables.bootstrap.js
 create mode 100644 Resources/Public/JavaScript/dataTables.bootstrap.min.js
 create mode 100644 Resources/Public/JavaScript/jquery.dataTables.js
 create mode 100644 Resources/Public/JavaScript/jquery.dataTables.min.js

diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index e5e110e..4d931b4 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -16,12 +16,16 @@
 use T3Monitor\T3monitoring\Domain\Repository\StatisticRepository;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
+use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
@@ -73,6 +77,22 @@ public function initializeAction()
         $this->emConfiguration = GeneralUtility::makeInstance(EmMonitoringConfiguration::class);
 
         parent::initializeAction();
+
+        $isv10 = VersionNumberUtility::convertVersionNumberToInteger('10.0')
+            <= VersionNumberUtility::convertVersionNumberToInteger((new Typo3Version())->getBranch());
+        if ($isv10) {
+            $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+            $fullJsPath = 'EXT:t3monitoring/Resources/Public/JavaScript/';
+            $fullJsPath = GeneralUtility::getFileAbsFileName($fullJsPath);
+            $fullJsPath = PathUtility::getRelativePath(Environment::getProjectPath(), $fullJsPath);
+            $fullJsPath = rtrim($fullJsPath, '/');
+            $pageRenderer->addRequireJsConfiguration([
+                'paths' => [
+                    'datatables' => $fullJsPath . '/jquery.dataTables.min',
+                    'datatablesBootstrap' => $fullJsPath . '/dataTables.bootstrap.min',
+                ]
+            ]);
+        }
     }
 
     /**
diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index 43d0eea..c2b3e5c 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -300,8 +300,7 @@
                                     <f:then>
                                         <div class="panel panel-default">
                                             <div class="panel-heading">
-                                                {f:translate(key:'clients.total', arguments:'{0:\'{clients ->
-                                                f:count()}\'}')}
+                                                {f:translate(key:'clients.total', arguments:'{0:\'{clients -> f:count()}\'}')}
                                             </div>
                                             <table class="table table-striped table-hover client-list">
                                                 <thead>
@@ -315,19 +314,18 @@
                                                     <th class="text-center"><span data-toggle="tooltip" data-title="{f:translate(key:'clients.numberOfExtensions')}" class="badge badge-info">-</span></th>
                                                     <th class="text-center"><span data-toggle="tooltip" data-title="{f:translate(key:'tx_t3monitoring_domain_model_client.insecure_extensions')}" class="badge badge-danger">-</span></th>
                                                     <th class="text-center"><span data-toggle="tooltip" data-title="{f:translate(key:'tx_t3monitoring_domain_model_client.outdated_extensions')}" class="badge badge-default">-</span></th>
-                                                    <th class="no-sorting text-center" colspan="2">
+                                                    <th class="no-sorting text-center" data-orderable="false">
                                                         {f:translate(key:'client.extra')}
                                                     </th>
-                                                    <th class="no-sorting"></th>
+                                                    <th class="no-sorting" data-orderable="false"></th>
+                                                    <th class="no-sorting" data-orderable="false"></th>
                                                 </tr>
                                                 </thead>
                                                 <tbody>
                                                 <f:for each="{clients}" as="client">
                                                     <tr>
                                                         <td data-order="{client.title -> f:format.htmlspecialchars()}">
-                                                            <f:link.action action="show" controller="Client"
-                                                                           arguments="{client:client}">
-
+                                                            <f:link.action action="show" controller="Client" arguments="{client:client}">
                                                                 <f:if condition="{emConfiguration.presentationMode}">
                                                                     <f:then>
                                                                         <f:translate key="presentationMode.client.title" arguments="{0:client.uid}" />
@@ -339,9 +337,7 @@
                                                             </f:link.action>
                                                         </td>
                                                         <td data-order="{client.domain -> f:format.htmlspecialchars()}">
-                                                            <f:link.action action="show" controller="Client"
-                                                                           arguments="{client:client}">
-
+                                                            <f:link.action action="show" controller="Client" arguments="{client:client}">
                                                                 <f:if condition="{emConfiguration.presentationMode}">
                                                                     <f:then>
                                                                         <f:translate key="presentationMode.client.domain" arguments="{0:client.uid}" />
@@ -367,8 +363,7 @@
                                                         <td class="text-nowrap">
                                                             <f:if condition="{client.sla}">
                                                                 <f:then>
-                                                                    <f:link.action action="show" controller="Sla"
-                                                                                   arguments="{sla:client.sla}">
+                                                                    <f:link.action action="show" controller="Sla" arguments="{sla:client.sla}">
                                                                         {client.sla.title}
                                                                     </f:link.action>
                                                                 </f:then>
diff --git a/Resources/Public/JavaScript/dataTables.bootstrap.js b/Resources/Public/JavaScript/dataTables.bootstrap.js
new file mode 100644
index 0000000..9c5bbdc
--- /dev/null
+++ b/Resources/Public/JavaScript/dataTables.bootstrap.js
@@ -0,0 +1,206 @@
+/*! DataTables Bootstrap 3 integration
+ * ©2011-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * DataTables integration for Bootstrap 3. This requires Bootstrap 3 and
+ * DataTables 1.10 or newer.
+ *
+ * This file sets the defaults and adds options to DataTables to style its
+ * controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
+ * for further information.
+ */
+(function(window, document, undefined){
+
+	var factory = function( $, DataTable ) {
+		"use strict";
+
+
+		/* Set the defaults for DataTables initialisation */
+		$.extend( true, DataTable.defaults, {
+			dom:
+			"<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+			"<'row'<'col-sm-12'tr>>" +
+			"<'row'<'col-sm-5'i><'col-sm-7'p>>",
+			renderer: 'bootstrap'
+		} );
+
+
+		/* Default class modification */
+		$.extend( DataTable.ext.classes, {
+			sWrapper:      "dataTables_wrapper form-inline dt-bootstrap",
+			sFilterInput:  "form-control input-sm",
+			sLengthSelect: "form-control input-sm"
+		} );
+
+
+		/* Bootstrap paging button renderer */
+		DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
+			var api     = new DataTable.Api( settings );
+			var classes = settings.oClasses;
+			var lang    = settings.oLanguage.oPaginate;
+			var btnDisplay, btnClass, counter=0;
+
+			var attach = function( container, buttons ) {
+				var i, ien, node, button;
+				var clickHandler = function ( e ) {
+					e.preventDefault();
+					if ( !$(e.currentTarget).hasClass('disabled') ) {
+						api.page( e.data.action ).draw( false );
+					}
+				};
+
+				for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+					button = buttons[i];
+
+					if ( $.isArray( button ) ) {
+						attach( container, button );
+					}
+					else {
+						btnDisplay = '';
+						btnClass = '';
+
+						switch ( button ) {
+							case 'ellipsis':
+								btnDisplay = '&hellip;';
+								btnClass = 'disabled';
+								break;
+
+							case 'first':
+								btnDisplay = lang.sFirst;
+								btnClass = button + (page > 0 ?
+										'' : ' disabled');
+								break;
+
+							case 'previous':
+								btnDisplay = lang.sPrevious;
+								btnClass = button + (page > 0 ?
+										'' : ' disabled');
+								break;
+
+							case 'next':
+								btnDisplay = lang.sNext;
+								btnClass = button + (page < pages-1 ?
+										'' : ' disabled');
+								break;
+
+							case 'last':
+								btnDisplay = lang.sLast;
+								btnClass = button + (page < pages-1 ?
+										'' : ' disabled');
+								break;
+
+							default:
+								btnDisplay = button + 1;
+								btnClass = page === button ?
+									'active' : '';
+								break;
+						}
+
+						if ( btnDisplay ) {
+							node = $('<li>', {
+								'class': classes.sPageButton+' '+btnClass,
+								'id': idx === 0 && typeof button === 'string' ?
+								settings.sTableId +'_'+ button :
+									null
+							} )
+								.append( $('<a>', {
+									'href': '#',
+									'aria-controls': settings.sTableId,
+									'data-dt-idx': counter,
+									'tabindex': settings.iTabIndex
+								} )
+									.html( btnDisplay )
+							)
+								.appendTo( container );
+
+							settings.oApi._fnBindAction(
+								node, {action: button}, clickHandler
+							);
+
+							counter++;
+						}
+					}
+				}
+			};
+
+			// IE9 throws an 'unknown error' if document.activeElement is used
+			// inside an iframe or frame.
+			var activeEl;
+
+			try {
+				// Because this approach is destroying and recreating the paging
+				// elements, focus is lost on the select button which is bad for
+				// accessibility. So we want to restore focus once the draw has
+				// completed
+				activeEl = $(document.activeElement).data('dt-idx');
+			}
+			catch (e) {}
+
+			attach(
+				$(host).empty().html('<ul class="pagination"/>').children('ul'),
+				buttons
+			);
+
+			if ( activeEl ) {
+				$(host).find( '[data-dt-idx='+activeEl+']' ).focus();
+			}
+		};
+
+
+		/*
+		 * TableTools Bootstrap compatibility
+		 * Required TableTools 2.1+
+		 */
+		if ( DataTable.TableTools ) {
+			// Set the classes that TableTools uses to something suitable for Bootstrap
+			$.extend( true, DataTable.TableTools.classes, {
+				"container": "DTTT btn-group",
+				"buttons": {
+					"normal": "btn btn-default",
+					"disabled": "disabled"
+				},
+				"collection": {
+					"container": "DTTT_dropdown dropdown-menu",
+					"buttons": {
+						"normal": "",
+						"disabled": "disabled"
+					}
+				},
+				"print": {
+					"info": "DTTT_print_info"
+				},
+				"select": {
+					"row": "active"
+				}
+			} );
+
+			// Have the collection use a bootstrap compatible drop down
+			$.extend( true, DataTable.TableTools.DEFAULTS.oTags, {
+				"collection": {
+					"container": "ul",
+					"button": "li",
+					"liner": "a"
+				}
+			} );
+		}
+
+	}; // /factory
+
+
+// Define as an AMD module if possible
+	if ( typeof define === 'function' && define.amd ) {
+		define( ['jquery', 'datatables'], factory );
+	}
+	else if ( typeof exports === 'object' ) {
+		// Node/CommonJS
+		factory( require('jquery'), require('datatables') );
+	}
+	else if ( jQuery ) {
+		// Otherwise simply initialise as normal, stopping multiple evaluation
+		factory( jQuery, jQuery.fn.dataTable );
+	}
+
+
+})(window, document);
+
diff --git a/Resources/Public/JavaScript/dataTables.bootstrap.min.js b/Resources/Public/JavaScript/dataTables.bootstrap.min.js
new file mode 100644
index 0000000..279e1e7
--- /dev/null
+++ b/Resources/Public/JavaScript/dataTables.bootstrap.min.js
@@ -0,0 +1,8 @@
+/*!
+ DataTables Bootstrap 3 integration
+ ©2011-2014 SpryMedia Ltd - datatables.net/license
+ */
+(function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+	b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+	collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
diff --git a/Resources/Public/JavaScript/jquery.dataTables.js b/Resources/Public/JavaScript/jquery.dataTables.js
new file mode 100644
index 0000000..0bb3009
--- /dev/null
+++ b/Resources/Public/JavaScript/jquery.dataTables.js
@@ -0,0 +1,15095 @@
+/*! DataTables 1.10.8
+ * ©2008-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * @summary     DataTables
+ * @description Paginate, search and order HTML tables
+ * @version     1.10.8
+ * @file        jquery.dataTables.js
+ * @author      SpryMedia Ltd (www.sprymedia.co.uk)
+ * @contact     www.sprymedia.co.uk/contact
+ * @copyright   Copyright 2008-2014 SpryMedia Ltd.
+ *
+ * This source file is free software, available under the following license:
+ *   MIT license - http://datatables.net/license
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ *
+ * For details please refer to: http://www.datatables.net
+ */
+
+/*jslint evil: true, undef: true, browser: true */
+/*globals $,require,jQuery,define,_selector_run,_selector_opts,_selector_first,_selector_row_indexes,_ext,_Api,_api_register,_api_registerPlural,_re_new_lines,_re_html,_re_formatted_numeric,_re_escape_regex,_empty,_intVal,_numToDecimal,_isNumber,_isHtml,_htmlNumeric,_pluck,_pluck_order,_range,_stripHtml,_unique,_fnBuildAjax,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnAjaxDataSrc,_fnAddColumn,_fnColumnOptions,_fnAdjustColumnSizing,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnVisbleColumns,_fnGetColumns,_fnColumnTypes,_fnApplyColumnDefs,_fnHungarianMap,_fnCamelToHungarian,_fnLanguageCompat,_fnBrowserDetect,_fnAddData,_fnAddTr,_fnNodeToDataIndex,_fnNodeToColumnIndex,_fnGetCellData,_fnSetCellData,_fnSplitObjNotation,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnGetDataMaster,_fnClearTable,_fnDeleteIndex,_fnInvalidate,_fnGetRowElements,_fnCreateTr,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAddOptionsHtml,_fnDetectHeader,_fnGetUniqueThs,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnFilterCreateSearch,_fnEscapeRegex,_fnFilterData,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnInfoMacros,_fnInitialise,_fnInitComplete,_fnLengthChange,_fnFeatureHtmlLength,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnFeatureHtmlTable,_fnScrollDraw,_fnApplyToChildren,_fnCalculateColumnWidths,_fnThrottle,_fnConvertToWidth,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnScrollBarWidth,_fnSortFlatten,_fnSort,_fnSortAria,_fnSortListener,_fnSortAttachListener,_fnSortingClasses,_fnSortData,_fnSaveState,_fnLoadState,_fnSettingsFromNode,_fnLog,_fnMap,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnLengthOverflow,_fnRenderer,_fnDataSource,_fnRowAttributes*/
+
+(/** @lends <global> */function( window, document, undefined ) {
+
+(function( factory ) {
+	"use strict";
+
+	if ( typeof define === 'function' && define.amd ) {
+		// Define as an AMD module if possible
+		define( 'datatables', ['jquery'], factory );
+	}
+	else if ( typeof exports === 'object' ) {
+		// Node/CommonJS
+		module.exports = factory( require( 'jquery' ) );
+	}
+	else if ( jQuery && !jQuery.fn.dataTable ) {
+		// Define using browser globals otherwise
+		// Prevent multiple instantiations if the script is loaded twice
+		factory( jQuery );
+	}
+}
+(/** @lends <global> */function( $ ) {
+	"use strict";
+
+	/**
+	 * DataTables is a plug-in for the jQuery Javascript library. It is a highly
+	 * flexible tool, based upon the foundations of progressive enhancement,
+	 * which will add advanced interaction controls to any HTML table. For a
+	 * full list of features please refer to
+	 * [DataTables.net](href="http://datatables.net).
+	 *
+	 * Note that the `DataTable` object is not a global variable but is aliased
+	 * to `jQuery.fn.DataTable` and `jQuery.fn.dataTable` through which it may
+	 * be  accessed.
+	 *
+	 *  @class
+	 *  @param {object} [init={}] Configuration object for DataTables. Options
+	 *    are defined by {@link DataTable.defaults}
+	 *  @requires jQuery 1.7+
+	 *
+	 *  @example
+	 *    // Basic initialisation
+	 *    $(document).ready( function {
+	 *      $('#example').dataTable();
+	 *    } );
+	 *
+	 *  @example
+	 *    // Initialisation with configuration options - in this case, disable
+	 *    // pagination and sorting.
+	 *    $(document).ready( function {
+	 *      $('#example').dataTable( {
+	 *        "paginate": false,
+	 *        "sort": false
+	 *      } );
+	 *    } );
+	 */
+	var DataTable;
+
+	
+	/*
+	 * It is useful to have variables which are scoped locally so only the
+	 * DataTables functions can access them and they don't leak into global space.
+	 * At the same time these functions are often useful over multiple files in the
+	 * core and API, so we list, or at least document, all variables which are used
+	 * by DataTables as private variables here. This also ensures that there is no
+	 * clashing of variable names and that they can easily referenced for reuse.
+	 */
+	
+	
+	// Defined else where
+	//  _selector_run
+	//  _selector_opts
+	//  _selector_first
+	//  _selector_row_indexes
+	
+	var _ext; // DataTable.ext
+	var _Api; // DataTable.Api
+	var _api_register; // DataTable.Api.register
+	var _api_registerPlural; // DataTable.Api.registerPlural
+	
+	var _re_dic = {};
+	var _re_new_lines = /[\r\n]/g;
+	var _re_html = /<.*?>/g;
+	var _re_date_start = /^[\w\+\-]/;
+	var _re_date_end = /[\w\+\-]$/;
+	
+	// Escape regular expression special characters
+	var _re_escape_regex = new RegExp( '(\\' + [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ].join('|\\') + ')', 'g' );
+	
+	// http://en.wikipedia.org/wiki/Foreign_exchange_market
+	// - \u20BD - Russian ruble.
+	// - \u20a9 - South Korean Won
+	// - \u20BA - Turkish Lira
+	// - \u20B9 - Indian Rupee
+	// - R - Brazil (R$) and South Africa
+	// - fr - Swiss Franc
+	// - kr - Swedish krona, Norwegian krone and Danish krone
+	// - \u2009 is thin space and \u202F is narrow no-break space, both used in many
+	//   standards as thousands separators.
+	var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi;
+	
+	
+	var _empty = function ( d ) {
+		return !d || d === true || d === '-' ? true : false;
+	};
+	
+	
+	var _intVal = function ( s ) {
+		var integer = parseInt( s, 10 );
+		return !isNaN(integer) && isFinite(s) ? integer : null;
+	};
+	
+	// Convert from a formatted number with characters other than `.` as the
+	// decimal place, to a Javascript number
+	var _numToDecimal = function ( num, decimalPoint ) {
+		// Cache created regular expressions for speed as this function is called often
+		if ( ! _re_dic[ decimalPoint ] ) {
+			_re_dic[ decimalPoint ] = new RegExp( _fnEscapeRegex( decimalPoint ), 'g' );
+		}
+		return typeof num === 'string' && decimalPoint !== '.' ?
+			num.replace( /\./g, '' ).replace( _re_dic[ decimalPoint ], '.' ) :
+			num;
+	};
+	
+	
+	var _isNumber = function ( d, decimalPoint, formatted ) {
+		var strType = typeof d === 'string';
+	
+		// If empty return immediately so there must be a number if it is a
+		// formatted string (this stops the string "k", or "kr", etc being detected
+		// as a formatted number for currency
+		if ( _empty( d ) ) {
+			return true;
+		}
+	
+		if ( decimalPoint && strType ) {
+			d = _numToDecimal( d, decimalPoint );
+		}
+	
+		if ( formatted && strType ) {
+			d = d.replace( _re_formatted_numeric, '' );
+		}
+	
+		return !isNaN( parseFloat(d) ) && isFinite( d );
+	};
+	
+	
+	// A string without HTML in it can be considered to be HTML still
+	var _isHtml = function ( d ) {
+		return _empty( d ) || typeof d === 'string';
+	};
+	
+	
+	var _htmlNumeric = function ( d, decimalPoint, formatted ) {
+		if ( _empty( d ) ) {
+			return true;
+		}
+	
+		var html = _isHtml( d );
+		return ! html ?
+			null :
+			_isNumber( _stripHtml( d ), decimalPoint, formatted ) ?
+				true :
+				null;
+	};
+	
+	
+	var _pluck = function ( a, prop, prop2 ) {
+		var out = [];
+		var i=0, ien=a.length;
+	
+		// Could have the test in the loop for slightly smaller code, but speed
+		// is essential here
+		if ( prop2 !== undefined ) {
+			for ( ; i<ien ; i++ ) {
+				if ( a[i] && a[i][ prop ] ) {
+					out.push( a[i][ prop ][ prop2 ] );
+				}
+			}
+		}
+		else {
+			for ( ; i<ien ; i++ ) {
+				if ( a[i] ) {
+					out.push( a[i][ prop ] );
+				}
+			}
+		}
+	
+		return out;
+	};
+	
+	
+	// Basically the same as _pluck, but rather than looping over `a` we use `order`
+	// as the indexes to pick from `a`
+	var _pluck_order = function ( a, order, prop, prop2 )
+	{
+		var out = [];
+		var i=0, ien=order.length;
+	
+		// Could have the test in the loop for slightly smaller code, but speed
+		// is essential here
+		if ( prop2 !== undefined ) {
+			for ( ; i<ien ; i++ ) {
+				if ( a[ order[i] ][ prop ] ) {
+					out.push( a[ order[i] ][ prop ][ prop2 ] );
+				}
+			}
+		}
+		else {
+			for ( ; i<ien ; i++ ) {
+				out.push( a[ order[i] ][ prop ] );
+			}
+		}
+	
+		return out;
+	};
+	
+	
+	var _range = function ( len, start )
+	{
+		var out = [];
+		var end;
+	
+		if ( start === undefined ) {
+			start = 0;
+			end = len;
+		}
+		else {
+			end = start;
+			start = len;
+		}
+	
+		for ( var i=start ; i<end ; i++ ) {
+			out.push( i );
+		}
+	
+		return out;
+	};
+	
+	
+	var _removeEmpty = function ( a )
+	{
+		var out = [];
+	
+		for ( var i=0, ien=a.length ; i<ien ; i++ ) {
+			if ( a[i] ) { // careful - will remove all falsy values!
+				out.push( a[i] );
+			}
+		}
+	
+		return out;
+	};
+	
+	
+	var _stripHtml = function ( d ) {
+		return d.replace( _re_html, '' );
+	};
+	
+	
+	/**
+	 * Find the unique elements in a source array.
+	 *
+	 * @param  {array} src Source array
+	 * @return {array} Array of unique items
+	 * @ignore
+	 */
+	var _unique = function ( src )
+	{
+		// A faster unique method is to use object keys to identify used values,
+		// but this doesn't work with arrays or objects, which we must also
+		// consider. See jsperf.com/compare-array-unique-versions/4 for more
+		// information.
+		var
+			out = [],
+			val,
+			i, ien=src.length,
+			j, k=0;
+	
+		again: for ( i=0 ; i<ien ; i++ ) {
+			val = src[i];
+	
+			for ( j=0 ; j<k ; j++ ) {
+				if ( out[j] === val ) {
+					continue again;
+				}
+			}
+	
+			out.push( val );
+			k++;
+		}
+	
+		return out;
+	};
+	
+	
+	
+	/**
+	 * Create a mapping object that allows camel case parameters to be looked up
+	 * for their Hungarian counterparts. The mapping is stored in a private
+	 * parameter called `_hungarianMap` which can be accessed on the source object.
+	 *  @param {object} o
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnHungarianMap ( o )
+	{
+		var
+			hungarian = 'a aa ai ao as b fn i m o s ',
+			match,
+			newKey,
+			map = {};
+	
+		$.each( o, function (key, val) {
+			match = key.match(/^([^A-Z]+?)([A-Z])/);
+	
+			if ( match && hungarian.indexOf(match[1]+' ') !== -1 )
+			{
+				newKey = key.replace( match[0], match[2].toLowerCase() );
+				map[ newKey ] = key;
+	
+				if ( match[1] === 'o' )
+				{
+					_fnHungarianMap( o[key] );
+				}
+			}
+		} );
+	
+		o._hungarianMap = map;
+	}
+	
+	
+	/**
+	 * Convert from camel case parameters to Hungarian, based on a Hungarian map
+	 * created by _fnHungarianMap.
+	 *  @param {object} src The model object which holds all parameters that can be
+	 *    mapped.
+	 *  @param {object} user The object to convert from camel case to Hungarian.
+	 *  @param {boolean} force When set to `true`, properties which already have a
+	 *    Hungarian value in the `user` object will be overwritten. Otherwise they
+	 *    won't be.
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnCamelToHungarian ( src, user, force )
+	{
+		if ( ! src._hungarianMap ) {
+			_fnHungarianMap( src );
+		}
+	
+		var hungarianKey;
+	
+		$.each( user, function (key, val) {
+			hungarianKey = src._hungarianMap[ key ];
+	
+			if ( hungarianKey !== undefined && (force || user[hungarianKey] === undefined) )
+			{
+				// For objects, we need to buzz down into the object to copy parameters
+				if ( hungarianKey.charAt(0) === 'o' )
+				{
+					// Copy the camelCase options over to the hungarian
+					if ( ! user[ hungarianKey ] ) {
+						user[ hungarianKey ] = {};
+					}
+					$.extend( true, user[hungarianKey], user[key] );
+	
+					_fnCamelToHungarian( src[hungarianKey], user[hungarianKey], force );
+				}
+				else {
+					user[hungarianKey] = user[ key ];
+				}
+			}
+		} );
+	}
+	
+	
+	/**
+	 * Language compatibility - when certain options are given, and others aren't, we
+	 * need to duplicate the values over, in order to provide backwards compatibility
+	 * with older language files.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnLanguageCompat( lang )
+	{
+		var defaults = DataTable.defaults.oLanguage;
+		var zeroRecords = lang.sZeroRecords;
+	
+		/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
+		 * sZeroRecords - assuming that is given.
+		 */
+		if ( ! lang.sEmptyTable && zeroRecords &&
+			defaults.sEmptyTable === "No data available in table" )
+		{
+			_fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' );
+		}
+	
+		/* Likewise with loading records */
+		if ( ! lang.sLoadingRecords && zeroRecords &&
+			defaults.sLoadingRecords === "Loading..." )
+		{
+			_fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' );
+		}
+	
+		// Old parameter name of the thousands separator mapped onto the new
+		if ( lang.sInfoThousands ) {
+			lang.sThousands = lang.sInfoThousands;
+		}
+	
+		var decimal = lang.sDecimal;
+		if ( decimal ) {
+			_addNumericSort( decimal );
+		}
+	}
+	
+	
+	/**
+	 * Map one parameter onto another
+	 *  @param {object} o Object to map
+	 *  @param {*} knew The new parameter name
+	 *  @param {*} old The old parameter name
+	 */
+	var _fnCompatMap = function ( o, knew, old ) {
+		if ( o[ knew ] !== undefined ) {
+			o[ old ] = o[ knew ];
+		}
+	};
+	
+	
+	/**
+	 * Provide backwards compatibility for the main DT options. Note that the new
+	 * options are mapped onto the old parameters, so this is an external interface
+	 * change only.
+	 *  @param {object} init Object to map
+	 */
+	function _fnCompatOpts ( init )
+	{
+		_fnCompatMap( init, 'ordering',      'bSort' );
+		_fnCompatMap( init, 'orderMulti',    'bSortMulti' );
+		_fnCompatMap( init, 'orderClasses',  'bSortClasses' );
+		_fnCompatMap( init, 'orderCellsTop', 'bSortCellsTop' );
+		_fnCompatMap( init, 'order',         'aaSorting' );
+		_fnCompatMap( init, 'orderFixed',    'aaSortingFixed' );
+		_fnCompatMap( init, 'paging',        'bPaginate' );
+		_fnCompatMap( init, 'pagingType',    'sPaginationType' );
+		_fnCompatMap( init, 'pageLength',    'iDisplayLength' );
+		_fnCompatMap( init, 'searching',     'bFilter' );
+	
+		// Boolean initialisation of x-scrolling
+		if ( typeof init.sScrollX === 'boolean' ) {
+			init.sScrollX = init.sScrollX ? '100%' : '';
+		}
+	
+		// Column search objects are in an array, so it needs to be converted
+		// element by element
+		var searchCols = init.aoSearchCols;
+	
+		if ( searchCols ) {
+			for ( var i=0, ien=searchCols.length ; i<ien ; i++ ) {
+				if ( searchCols[i] ) {
+					_fnCamelToHungarian( DataTable.models.oSearch, searchCols[i] );
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * Provide backwards compatibility for column options. Note that the new options
+	 * are mapped onto the old parameters, so this is an external interface change
+	 * only.
+	 *  @param {object} init Object to map
+	 */
+	function _fnCompatCols ( init )
+	{
+		_fnCompatMap( init, 'orderable',     'bSortable' );
+		_fnCompatMap( init, 'orderData',     'aDataSort' );
+		_fnCompatMap( init, 'orderSequence', 'asSorting' );
+		_fnCompatMap( init, 'orderDataType', 'sortDataType' );
+	
+		// orderData can be given as an integer
+		var dataSort = init.aDataSort;
+		if ( dataSort && ! $.isArray( dataSort ) ) {
+			init.aDataSort = [ dataSort ];
+		}
+	}
+	
+	
+	/**
+	 * Browser feature detection for capabilities, quirks
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnBrowserDetect( settings )
+	{
+		var browser = settings.oBrowser;
+	
+		// Scrolling feature / quirks detection
+		var n = $('<div/>')
+			.css( {
+				position: 'fixed',
+				top: 0,
+				left: 0,
+				height: 1,
+				width: 1,
+				overflow: 'hidden'
+			} )
+			.append(
+				$('<div/>')
+					.css( {
+						position: 'absolute',
+						top: 1,
+						left: 1,
+						width: 100,
+						overflow: 'scroll'
+					} )
+					.append(
+						$('<div class="test"/>')
+							.css( {
+								width: '100%',
+								height: 10
+							} )
+					)
+			)
+			.appendTo( 'body' );
+	
+		var test = n.find('.test');
+	
+		// IE6/7 will oversize a width 100% element inside a scrolling element, to
+		// include the width of the scrollbar, while other browsers ensure the inner
+		// element is contained without forcing scrolling
+		browser.bScrollOversize = test[0].offsetWidth === 100;
+	
+		// In rtl text layout, some browsers (most, but not all) will place the
+		// scrollbar on the left, rather than the right.
+		browser.bScrollbarLeft = Math.round( test.offset().left ) !== 1;
+	
+		// IE8- don't provide height and width for getBoundingClientRect
+		browser.bBounding = n[0].getBoundingClientRect().width ? true : false;
+	
+		n.remove();
+	}
+	
+	
+	/**
+	 * Array.prototype reduce[Right] method, used for browsers which don't support
+	 * JS 1.6. Done this way to reduce code size, since we iterate either way
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnReduce ( that, fn, init, start, end, inc )
+	{
+		var
+			i = start,
+			value,
+			isSet = false;
+	
+		if ( init !== undefined ) {
+			value = init;
+			isSet = true;
+		}
+	
+		while ( i !== end ) {
+			if ( ! that.hasOwnProperty(i) ) {
+				continue;
+			}
+	
+			value = isSet ?
+				fn( value, that[i], i, that ) :
+				that[i];
+	
+			isSet = true;
+			i += inc;
+		}
+	
+		return value;
+	}
+	
+	/**
+	 * Add a column to the list used for the table with default values
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {node} nTh The th element for this column
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAddColumn( oSettings, nTh )
+	{
+		// Add column to aoColumns array
+		var oDefaults = DataTable.defaults.column;
+		var iCol = oSettings.aoColumns.length;
+		var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, {
+			"nTh": nTh ? nTh : document.createElement('th'),
+			"sTitle":    oDefaults.sTitle    ? oDefaults.sTitle    : nTh ? nTh.innerHTML : '',
+			"aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol],
+			"mData": oDefaults.mData ? oDefaults.mData : iCol,
+			idx: iCol
+		} );
+		oSettings.aoColumns.push( oCol );
+	
+		// Add search object for column specific search. Note that the `searchCols[ iCol ]`
+		// passed into extend can be undefined. This allows the user to give a default
+		// with only some of the parameters defined, and also not give a default
+		var searchCols = oSettings.aoPreSearchCols;
+		searchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch, searchCols[ iCol ] );
+	
+		// Use the default column options function to initialise classes etc
+		_fnColumnOptions( oSettings, iCol, $(nTh).data() );
+	}
+	
+	
+	/**
+	 * Apply options for a column
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {int} iCol column index to consider
+	 *  @param {object} oOptions object with sType, bVisible and bSearchable etc
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnColumnOptions( oSettings, iCol, oOptions )
+	{
+		var oCol = oSettings.aoColumns[ iCol ];
+		var oClasses = oSettings.oClasses;
+		var th = $(oCol.nTh);
+	
+		// Try to get width information from the DOM. We can't get it from CSS
+		// as we'd need to parse the CSS stylesheet. `width` option can override
+		if ( ! oCol.sWidthOrig ) {
+			// Width attribute
+			oCol.sWidthOrig = th.attr('width') || null;
+	
+			// Style attribute
+			var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%]+)/);
+			if ( t ) {
+				oCol.sWidthOrig = t[1];
+			}
+		}
+	
+		/* User specified column options */
+		if ( oOptions !== undefined && oOptions !== null )
+		{
+			// Backwards compatibility
+			_fnCompatCols( oOptions );
+	
+			// Map camel case parameters to their Hungarian counterparts
+			_fnCamelToHungarian( DataTable.defaults.column, oOptions );
+	
+			/* Backwards compatibility for mDataProp */
+			if ( oOptions.mDataProp !== undefined && !oOptions.mData )
+			{
+				oOptions.mData = oOptions.mDataProp;
+			}
+	
+			if ( oOptions.sType )
+			{
+				oCol._sManualType = oOptions.sType;
+			}
+	
+			// `class` is a reserved word in Javascript, so we need to provide
+			// the ability to use a valid name for the camel case input
+			if ( oOptions.className && ! oOptions.sClass )
+			{
+				oOptions.sClass = oOptions.className;
+			}
+	
+			$.extend( oCol, oOptions );
+			_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
+	
+			/* iDataSort to be applied (backwards compatibility), but aDataSort will take
+			 * priority if defined
+			 */
+			if ( oOptions.iDataSort !== undefined )
+			{
+				oCol.aDataSort = [ oOptions.iDataSort ];
+			}
+			_fnMap( oCol, oOptions, "aDataSort" );
+		}
+	
+		/* Cache the data get and set functions for speed */
+		var mDataSrc = oCol.mData;
+		var mData = _fnGetObjectDataFn( mDataSrc );
+		var mRender = oCol.mRender ? _fnGetObjectDataFn( oCol.mRender ) : null;
+	
+		var attrTest = function( src ) {
+			return typeof src === 'string' && src.indexOf('@') !== -1;
+		};
+		oCol._bAttrSrc = $.isPlainObject( mDataSrc ) && (
+			attrTest(mDataSrc.sort) || attrTest(mDataSrc.type) || attrTest(mDataSrc.filter)
+		);
+	
+		oCol.fnGetData = function (rowData, type, meta) {
+			var innerData = mData( rowData, type, undefined, meta );
+	
+			return mRender && type ?
+				mRender( innerData, type, rowData, meta ) :
+				innerData;
+		};
+		oCol.fnSetData = function ( rowData, val, meta ) {
+			return _fnSetObjectDataFn( mDataSrc )( rowData, val, meta );
+		};
+	
+		// Indicate if DataTables should read DOM data as an object or array
+		// Used in _fnGetRowElements
+		if ( typeof mDataSrc !== 'number' ) {
+			oSettings._rowReadObject = true;
+		}
+	
+		/* Feature sorting overrides column specific when off */
+		if ( !oSettings.oFeatures.bSort )
+		{
+			oCol.bSortable = false;
+			th.addClass( oClasses.sSortableNone ); // Have to add class here as order event isn't called
+		}
+	
+		/* Check that the class assignment is correct for sorting */
+		var bAsc = $.inArray('asc', oCol.asSorting) !== -1;
+		var bDesc = $.inArray('desc', oCol.asSorting) !== -1;
+		if ( !oCol.bSortable || (!bAsc && !bDesc) )
+		{
+			oCol.sSortingClass = oClasses.sSortableNone;
+			oCol.sSortingClassJUI = "";
+		}
+		else if ( bAsc && !bDesc )
+		{
+			oCol.sSortingClass = oClasses.sSortableAsc;
+			oCol.sSortingClassJUI = oClasses.sSortJUIAscAllowed;
+		}
+		else if ( !bAsc && bDesc )
+		{
+			oCol.sSortingClass = oClasses.sSortableDesc;
+			oCol.sSortingClassJUI = oClasses.sSortJUIDescAllowed;
+		}
+		else
+		{
+			oCol.sSortingClass = oClasses.sSortable;
+			oCol.sSortingClassJUI = oClasses.sSortJUI;
+		}
+	}
+	
+	
+	/**
+	 * Adjust the table column widths for new data. Note: you would probably want to
+	 * do a redraw after calling this function!
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAdjustColumnSizing ( settings )
+	{
+		/* Not interested in doing column width calculation if auto-width is disabled */
+		if ( settings.oFeatures.bAutoWidth !== false )
+		{
+			var columns = settings.aoColumns;
+	
+			_fnCalculateColumnWidths( settings );
+			for ( var i=0 , iLen=columns.length ; i<iLen ; i++ )
+			{
+				columns[i].nTh.style.width = columns[i].sWidth;
+			}
+		}
+	
+		var scroll = settings.oScroll;
+		if ( scroll.sY !== '' || scroll.sX !== '')
+		{
+			_fnScrollDraw( settings );
+		}
+	
+		_fnCallbackFire( settings, null, 'column-sizing', [settings] );
+	}
+	
+	
+	/**
+	 * Covert the index of a visible column to the index in the data array (take account
+	 * of hidden columns)
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {int} iMatch Visible column index to lookup
+	 *  @returns {int} i the data index
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnVisibleToColumnIndex( oSettings, iMatch )
+	{
+		var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+	
+		return typeof aiVis[iMatch] === 'number' ?
+			aiVis[iMatch] :
+			null;
+	}
+	
+	
+	/**
+	 * Covert the index of an index in the data array and convert it to the visible
+	 *   column index (take account of hidden columns)
+	 *  @param {int} iMatch Column index to lookup
+	 *  @param {object} oSettings dataTables settings object
+	 *  @returns {int} i the data index
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnColumnIndexToVisible( oSettings, iMatch )
+	{
+		var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+		var iPos = $.inArray( iMatch, aiVis );
+	
+		return iPos !== -1 ? iPos : null;
+	}
+	
+	
+	/**
+	 * Get the number of visible columns
+	 *  @param {object} oSettings dataTables settings object
+	 *  @returns {int} i the number of visible columns
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnVisbleColumns( oSettings )
+	{
+		return _fnGetColumns( oSettings, 'bVisible' ).length;
+	}
+	
+	
+	/**
+	 * Get an array of column indexes that match a given property
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {string} sParam Parameter in aoColumns to look for - typically
+	 *    bVisible or bSearchable
+	 *  @returns {array} Array of indexes with matched properties
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetColumns( oSettings, sParam )
+	{
+		var a = [];
+	
+		$.map( oSettings.aoColumns, function(val, i) {
+			if ( val[sParam] ) {
+				a.push( i );
+			}
+		} );
+	
+		return a;
+	}
+	
+	
+	/**
+	 * Calculate the 'type' of a column
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnColumnTypes ( settings )
+	{
+		var columns = settings.aoColumns;
+		var data = settings.aoData;
+		var types = DataTable.ext.type.detect;
+		var i, ien, j, jen, k, ken;
+		var col, cell, detectedType, cache;
+	
+		// For each column, spin over the 
+		for ( i=0, ien=columns.length ; i<ien ; i++ ) {
+			col = columns[i];
+			cache = [];
+	
+			if ( ! col.sType && col._sManualType ) {
+				col.sType = col._sManualType;
+			}
+			else if ( ! col.sType ) {
+				for ( j=0, jen=types.length ; j<jen ; j++ ) {
+					for ( k=0, ken=data.length ; k<ken ; k++ ) {
+						// Use a cache array so we only need to get the type data
+						// from the formatter once (when using multiple detectors)
+						if ( cache[k] === undefined ) {
+							cache[k] = _fnGetCellData( settings, k, i, 'type' );
+						}
+	
+						detectedType = types[j]( cache[k], settings );
+	
+						// If null, then this type can't apply to this column, so
+						// rather than testing all cells, break out. There is an
+						// exception for the last type which is `html`. We need to
+						// scan all rows since it is possible to mix string and HTML
+						// types
+						if ( ! detectedType && j !== types.length-1 ) {
+							break;
+						}
+	
+						// Only a single match is needed for html type since it is
+						// bottom of the pile and very similar to string
+						if ( detectedType === 'html' ) {
+							break;
+						}
+					}
+	
+					// Type is valid for all data points in the column - use this
+					// type
+					if ( detectedType ) {
+						col.sType = detectedType;
+						break;
+					}
+				}
+	
+				// Fall back - if no type was detected, always use string
+				if ( ! col.sType ) {
+					col.sType = 'string';
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * Take the column definitions and static columns arrays and calculate how
+	 * they relate to column indexes. The callback function will then apply the
+	 * definition found for a column to a suitable configuration object.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {array} aoColDefs The aoColumnDefs array that is to be applied
+	 *  @param {array} aoCols The aoColumns array that defines columns individually
+	 *  @param {function} fn Callback function - takes two parameters, the calculated
+	 *    column index and the definition for that column.
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, fn )
+	{
+		var i, iLen, j, jLen, k, kLen, def;
+		var columns = oSettings.aoColumns;
+	
+		// Column definitions with aTargets
+		if ( aoColDefs )
+		{
+			/* Loop over the definitions array - loop in reverse so first instance has priority */
+			for ( i=aoColDefs.length-1 ; i>=0 ; i-- )
+			{
+				def = aoColDefs[i];
+	
+				/* Each definition can target multiple columns, as it is an array */
+				var aTargets = def.targets !== undefined ?
+					def.targets :
+					def.aTargets;
+	
+				if ( ! $.isArray( aTargets ) )
+				{
+					aTargets = [ aTargets ];
+				}
+	
+				for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
+				{
+					if ( typeof aTargets[j] === 'number' && aTargets[j] >= 0 )
+					{
+						/* Add columns that we don't yet know about */
+						while( columns.length <= aTargets[j] )
+						{
+							_fnAddColumn( oSettings );
+						}
+	
+						/* Integer, basic index */
+						fn( aTargets[j], def );
+					}
+					else if ( typeof aTargets[j] === 'number' && aTargets[j] < 0 )
+					{
+						/* Negative integer, right to left column counting */
+						fn( columns.length+aTargets[j], def );
+					}
+					else if ( typeof aTargets[j] === 'string' )
+					{
+						/* Class name matching on TH element */
+						for ( k=0, kLen=columns.length ; k<kLen ; k++ )
+						{
+							if ( aTargets[j] == "_all" ||
+							     $(columns[k].nTh).hasClass( aTargets[j] ) )
+							{
+								fn( k, def );
+							}
+						}
+					}
+				}
+			}
+		}
+	
+		// Statically defined columns array
+		if ( aoCols )
+		{
+			for ( i=0, iLen=aoCols.length ; i<iLen ; i++ )
+			{
+				fn( i, aoCols[i] );
+			}
+		}
+	}
+	
+	/**
+	 * Add a data array to the table, creating DOM node etc. This is the parallel to
+	 * _fnGatherData, but for adding rows from a Javascript source, rather than a
+	 * DOM source.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {array} aData data array to be added
+	 *  @param {node} [nTr] TR element to add to the table - optional. If not given,
+	 *    DataTables will create a row automatically
+	 *  @param {array} [anTds] Array of TD|TH elements for the row - must be given
+	 *    if nTr is.
+	 *  @returns {int} >=0 if successful (index of new aoData entry), -1 if failed
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAddData ( oSettings, aDataIn, nTr, anTds )
+	{
+		/* Create the object for storing information about this new row */
+		var iRow = oSettings.aoData.length;
+		var oData = $.extend( true, {}, DataTable.models.oRow, {
+			src: nTr ? 'dom' : 'data',
+			idx: iRow
+		} );
+	
+		oData._aData = aDataIn;
+		oSettings.aoData.push( oData );
+	
+		/* Create the cells */
+		var nTd, sThisType;
+		var columns = oSettings.aoColumns;
+		for ( var i=0, iLen=columns.length ; i<iLen ; i++ )
+		{
+			// When working with a row, the data source object must be populated. In
+			// all other cases, the data source object is already populated, so we
+			// don't overwrite it, which might break bindings etc
+			if ( nTr ) {
+				_fnSetCellData( oSettings, iRow, i, _fnGetCellData( oSettings, iRow, i ) );
+			}
+			columns[i].sType = null;
+		}
+	
+		/* Add to the display array */
+		oSettings.aiDisplayMaster.push( iRow );
+	
+		var id = oSettings.rowIdFn( aDataIn );
+		if ( id !== undefined ) {
+			oSettings.aIds[ id ] = oData;
+		}
+	
+		/* Create the DOM information, or register it if already present */
+		if ( nTr || ! oSettings.oFeatures.bDeferRender )
+		{
+			_fnCreateTr( oSettings, iRow, nTr, anTds );
+		}
+	
+		return iRow;
+	}
+	
+	
+	/**
+	 * Add one or more TR elements to the table. Generally we'd expect to
+	 * use this for reading data from a DOM sourced table, but it could be
+	 * used for an TR element. Note that if a TR is given, it is used (i.e.
+	 * it is not cloned).
+	 *  @param {object} settings dataTables settings object
+	 *  @param {array|node|jQuery} trs The TR element(s) to add to the table
+	 *  @returns {array} Array of indexes for the added rows
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAddTr( settings, trs )
+	{
+		var row;
+	
+		// Allow an individual node to be passed in
+		if ( ! (trs instanceof $) ) {
+			trs = $(trs);
+		}
+	
+		return trs.map( function (i, el) {
+			row = _fnGetRowElements( settings, el );
+			return _fnAddData( settings, row.data, el, row.cells );
+		} );
+	}
+	
+	
+	/**
+	 * Take a TR element and convert it to an index in aoData
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {node} n the TR element to find
+	 *  @returns {int} index if the node is found, null if not
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnNodeToDataIndex( oSettings, n )
+	{
+		return (n._DT_RowIndex!==undefined) ? n._DT_RowIndex : null;
+	}
+	
+	
+	/**
+	 * Take a TD element and convert it into a column data index (not the visible index)
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {int} iRow The row number the TD/TH can be found in
+	 *  @param {node} n The TD/TH element to find
+	 *  @returns {int} index if the node is found, -1 if not
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnNodeToColumnIndex( oSettings, iRow, n )
+	{
+		return $.inArray( n, oSettings.aoData[ iRow ].anCells );
+	}
+	
+	
+	/**
+	 * Get the data for a given cell from the internal cache, taking into account data mapping
+	 *  @param {object} settings dataTables settings object
+	 *  @param {int} rowIdx aoData row id
+	 *  @param {int} colIdx Column index
+	 *  @param {string} type data get type ('display', 'type' 'filter' 'sort')
+	 *  @returns {*} Cell data
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetCellData( settings, rowIdx, colIdx, type )
+	{
+		var draw           = settings.iDraw;
+		var col            = settings.aoColumns[colIdx];
+		var rowData        = settings.aoData[rowIdx]._aData;
+		var defaultContent = col.sDefaultContent;
+		var cellData       = col.fnGetData( rowData, type, {
+			settings: settings,
+			row:      rowIdx,
+			col:      colIdx
+		} );
+	
+		if ( cellData === undefined ) {
+			if ( settings.iDrawError != draw && defaultContent === null ) {
+				_fnLog( settings, 0, "Requested unknown parameter "+
+					(typeof col.mData=='function' ? '{function}' : "'"+col.mData+"'")+
+					" for row "+rowIdx, 4 );
+				settings.iDrawError = draw;
+			}
+			return defaultContent;
+		}
+	
+		/* When the data source is null, we can use default column data */
+		if ( (cellData === rowData || cellData === null) && defaultContent !== null ) {
+			cellData = defaultContent;
+		}
+		else if ( typeof cellData === 'function' ) {
+			// If the data source is a function, then we run it and use the return,
+			// executing in the scope of the data object (for instances)
+			return cellData.call( rowData );
+		}
+	
+		if ( cellData === null && type == 'display' ) {
+			return '';
+		}
+		return cellData;
+	}
+	
+	
+	/**
+	 * Set the value for a specific cell, into the internal data cache
+	 *  @param {object} settings dataTables settings object
+	 *  @param {int} rowIdx aoData row id
+	 *  @param {int} colIdx Column index
+	 *  @param {*} val Value to set
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSetCellData( settings, rowIdx, colIdx, val )
+	{
+		var col     = settings.aoColumns[colIdx];
+		var rowData = settings.aoData[rowIdx]._aData;
+	
+		col.fnSetData( rowData, val, {
+			settings: settings,
+			row:      rowIdx,
+			col:      colIdx
+		}  );
+	}
+	
+	
+	// Private variable that is used to match action syntax in the data property object
+	var __reArray = /\[.*?\]$/;
+	var __reFn = /\(\)$/;
+	
+	/**
+	 * Split string on periods, taking into account escaped periods
+	 * @param  {string} str String to split
+	 * @return {array} Split string
+	 */
+	function _fnSplitObjNotation( str )
+	{
+		return $.map( str.match(/(\\.|[^\.])+/g) || [''], function ( s ) {
+			return s.replace(/\\./g, '.');
+		} );
+	}
+	
+	
+	/**
+	 * Return a function that can be used to get data from a source object, taking
+	 * into account the ability to use nested objects as a source
+	 *  @param {string|int|function} mSource The data source for the object
+	 *  @returns {function} Data get function
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetObjectDataFn( mSource )
+	{
+		if ( $.isPlainObject( mSource ) )
+		{
+			/* Build an object of get functions, and wrap them in a single call */
+			var o = {};
+			$.each( mSource, function (key, val) {
+				if ( val ) {
+					o[key] = _fnGetObjectDataFn( val );
+				}
+			} );
+	
+			return function (data, type, row, meta) {
+				var t = o[type] || o._;
+				return t !== undefined ?
+					t(data, type, row, meta) :
+					data;
+			};
+		}
+		else if ( mSource === null )
+		{
+			/* Give an empty string for rendering / sorting etc */
+			return function (data) { // type, row and meta also passed, but not used
+				return data;
+			};
+		}
+		else if ( typeof mSource === 'function' )
+		{
+			return function (data, type, row, meta) {
+				return mSource( data, type, row, meta );
+			};
+		}
+		else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 ||
+			      mSource.indexOf('[') !== -1 || mSource.indexOf('(') !== -1) )
+		{
+			/* If there is a . in the source string then the data source is in a
+			 * nested object so we loop over the data for each level to get the next
+			 * level down. On each loop we test for undefined, and if found immediately
+			 * return. This allows entire objects to be missing and sDefaultContent to
+			 * be used if defined, rather than throwing an error
+			 */
+			var fetchData = function (data, type, src) {
+				var arrayNotation, funcNotation, out, innerSrc;
+	
+				if ( src !== "" )
+				{
+					var a = _fnSplitObjNotation( src );
+	
+					for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+					{
+						// Check if we are dealing with special notation
+						arrayNotation = a[i].match(__reArray);
+						funcNotation = a[i].match(__reFn);
+	
+						if ( arrayNotation )
+						{
+							// Array notation
+							a[i] = a[i].replace(__reArray, '');
+	
+							// Condition allows simply [] to be passed in
+							if ( a[i] !== "" ) {
+								data = data[ a[i] ];
+							}
+							out = [];
+	
+							// Get the remainder of the nested object to get
+							a.splice( 0, i+1 );
+							innerSrc = a.join('.');
+	
+							// Traverse each entry in the array getting the properties requested
+							for ( var j=0, jLen=data.length ; j<jLen ; j++ ) {
+								out.push( fetchData( data[j], type, innerSrc ) );
+							}
+	
+							// If a string is given in between the array notation indicators, that
+							// is used to join the strings together, otherwise an array is returned
+							var join = arrayNotation[0].substring(1, arrayNotation[0].length-1);
+							data = (join==="") ? out : out.join(join);
+	
+							// The inner call to fetchData has already traversed through the remainder
+							// of the source requested, so we exit from the loop
+							break;
+						}
+						else if ( funcNotation )
+						{
+							// Function call
+							a[i] = a[i].replace(__reFn, '');
+							data = data[ a[i] ]();
+							continue;
+						}
+	
+						if ( data === null || data[ a[i] ] === undefined )
+						{
+							return undefined;
+						}
+						data = data[ a[i] ];
+					}
+				}
+	
+				return data;
+			};
+	
+			return function (data, type) { // row and meta also passed, but not used
+				return fetchData( data, type, mSource );
+			};
+		}
+		else
+		{
+			/* Array or flat object mapping */
+			return function (data, type) { // row and meta also passed, but not used
+				return data[mSource];
+			};
+		}
+	}
+	
+	
+	/**
+	 * Return a function that can be used to set data from a source object, taking
+	 * into account the ability to use nested objects as a source
+	 *  @param {string|int|function} mSource The data source for the object
+	 *  @returns {function} Data set function
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSetObjectDataFn( mSource )
+	{
+		if ( $.isPlainObject( mSource ) )
+		{
+			/* Unlike get, only the underscore (global) option is used for for
+			 * setting data since we don't know the type here. This is why an object
+			 * option is not documented for `mData` (which is read/write), but it is
+			 * for `mRender` which is read only.
+			 */
+			return _fnSetObjectDataFn( mSource._ );
+		}
+		else if ( mSource === null )
+		{
+			/* Nothing to do when the data source is null */
+			return function () {};
+		}
+		else if ( typeof mSource === 'function' )
+		{
+			return function (data, val, meta) {
+				mSource( data, 'set', val, meta );
+			};
+		}
+		else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 ||
+			      mSource.indexOf('[') !== -1 || mSource.indexOf('(') !== -1) )
+		{
+			/* Like the get, we need to get data from a nested object */
+			var setData = function (data, val, src) {
+				var a = _fnSplitObjNotation( src ), b;
+				var aLast = a[a.length-1];
+				var arrayNotation, funcNotation, o, innerSrc;
+	
+				for ( var i=0, iLen=a.length-1 ; i<iLen ; i++ )
+				{
+					// Check if we are dealing with an array notation request
+					arrayNotation = a[i].match(__reArray);
+					funcNotation = a[i].match(__reFn);
+	
+					if ( arrayNotation )
+					{
+						a[i] = a[i].replace(__reArray, '');
+						data[ a[i] ] = [];
+	
+						// Get the remainder of the nested object to set so we can recurse
+						b = a.slice();
+						b.splice( 0, i+1 );
+						innerSrc = b.join('.');
+	
+						// Traverse each entry in the array setting the properties requested
+						for ( var j=0, jLen=val.length ; j<jLen ; j++ )
+						{
+							o = {};
+							setData( o, val[j], innerSrc );
+							data[ a[i] ].push( o );
+						}
+	
+						// The inner call to setData has already traversed through the remainder
+						// of the source and has set the data, thus we can exit here
+						return;
+					}
+					else if ( funcNotation )
+					{
+						// Function call
+						a[i] = a[i].replace(__reFn, '');
+						data = data[ a[i] ]( val );
+					}
+	
+					// If the nested object doesn't currently exist - since we are
+					// trying to set the value - create it
+					if ( data[ a[i] ] === null || data[ a[i] ] === undefined )
+					{
+						data[ a[i] ] = {};
+					}
+					data = data[ a[i] ];
+				}
+	
+				// Last item in the input - i.e, the actual set
+				if ( aLast.match(__reFn ) )
+				{
+					// Function call
+					data = data[ aLast.replace(__reFn, '') ]( val );
+				}
+				else
+				{
+					// If array notation is used, we just want to strip it and use the property name
+					// and assign the value. If it isn't used, then we get the result we want anyway
+					data[ aLast.replace(__reArray, '') ] = val;
+				}
+			};
+	
+			return function (data, val) { // meta is also passed in, but not used
+				return setData( data, val, mSource );
+			};
+		}
+		else
+		{
+			/* Array or flat object mapping */
+			return function (data, val) { // meta is also passed in, but not used
+				data[mSource] = val;
+			};
+		}
+	}
+	
+	
+	/**
+	 * Return an array with the full table data
+	 *  @param {object} oSettings dataTables settings object
+	 *  @returns array {array} aData Master data array
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetDataMaster ( settings )
+	{
+		return _pluck( settings.aoData, '_aData' );
+	}
+	
+	
+	/**
+	 * Nuke the table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnClearTable( settings )
+	{
+		settings.aoData.length = 0;
+		settings.aiDisplayMaster.length = 0;
+		settings.aiDisplay.length = 0;
+	}
+	
+	
+	 /**
+	 * Take an array of integers (index array) and remove a target integer (value - not
+	 * the key!)
+	 *  @param {array} a Index array to target
+	 *  @param {int} iTarget value to find
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnDeleteIndex( a, iTarget, splice )
+	{
+		var iTargetIndex = -1;
+	
+		for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+		{
+			if ( a[i] == iTarget )
+			{
+				iTargetIndex = i;
+			}
+			else if ( a[i] > iTarget )
+			{
+				a[i]--;
+			}
+		}
+	
+		if ( iTargetIndex != -1 && splice === undefined )
+		{
+			a.splice( iTargetIndex, 1 );
+		}
+	}
+	
+	
+	/**
+	 * Mark cached data as invalid such that a re-read of the data will occur when
+	 * the cached data is next requested. Also update from the data source object.
+	 *
+	 * @param {object} settings DataTables settings object
+	 * @param {int}    rowIdx   Row index to invalidate
+	 * @param {string} [src]    Source to invalidate from: undefined, 'auto', 'dom'
+	 *     or 'data'
+	 * @param {int}    [colIdx] Column index to invalidate. If undefined the whole
+	 *     row will be invalidated
+	 * @memberof DataTable#oApi
+	 *
+	 * @todo For the modularisation of v1.11 this will need to become a callback, so
+	 *   the sort and filter methods can subscribe to it. That will required
+	 *   initialisation options for sorting, which is why it is not already baked in
+	 */
+	function _fnInvalidate( settings, rowIdx, src, colIdx )
+	{
+		var row = settings.aoData[ rowIdx ];
+		var i, ien;
+		var cellWrite = function ( cell, col ) {
+			// This is very frustrating, but in IE if you just write directly
+			// to innerHTML, and elements that are overwritten are GC'ed,
+			// even if there is a reference to them elsewhere
+			while ( cell.childNodes.length ) {
+				cell.removeChild( cell.firstChild );
+			}
+	
+			cell.innerHTML = _fnGetCellData( settings, rowIdx, col, 'display' );
+		};
+	
+		// Are we reading last data from DOM or the data object?
+		if ( src === 'dom' || ((! src || src === 'auto') && row.src === 'dom') ) {
+			// Read the data from the DOM
+			row._aData = _fnGetRowElements(
+					settings, row, colIdx, colIdx === undefined ? undefined : row._aData
+				)
+				.data;
+		}
+		else {
+			// Reading from data object, update the DOM
+			var cells = row.anCells;
+	
+			if ( cells ) {
+				if ( colIdx !== undefined ) {
+					cellWrite( cells[colIdx], colIdx );
+				}
+				else {
+					for ( i=0, ien=cells.length ; i<ien ; i++ ) {
+						cellWrite( cells[i], i );
+					}
+				}
+			}
+		}
+	
+		// For both row and cell invalidation, the cached data for sorting and
+		// filtering is nulled out
+		row._aSortData = null;
+		row._aFilterData = null;
+	
+		// Invalidate the type for a specific column (if given) or all columns since
+		// the data might have changed
+		var cols = settings.aoColumns;
+		if ( colIdx !== undefined ) {
+			cols[ colIdx ].sType = null;
+		}
+		else {
+			for ( i=0, ien=cols.length ; i<ien ; i++ ) {
+				cols[i].sType = null;
+			}
+	
+			// Update DataTables special `DT_*` attributes for the row
+			_fnRowAttributes( settings, row );
+		}
+	}
+	
+	
+	/**
+	 * Build a data source object from an HTML row, reading the contents of the
+	 * cells that are in the row.
+	 *
+	 * @param {object} settings DataTables settings object
+	 * @param {node|object} TR element from which to read data or existing row
+	 *   object from which to re-read the data from the cells
+	 * @param {int} [colIdx] Optional column index
+	 * @param {array|object} [d] Data source object. If `colIdx` is given then this
+	 *   parameter should also be given and will be used to write the data into.
+	 *   Only the column in question will be written
+	 * @returns {object} Object with two parameters: `data` the data read, in
+	 *   document order, and `cells` and array of nodes (they can be useful to the
+	 *   caller, so rather than needing a second traversal to get them, just return
+	 *   them from here).
+	 * @memberof DataTable#oApi
+	 */
+	function _fnGetRowElements( settings, row, colIdx, d )
+	{
+		var
+			tds = [],
+			td = row.firstChild,
+			name, col, o, i=0, contents,
+			columns = settings.aoColumns,
+			objectRead = settings._rowReadObject;
+	
+		// Allow the data object to be passed in, or construct
+		d = d || objectRead ? {} : [];
+	
+		var attr = function ( str, td  ) {
+			if ( typeof str === 'string' ) {
+				var idx = str.indexOf('@');
+	
+				if ( idx !== -1 ) {
+					var attr = str.substring( idx+1 );
+					var setter = _fnSetObjectDataFn( str );
+					setter( d, td.getAttribute( attr ) );
+				}
+			}
+		};
+	
+		// Read data from a cell and store into the data object
+		var cellProcess = function ( cell ) {
+			if ( colIdx === undefined || colIdx === i ) {
+				col = columns[i];
+				contents = $.trim(cell.innerHTML);
+	
+				if ( col && col._bAttrSrc ) {
+					var setter = _fnSetObjectDataFn( col.mData._ );
+					setter( d, contents );
+	
+					attr( col.mData.sort, cell );
+					attr( col.mData.type, cell );
+					attr( col.mData.filter, cell );
+				}
+				else {
+					// Depending on the `data` option for the columns the data can
+					// be read to either an object or an array.
+					if ( objectRead ) {
+						if ( ! col._setter ) {
+							// Cache the setter function
+							col._setter = _fnSetObjectDataFn( col.mData );
+						}
+						col._setter( d, contents );
+					}
+					else {
+						d[i] = contents;
+					}
+				}
+			}
+	
+			i++;
+		};
+	
+		if ( td ) {
+			// `tr` element was passed in
+			while ( td ) {
+				name = td.nodeName.toUpperCase();
+	
+				if ( name == "TD" || name == "TH" ) {
+					cellProcess( td );
+					tds.push( td );
+				}
+	
+				td = td.nextSibling;
+			}
+		}
+		else {
+			// Existing row object passed in
+			tds = row.anCells;
+	
+			for ( var j=0, jen=tds.length ; j<jen ; j++ ) {
+				cellProcess( tds[j] );
+			}
+		}
+	
+		// Read the ID from the DOM if present
+		var id = row.getAttribute( 'id' );
+		if ( id ) {
+			_fnSetObjectDataFn( settings.rowId )( d, id );
+		}
+	
+		return {
+			data: d,
+			cells: tds
+		};
+	}
+	/**
+	 * Create a new TR element (and it's TD children) for a row
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {int} iRow Row to consider
+	 *  @param {node} [nTrIn] TR element to add to the table - optional. If not given,
+	 *    DataTables will create a row automatically
+	 *  @param {array} [anTds] Array of TD|TH elements for the row - must be given
+	 *    if nTr is.
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
+	{
+		var
+			row = oSettings.aoData[iRow],
+			rowData = row._aData,
+			cells = [],
+			nTr, nTd, oCol,
+			i, iLen;
+	
+		if ( row.nTr === null )
+		{
+			nTr = nTrIn || document.createElement('tr');
+	
+			row.nTr = nTr;
+			row.anCells = cells;
+	
+			/* Use a private property on the node to allow reserve mapping from the node
+			 * to the aoData array for fast look up
+			 */
+			nTr._DT_RowIndex = iRow;
+	
+			/* Special parameters can be given by the data source to be used on the row */
+			_fnRowAttributes( oSettings, row );
+	
+			/* Process each column */
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				oCol = oSettings.aoColumns[i];
+	
+				nTd = nTrIn ? anTds[i] : document.createElement( oCol.sCellType );
+				cells.push( nTd );
+	
+				// Need to create the HTML if new, or if a rendering function is defined
+				if ( !nTrIn || oCol.mRender || oCol.mData !== i )
+				{
+					nTd.innerHTML = _fnGetCellData( oSettings, iRow, i, 'display' );
+				}
+	
+				/* Add user defined class */
+				if ( oCol.sClass )
+				{
+					nTd.className += ' '+oCol.sClass;
+				}
+	
+				// Visibility - add or remove as required
+				if ( oCol.bVisible && ! nTrIn )
+				{
+					nTr.appendChild( nTd );
+				}
+				else if ( ! oCol.bVisible && nTrIn )
+				{
+					nTd.parentNode.removeChild( nTd );
+				}
+	
+				if ( oCol.fnCreatedCell )
+				{
+					oCol.fnCreatedCell.call( oSettings.oInstance,
+						nTd, _fnGetCellData( oSettings, iRow, i ), rowData, iRow, i
+					);
+				}
+			}
+	
+			_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow] );
+		}
+	
+		// Remove once webkit bug 131819 and Chromium bug 365619 have been resolved
+		// and deployed
+		row.nTr.setAttribute( 'role', 'row' );
+	}
+	
+	
+	/**
+	 * Add attributes to a row based on the special `DT_*` parameters in a data
+	 * source object.
+	 *  @param {object} settings DataTables settings object
+	 *  @param {object} DataTables row object for the row to be modified
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnRowAttributes( settings, row )
+	{
+		var tr = row.nTr;
+		var data = row._aData;
+	
+		if ( tr ) {
+			var id = settings.rowIdFn( data );
+	
+			if ( id ) {
+				tr.id = id;
+			}
+	
+			if ( data.DT_RowClass ) {
+				// Remove any classes added by DT_RowClass before
+				var a = data.DT_RowClass.split(' ');
+				row.__rowc = row.__rowc ?
+					_unique( row.__rowc.concat( a ) ) :
+					a;
+	
+				$(tr)
+					.removeClass( row.__rowc.join(' ') )
+					.addClass( data.DT_RowClass );
+			}
+	
+			if ( data.DT_RowAttr ) {
+				$(tr).attr( data.DT_RowAttr );
+			}
+	
+			if ( data.DT_RowData ) {
+				$(tr).data( data.DT_RowData );
+			}
+		}
+	}
+	
+	
+	/**
+	 * Create the HTML header for the table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnBuildHead( oSettings )
+	{
+		var i, ien, cell, row, column;
+		var thead = oSettings.nTHead;
+		var tfoot = oSettings.nTFoot;
+		var createHeader = $('th, td', thead).length === 0;
+		var classes = oSettings.oClasses;
+		var columns = oSettings.aoColumns;
+	
+		if ( createHeader ) {
+			row = $('<tr/>').appendTo( thead );
+		}
+	
+		for ( i=0, ien=columns.length ; i<ien ; i++ ) {
+			column = columns[i];
+			cell = $( column.nTh ).addClass( column.sClass );
+	
+			if ( createHeader ) {
+				cell.appendTo( row );
+			}
+	
+			// 1.11 move into sorting
+			if ( oSettings.oFeatures.bSort ) {
+				cell.addClass( column.sSortingClass );
+	
+				if ( column.bSortable !== false ) {
+					cell
+						.attr( 'tabindex', oSettings.iTabIndex )
+						.attr( 'aria-controls', oSettings.sTableId );
+	
+					_fnSortAttachListener( oSettings, column.nTh, i );
+				}
+			}
+	
+			if ( column.sTitle != cell[0].innerHTML ) {
+				cell.html( column.sTitle );
+			}
+	
+			_fnRenderer( oSettings, 'header' )(
+				oSettings, cell, column, classes
+			);
+		}
+	
+		if ( createHeader ) {
+			_fnDetectHeader( oSettings.aoHeader, thead );
+		}
+		
+		/* ARIA role for the rows */
+	 	$(thead).find('>tr').attr('role', 'row');
+	
+		/* Deal with the footer - add classes if required */
+		$(thead).find('>tr>th, >tr>td').addClass( classes.sHeaderTH );
+		$(tfoot).find('>tr>th, >tr>td').addClass( classes.sFooterTH );
+	
+		// Cache the footer cells. Note that we only take the cells from the first
+		// row in the footer. If there is more than one row the user wants to
+		// interact with, they need to use the table().foot() method. Note also this
+		// allows cells to be used for multiple columns using colspan
+		if ( tfoot !== null ) {
+			var cells = oSettings.aoFooter[0];
+	
+			for ( i=0, ien=cells.length ; i<ien ; i++ ) {
+				column = columns[i];
+				column.nTf = cells[i].cell;
+	
+				if ( column.sClass ) {
+					$(column.nTf).addClass( column.sClass );
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * Draw the header (or footer) element based on the column visibility states. The
+	 * methodology here is to use the layout array from _fnDetectHeader, modified for
+	 * the instantaneous column visibility, to construct the new layout. The grid is
+	 * traversed over cell at a time in a rows x columns grid fashion, although each
+	 * cell insert can cover multiple elements in the grid - which is tracks using the
+	 * aApplied array. Cell inserts in the grid will only occur where there isn't
+	 * already a cell in that position.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param array {objects} aoSource Layout array from _fnDetectHeader
+	 *  @param {boolean} [bIncludeHidden=false] If true then include the hidden columns in the calc,
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnDrawHead( oSettings, aoSource, bIncludeHidden )
+	{
+		var i, iLen, j, jLen, k, kLen, n, nLocalTr;
+		var aoLocal = [];
+		var aApplied = [];
+		var iColumns = oSettings.aoColumns.length;
+		var iRowspan, iColspan;
+	
+		if ( ! aoSource )
+		{
+			return;
+		}
+	
+		if (  bIncludeHidden === undefined )
+		{
+			bIncludeHidden = false;
+		}
+	
+		/* Make a copy of the master layout array, but without the visible columns in it */
+		for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
+		{
+			aoLocal[i] = aoSource[i].slice();
+			aoLocal[i].nTr = aoSource[i].nTr;
+	
+			/* Remove any columns which are currently hidden */
+			for ( j=iColumns-1 ; j>=0 ; j-- )
+			{
+				if ( !oSettings.aoColumns[j].bVisible && !bIncludeHidden )
+				{
+					aoLocal[i].splice( j, 1 );
+				}
+			}
+	
+			/* Prep the applied array - it needs an element for each row */
+			aApplied.push( [] );
+		}
+	
+		for ( i=0, iLen=aoLocal.length ; i<iLen ; i++ )
+		{
+			nLocalTr = aoLocal[i].nTr;
+	
+			/* All cells are going to be replaced, so empty out the row */
+			if ( nLocalTr )
+			{
+				while( (n = nLocalTr.firstChild) )
+				{
+					nLocalTr.removeChild( n );
+				}
+			}
+	
+			for ( j=0, jLen=aoLocal[i].length ; j<jLen ; j++ )
+			{
+				iRowspan = 1;
+				iColspan = 1;
+	
+				/* Check to see if there is already a cell (row/colspan) covering our target
+				 * insert point. If there is, then there is nothing to do.
+				 */
+				if ( aApplied[i][j] === undefined )
+				{
+					nLocalTr.appendChild( aoLocal[i][j].cell );
+					aApplied[i][j] = 1;
+	
+					/* Expand the cell to cover as many rows as needed */
+					while ( aoLocal[i+iRowspan] !== undefined &&
+					        aoLocal[i][j].cell == aoLocal[i+iRowspan][j].cell )
+					{
+						aApplied[i+iRowspan][j] = 1;
+						iRowspan++;
+					}
+	
+					/* Expand the cell to cover as many columns as needed */
+					while ( aoLocal[i][j+iColspan] !== undefined &&
+					        aoLocal[i][j].cell == aoLocal[i][j+iColspan].cell )
+					{
+						/* Must update the applied array over the rows for the columns */
+						for ( k=0 ; k<iRowspan ; k++ )
+						{
+							aApplied[i+k][j+iColspan] = 1;
+						}
+						iColspan++;
+					}
+	
+					/* Do the actual expansion in the DOM */
+					$(aoLocal[i][j].cell)
+						.attr('rowspan', iRowspan)
+						.attr('colspan', iColspan);
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * Insert the required TR nodes into the table for display
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnDraw( oSettings )
+	{
+		/* Provide a pre-callback function which can be used to cancel the draw is false is returned */
+		var aPreDraw = _fnCallbackFire( oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings] );
+		if ( $.inArray( false, aPreDraw ) !== -1 )
+		{
+			_fnProcessingDisplay( oSettings, false );
+			return;
+		}
+	
+		var i, iLen, n;
+		var anRows = [];
+		var iRowCount = 0;
+		var asStripeClasses = oSettings.asStripeClasses;
+		var iStripes = asStripeClasses.length;
+		var iOpenRows = oSettings.aoOpenRows.length;
+		var oLang = oSettings.oLanguage;
+		var iInitDisplayStart = oSettings.iInitDisplayStart;
+		var bServerSide = _fnDataSource( oSettings ) == 'ssp';
+		var aiDisplay = oSettings.aiDisplay;
+	
+		oSettings.bDrawing = true;
+	
+		/* Check and see if we have an initial draw position from state saving */
+		if ( iInitDisplayStart !== undefined && iInitDisplayStart !== -1 )
+		{
+			oSettings._iDisplayStart = bServerSide ?
+				iInitDisplayStart :
+				iInitDisplayStart >= oSettings.fnRecordsDisplay() ?
+					0 :
+					iInitDisplayStart;
+	
+			oSettings.iInitDisplayStart = -1;
+		}
+	
+		var iDisplayStart = oSettings._iDisplayStart;
+		var iDisplayEnd = oSettings.fnDisplayEnd();
+	
+		/* Server-side processing draw intercept */
+		if ( oSettings.bDeferLoading )
+		{
+			oSettings.bDeferLoading = false;
+			oSettings.iDraw++;
+			_fnProcessingDisplay( oSettings, false );
+		}
+		else if ( !bServerSide )
+		{
+			oSettings.iDraw++;
+		}
+		else if ( !oSettings.bDestroying && !_fnAjaxUpdate( oSettings ) )
+		{
+			return;
+		}
+	
+		if ( aiDisplay.length !== 0 )
+		{
+			var iStart = bServerSide ? 0 : iDisplayStart;
+			var iEnd = bServerSide ? oSettings.aoData.length : iDisplayEnd;
+	
+			for ( var j=iStart ; j<iEnd ; j++ )
+			{
+				var iDataIndex = aiDisplay[j];
+				var aoData = oSettings.aoData[ iDataIndex ];
+				if ( aoData.nTr === null )
+				{
+					_fnCreateTr( oSettings, iDataIndex );
+				}
+	
+				var nRow = aoData.nTr;
+	
+				/* Remove the old striping classes and then add the new one */
+				if ( iStripes !== 0 )
+				{
+					var sStripe = asStripeClasses[ iRowCount % iStripes ];
+					if ( aoData._sRowStripe != sStripe )
+					{
+						$(nRow).removeClass( aoData._sRowStripe ).addClass( sStripe );
+						aoData._sRowStripe = sStripe;
+					}
+				}
+	
+				// Row callback functions - might want to manipulate the row
+				// iRowCount and j are not currently documented. Are they at all
+				// useful?
+				_fnCallbackFire( oSettings, 'aoRowCallback', null,
+					[nRow, aoData._aData, iRowCount, j] );
+	
+				anRows.push( nRow );
+				iRowCount++;
+			}
+		}
+		else
+		{
+			/* Table is empty - create a row with an empty message in it */
+			var sZero = oLang.sZeroRecords;
+			if ( oSettings.iDraw == 1 &&  _fnDataSource( oSettings ) == 'ajax' )
+			{
+				sZero = oLang.sLoadingRecords;
+			}
+			else if ( oLang.sEmptyTable && oSettings.fnRecordsTotal() === 0 )
+			{
+				sZero = oLang.sEmptyTable;
+			}
+	
+			anRows[ 0 ] = $( '<tr/>', { 'class': iStripes ? asStripeClasses[0] : '' } )
+				.append( $('<td />', {
+					'valign':  'top',
+					'colSpan': _fnVisbleColumns( oSettings ),
+					'class':   oSettings.oClasses.sRowEmpty
+				} ).html( sZero ) )[0];
+		}
+	
+		/* Header and footer callbacks */
+		_fnCallbackFire( oSettings, 'aoHeaderCallback', 'header', [ $(oSettings.nTHead).children('tr')[0],
+			_fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
+	
+		_fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0],
+			_fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
+	
+		var body = $(oSettings.nTBody);
+	
+		body.children().detach();
+		body.append( $(anRows) );
+	
+		/* Call all required callback functions for the end of a draw */
+		_fnCallbackFire( oSettings, 'aoDrawCallback', 'draw', [oSettings] );
+	
+		/* Draw is complete, sorting and filtering must be as well */
+		oSettings.bSorted = false;
+		oSettings.bFiltered = false;
+		oSettings.bDrawing = false;
+	}
+	
+	
+	/**
+	 * Redraw the table - taking account of the various features which are enabled
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {boolean} [holdPosition] Keep the current paging position. By default
+	 *    the paging is reset to the first page
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnReDraw( settings, holdPosition )
+	{
+		var
+			features = settings.oFeatures,
+			sort     = features.bSort,
+			filter   = features.bFilter;
+	
+		if ( sort ) {
+			_fnSort( settings );
+		}
+	
+		if ( filter ) {
+			_fnFilterComplete( settings, settings.oPreviousSearch );
+		}
+		else {
+			// No filtering, so we want to just use the display master
+			settings.aiDisplay = settings.aiDisplayMaster.slice();
+		}
+	
+		if ( holdPosition !== true ) {
+			settings._iDisplayStart = 0;
+		}
+	
+		// Let any modules know about the draw hold position state (used by
+		// scrolling internally)
+		settings._drawHold = holdPosition;
+	
+		_fnDraw( settings );
+	
+		settings._drawHold = false;
+	}
+	
+	
+	/**
+	 * Add the options to the page HTML for the table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAddOptionsHtml ( oSettings )
+	{
+		var classes = oSettings.oClasses;
+		var table = $(oSettings.nTable);
+		var holding = $('<div/>').insertBefore( table ); // Holding element for speed
+		var features = oSettings.oFeatures;
+	
+		// All DataTables are wrapped in a div
+		var insert = $('<div/>', {
+			id:      oSettings.sTableId+'_wrapper',
+			'class': classes.sWrapper + (oSettings.nTFoot ? '' : ' '+classes.sNoFooter)
+		} );
+	
+		oSettings.nHolding = holding[0];
+		oSettings.nTableWrapper = insert[0];
+		oSettings.nTableReinsertBefore = oSettings.nTable.nextSibling;
+	
+		/* Loop over the user set positioning and place the elements as needed */
+		var aDom = oSettings.sDom.split('');
+		var featureNode, cOption, nNewNode, cNext, sAttr, j;
+		for ( var i=0 ; i<aDom.length ; i++ )
+		{
+			featureNode = null;
+			cOption = aDom[i];
+	
+			if ( cOption == '<' )
+			{
+				/* New container div */
+				nNewNode = $('<div/>')[0];
+	
+				/* Check to see if we should append an id and/or a class name to the container */
+				cNext = aDom[i+1];
+				if ( cNext == "'" || cNext == '"' )
+				{
+					sAttr = "";
+					j = 2;
+					while ( aDom[i+j] != cNext )
+					{
+						sAttr += aDom[i+j];
+						j++;
+					}
+	
+					/* Replace jQuery UI constants @todo depreciated */
+					if ( sAttr == "H" )
+					{
+						sAttr = classes.sJUIHeader;
+					}
+					else if ( sAttr == "F" )
+					{
+						sAttr = classes.sJUIFooter;
+					}
+	
+					/* The attribute can be in the format of "#id.class", "#id" or "class" This logic
+					 * breaks the string into parts and applies them as needed
+					 */
+					if ( sAttr.indexOf('.') != -1 )
+					{
+						var aSplit = sAttr.split('.');
+						nNewNode.id = aSplit[0].substr(1, aSplit[0].length-1);
+						nNewNode.className = aSplit[1];
+					}
+					else if ( sAttr.charAt(0) == "#" )
+					{
+						nNewNode.id = sAttr.substr(1, sAttr.length-1);
+					}
+					else
+					{
+						nNewNode.className = sAttr;
+					}
+	
+					i += j; /* Move along the position array */
+				}
+	
+				insert.append( nNewNode );
+				insert = $(nNewNode);
+			}
+			else if ( cOption == '>' )
+			{
+				/* End container div */
+				insert = insert.parent();
+			}
+			// @todo Move options into their own plugins?
+			else if ( cOption == 'l' && features.bPaginate && features.bLengthChange )
+			{
+				/* Length */
+				featureNode = _fnFeatureHtmlLength( oSettings );
+			}
+			else if ( cOption == 'f' && features.bFilter )
+			{
+				/* Filter */
+				featureNode = _fnFeatureHtmlFilter( oSettings );
+			}
+			else if ( cOption == 'r' && features.bProcessing )
+			{
+				/* pRocessing */
+				featureNode = _fnFeatureHtmlProcessing( oSettings );
+			}
+			else if ( cOption == 't' )
+			{
+				/* Table */
+				featureNode = _fnFeatureHtmlTable( oSettings );
+			}
+			else if ( cOption ==  'i' && features.bInfo )
+			{
+				/* Info */
+				featureNode = _fnFeatureHtmlInfo( oSettings );
+			}
+			else if ( cOption == 'p' && features.bPaginate )
+			{
+				/* Pagination */
+				featureNode = _fnFeatureHtmlPaginate( oSettings );
+			}
+			else if ( DataTable.ext.feature.length !== 0 )
+			{
+				/* Plug-in features */
+				var aoFeatures = DataTable.ext.feature;
+				for ( var k=0, kLen=aoFeatures.length ; k<kLen ; k++ )
+				{
+					if ( cOption == aoFeatures[k].cFeature )
+					{
+						featureNode = aoFeatures[k].fnInit( oSettings );
+						break;
+					}
+				}
+			}
+	
+			/* Add to the 2D features array */
+			if ( featureNode )
+			{
+				var aanFeatures = oSettings.aanFeatures;
+	
+				if ( ! aanFeatures[cOption] )
+				{
+					aanFeatures[cOption] = [];
+				}
+	
+				aanFeatures[cOption].push( featureNode );
+				insert.append( featureNode );
+			}
+		}
+	
+		/* Built our DOM structure - replace the holding div with what we want */
+		holding.replaceWith( insert );
+		oSettings.nHolding = null;
+	}
+	
+	
+	/**
+	 * Use the DOM source to create up an array of header cells. The idea here is to
+	 * create a layout grid (array) of rows x columns, which contains a reference
+	 * to the cell that that point in the grid (regardless of col/rowspan), such that
+	 * any column / row could be removed and the new grid constructed
+	 *  @param array {object} aLayout Array to store the calculated layout in
+	 *  @param {node} nThead The header/footer element for the table
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnDetectHeader ( aLayout, nThead )
+	{
+		var nTrs = $(nThead).children('tr');
+		var nTr, nCell;
+		var i, k, l, iLen, jLen, iColShifted, iColumn, iColspan, iRowspan;
+		var bUnique;
+		var fnShiftCol = function ( a, i, j ) {
+			var k = a[i];
+	                while ( k[j] ) {
+				j++;
+			}
+			return j;
+		};
+	
+		aLayout.splice( 0, aLayout.length );
+	
+		/* We know how many rows there are in the layout - so prep it */
+		for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+		{
+			aLayout.push( [] );
+		}
+	
+		/* Calculate a layout array */
+		for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+		{
+			nTr = nTrs[i];
+			iColumn = 0;
+	
+			/* For every cell in the row... */
+			nCell = nTr.firstChild;
+			while ( nCell ) {
+				if ( nCell.nodeName.toUpperCase() == "TD" ||
+				     nCell.nodeName.toUpperCase() == "TH" )
+				{
+					/* Get the col and rowspan attributes from the DOM and sanitise them */
+					iColspan = nCell.getAttribute('colspan') * 1;
+					iRowspan = nCell.getAttribute('rowspan') * 1;
+					iColspan = (!iColspan || iColspan===0 || iColspan===1) ? 1 : iColspan;
+					iRowspan = (!iRowspan || iRowspan===0 || iRowspan===1) ? 1 : iRowspan;
+	
+					/* There might be colspan cells already in this row, so shift our target
+					 * accordingly
+					 */
+					iColShifted = fnShiftCol( aLayout, i, iColumn );
+	
+					/* Cache calculation for unique columns */
+					bUnique = iColspan === 1 ? true : false;
+	
+					/* If there is col / rowspan, copy the information into the layout grid */
+					for ( l=0 ; l<iColspan ; l++ )
+					{
+						for ( k=0 ; k<iRowspan ; k++ )
+						{
+							aLayout[i+k][iColShifted+l] = {
+								"cell": nCell,
+								"unique": bUnique
+							};
+							aLayout[i+k].nTr = nTr;
+						}
+					}
+				}
+				nCell = nCell.nextSibling;
+			}
+		}
+	}
+	
+	
+	/**
+	 * Get an array of unique th elements, one for each column
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {node} nHeader automatically detect the layout from this node - optional
+	 *  @param {array} aLayout thead/tfoot layout from _fnDetectHeader - optional
+	 *  @returns array {node} aReturn list of unique th's
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetUniqueThs ( oSettings, nHeader, aLayout )
+	{
+		var aReturn = [];
+		if ( !aLayout )
+		{
+			aLayout = oSettings.aoHeader;
+			if ( nHeader )
+			{
+				aLayout = [];
+				_fnDetectHeader( aLayout, nHeader );
+			}
+		}
+	
+		for ( var i=0, iLen=aLayout.length ; i<iLen ; i++ )
+		{
+			for ( var j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
+			{
+				if ( aLayout[i][j].unique &&
+					 (!aReturn[j] || !oSettings.bSortCellsTop) )
+				{
+					aReturn[j] = aLayout[i][j].cell;
+				}
+			}
+		}
+	
+		return aReturn;
+	}
+	
+	/**
+	 * Create an Ajax call based on the table's settings, taking into account that
+	 * parameters can have multiple forms, and backwards compatibility.
+	 *
+	 * @param {object} oSettings dataTables settings object
+	 * @param {array} data Data to send to the server, required by
+	 *     DataTables - may be augmented by developer callbacks
+	 * @param {function} fn Callback function to run when data is obtained
+	 */
+	function _fnBuildAjax( oSettings, data, fn )
+	{
+		// Compatibility with 1.9-, allow fnServerData and event to manipulate
+		_fnCallbackFire( oSettings, 'aoServerParams', 'serverParams', [data] );
+	
+		// Convert to object based for 1.10+ if using the old array scheme which can
+		// come from server-side processing or serverParams
+		if ( data && $.isArray(data) ) {
+			var tmp = {};
+			var rbracket = /(.*?)\[\]$/;
+	
+			$.each( data, function (key, val) {
+				var match = val.name.match(rbracket);
+	
+				if ( match ) {
+					// Support for arrays
+					var name = match[0];
+	
+					if ( ! tmp[ name ] ) {
+						tmp[ name ] = [];
+					}
+					tmp[ name ].push( val.value );
+				}
+				else {
+					tmp[val.name] = val.value;
+				}
+			} );
+			data = tmp;
+		}
+	
+		var ajaxData;
+		var ajax = oSettings.ajax;
+		var instance = oSettings.oInstance;
+		var callback = function ( json ) {
+			_fnCallbackFire( oSettings, null, 'xhr', [oSettings, json, oSettings.jqXHR] );
+			fn( json );
+		};
+	
+		if ( $.isPlainObject( ajax ) && ajax.data )
+		{
+			ajaxData = ajax.data;
+	
+			var newData = $.isFunction( ajaxData ) ?
+				ajaxData( data, oSettings ) :  // fn can manipulate data or return
+				ajaxData;                      // an object object or array to merge
+	
+			// If the function returned something, use that alone
+			data = $.isFunction( ajaxData ) && newData ?
+				newData :
+				$.extend( true, data, newData );
+	
+			// Remove the data property as we've resolved it already and don't want
+			// jQuery to do it again (it is restored at the end of the function)
+			delete ajax.data;
+		}
+	
+		var baseAjax = {
+			"data": data,
+			"success": function (json) {
+				var error = json.error || json.sError;
+				if ( error ) {
+					_fnLog( oSettings, 0, error );
+				}
+	
+				oSettings.json = json;
+				callback( json );
+			},
+			"dataType": "json",
+			"cache": false,
+			"type": oSettings.sServerMethod,
+			"error": function (xhr, error, thrown) {
+				var ret = _fnCallbackFire( oSettings, null, 'xhr', [oSettings, null, oSettings.jqXHR] );
+	
+				if ( $.inArray( true, ret ) === -1 ) {
+					if ( error == "parsererror" ) {
+						_fnLog( oSettings, 0, 'Invalid JSON response', 1 );
+					}
+					else if ( xhr.readyState === 4 ) {
+						_fnLog( oSettings, 0, 'Ajax error', 7 );
+					}
+				}
+	
+				_fnProcessingDisplay( oSettings, false );
+			}
+		};
+	
+		// Store the data submitted for the API
+		oSettings.oAjaxData = data;
+	
+		// Allow plug-ins and external processes to modify the data
+		_fnCallbackFire( oSettings, null, 'preXhr', [oSettings, data] );
+	
+		if ( oSettings.fnServerData )
+		{
+			// DataTables 1.9- compatibility
+			oSettings.fnServerData.call( instance,
+				oSettings.sAjaxSource,
+				$.map( data, function (val, key) { // Need to convert back to 1.9 trad format
+					return { name: key, value: val };
+				} ),
+				callback,
+				oSettings
+			);
+		}
+		else if ( oSettings.sAjaxSource || typeof ajax === 'string' )
+		{
+			// DataTables 1.9- compatibility
+			oSettings.jqXHR = $.ajax( $.extend( baseAjax, {
+				url: ajax || oSettings.sAjaxSource
+			} ) );
+		}
+		else if ( $.isFunction( ajax ) )
+		{
+			// Is a function - let the caller define what needs to be done
+			oSettings.jqXHR = ajax.call( instance, data, callback, oSettings );
+		}
+		else
+		{
+			// Object to extend the base settings
+			oSettings.jqXHR = $.ajax( $.extend( baseAjax, ajax ) );
+	
+			// Restore for next time around
+			ajax.data = ajaxData;
+		}
+	}
+	
+	
+	/**
+	 * Update the table using an Ajax call
+	 *  @param {object} settings dataTables settings object
+	 *  @returns {boolean} Block the table drawing or not
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAjaxUpdate( settings )
+	{
+		if ( settings.bAjaxDataGet ) {
+			settings.iDraw++;
+			_fnProcessingDisplay( settings, true );
+	
+			_fnBuildAjax(
+				settings,
+				_fnAjaxParameters( settings ),
+				function(json) {
+					_fnAjaxUpdateDraw( settings, json );
+				}
+			);
+	
+			return false;
+		}
+		return true;
+	}
+	
+	
+	/**
+	 * Build up the parameters in an object needed for a server-side processing
+	 * request. Note that this is basically done twice, is different ways - a modern
+	 * method which is used by default in DataTables 1.10 which uses objects and
+	 * arrays, or the 1.9- method with is name / value pairs. 1.9 method is used if
+	 * the sAjaxSource option is used in the initialisation, or the legacyAjax
+	 * option is set.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @returns {bool} block the table drawing or not
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAjaxParameters( settings )
+	{
+		var
+			columns = settings.aoColumns,
+			columnCount = columns.length,
+			features = settings.oFeatures,
+			preSearch = settings.oPreviousSearch,
+			preColSearch = settings.aoPreSearchCols,
+			i, data = [], dataProp, column, columnSearch,
+			sort = _fnSortFlatten( settings ),
+			displayStart = settings._iDisplayStart,
+			displayLength = features.bPaginate !== false ?
+				settings._iDisplayLength :
+				-1;
+	
+		var param = function ( name, value ) {
+			data.push( { 'name': name, 'value': value } );
+		};
+	
+		// DataTables 1.9- compatible method
+		param( 'sEcho',          settings.iDraw );
+		param( 'iColumns',       columnCount );
+		param( 'sColumns',       _pluck( columns, 'sName' ).join(',') );
+		param( 'iDisplayStart',  displayStart );
+		param( 'iDisplayLength', displayLength );
+	
+		// DataTables 1.10+ method
+		var d = {
+			draw:    settings.iDraw,
+			columns: [],
+			order:   [],
+			start:   displayStart,
+			length:  displayLength,
+			search:  {
+				value: preSearch.sSearch,
+				regex: preSearch.bRegex
+			}
+		};
+	
+		for ( i=0 ; i<columnCount ; i++ ) {
+			column = columns[i];
+			columnSearch = preColSearch[i];
+			dataProp = typeof column.mData=="function" ? 'function' : column.mData ;
+	
+			d.columns.push( {
+				data:       dataProp,
+				name:       column.sName,
+				searchable: column.bSearchable,
+				orderable:  column.bSortable,
+				search:     {
+					value: columnSearch.sSearch,
+					regex: columnSearch.bRegex
+				}
+			} );
+	
+			param( "mDataProp_"+i, dataProp );
+	
+			if ( features.bFilter ) {
+				param( 'sSearch_'+i,     columnSearch.sSearch );
+				param( 'bRegex_'+i,      columnSearch.bRegex );
+				param( 'bSearchable_'+i, column.bSearchable );
+			}
+	
+			if ( features.bSort ) {
+				param( 'bSortable_'+i, column.bSortable );
+			}
+		}
+	
+		if ( features.bFilter ) {
+			param( 'sSearch', preSearch.sSearch );
+			param( 'bRegex', preSearch.bRegex );
+		}
+	
+		if ( features.bSort ) {
+			$.each( sort, function ( i, val ) {
+				d.order.push( { column: val.col, dir: val.dir } );
+	
+				param( 'iSortCol_'+i, val.col );
+				param( 'sSortDir_'+i, val.dir );
+			} );
+	
+			param( 'iSortingCols', sort.length );
+		}
+	
+		// If the legacy.ajax parameter is null, then we automatically decide which
+		// form to use, based on sAjaxSource
+		var legacy = DataTable.ext.legacy.ajax;
+		if ( legacy === null ) {
+			return settings.sAjaxSource ? data : d;
+		}
+	
+		// Otherwise, if legacy has been specified then we use that to decide on the
+		// form
+		return legacy ? data : d;
+	}
+	
+	
+	/**
+	 * Data the data from the server (nuking the old) and redraw the table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {object} json json data return from the server.
+	 *  @param {string} json.sEcho Tracking flag for DataTables to match requests
+	 *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
+	 *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
+	 *  @param {array} json.aaData The data to display on this page
+	 *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAjaxUpdateDraw ( settings, json )
+	{
+		// v1.10 uses camelCase variables, while 1.9 uses Hungarian notation.
+		// Support both
+		var compat = function ( old, modern ) {
+			return json[old] !== undefined ? json[old] : json[modern];
+		};
+	
+		var data = _fnAjaxDataSrc( settings, json );
+		var draw            = compat( 'sEcho',                'draw' );
+		var recordsTotal    = compat( 'iTotalRecords',        'recordsTotal' );
+		var recordsFiltered = compat( 'iTotalDisplayRecords', 'recordsFiltered' );
+	
+		if ( draw ) {
+			// Protect against out of sequence returns
+			if ( draw*1 < settings.iDraw ) {
+				return;
+			}
+			settings.iDraw = draw * 1;
+		}
+	
+		_fnClearTable( settings );
+		settings._iRecordsTotal   = parseInt(recordsTotal, 10);
+		settings._iRecordsDisplay = parseInt(recordsFiltered, 10);
+	
+		for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+			_fnAddData( settings, data[i] );
+		}
+		settings.aiDisplay = settings.aiDisplayMaster.slice();
+	
+		settings.bAjaxDataGet = false;
+		_fnDraw( settings );
+	
+		if ( ! settings._bInitComplete ) {
+			_fnInitComplete( settings, json );
+		}
+	
+		settings.bAjaxDataGet = true;
+		_fnProcessingDisplay( settings, false );
+	}
+	
+	
+	/**
+	 * Get the data from the JSON data source to use for drawing a table. Using
+	 * `_fnGetObjectDataFn` allows the data to be sourced from a property of the
+	 * source object, or from a processing function.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param  {object} json Data source object / array from the server
+	 *  @return {array} Array of data to use
+	 */
+	function _fnAjaxDataSrc ( oSettings, json )
+	{
+		var dataSrc = $.isPlainObject( oSettings.ajax ) && oSettings.ajax.dataSrc !== undefined ?
+			oSettings.ajax.dataSrc :
+			oSettings.sAjaxDataProp; // Compatibility with 1.9-.
+	
+		// Compatibility with 1.9-. In order to read from aaData, check if the
+		// default has been changed, if not, check for aaData
+		if ( dataSrc === 'data' ) {
+			return json.aaData || json[dataSrc];
+		}
+	
+		return dataSrc !== "" ?
+			_fnGetObjectDataFn( dataSrc )( json ) :
+			json;
+	}
+	
+	/**
+	 * Generate the node required for filtering text
+	 *  @returns {node} Filter control element
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFeatureHtmlFilter ( settings )
+	{
+		var classes = settings.oClasses;
+		var tableId = settings.sTableId;
+		var language = settings.oLanguage;
+		var previousSearch = settings.oPreviousSearch;
+		var features = settings.aanFeatures;
+		var input = '<input type="search" class="'+classes.sFilterInput+'"/>';
+	
+		var str = language.sSearch;
+		str = str.match(/_INPUT_/) ?
+			str.replace('_INPUT_', input) :
+			str+input;
+	
+		var filter = $('<div/>', {
+				'id': ! features.f ? tableId+'_filter' : null,
+				'class': classes.sFilter
+			} )
+			.append( $('<label/>' ).append( str ) );
+	
+		var searchFn = function() {
+			/* Update all other filter input elements for the new display */
+			var n = features.f;
+			var val = !this.value ? "" : this.value; // mental IE8 fix :-(
+	
+			/* Now do the filter */
+			if ( val != previousSearch.sSearch ) {
+				_fnFilterComplete( settings, {
+					"sSearch": val,
+					"bRegex": previousSearch.bRegex,
+					"bSmart": previousSearch.bSmart ,
+					"bCaseInsensitive": previousSearch.bCaseInsensitive
+				} );
+	
+				// Need to redraw, without resorting
+				settings._iDisplayStart = 0;
+				_fnDraw( settings );
+			}
+		};
+	
+		var searchDelay = settings.searchDelay !== null ?
+			settings.searchDelay :
+			_fnDataSource( settings ) === 'ssp' ?
+				400 :
+				0;
+	
+		var jqFilter = $('input', filter)
+			.val( previousSearch.sSearch )
+			.attr( 'placeholder', language.sSearchPlaceholder )
+			.bind(
+				'keyup.DT search.DT input.DT paste.DT cut.DT',
+				searchDelay ?
+					_fnThrottle( searchFn, searchDelay ) :
+					searchFn
+			)
+			.bind( 'keypress.DT', function(e) {
+				/* Prevent form submission */
+				if ( e.keyCode == 13 ) {
+					return false;
+				}
+			} )
+			.attr('aria-controls', tableId);
+	
+		// Update the input elements whenever the table is filtered
+		$(settings.nTable).on( 'search.dt.DT', function ( ev, s ) {
+			if ( settings === s ) {
+				// IE9 throws an 'unknown error' if document.activeElement is used
+				// inside an iframe or frame...
+				try {
+					if ( jqFilter[0] !== document.activeElement ) {
+						jqFilter.val( previousSearch.sSearch );
+					}
+				}
+				catch ( e ) {}
+			}
+		} );
+	
+		return filter[0];
+	}
+	
+	
+	/**
+	 * Filter the table using both the global filter and column based filtering
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {object} oSearch search information
+	 *  @param {int} [iForce] force a research of the master array (1) or not (undefined or 0)
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFilterComplete ( oSettings, oInput, iForce )
+	{
+		var oPrevSearch = oSettings.oPreviousSearch;
+		var aoPrevSearch = oSettings.aoPreSearchCols;
+		var fnSaveFilter = function ( oFilter ) {
+			/* Save the filtering values */
+			oPrevSearch.sSearch = oFilter.sSearch;
+			oPrevSearch.bRegex = oFilter.bRegex;
+			oPrevSearch.bSmart = oFilter.bSmart;
+			oPrevSearch.bCaseInsensitive = oFilter.bCaseInsensitive;
+		};
+		var fnRegex = function ( o ) {
+			// Backwards compatibility with the bEscapeRegex option
+			return o.bEscapeRegex !== undefined ? !o.bEscapeRegex : o.bRegex;
+		};
+	
+		// Resolve any column types that are unknown due to addition or invalidation
+		// @todo As per sort - can this be moved into an event handler?
+		_fnColumnTypes( oSettings );
+	
+		/* In server-side processing all filtering is done by the server, so no point hanging around here */
+		if ( _fnDataSource( oSettings ) != 'ssp' )
+		{
+			/* Global filter */
+			_fnFilter( oSettings, oInput.sSearch, iForce, fnRegex(oInput), oInput.bSmart, oInput.bCaseInsensitive );
+			fnSaveFilter( oInput );
+	
+			/* Now do the individual column filter */
+			for ( var i=0 ; i<aoPrevSearch.length ; i++ )
+			{
+				_fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, fnRegex(aoPrevSearch[i]),
+					aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
+			}
+	
+			/* Custom filtering */
+			_fnFilterCustom( oSettings );
+		}
+		else
+		{
+			fnSaveFilter( oInput );
+		}
+	
+		/* Tell the draw function we have been filtering */
+		oSettings.bFiltered = true;
+		_fnCallbackFire( oSettings, null, 'search', [oSettings] );
+	}
+	
+	
+	/**
+	 * Apply custom filtering functions
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFilterCustom( settings )
+	{
+		var filters = DataTable.ext.search;
+		var displayRows = settings.aiDisplay;
+		var row, rowIdx;
+	
+		for ( var i=0, ien=filters.length ; i<ien ; i++ ) {
+			var rows = [];
+	
+			// Loop over each row and see if it should be included
+			for ( var j=0, jen=displayRows.length ; j<jen ; j++ ) {
+				rowIdx = displayRows[ j ];
+				row = settings.aoData[ rowIdx ];
+	
+				if ( filters[i]( settings, row._aFilterData, rowIdx, row._aData, j ) ) {
+					rows.push( rowIdx );
+				}
+			}
+	
+			// So the array reference doesn't break set the results into the
+			// existing array
+			displayRows.length = 0;
+			displayRows.push.apply( displayRows, rows );
+		}
+	}
+	
+	
+	/**
+	 * Filter the table on a per-column basis
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {string} sInput string to filter on
+	 *  @param {int} iColumn column to filter
+	 *  @param {bool} bRegex treat search string as a regular expression or not
+	 *  @param {bool} bSmart use smart filtering or not
+	 *  @param {bool} bCaseInsensitive Do case insenstive matching or not
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFilterColumn ( settings, searchStr, colIdx, regex, smart, caseInsensitive )
+	{
+		if ( searchStr === '' ) {
+			return;
+		}
+	
+		var data;
+		var display = settings.aiDisplay;
+		var rpSearch = _fnFilterCreateSearch( searchStr, regex, smart, caseInsensitive );
+	
+		for ( var i=display.length-1 ; i>=0 ; i-- ) {
+			data = settings.aoData[ display[i] ]._aFilterData[ colIdx ];
+	
+			if ( ! rpSearch.test( data ) ) {
+				display.splice( i, 1 );
+			}
+		}
+	}
+	
+	
+	/**
+	 * Filter the data table based on user input and draw the table
+	 *  @param {object} settings dataTables settings object
+	 *  @param {string} input string to filter on
+	 *  @param {int} force optional - force a research of the master array (1) or not (undefined or 0)
+	 *  @param {bool} regex treat as a regular expression or not
+	 *  @param {bool} smart perform smart filtering or not
+	 *  @param {bool} caseInsensitive Do case insenstive matching or not
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFilter( settings, input, force, regex, smart, caseInsensitive )
+	{
+		var rpSearch = _fnFilterCreateSearch( input, regex, smart, caseInsensitive );
+		var prevSearch = settings.oPreviousSearch.sSearch;
+		var displayMaster = settings.aiDisplayMaster;
+		var display, invalidated, i;
+	
+		// Need to take account of custom filtering functions - always filter
+		if ( DataTable.ext.search.length !== 0 ) {
+			force = true;
+		}
+	
+		// Check if any of the rows were invalidated
+		invalidated = _fnFilterData( settings );
+	
+		// If the input is blank - we just want the full data set
+		if ( input.length <= 0 ) {
+			settings.aiDisplay = displayMaster.slice();
+		}
+		else {
+			// New search - start from the master array
+			if ( invalidated ||
+				 force ||
+				 prevSearch.length > input.length ||
+				 input.indexOf(prevSearch) !== 0 ||
+				 settings.bSorted // On resort, the display master needs to be
+				                  // re-filtered since indexes will have changed
+			) {
+				settings.aiDisplay = displayMaster.slice();
+			}
+	
+			// Search the display array
+			display = settings.aiDisplay;
+	
+			for ( i=display.length-1 ; i>=0 ; i-- ) {
+				if ( ! rpSearch.test( settings.aoData[ display[i] ]._sFilterRow ) ) {
+					display.splice( i, 1 );
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * Build a regular expression object suitable for searching a table
+	 *  @param {string} sSearch string to search for
+	 *  @param {bool} bRegex treat as a regular expression or not
+	 *  @param {bool} bSmart perform smart filtering or not
+	 *  @param {bool} bCaseInsensitive Do case insensitive matching or not
+	 *  @returns {RegExp} constructed object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFilterCreateSearch( search, regex, smart, caseInsensitive )
+	{
+		search = regex ?
+			search :
+			_fnEscapeRegex( search );
+		
+		if ( smart ) {
+			/* For smart filtering we want to allow the search to work regardless of
+			 * word order. We also want double quoted text to be preserved, so word
+			 * order is important - a la google. So this is what we want to
+			 * generate:
+			 * 
+			 * ^(?=.*?\bone\b)(?=.*?\btwo three\b)(?=.*?\bfour\b).*$
+			 */
+			var a = $.map( search.match( /"[^"]+"|[^ ]+/g ) || [''], function ( word ) {
+				if ( word.charAt(0) === '"' ) {
+					var m = word.match( /^"(.*)"$/ );
+					word = m ? m[1] : word;
+				}
+	
+				return word.replace('"', '');
+			} );
+	
+			search = '^(?=.*?'+a.join( ')(?=.*?' )+').*$';
+		}
+	
+		return new RegExp( search, caseInsensitive ? 'i' : '' );
+	}
+	
+	
+	/**
+	 * Escape a string such that it can be used in a regular expression
+	 *  @param {string} sVal string to escape
+	 *  @returns {string} escaped string
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnEscapeRegex ( sVal )
+	{
+		return sVal.replace( _re_escape_regex, '\\$1' );
+	}
+	
+	
+	
+	var __filter_div = $('<div>')[0];
+	var __filter_div_textContent = __filter_div.textContent !== undefined;
+	
+	// Update the filtering data for each row if needed (by invalidation or first run)
+	function _fnFilterData ( settings )
+	{
+		var columns = settings.aoColumns;
+		var column;
+		var i, j, ien, jen, filterData, cellData, row;
+		var fomatters = DataTable.ext.type.search;
+		var wasInvalidated = false;
+	
+		for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+			row = settings.aoData[i];
+	
+			if ( ! row._aFilterData ) {
+				filterData = [];
+	
+				for ( j=0, jen=columns.length ; j<jen ; j++ ) {
+					column = columns[j];
+	
+					if ( column.bSearchable ) {
+						cellData = _fnGetCellData( settings, i, j, 'filter' );
+	
+						if ( fomatters[ column.sType ] ) {
+							cellData = fomatters[ column.sType ]( cellData );
+						}
+	
+						// Search in DataTables 1.10 is string based. In 1.11 this
+						// should be altered to also allow strict type checking.
+						if ( cellData === null ) {
+							cellData = '';
+						}
+	
+						if ( typeof cellData !== 'string' && cellData.toString ) {
+							cellData = cellData.toString();
+						}
+					}
+					else {
+						cellData = '';
+					}
+	
+					// If it looks like there is an HTML entity in the string,
+					// attempt to decode it so sorting works as expected. Note that
+					// we could use a single line of jQuery to do this, but the DOM
+					// method used here is much faster http://jsperf.com/html-decode
+					if ( cellData.indexOf && cellData.indexOf('&') !== -1 ) {
+						__filter_div.innerHTML = cellData;
+						cellData = __filter_div_textContent ?
+							__filter_div.textContent :
+							__filter_div.innerText;
+					}
+	
+					if ( cellData.replace ) {
+						cellData = cellData.replace(/[\r\n]/g, '');
+					}
+	
+					filterData.push( cellData );
+				}
+	
+				row._aFilterData = filterData;
+				row._sFilterRow = filterData.join('  ');
+				wasInvalidated = true;
+			}
+		}
+	
+		return wasInvalidated;
+	}
+	
+	
+	/**
+	 * Convert from the internal Hungarian notation to camelCase for external
+	 * interaction
+	 *  @param {object} obj Object to convert
+	 *  @returns {object} Inverted object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSearchToCamel ( obj )
+	{
+		return {
+			search:          obj.sSearch,
+			smart:           obj.bSmart,
+			regex:           obj.bRegex,
+			caseInsensitive: obj.bCaseInsensitive
+		};
+	}
+	
+	
+	
+	/**
+	 * Convert from camelCase notation to the internal Hungarian. We could use the
+	 * Hungarian convert function here, but this is cleaner
+	 *  @param {object} obj Object to convert
+	 *  @returns {object} Inverted object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSearchToHung ( obj )
+	{
+		return {
+			sSearch:          obj.search,
+			bSmart:           obj.smart,
+			bRegex:           obj.regex,
+			bCaseInsensitive: obj.caseInsensitive
+		};
+	}
+	
+	/**
+	 * Generate the node required for the info display
+	 *  @param {object} oSettings dataTables settings object
+	 *  @returns {node} Information element
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFeatureHtmlInfo ( settings )
+	{
+		var
+			tid = settings.sTableId,
+			nodes = settings.aanFeatures.i,
+			n = $('<div/>', {
+				'class': settings.oClasses.sInfo,
+				'id': ! nodes ? tid+'_info' : null
+			} );
+	
+		if ( ! nodes ) {
+			// Update display on each draw
+			settings.aoDrawCallback.push( {
+				"fn": _fnUpdateInfo,
+				"sName": "information"
+			} );
+	
+			n
+				.attr( 'role', 'status' )
+				.attr( 'aria-live', 'polite' );
+	
+			// Table is described by our info div
+			$(settings.nTable).attr( 'aria-describedby', tid+'_info' );
+		}
+	
+		return n[0];
+	}
+	
+	
+	/**
+	 * Update the information elements in the display
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnUpdateInfo ( settings )
+	{
+		/* Show information about the table */
+		var nodes = settings.aanFeatures.i;
+		if ( nodes.length === 0 ) {
+			return;
+		}
+	
+		var
+			lang  = settings.oLanguage,
+			start = settings._iDisplayStart+1,
+			end   = settings.fnDisplayEnd(),
+			max   = settings.fnRecordsTotal(),
+			total = settings.fnRecordsDisplay(),
+			out   = total ?
+				lang.sInfo :
+				lang.sInfoEmpty;
+	
+		if ( total !== max ) {
+			/* Record set after filtering */
+			out += ' ' + lang.sInfoFiltered;
+		}
+	
+		// Convert the macros
+		out += lang.sInfoPostFix;
+		out = _fnInfoMacros( settings, out );
+	
+		var callback = lang.fnInfoCallback;
+		if ( callback !== null ) {
+			out = callback.call( settings.oInstance,
+				settings, start, end, max, total, out
+			);
+		}
+	
+		$(nodes).html( out );
+	}
+	
+	
+	function _fnInfoMacros ( settings, str )
+	{
+		// When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
+		// internally
+		var
+			formatter  = settings.fnFormatNumber,
+			start      = settings._iDisplayStart+1,
+			len        = settings._iDisplayLength,
+			vis        = settings.fnRecordsDisplay(),
+			all        = len === -1;
+	
+		return str.
+			replace(/_START_/g, formatter.call( settings, start ) ).
+			replace(/_END_/g,   formatter.call( settings, settings.fnDisplayEnd() ) ).
+			replace(/_MAX_/g,   formatter.call( settings, settings.fnRecordsTotal() ) ).
+			replace(/_TOTAL_/g, formatter.call( settings, vis ) ).
+			replace(/_PAGE_/g,  formatter.call( settings, all ? 1 : Math.ceil( start / len ) ) ).
+			replace(/_PAGES_/g, formatter.call( settings, all ? 1 : Math.ceil( vis / len ) ) );
+	}
+	
+	
+	
+	/**
+	 * Draw the table for the first time, adding all required features
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnInitialise ( settings )
+	{
+		var i, iLen, iAjaxStart=settings.iInitDisplayStart;
+		var columns = settings.aoColumns, column;
+		var features = settings.oFeatures;
+		var deferLoading = settings.bDeferLoading; // value modified by the draw
+	
+		/* Ensure that the table data is fully initialised */
+		if ( ! settings.bInitialised ) {
+			setTimeout( function(){ _fnInitialise( settings ); }, 200 );
+			return;
+		}
+	
+		/* Show the display HTML options */
+		_fnAddOptionsHtml( settings );
+	
+		/* Build and draw the header / footer for the table */
+		_fnBuildHead( settings );
+		_fnDrawHead( settings, settings.aoHeader );
+		_fnDrawHead( settings, settings.aoFooter );
+	
+		/* Okay to show that something is going on now */
+		_fnProcessingDisplay( settings, true );
+	
+		/* Calculate sizes for columns */
+		if ( features.bAutoWidth ) {
+			_fnCalculateColumnWidths( settings );
+		}
+	
+		for ( i=0, iLen=columns.length ; i<iLen ; i++ ) {
+			column = columns[i];
+	
+			if ( column.sWidth ) {
+				column.nTh.style.width = _fnStringToCss( column.sWidth );
+			}
+		}
+	
+		_fnCallbackFire( settings, null, 'preInit', [settings] );
+	
+		// If there is default sorting required - let's do it. The sort function
+		// will do the drawing for us. Otherwise we draw the table regardless of the
+		// Ajax source - this allows the table to look initialised for Ajax sourcing
+		// data (show 'loading' message possibly)
+		_fnReDraw( settings );
+	
+		// Server-side processing init complete is done by _fnAjaxUpdateDraw
+		var dataSrc = _fnDataSource( settings );
+		if ( dataSrc != 'ssp' || deferLoading ) {
+			// if there is an ajax source load the data
+			if ( dataSrc == 'ajax' ) {
+				_fnBuildAjax( settings, [], function(json) {
+					var aData = _fnAjaxDataSrc( settings, json );
+	
+					// Got the data - add it to the table
+					for ( i=0 ; i<aData.length ; i++ ) {
+						_fnAddData( settings, aData[i] );
+					}
+	
+					// Reset the init display for cookie saving. We've already done
+					// a filter, and therefore cleared it before. So we need to make
+					// it appear 'fresh'
+					settings.iInitDisplayStart = iAjaxStart;
+	
+					_fnReDraw( settings );
+	
+					_fnProcessingDisplay( settings, false );
+					_fnInitComplete( settings, json );
+				}, settings );
+			}
+			else {
+				_fnProcessingDisplay( settings, false );
+				_fnInitComplete( settings );
+			}
+		}
+	}
+	
+	
+	/**
+	 * Draw the table for the first time, adding all required features
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {object} [json] JSON from the server that completed the table, if using Ajax source
+	 *    with client-side processing (optional)
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnInitComplete ( settings, json )
+	{
+		settings._bInitComplete = true;
+	
+		// When data was added after the initialisation (data or Ajax) we need to
+		// calculate the column sizing
+		if ( json || settings.oInit.aaData ) {
+			_fnAdjustColumnSizing( settings );
+		}
+	
+		_fnCallbackFire( settings, 'aoInitComplete', 'init', [settings, json] );
+	}
+	
+	
+	function _fnLengthChange ( settings, val )
+	{
+		var len = parseInt( val, 10 );
+		settings._iDisplayLength = len;
+	
+		_fnLengthOverflow( settings );
+	
+		// Fire length change event
+		_fnCallbackFire( settings, null, 'length', [settings, len] );
+	}
+	
+	
+	/**
+	 * Generate the node required for user display length changing
+	 *  @param {object} settings dataTables settings object
+	 *  @returns {node} Display length feature node
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFeatureHtmlLength ( settings )
+	{
+		var
+			classes  = settings.oClasses,
+			tableId  = settings.sTableId,
+			menu     = settings.aLengthMenu,
+			d2       = $.isArray( menu[0] ),
+			lengths  = d2 ? menu[0] : menu,
+			language = d2 ? menu[1] : menu;
+	
+		var select = $('<select/>', {
+			'name':          tableId+'_length',
+			'aria-controls': tableId,
+			'class':         classes.sLengthSelect
+		} );
+	
+		for ( var i=0, ien=lengths.length ; i<ien ; i++ ) {
+			select[0][ i ] = new Option( language[i], lengths[i] );
+		}
+	
+		var div = $('<div><label/></div>').addClass( classes.sLength );
+		if ( ! settings.aanFeatures.l ) {
+			div[0].id = tableId+'_length';
+		}
+	
+		div.children().append(
+			settings.oLanguage.sLengthMenu.replace( '_MENU_', select[0].outerHTML )
+		);
+	
+		// Can't use `select` variable as user might provide their own and the
+		// reference is broken by the use of outerHTML
+		$('select', div)
+			.val( settings._iDisplayLength )
+			.bind( 'change.DT', function(e) {
+				_fnLengthChange( settings, $(this).val() );
+				_fnDraw( settings );
+			} );
+	
+		// Update node value whenever anything changes the table's length
+		$(settings.nTable).bind( 'length.dt.DT', function (e, s, len) {
+			if ( settings === s ) {
+				$('select', div).val( len );
+			}
+		} );
+	
+		return div[0];
+	}
+	
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Note that most of the paging logic is done in
+	 * DataTable.ext.pager
+	 */
+	
+	/**
+	 * Generate the node required for default pagination
+	 *  @param {object} oSettings dataTables settings object
+	 *  @returns {node} Pagination feature node
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFeatureHtmlPaginate ( settings )
+	{
+		var
+			type   = settings.sPaginationType,
+			plugin = DataTable.ext.pager[ type ],
+			modern = typeof plugin === 'function',
+			redraw = function( settings ) {
+				_fnDraw( settings );
+			},
+			node = $('<div/>').addClass( settings.oClasses.sPaging + type )[0],
+			features = settings.aanFeatures;
+	
+		if ( ! modern ) {
+			plugin.fnInit( settings, node, redraw );
+		}
+	
+		/* Add a draw callback for the pagination on first instance, to update the paging display */
+		if ( ! features.p )
+		{
+			node.id = settings.sTableId+'_paginate';
+	
+			settings.aoDrawCallback.push( {
+				"fn": function( settings ) {
+					if ( modern ) {
+						var
+							start      = settings._iDisplayStart,
+							len        = settings._iDisplayLength,
+							visRecords = settings.fnRecordsDisplay(),
+							all        = len === -1,
+							page = all ? 0 : Math.ceil( start / len ),
+							pages = all ? 1 : Math.ceil( visRecords / len ),
+							buttons = plugin(page, pages),
+							i, ien;
+	
+						for ( i=0, ien=features.p.length ; i<ien ; i++ ) {
+							_fnRenderer( settings, 'pageButton' )(
+								settings, features.p[i], i, buttons, page, pages
+							);
+						}
+					}
+					else {
+						plugin.fnUpdate( settings, redraw );
+					}
+				},
+				"sName": "pagination"
+			} );
+		}
+	
+		return node;
+	}
+	
+	
+	/**
+	 * Alter the display settings to change the page
+	 *  @param {object} settings DataTables settings object
+	 *  @param {string|int} action Paging action to take: "first", "previous",
+	 *    "next" or "last" or page number to jump to (integer)
+	 *  @param [bool] redraw Automatically draw the update or not
+	 *  @returns {bool} true page has changed, false - no change
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnPageChange ( settings, action, redraw )
+	{
+		var
+			start     = settings._iDisplayStart,
+			len       = settings._iDisplayLength,
+			records   = settings.fnRecordsDisplay();
+	
+		if ( records === 0 || len === -1 )
+		{
+			start = 0;
+		}
+		else if ( typeof action === "number" )
+		{
+			start = action * len;
+	
+			if ( start > records )
+			{
+				start = 0;
+			}
+		}
+		else if ( action == "first" )
+		{
+			start = 0;
+		}
+		else if ( action == "previous" )
+		{
+			start = len >= 0 ?
+				start - len :
+				0;
+	
+			if ( start < 0 )
+			{
+			  start = 0;
+			}
+		}
+		else if ( action == "next" )
+		{
+			if ( start + len < records )
+			{
+				start += len;
+			}
+		}
+		else if ( action == "last" )
+		{
+			start = Math.floor( (records-1) / len) * len;
+		}
+		else
+		{
+			_fnLog( settings, 0, "Unknown paging action: "+action, 5 );
+		}
+	
+		var changed = settings._iDisplayStart !== start;
+		settings._iDisplayStart = start;
+	
+		if ( changed ) {
+			_fnCallbackFire( settings, null, 'page', [settings] );
+	
+			if ( redraw ) {
+				_fnDraw( settings );
+			}
+		}
+	
+		return changed;
+	}
+	
+	
+	
+	/**
+	 * Generate the node required for the processing node
+	 *  @param {object} settings dataTables settings object
+	 *  @returns {node} Processing element
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFeatureHtmlProcessing ( settings )
+	{
+		return $('<div/>', {
+				'id': ! settings.aanFeatures.r ? settings.sTableId+'_processing' : null,
+				'class': settings.oClasses.sProcessing
+			} )
+			.html( settings.oLanguage.sProcessing )
+			.insertBefore( settings.nTable )[0];
+	}
+	
+	
+	/**
+	 * Display or hide the processing indicator
+	 *  @param {object} settings dataTables settings object
+	 *  @param {bool} show Show the processing indicator (true) or not (false)
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnProcessingDisplay ( settings, show )
+	{
+		if ( settings.oFeatures.bProcessing ) {
+			$(settings.aanFeatures.r).css( 'display', show ? 'block' : 'none' );
+		}
+	
+		_fnCallbackFire( settings, null, 'processing', [settings, show] );
+	}
+	
+	/**
+	 * Add any control elements for the table - specifically scrolling
+	 *  @param {object} settings dataTables settings object
+	 *  @returns {node} Node to add to the DOM
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnFeatureHtmlTable ( settings )
+	{
+		var table = $(settings.nTable);
+	
+		// Add the ARIA grid role to the table
+		table.attr( 'role', 'grid' );
+	
+		// Scrolling from here on in
+		var scroll = settings.oScroll;
+	
+		if ( scroll.sX === '' && scroll.sY === '' ) {
+			return settings.nTable;
+		}
+	
+		var scrollX = scroll.sX;
+		var scrollY = scroll.sY;
+		var classes = settings.oClasses;
+		var caption = table.children('caption');
+		var captionSide = caption.length ? caption[0]._captionSide : null;
+		var headerClone = $( table[0].cloneNode(false) );
+		var footerClone = $( table[0].cloneNode(false) );
+		var footer = table.children('tfoot');
+		var _div = '<div/>';
+		var size = function ( s ) {
+			return !s ? null : _fnStringToCss( s );
+		};
+	
+		// This is fairly messy, but with x scrolling enabled, if the table has a
+		// width attribute, regardless of any width applied using the column width
+		// options, the browser will shrink or grow the table as needed to fit into
+		// that 100%. That would make the width options useless. So we remove it.
+		// This is okay, under the assumption that width:100% is applied to the
+		// table in CSS (it is in the default stylesheet) which will set the table
+		// width as appropriate (the attribute and css behave differently...)
+		if ( scroll.sX && table.attr('width') === '100%' ) {
+			table.removeAttr('width');
+		}
+	
+		if ( ! footer.length ) {
+			footer = null;
+		}
+	
+		/*
+		 * The HTML structure that we want to generate in this function is:
+		 *  div - scroller
+		 *    div - scroll head
+		 *      div - scroll head inner
+		 *        table - scroll head table
+		 *          thead - thead
+		 *    div - scroll body
+		 *      table - table (master table)
+		 *        thead - thead clone for sizing
+		 *        tbody - tbody
+		 *    div - scroll foot
+		 *      div - scroll foot inner
+		 *        table - scroll foot table
+		 *          tfoot - tfoot
+		 */
+		var scroller = $( _div, { 'class': classes.sScrollWrapper } )
+			.append(
+				$(_div, { 'class': classes.sScrollHead } )
+					.css( {
+						overflow: 'hidden',
+						position: 'relative',
+						border: 0,
+						width: scrollX ? size(scrollX) : '100%'
+					} )
+					.append(
+						$(_div, { 'class': classes.sScrollHeadInner } )
+							.css( {
+								'box-sizing': 'content-box',
+								width: scroll.sXInner || '100%'
+							} )
+							.append(
+								headerClone
+									.removeAttr('id')
+									.css( 'margin-left', 0 )
+									.append( captionSide === 'top' ? caption : null )
+									.append(
+										table.children('thead')
+									)
+							)
+					)
+			)
+			.append(
+				$(_div, { 'class': classes.sScrollBody } )
+					.css( {
+						position: 'relative',
+						overflow: 'auto',
+						width: size( scrollX )
+					} )
+					.append( table )
+			);
+	
+		if ( footer ) {
+			scroller.append(
+				$(_div, { 'class': classes.sScrollFoot } )
+					.css( {
+						overflow: 'hidden',
+						border: 0,
+						width: scrollX ? size(scrollX) : '100%'
+					} )
+					.append(
+						$(_div, { 'class': classes.sScrollFootInner } )
+							.append(
+								footerClone
+									.removeAttr('id')
+									.css( 'margin-left', 0 )
+									.append( captionSide === 'bottom' ? caption : null )
+									.append(
+										table.children('tfoot')
+									)
+							)
+					)
+			);
+		}
+	
+		var children = scroller.children();
+		var scrollHead = children[0];
+		var scrollBody = children[1];
+		var scrollFoot = footer ? children[2] : null;
+	
+		// When the body is scrolled, then we also want to scroll the headers
+		if ( scrollX ) {
+			$(scrollBody).on( 'scroll.DT', function (e) {
+				var scrollLeft = this.scrollLeft;
+	
+				scrollHead.scrollLeft = scrollLeft;
+	
+				if ( footer ) {
+					scrollFoot.scrollLeft = scrollLeft;
+				}
+			} );
+		}
+	
+		$(scrollBody).css(
+			scrollY && scroll.bCollapse ? 'max-height' : 'height', 
+			scrollY
+		);
+	
+		settings.nScrollHead = scrollHead;
+		settings.nScrollBody = scrollBody;
+		settings.nScrollFoot = scrollFoot;
+	
+		// On redraw - align columns
+		settings.aoDrawCallback.push( {
+			"fn": _fnScrollDraw,
+			"sName": "scrolling"
+		} );
+	
+		return scroller[0];
+	}
+	
+	
+	
+	/**
+	 * Update the header, footer and body tables for resizing - i.e. column
+	 * alignment.
+	 *
+	 * Welcome to the most horrible function DataTables. The process that this
+	 * function follows is basically:
+	 *   1. Re-create the table inside the scrolling div
+	 *   2. Take live measurements from the DOM
+	 *   3. Apply the measurements to align the columns
+	 *   4. Clean up
+	 *
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnScrollDraw ( settings )
+	{
+		// Given that this is such a monster function, a lot of variables are use
+		// to try and keep the minimised size as small as possible
+		var
+			scroll         = settings.oScroll,
+			scrollX        = scroll.sX,
+			scrollXInner   = scroll.sXInner,
+			scrollY        = scroll.sY,
+			barWidth       = scroll.iBarWidth,
+			divHeader      = $(settings.nScrollHead),
+			divHeaderStyle = divHeader[0].style,
+			divHeaderInner = divHeader.children('div'),
+			divHeaderInnerStyle = divHeaderInner[0].style,
+			divHeaderTable = divHeaderInner.children('table'),
+			divBodyEl      = settings.nScrollBody,
+			divBody        = $(divBodyEl),
+			divBodyStyle   = divBodyEl.style,
+			divFooter      = $(settings.nScrollFoot),
+			divFooterInner = divFooter.children('div'),
+			divFooterTable = divFooterInner.children('table'),
+			header         = $(settings.nTHead),
+			table          = $(settings.nTable),
+			tableEl        = table[0],
+			tableStyle     = tableEl.style,
+			footer         = settings.nTFoot ? $(settings.nTFoot) : null,
+			browser        = settings.oBrowser,
+			ie67           = browser.bScrollOversize,
+			headerTrgEls, footerTrgEls,
+			headerSrcEls, footerSrcEls,
+			headerCopy, footerCopy,
+			headerWidths=[], footerWidths=[],
+			headerContent=[],
+			idx, correction, sanityWidth,
+			zeroOut = function(nSizer) {
+				var style = nSizer.style;
+				style.paddingTop = "0";
+				style.paddingBottom = "0";
+				style.borderTopWidth = "0";
+				style.borderBottomWidth = "0";
+				style.height = 0;
+			};
+	
+		/*
+		 * 1. Re-create the table inside the scrolling div
+		 */
+	
+		// Remove the old minimised thead and tfoot elements in the inner table
+		table.children('thead, tfoot').remove();
+	
+		// Clone the current header and footer elements and then place it into the inner table
+		headerCopy = header.clone().prependTo( table );
+		headerTrgEls = header.find('tr'); // original header is in its own table
+		headerSrcEls = headerCopy.find('tr');
+		headerCopy.find('th, td').removeAttr('tabindex');
+	
+		if ( footer ) {
+			footerCopy = footer.clone().prependTo( table );
+			footerTrgEls = footer.find('tr'); // the original tfoot is in its own table and must be sized
+			footerSrcEls = footerCopy.find('tr');
+		}
+	
+	
+		/*
+		 * 2. Take live measurements from the DOM - do not alter the DOM itself!
+		 */
+	
+		// Remove old sizing and apply the calculated column widths
+		// Get the unique column headers in the newly created (cloned) header. We want to apply the
+		// calculated sizes to this header
+		if ( ! scrollX )
+		{
+			divBodyStyle.width = '100%';
+			divHeader[0].style.width = '100%';
+		}
+	
+		$.each( _fnGetUniqueThs( settings, headerCopy ), function ( i, el ) {
+			idx = _fnVisibleToColumnIndex( settings, i );
+			el.style.width = settings.aoColumns[idx].sWidth;
+		} );
+	
+		if ( footer ) {
+			_fnApplyToChildren( function(n) {
+				n.style.width = "";
+			}, footerSrcEls );
+		}
+	
+		// Size the table as a whole
+		sanityWidth = table.outerWidth();
+		if ( scrollX === "" ) {
+			// No x scrolling
+			tableStyle.width = "100%";
+	
+			// IE7 will make the width of the table when 100% include the scrollbar
+			// - which is shouldn't. When there is a scrollbar we need to take this
+			// into account.
+			if ( ie67 && (table.find('tbody').height() > divBodyEl.offsetHeight ||
+				divBody.css('overflow-y') == "scroll")
+			) {
+				tableStyle.width = _fnStringToCss( table.outerWidth() - barWidth);
+			}
+	
+			// Recalculate the sanity width
+			sanityWidth = table.outerWidth();
+		}
+		else if ( scrollXInner !== "" ) {
+			// legacy x scroll inner has been given - use it
+			tableStyle.width = _fnStringToCss(scrollXInner);
+	
+			// Recalculate the sanity width
+			sanityWidth = table.outerWidth();
+		}
+	
+		// Hidden header should have zero height, so remove padding and borders. Then
+		// set the width based on the real headers
+	
+		// Apply all styles in one pass
+		_fnApplyToChildren( zeroOut, headerSrcEls );
+	
+		// Read all widths in next pass
+		_fnApplyToChildren( function(nSizer) {
+			headerContent.push( nSizer.innerHTML );
+			headerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
+		}, headerSrcEls );
+	
+		// Apply all widths in final pass
+		_fnApplyToChildren( function(nToSize, i) {
+			nToSize.style.width = headerWidths[i];
+		}, headerTrgEls );
+	
+		$(headerSrcEls).height(0);
+	
+		/* Same again with the footer if we have one */
+		if ( footer )
+		{
+			_fnApplyToChildren( zeroOut, footerSrcEls );
+	
+			_fnApplyToChildren( function(nSizer) {
+				footerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
+			}, footerSrcEls );
+	
+			_fnApplyToChildren( function(nToSize, i) {
+				nToSize.style.width = footerWidths[i];
+			}, footerTrgEls );
+	
+			$(footerSrcEls).height(0);
+		}
+	
+	
+		/*
+		 * 3. Apply the measurements
+		 */
+	
+		// "Hide" the header and footer that we used for the sizing. We need to keep
+		// the content of the cell so that the width applied to the header and body
+		// both match, but we want to hide it completely. We want to also fix their
+		// width to what they currently are
+		_fnApplyToChildren( function(nSizer, i) {
+			nSizer.innerHTML = '<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+headerContent[i]+'</div>';
+			nSizer.style.width = headerWidths[i];
+		}, headerSrcEls );
+	
+		if ( footer )
+		{
+			_fnApplyToChildren( function(nSizer, i) {
+				nSizer.innerHTML = "";
+				nSizer.style.width = footerWidths[i];
+			}, footerSrcEls );
+		}
+	
+		// Sanity check that the table is of a sensible width. If not then we are going to get
+		// misalignment - try to prevent this by not allowing the table to shrink below its min width
+		if ( table.outerWidth() < sanityWidth )
+		{
+			// The min width depends upon if we have a vertical scrollbar visible or not */
+			correction = ((divBodyEl.scrollHeight > divBodyEl.offsetHeight ||
+				divBody.css('overflow-y') == "scroll")) ?
+					sanityWidth+barWidth :
+					sanityWidth;
+	
+			// IE6/7 are a law unto themselves...
+			if ( ie67 && (divBodyEl.scrollHeight >
+				divBodyEl.offsetHeight || divBody.css('overflow-y') == "scroll")
+			) {
+				tableStyle.width = _fnStringToCss( correction-barWidth );
+			}
+	
+			// And give the user a warning that we've stopped the table getting too small
+			if ( scrollX === "" || scrollXInner !== "" ) {
+				_fnLog( settings, 1, 'Possible column misalignment', 6 );
+			}
+		}
+		else
+		{
+			correction = '100%';
+		}
+	
+		// Apply to the container elements
+		divBodyStyle.width = _fnStringToCss( correction );
+		divHeaderStyle.width = _fnStringToCss( correction );
+	
+		if ( footer ) {
+			settings.nScrollFoot.style.width = _fnStringToCss( correction );
+		}
+	
+	
+		/*
+		 * 4. Clean up
+		 */
+		if ( ! scrollY ) {
+			/* IE7< puts a vertical scrollbar in place (when it shouldn't be) due to subtracting
+			 * the scrollbar height from the visible display, rather than adding it on. We need to
+			 * set the height in order to sort this. Don't want to do it in any other browsers.
+			 */
+			if ( ie67 ) {
+				divBodyStyle.height = _fnStringToCss( tableEl.offsetHeight+barWidth );
+			}
+		}
+	
+		/* Finally set the width's of the header and footer tables */
+		var iOuterWidth = table.outerWidth();
+		divHeaderTable[0].style.width = _fnStringToCss( iOuterWidth );
+		divHeaderInnerStyle.width = _fnStringToCss( iOuterWidth );
+	
+		// Figure out if there are scrollbar present - if so then we need a the header and footer to
+		// provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar)
+		var bScrolling = table.height() > divBodyEl.clientHeight || divBody.css('overflow-y') == "scroll";
+		var padding = 'padding' + (browser.bScrollbarLeft ? 'Left' : 'Right' );
+		divHeaderInnerStyle[ padding ] = bScrolling ? barWidth+"px" : "0px";
+	
+		if ( footer ) {
+			divFooterTable[0].style.width = _fnStringToCss( iOuterWidth );
+			divFooterInner[0].style.width = _fnStringToCss( iOuterWidth );
+			divFooterInner[0].style[padding] = bScrolling ? barWidth+"px" : "0px";
+		}
+	
+		/* Adjust the position of the header in case we loose the y-scrollbar */
+		divBody.scroll();
+	
+		// If sorting or filtering has occurred, jump the scrolling back to the top
+		// only if we aren't holding the position
+		if ( (settings.bSorted || settings.bFiltered) && ! settings._drawHold ) {
+			divBodyEl.scrollTop = 0;
+		}
+	}
+	
+	
+	
+	/**
+	 * Apply a given function to the display child nodes of an element array (typically
+	 * TD children of TR rows
+	 *  @param {function} fn Method to apply to the objects
+	 *  @param array {nodes} an1 List of elements to look through for display children
+	 *  @param array {nodes} an2 Another list (identical structure to the first) - optional
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnApplyToChildren( fn, an1, an2 )
+	{
+		var index=0, i=0, iLen=an1.length;
+		var nNode1, nNode2;
+	
+		while ( i < iLen ) {
+			nNode1 = an1[i].firstChild;
+			nNode2 = an2 ? an2[i].firstChild : null;
+	
+			while ( nNode1 ) {
+				if ( nNode1.nodeType === 1 ) {
+					if ( an2 ) {
+						fn( nNode1, nNode2, index );
+					}
+					else {
+						fn( nNode1, index );
+					}
+	
+					index++;
+				}
+	
+				nNode1 = nNode1.nextSibling;
+				nNode2 = an2 ? nNode2.nextSibling : null;
+			}
+	
+			i++;
+		}
+	}
+	
+	
+	
+	var __re_html_remove = /<.*?>/g;
+	
+	
+	/**
+	 * Calculate the width of columns for the table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnCalculateColumnWidths ( oSettings )
+	{
+		var
+			table = oSettings.nTable,
+			columns = oSettings.aoColumns,
+			scroll = oSettings.oScroll,
+			scrollY = scroll.sY,
+			scrollX = scroll.sX,
+			scrollXInner = scroll.sXInner,
+			columnCount = columns.length,
+			visibleColumns = _fnGetColumns( oSettings, 'bVisible' ),
+			headerCells = $('th', oSettings.nTHead),
+			tableWidthAttr = table.getAttribute('width'), // from DOM element
+			tableContainer = table.parentNode,
+			userInputs = false,
+			i, column, columnIdx, width, outerWidth,
+			browser = oSettings.oBrowser,
+			ie67 = browser.bScrollOversize;
+	
+		var styleWidth = table.style.width;
+		if ( styleWidth && styleWidth.indexOf('%') !== -1 ) {
+			tableWidthAttr = styleWidth;
+		}
+	
+		/* Convert any user input sizes into pixel sizes */
+		for ( i=0 ; i<visibleColumns.length ; i++ ) {
+			column = columns[ visibleColumns[i] ];
+	
+			if ( column.sWidth !== null ) {
+				column.sWidth = _fnConvertToWidth( column.sWidthOrig, tableContainer );
+	
+				userInputs = true;
+			}
+		}
+	
+		/* If the number of columns in the DOM equals the number that we have to
+		 * process in DataTables, then we can use the offsets that are created by
+		 * the web- browser. No custom sizes can be set in order for this to happen,
+		 * nor scrolling used
+		 */
+		if ( ie67 || ! userInputs && ! scrollX && ! scrollY &&
+		     columnCount == _fnVisbleColumns( oSettings ) &&
+		     columnCount == headerCells.length
+		) {
+			for ( i=0 ; i<columnCount ; i++ ) {
+				columns[i].sWidth = _fnStringToCss( headerCells.eq(i).width() );
+			}
+		}
+		else
+		{
+			// Otherwise construct a single row, worst case, table with the widest
+			// node in the data, assign any user defined widths, then insert it into
+			// the DOM and allow the browser to do all the hard work of calculating
+			// table widths
+			var tmpTable = $(table).clone() // don't use cloneNode - IE8 will remove events on the main table
+				.css( 'visibility', 'hidden' )
+				.removeAttr( 'id' );
+	
+			// Clean up the table body
+			tmpTable.find('tbody tr').remove();
+			var tr = $('<tr/>').appendTo( tmpTable.find('tbody') );
+	
+			// Clone the table header and footer - we can't use the header / footer
+			// from the cloned table, since if scrolling is active, the table's
+			// real header and footer are contained in different table tags
+			tmpTable.find('thead, tfoot').remove();
+			tmpTable
+				.append( $(oSettings.nTHead).clone() )
+				.append( $(oSettings.nTFoot).clone() );
+	
+			// Remove any assigned widths from the footer (from scrolling)
+			tmpTable.find('tfoot th, tfoot td').css('width', '');
+	
+			// Apply custom sizing to the cloned header
+			headerCells = _fnGetUniqueThs( oSettings, tmpTable.find('thead')[0] );
+	
+			for ( i=0 ; i<visibleColumns.length ; i++ ) {
+				column = columns[ visibleColumns[i] ];
+	
+				headerCells[i].style.width = column.sWidthOrig !== null && column.sWidthOrig !== '' ?
+					_fnStringToCss( column.sWidthOrig ) :
+					'';
+			}
+	
+			// Find the widest cell for each column and put it into the table
+			if ( oSettings.aoData.length ) {
+				for ( i=0 ; i<visibleColumns.length ; i++ ) {
+					columnIdx = visibleColumns[i];
+					column = columns[ columnIdx ];
+	
+					$( _fnGetWidestNode( oSettings, columnIdx ) )
+						.clone( false )
+						.append( column.sContentPadding )
+						.appendTo( tr );
+				}
+			}
+	
+			// Table has been built, attach to the document so we can work with it.
+			// A holding element is used, positioned at the top of the container
+			// with minimal height, so it has no effect on if the container scrolls
+			// or not. Otherwise it might trigger scrolling when it actually isn't
+			// needed
+			var holder = $('<div/>').css( scrollX || scrollY ?
+					{
+						position: 'absolute',
+						top: 0,
+						left: 0,
+						height: 1,
+						right: 0,
+						overflow: 'hidden'
+					} :
+					{}
+				)
+				.append( tmpTable )
+				.appendTo( tableContainer );
+	
+			// When scrolling (X or Y) we want to set the width of the table as 
+			// appropriate. However, when not scrolling leave the table width as it
+			// is. This results in slightly different, but I think correct behaviour
+			if ( scrollX && scrollXInner ) {
+				tmpTable.width( scrollXInner );
+			}
+			else if ( scrollX ) {
+				tmpTable.css( 'width', 'auto' );
+	
+				if ( tmpTable.width() < tableContainer.clientWidth ) {
+					tmpTable.width( tableContainer.clientWidth );
+				}
+			}
+			else if ( scrollY ) {
+				tmpTable.width( tableContainer.clientWidth );
+			}
+			else if ( tableWidthAttr ) {
+				tmpTable.width( tableWidthAttr );
+			}
+	
+			// Browsers need a bit of a hand when a width is assigned to any columns
+			// when x-scrolling as they tend to collapse the table to the min-width,
+			// even if we sent the column widths. So we need to keep track of what
+			// the table width should be by summing the user given values, and the
+			// automatic values
+			if ( scrollX )
+			{
+				var total = 0;
+	
+				for ( i=0 ; i<visibleColumns.length ; i++ ) {
+					column = columns[ visibleColumns[i] ];
+	
+					// Much prefer to use getBoundingClientRect due to its sub-pixel
+					// resolution, but IE8- do not support the width property.
+					outerWidth = browser.bBounding ?
+						headerCells[i].getBoundingClientRect().width :
+						$(headerCells[i]).outerWidth();
+	
+					total += column.sWidthOrig === null ?
+						outerWidth :
+						parseInt( column.sWidth, 10 ) + outerWidth - $(headerCells[i]).width();
+				}
+	
+				tmpTable.width( _fnStringToCss( total ) );
+				table.style.width = _fnStringToCss( total );
+			}
+	
+			// Get the width of each column in the constructed table
+			for ( i=0 ; i<visibleColumns.length ; i++ ) {
+				column = columns[ visibleColumns[i] ];
+				width = $(headerCells[i]).width();
+	
+				if ( width ) {
+					column.sWidth = _fnStringToCss( width );
+				}
+			}
+	
+			table.style.width = _fnStringToCss( tmpTable.css('width') );
+	
+			// Finished with the table - ditch it
+			holder.remove();
+		}
+	
+		// If there is a width attr, we want to attach an event listener which
+		// allows the table sizing to automatically adjust when the window is
+		// resized. Use the width attr rather than CSS, since we can't know if the
+		// CSS is a relative value or absolute - DOM read is always px.
+		if ( tableWidthAttr ) {
+			table.style.width = _fnStringToCss( tableWidthAttr );
+		}
+	
+		if ( (tableWidthAttr || scrollX) && ! oSettings._reszEvt ) {
+			var bindResize = function () {
+				$(window).bind('resize.DT-'+oSettings.sInstance, _fnThrottle( function () {
+					_fnAdjustColumnSizing( oSettings );
+				} ) );
+			};
+	
+			// IE6/7 will crash if we bind a resize event handler on page load.
+			// To be removed in 1.11 which drops IE6/7 support
+			if ( ie67 ) {
+				setTimeout( bindResize, 1000 );
+			}
+			else {
+				bindResize();
+			}
+	
+			oSettings._reszEvt = true;
+		}
+	}
+	
+	
+	/**
+	 * Throttle the calls to a function. Arguments and context are maintained for
+	 * the throttled function
+	 *  @param {function} fn Function to be called
+	 *  @param {int} [freq=200] call frequency in mS
+	 *  @returns {function} wrapped function
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnThrottle( fn, freq ) {
+		var
+			frequency = freq !== undefined ? freq : 200,
+			last,
+			timer;
+	
+		return function () {
+			var
+				that = this,
+				now  = +new Date(),
+				args = arguments;
+	
+			if ( last && now < last + frequency ) {
+				clearTimeout( timer );
+	
+				timer = setTimeout( function () {
+					last = undefined;
+					fn.apply( that, args );
+				}, frequency );
+			}
+			else {
+				last = now;
+				fn.apply( that, args );
+			}
+		};
+	}
+	
+	
+	/**
+	 * Convert a CSS unit width to pixels (e.g. 2em)
+	 *  @param {string} width width to be converted
+	 *  @param {node} parent parent to get the with for (required for relative widths) - optional
+	 *  @returns {int} width in pixels
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnConvertToWidth ( width, parent )
+	{
+		if ( ! width ) {
+			return 0;
+		}
+	
+		var n = $('<div/>')
+			.css( 'width', _fnStringToCss( width ) )
+			.appendTo( parent || document.body );
+	
+		var val = n[0].offsetWidth;
+		n.remove();
+	
+		return val;
+	}
+	
+	
+	/**
+	 * Get the widest node
+	 *  @param {object} settings dataTables settings object
+	 *  @param {int} colIdx column of interest
+	 *  @returns {node} widest table node
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetWidestNode( settings, colIdx )
+	{
+		var idx = _fnGetMaxLenString( settings, colIdx );
+		if ( idx < 0 ) {
+			return null;
+		}
+	
+		var data = settings.aoData[ idx ];
+		return ! data.nTr ? // Might not have been created when deferred rendering
+			$('<td/>').html( _fnGetCellData( settings, idx, colIdx, 'display' ) )[0] :
+			data.anCells[ colIdx ];
+	}
+	
+	
+	/**
+	 * Get the maximum strlen for each data column
+	 *  @param {object} settings dataTables settings object
+	 *  @param {int} colIdx column of interest
+	 *  @returns {string} max string length for each column
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnGetMaxLenString( settings, colIdx )
+	{
+		var s, max=-1, maxIdx = -1;
+	
+		for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+			s = _fnGetCellData( settings, i, colIdx, 'display' )+'';
+			s = s.replace( __re_html_remove, '' );
+	
+			if ( s.length > max ) {
+				max = s.length;
+				maxIdx = i;
+			}
+		}
+	
+		return maxIdx;
+	}
+	
+	
+	/**
+	 * Append a CSS unit (only if required) to a string
+	 *  @param {string} value to css-ify
+	 *  @returns {string} value with css unit
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnStringToCss( s )
+	{
+		if ( s === null ) {
+			return '0px';
+		}
+	
+		if ( typeof s == 'number' ) {
+			return s < 0 ?
+				'0px' :
+				s+'px';
+		}
+	
+		// Check it has a unit character already
+		return s.match(/\d$/) ?
+			s+'px' :
+			s;
+	}
+	
+	
+	/**
+	 * Get the width of a scroll bar in this browser being used
+	 *  @returns {int} width in pixels
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnScrollBarWidth ()
+	{
+		// On first run a static variable is set, since this is only needed once.
+		// Subsequent runs will just use the previously calculated value
+		var width = DataTable.__scrollbarWidth;
+	
+		if ( width === undefined ) {
+			var sizer = $('<p/>').css( {
+					position: 'absolute',
+					top: 0,
+					left: 0,
+					width: '100%',
+					height: 150,
+					padding: 0,
+					overflow: 'scroll',
+					visibility: 'hidden'
+				} )
+				.appendTo('body');
+	
+			width = sizer[0].offsetWidth - sizer[0].clientWidth;
+			DataTable.__scrollbarWidth = width;
+	
+			sizer.remove();
+		}
+	
+		return width;
+	}
+	
+	
+	
+	function _fnSortFlatten ( settings )
+	{
+		var
+			i, iLen, k, kLen,
+			aSort = [],
+			aiOrig = [],
+			aoColumns = settings.aoColumns,
+			aDataSort, iCol, sType, srcCol,
+			fixed = settings.aaSortingFixed,
+			fixedObj = $.isPlainObject( fixed ),
+			nestedSort = [],
+			add = function ( a ) {
+				if ( a.length && ! $.isArray( a[0] ) ) {
+					// 1D array
+					nestedSort.push( a );
+				}
+				else {
+					// 2D array
+					nestedSort.push.apply( nestedSort, a );
+				}
+			};
+	
+		// Build the sort array, with pre-fix and post-fix options if they have been
+		// specified
+		if ( $.isArray( fixed ) ) {
+			add( fixed );
+		}
+	
+		if ( fixedObj && fixed.pre ) {
+			add( fixed.pre );
+		}
+	
+		add( settings.aaSorting );
+	
+		if (fixedObj && fixed.post ) {
+			add( fixed.post );
+		}
+	
+		for ( i=0 ; i<nestedSort.length ; i++ )
+		{
+			srcCol = nestedSort[i][0];
+			aDataSort = aoColumns[ srcCol ].aDataSort;
+	
+			for ( k=0, kLen=aDataSort.length ; k<kLen ; k++ )
+			{
+				iCol = aDataSort[k];
+				sType = aoColumns[ iCol ].sType || 'string';
+	
+				if ( nestedSort[i]._idx === undefined ) {
+					nestedSort[i]._idx = $.inArray( nestedSort[i][1], aoColumns[iCol].asSorting );
+				}
+	
+				aSort.push( {
+					src:       srcCol,
+					col:       iCol,
+					dir:       nestedSort[i][1],
+					index:     nestedSort[i]._idx,
+					type:      sType,
+					formatter: DataTable.ext.type.order[ sType+"-pre" ]
+				} );
+			}
+		}
+	
+		return aSort;
+	}
+	
+	/**
+	 * Change the order of the table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 *  @todo This really needs split up!
+	 */
+	function _fnSort ( oSettings )
+	{
+		var
+			i, ien, iLen, j, jLen, k, kLen,
+			sDataType, nTh,
+			aiOrig = [],
+			oExtSort = DataTable.ext.type.order,
+			aoData = oSettings.aoData,
+			aoColumns = oSettings.aoColumns,
+			aDataSort, data, iCol, sType, oSort,
+			formatters = 0,
+			sortCol,
+			displayMaster = oSettings.aiDisplayMaster,
+			aSort;
+	
+		// Resolve any column types that are unknown due to addition or invalidation
+		// @todo Can this be moved into a 'data-ready' handler which is called when
+		//   data is going to be used in the table?
+		_fnColumnTypes( oSettings );
+	
+		aSort = _fnSortFlatten( oSettings );
+	
+		for ( i=0, ien=aSort.length ; i<ien ; i++ ) {
+			sortCol = aSort[i];
+	
+			// Track if we can use the fast sort algorithm
+			if ( sortCol.formatter ) {
+				formatters++;
+			}
+	
+			// Load the data needed for the sort, for each cell
+			_fnSortData( oSettings, sortCol.col );
+		}
+	
+		/* No sorting required if server-side or no sorting array */
+		if ( _fnDataSource( oSettings ) != 'ssp' && aSort.length !== 0 )
+		{
+			// Create a value - key array of the current row positions such that we can use their
+			// current position during the sort, if values match, in order to perform stable sorting
+			for ( i=0, iLen=displayMaster.length ; i<iLen ; i++ ) {
+				aiOrig[ displayMaster[i] ] = i;
+			}
+	
+			/* Do the sort - here we want multi-column sorting based on a given data source (column)
+			 * and sorting function (from oSort) in a certain direction. It's reasonably complex to
+			 * follow on it's own, but this is what we want (example two column sorting):
+			 *  fnLocalSorting = function(a,b){
+			 *    var iTest;
+			 *    iTest = oSort['string-asc']('data11', 'data12');
+			 *      if (iTest !== 0)
+			 *        return iTest;
+			 *    iTest = oSort['numeric-desc']('data21', 'data22');
+			 *    if (iTest !== 0)
+			 *      return iTest;
+			 *    return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
+			 *  }
+			 * Basically we have a test for each sorting column, if the data in that column is equal,
+			 * test the next column. If all columns match, then we use a numeric sort on the row
+			 * positions in the original data array to provide a stable sort.
+			 *
+			 * Note - I know it seems excessive to have two sorting methods, but the first is around
+			 * 15% faster, so the second is only maintained for backwards compatibility with sorting
+			 * methods which do not have a pre-sort formatting function.
+			 */
+			if ( formatters === aSort.length ) {
+				// All sort types have formatting functions
+				displayMaster.sort( function ( a, b ) {
+					var
+						x, y, k, test, sort,
+						len=aSort.length,
+						dataA = aoData[a]._aSortData,
+						dataB = aoData[b]._aSortData;
+	
+					for ( k=0 ; k<len ; k++ ) {
+						sort = aSort[k];
+	
+						x = dataA[ sort.col ];
+						y = dataB[ sort.col ];
+	
+						test = x<y ? -1 : x>y ? 1 : 0;
+						if ( test !== 0 ) {
+							return sort.dir === 'asc' ? test : -test;
+						}
+					}
+	
+					x = aiOrig[a];
+					y = aiOrig[b];
+					return x<y ? -1 : x>y ? 1 : 0;
+				} );
+			}
+			else {
+				// Depreciated - remove in 1.11 (providing a plug-in option)
+				// Not all sort types have formatting methods, so we have to call their sorting
+				// methods.
+				displayMaster.sort( function ( a, b ) {
+					var
+						x, y, k, l, test, sort, fn,
+						len=aSort.length,
+						dataA = aoData[a]._aSortData,
+						dataB = aoData[b]._aSortData;
+	
+					for ( k=0 ; k<len ; k++ ) {
+						sort = aSort[k];
+	
+						x = dataA[ sort.col ];
+						y = dataB[ sort.col ];
+	
+						fn = oExtSort[ sort.type+"-"+sort.dir ] || oExtSort[ "string-"+sort.dir ];
+						test = fn( x, y );
+						if ( test !== 0 ) {
+							return test;
+						}
+					}
+	
+					x = aiOrig[a];
+					y = aiOrig[b];
+					return x<y ? -1 : x>y ? 1 : 0;
+				} );
+			}
+		}
+	
+		/* Tell the draw function that we have sorted the data */
+		oSettings.bSorted = true;
+	}
+	
+	
+	function _fnSortAria ( settings )
+	{
+		var label;
+		var nextSort;
+		var columns = settings.aoColumns;
+		var aSort = _fnSortFlatten( settings );
+		var oAria = settings.oLanguage.oAria;
+	
+		// ARIA attributes - need to loop all columns, to update all (removing old
+		// attributes as needed)
+		for ( var i=0, iLen=columns.length ; i<iLen ; i++ )
+		{
+			var col = columns[i];
+			var asSorting = col.asSorting;
+			var sTitle = col.sTitle.replace( /<.*?>/g, "" );
+			var th = col.nTh;
+	
+			// IE7 is throwing an error when setting these properties with jQuery's
+			// attr() and removeAttr() methods...
+			th.removeAttribute('aria-sort');
+	
+			/* In ARIA only the first sorting column can be marked as sorting - no multi-sort option */
+			if ( col.bSortable ) {
+				if ( aSort.length > 0 && aSort[0].col == i ) {
+					th.setAttribute('aria-sort', aSort[0].dir=="asc" ? "ascending" : "descending" );
+					nextSort = asSorting[ aSort[0].index+1 ] || asSorting[0];
+				}
+				else {
+					nextSort = asSorting[0];
+				}
+	
+				label = sTitle + ( nextSort === "asc" ?
+					oAria.sSortAscending :
+					oAria.sSortDescending
+				);
+			}
+			else {
+				label = sTitle;
+			}
+	
+			th.setAttribute('aria-label', label);
+		}
+	}
+	
+	
+	/**
+	 * Function to run on user sort request
+	 *  @param {object} settings dataTables settings object
+	 *  @param {node} attachTo node to attach the handler to
+	 *  @param {int} colIdx column sorting index
+	 *  @param {boolean} [append=false] Append the requested sort to the existing
+	 *    sort if true (i.e. multi-column sort)
+	 *  @param {function} [callback] callback function
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSortListener ( settings, colIdx, append, callback )
+	{
+		var col = settings.aoColumns[ colIdx ];
+		var sorting = settings.aaSorting;
+		var asSorting = col.asSorting;
+		var nextSortIdx;
+		var next = function ( a, overflow ) {
+			var idx = a._idx;
+			if ( idx === undefined ) {
+				idx = $.inArray( a[1], asSorting );
+			}
+	
+			return idx+1 < asSorting.length ?
+				idx+1 :
+				overflow ?
+					null :
+					0;
+		};
+	
+		// Convert to 2D array if needed
+		if ( typeof sorting[0] === 'number' ) {
+			sorting = settings.aaSorting = [ sorting ];
+		}
+	
+		// If appending the sort then we are multi-column sorting
+		if ( append && settings.oFeatures.bSortMulti ) {
+			// Are we already doing some kind of sort on this column?
+			var sortIdx = $.inArray( colIdx, _pluck(sorting, '0') );
+	
+			if ( sortIdx !== -1 ) {
+				// Yes, modify the sort
+				nextSortIdx = next( sorting[sortIdx], true );
+	
+				if ( nextSortIdx === null && sorting.length === 1 ) {
+					nextSortIdx = 0; // can't remove sorting completely
+				}
+	
+				if ( nextSortIdx === null ) {
+					sorting.splice( sortIdx, 1 );
+				}
+				else {
+					sorting[sortIdx][1] = asSorting[ nextSortIdx ];
+					sorting[sortIdx]._idx = nextSortIdx;
+				}
+			}
+			else {
+				// No sort on this column yet
+				sorting.push( [ colIdx, asSorting[0], 0 ] );
+				sorting[sorting.length-1]._idx = 0;
+			}
+		}
+		else if ( sorting.length && sorting[0][0] == colIdx ) {
+			// Single column - already sorting on this column, modify the sort
+			nextSortIdx = next( sorting[0] );
+	
+			sorting.length = 1;
+			sorting[0][1] = asSorting[ nextSortIdx ];
+			sorting[0]._idx = nextSortIdx;
+		}
+		else {
+			// Single column - sort only on this column
+			sorting.length = 0;
+			sorting.push( [ colIdx, asSorting[0] ] );
+			sorting[0]._idx = 0;
+		}
+	
+		// Run the sort by calling a full redraw
+		_fnReDraw( settings );
+	
+		// callback used for async user interaction
+		if ( typeof callback == 'function' ) {
+			callback( settings );
+		}
+	}
+	
+	
+	/**
+	 * Attach a sort handler (click) to a node
+	 *  @param {object} settings dataTables settings object
+	 *  @param {node} attachTo node to attach the handler to
+	 *  @param {int} colIdx column sorting index
+	 *  @param {function} [callback] callback function
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSortAttachListener ( settings, attachTo, colIdx, callback )
+	{
+		var col = settings.aoColumns[ colIdx ];
+	
+		_fnBindAction( attachTo, {}, function (e) {
+			/* If the column is not sortable - don't to anything */
+			if ( col.bSortable === false ) {
+				return;
+			}
+	
+			// If processing is enabled use a timeout to allow the processing
+			// display to be shown - otherwise to it synchronously
+			if ( settings.oFeatures.bProcessing ) {
+				_fnProcessingDisplay( settings, true );
+	
+				setTimeout( function() {
+					_fnSortListener( settings, colIdx, e.shiftKey, callback );
+	
+					// In server-side processing, the draw callback will remove the
+					// processing display
+					if ( _fnDataSource( settings ) !== 'ssp' ) {
+						_fnProcessingDisplay( settings, false );
+					}
+				}, 0 );
+			}
+			else {
+				_fnSortListener( settings, colIdx, e.shiftKey, callback );
+			}
+		} );
+	}
+	
+	
+	/**
+	 * Set the sorting classes on table's body, Note: it is safe to call this function
+	 * when bSort and bSortClasses are false
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSortingClasses( settings )
+	{
+		var oldSort = settings.aLastSort;
+		var sortClass = settings.oClasses.sSortColumn;
+		var sort = _fnSortFlatten( settings );
+		var features = settings.oFeatures;
+		var i, ien, colIdx;
+	
+		if ( features.bSort && features.bSortClasses ) {
+			// Remove old sorting classes
+			for ( i=0, ien=oldSort.length ; i<ien ; i++ ) {
+				colIdx = oldSort[i].src;
+	
+				// Remove column sorting
+				$( _pluck( settings.aoData, 'anCells', colIdx ) )
+					.removeClass( sortClass + (i<2 ? i+1 : 3) );
+			}
+	
+			// Add new column sorting
+			for ( i=0, ien=sort.length ; i<ien ; i++ ) {
+				colIdx = sort[i].src;
+	
+				$( _pluck( settings.aoData, 'anCells', colIdx ) )
+					.addClass( sortClass + (i<2 ? i+1 : 3) );
+			}
+		}
+	
+		settings.aLastSort = sort;
+	}
+	
+	
+	// Get the data to sort a column, be it from cache, fresh (populating the
+	// cache), or from a sort formatter
+	function _fnSortData( settings, idx )
+	{
+		// Custom sorting function - provided by the sort data type
+		var column = settings.aoColumns[ idx ];
+		var customSort = DataTable.ext.order[ column.sSortDataType ];
+		var customData;
+	
+		if ( customSort ) {
+			customData = customSort.call( settings.oInstance, settings, idx,
+				_fnColumnIndexToVisible( settings, idx )
+			);
+		}
+	
+		// Use / populate cache
+		var row, cellData;
+		var formatter = DataTable.ext.type.order[ column.sType+"-pre" ];
+	
+		for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+			row = settings.aoData[i];
+	
+			if ( ! row._aSortData ) {
+				row._aSortData = [];
+			}
+	
+			if ( ! row._aSortData[idx] || customSort ) {
+				cellData = customSort ?
+					customData[i] : // If there was a custom sort function, use data from there
+					_fnGetCellData( settings, i, idx, 'sort' );
+	
+				row._aSortData[ idx ] = formatter ?
+					formatter( cellData ) :
+					cellData;
+			}
+		}
+	}
+	
+	
+	
+	/**
+	 * Save the state of a table
+	 *  @param {object} oSettings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSaveState ( settings )
+	{
+		if ( !settings.oFeatures.bStateSave || settings.bDestroying )
+		{
+			return;
+		}
+	
+		/* Store the interesting variables */
+		var state = {
+			time:    +new Date(),
+			start:   settings._iDisplayStart,
+			length:  settings._iDisplayLength,
+			order:   $.extend( true, [], settings.aaSorting ),
+			search:  _fnSearchToCamel( settings.oPreviousSearch ),
+			columns: $.map( settings.aoColumns, function ( col, i ) {
+				return {
+					visible: col.bVisible,
+					search: _fnSearchToCamel( settings.aoPreSearchCols[i] )
+				};
+			} )
+		};
+	
+		_fnCallbackFire( settings, "aoStateSaveParams", 'stateSaveParams', [settings, state] );
+	
+		settings.oSavedState = state;
+		settings.fnStateSaveCallback.call( settings.oInstance, settings, state );
+	}
+	
+	
+	/**
+	 * Attempt to load a saved table state
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {object} oInit DataTables init object so we can override settings
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnLoadState ( settings, oInit )
+	{
+		var i, ien;
+		var columns = settings.aoColumns;
+	
+		if ( ! settings.oFeatures.bStateSave ) {
+			return;
+		}
+	
+		var state = settings.fnStateLoadCallback.call( settings.oInstance, settings );
+		if ( ! state || ! state.time ) {
+			return;
+		}
+	
+		/* Allow custom and plug-in manipulation functions to alter the saved data set and
+		 * cancelling of loading by returning false
+		 */
+		var abStateLoad = _fnCallbackFire( settings, 'aoStateLoadParams', 'stateLoadParams', [settings, state] );
+		if ( $.inArray( false, abStateLoad ) !== -1 ) {
+			return;
+		}
+	
+		/* Reject old data */
+		var duration = settings.iStateDuration;
+		if ( duration > 0 && state.time < +new Date() - (duration*1000) ) {
+			return;
+		}
+	
+		// Number of columns have changed - all bets are off, no restore of settings
+		if ( columns.length !== state.columns.length ) {
+			return;
+		}
+	
+		// Store the saved state so it might be accessed at any time
+		settings.oLoadedState = $.extend( true, {}, state );
+	
+		// Restore key features - todo - for 1.11 this needs to be done by
+		// subscribed events
+		if ( state.start !== undefined ) {
+			settings._iDisplayStart    = state.start;
+			settings.iInitDisplayStart = state.start;
+		}
+		if ( state.length !== undefined ) {
+			settings._iDisplayLength   = state.length;
+		}
+	
+		// Order
+		if ( state.order !== undefined ) {
+			settings.aaSorting = [];
+			$.each( state.order, function ( i, col ) {
+				settings.aaSorting.push( col[0] >= columns.length ?
+					[ 0, col[1] ] :
+					col
+				);
+			} );
+		}
+	
+		// Search
+		if ( state.search !== undefined ) {
+			$.extend( settings.oPreviousSearch, _fnSearchToHung( state.search ) );
+		}
+	
+		// Columns
+		for ( i=0, ien=state.columns.length ; i<ien ; i++ ) {
+			var col = state.columns[i];
+	
+			// Visibility
+			if ( col.visible !== undefined ) {
+				columns[i].bVisible = col.visible;
+			}
+	
+			// Search
+			if ( col.search !== undefined ) {
+				$.extend( settings.aoPreSearchCols[i], _fnSearchToHung( col.search ) );
+			}
+		}
+	
+		_fnCallbackFire( settings, 'aoStateLoaded', 'stateLoaded', [settings, state] );
+	}
+	
+	
+	/**
+	 * Return the settings object for a particular table
+	 *  @param {node} table table we are using as a dataTable
+	 *  @returns {object} Settings object - or null if not found
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnSettingsFromNode ( table )
+	{
+		var settings = DataTable.settings;
+		var idx = $.inArray( table, _pluck( settings, 'nTable' ) );
+	
+		return idx !== -1 ?
+			settings[ idx ] :
+			null;
+	}
+	
+	
+	/**
+	 * Log an error message
+	 *  @param {object} settings dataTables settings object
+	 *  @param {int} level log error messages, or display them to the user
+	 *  @param {string} msg error message
+	 *  @param {int} tn Technical note id to get more information about the error.
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnLog( settings, level, msg, tn )
+	{
+		msg = 'DataTables warning: '+
+			(settings ? 'table id='+settings.sTableId+' - ' : '')+msg;
+	
+		if ( tn ) {
+			msg += '. For more information about this error, please see '+
+			'http://datatables.net/tn/'+tn;
+		}
+	
+		if ( ! level  ) {
+			// Backwards compatibility pre 1.10
+			var ext = DataTable.ext;
+			var type = ext.sErrMode || ext.errMode;
+	
+			if ( settings ) {
+				_fnCallbackFire( settings, null, 'error', [ settings, tn, msg ] );
+			}
+	
+			if ( type == 'alert' ) {
+				alert( msg );
+			}
+			else if ( type == 'throw' ) {
+				throw new Error(msg);
+			}
+			else if ( typeof type == 'function' ) {
+				type( settings, tn, msg );
+			}
+		}
+		else if ( window.console && console.log ) {
+			console.log( msg );
+		}
+	}
+	
+	
+	/**
+	 * See if a property is defined on one object, if so assign it to the other object
+	 *  @param {object} ret target object
+	 *  @param {object} src source object
+	 *  @param {string} name property
+	 *  @param {string} [mappedName] name to map too - optional, name used if not given
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnMap( ret, src, name, mappedName )
+	{
+		if ( $.isArray( name ) ) {
+			$.each( name, function (i, val) {
+				if ( $.isArray( val ) ) {
+					_fnMap( ret, src, val[0], val[1] );
+				}
+				else {
+					_fnMap( ret, src, val );
+				}
+			} );
+	
+			return;
+		}
+	
+		if ( mappedName === undefined ) {
+			mappedName = name;
+		}
+	
+		if ( src[name] !== undefined ) {
+			ret[mappedName] = src[name];
+		}
+	}
+	
+	
+	/**
+	 * Extend objects - very similar to jQuery.extend, but deep copy objects, and
+	 * shallow copy arrays. The reason we need to do this, is that we don't want to
+	 * deep copy array init values (such as aaSorting) since the dev wouldn't be
+	 * able to override them, but we do want to deep copy arrays.
+	 *  @param {object} out Object to extend
+	 *  @param {object} extender Object from which the properties will be applied to
+	 *      out
+	 *  @param {boolean} breakRefs If true, then arrays will be sliced to take an
+	 *      independent copy with the exception of the `data` or `aaData` parameters
+	 *      if they are present. This is so you can pass in a collection to
+	 *      DataTables and have that used as your data source without breaking the
+	 *      references
+	 *  @returns {object} out Reference, just for convenience - out === the return.
+	 *  @memberof DataTable#oApi
+	 *  @todo This doesn't take account of arrays inside the deep copied objects.
+	 */
+	function _fnExtend( out, extender, breakRefs )
+	{
+		var val;
+	
+		for ( var prop in extender ) {
+			if ( extender.hasOwnProperty(prop) ) {
+				val = extender[prop];
+	
+				if ( $.isPlainObject( val ) ) {
+					if ( ! $.isPlainObject( out[prop] ) ) {
+						out[prop] = {};
+					}
+					$.extend( true, out[prop], val );
+				}
+				else if ( breakRefs && prop !== 'data' && prop !== 'aaData' && $.isArray(val) ) {
+					out[prop] = val.slice();
+				}
+				else {
+					out[prop] = val;
+				}
+			}
+		}
+	
+		return out;
+	}
+	
+	
+	/**
+	 * Bind an event handers to allow a click or return key to activate the callback.
+	 * This is good for accessibility since a return on the keyboard will have the
+	 * same effect as a click, if the element has focus.
+	 *  @param {element} n Element to bind the action to
+	 *  @param {object} oData Data object to pass to the triggered function
+	 *  @param {function} fn Callback function for when the event is triggered
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnBindAction( n, oData, fn )
+	{
+		$(n)
+			.bind( 'click.DT', oData, function (e) {
+					n.blur(); // Remove focus outline for mouse users
+					fn(e);
+				} )
+			.bind( 'keypress.DT', oData, function (e){
+					if ( e.which === 13 ) {
+						e.preventDefault();
+						fn(e);
+					}
+				} )
+			.bind( 'selectstart.DT', function () {
+					/* Take the brutal approach to cancelling text selection */
+					return false;
+				} );
+	}
+	
+	
+	/**
+	 * Register a callback function. Easily allows a callback function to be added to
+	 * an array store of callback functions that can then all be called together.
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {string} sStore Name of the array storage for the callbacks in oSettings
+	 *  @param {function} fn Function to be called back
+	 *  @param {string} sName Identifying name for the callback (i.e. a label)
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnCallbackReg( oSettings, sStore, fn, sName )
+	{
+		if ( fn )
+		{
+			oSettings[sStore].push( {
+				"fn": fn,
+				"sName": sName
+			} );
+		}
+	}
+	
+	
+	/**
+	 * Fire callback functions and trigger events. Note that the loop over the
+	 * callback array store is done backwards! Further note that you do not want to
+	 * fire off triggers in time sensitive applications (for example cell creation)
+	 * as its slow.
+	 *  @param {object} settings dataTables settings object
+	 *  @param {string} callbackArr Name of the array storage for the callbacks in
+	 *      oSettings
+	 *  @param {string} eventName Name of the jQuery custom event to trigger. If
+	 *      null no trigger is fired
+	 *  @param {array} args Array of arguments to pass to the callback function /
+	 *      trigger
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnCallbackFire( settings, callbackArr, eventName, args )
+	{
+		var ret = [];
+	
+		if ( callbackArr ) {
+			ret = $.map( settings[callbackArr].slice().reverse(), function (val, i) {
+				return val.fn.apply( settings.oInstance, args );
+			} );
+		}
+	
+		if ( eventName !== null ) {
+			var e = $.Event( eventName+'.dt' );
+	
+			$(settings.nTable).trigger( e, args );
+	
+			ret.push( e.result );
+		}
+	
+		return ret;
+	}
+	
+	
+	function _fnLengthOverflow ( settings )
+	{
+		var
+			start = settings._iDisplayStart,
+			end = settings.fnDisplayEnd(),
+			len = settings._iDisplayLength;
+	
+		/* If we have space to show extra rows (backing up from the end point - then do so */
+		if ( start >= end )
+		{
+			start = end - len;
+		}
+	
+		// Keep the start record on the current page
+		start -= (start % len);
+	
+		if ( len === -1 || start < 0 )
+		{
+			start = 0;
+		}
+	
+		settings._iDisplayStart = start;
+	}
+	
+	
+	function _fnRenderer( settings, type )
+	{
+		var renderer = settings.renderer;
+		var host = DataTable.ext.renderer[type];
+	
+		if ( $.isPlainObject( renderer ) && renderer[type] ) {
+			// Specific renderer for this type. If available use it, otherwise use
+			// the default.
+			return host[renderer[type]] || host._;
+		}
+		else if ( typeof renderer === 'string' ) {
+			// Common renderer - if there is one available for this type use it,
+			// otherwise use the default
+			return host[renderer] || host._;
+		}
+	
+		// Use the default
+		return host._;
+	}
+	
+	
+	/**
+	 * Detect the data source being used for the table. Used to simplify the code
+	 * a little (ajax) and to make it compress a little smaller.
+	 *
+	 *  @param {object} settings dataTables settings object
+	 *  @returns {string} Data source
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnDataSource ( settings )
+	{
+		if ( settings.oFeatures.bServerSide ) {
+			return 'ssp';
+		}
+		else if ( settings.ajax || settings.sAjaxSource ) {
+			return 'ajax';
+		}
+		return 'dom';
+	}
+	
+
+	DataTable = function( options )
+	{
+		/**
+		 * Perform a jQuery selector action on the table's TR elements (from the tbody) and
+		 * return the resulting jQuery object.
+		 *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
+		 *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
+		 *  @param {string} [oOpts.filter=none] Select TR elements that meet the current filter
+		 *    criterion ("applied") or all TR elements (i.e. no filter).
+		 *  @param {string} [oOpts.order=current] Order of the TR elements in the processed array.
+		 *    Can be either 'current', whereby the current sorting of the table is used, or
+		 *    'original' whereby the original order the data was read into the table is used.
+		 *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
+		 *    ("current") or not ("all"). If 'current' is given, then order is assumed to be
+		 *    'current' and filter is 'applied', regardless of what they might be given as.
+		 *  @returns {object} jQuery object, filtered by the given selector.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Highlight every second row
+		 *      oTable.$('tr:odd').css('backgroundColor', 'blue');
+		 *    } );
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Filter to rows with 'Webkit' in them, add a background colour and then
+		 *      // remove the filter, thus highlighting the 'Webkit' rows only.
+		 *      oTable.fnFilter('Webkit');
+		 *      oTable.$('tr', {"search": "applied"}).css('backgroundColor', 'blue');
+		 *      oTable.fnFilter('');
+		 *    } );
+		 */
+		this.$ = function ( sSelector, oOpts )
+		{
+			return this.api(true).$( sSelector, oOpts );
+		};
+		
+		
+		/**
+		 * Almost identical to $ in operation, but in this case returns the data for the matched
+		 * rows - as such, the jQuery selector used should match TR row nodes or TD/TH cell nodes
+		 * rather than any descendants, so the data can be obtained for the row/cell. If matching
+		 * rows are found, the data returned is the original data array/object that was used to
+		 * create the row (or a generated array if from a DOM source).
+		 *
+		 * This method is often useful in-combination with $ where both functions are given the
+		 * same parameters and the array indexes will match identically.
+		 *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
+		 *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
+		 *  @param {string} [oOpts.filter=none] Select elements that meet the current filter
+		 *    criterion ("applied") or all elements (i.e. no filter).
+		 *  @param {string} [oOpts.order=current] Order of the data in the processed array.
+		 *    Can be either 'current', whereby the current sorting of the table is used, or
+		 *    'original' whereby the original order the data was read into the table is used.
+		 *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
+		 *    ("current") or not ("all"). If 'current' is given, then order is assumed to be
+		 *    'current' and filter is 'applied', regardless of what they might be given as.
+		 *  @returns {array} Data for the matched elements. If any elements, as a result of the
+		 *    selector, were not TR, TD or TH elements in the DataTable, they will have a null
+		 *    entry in the array.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Get the data from the first row in the table
+		 *      var data = oTable._('tr:first');
+		 *
+		 *      // Do something useful with the data
+		 *      alert( "First cell is: "+data[0] );
+		 *    } );
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Filter to 'Webkit' and get all data for
+		 *      oTable.fnFilter('Webkit');
+		 *      var data = oTable._('tr', {"search": "applied"});
+		 *
+		 *      // Do something with the data
+		 *      alert( data.length+" rows matched the search" );
+		 *    } );
+		 */
+		this._ = function ( sSelector, oOpts )
+		{
+			return this.api(true).rows( sSelector, oOpts ).data();
+		};
+		
+		
+		/**
+		 * Create a DataTables Api instance, with the currently selected tables for
+		 * the Api's context.
+		 * @param {boolean} [traditional=false] Set the API instance's context to be
+		 *   only the table referred to by the `DataTable.ext.iApiIndex` option, as was
+		 *   used in the API presented by DataTables 1.9- (i.e. the traditional mode),
+		 *   or if all tables captured in the jQuery object should be used.
+		 * @return {DataTables.Api}
+		 */
+		this.api = function ( traditional )
+		{
+			return traditional ?
+				new _Api(
+					_fnSettingsFromNode( this[ _ext.iApiIndex ] )
+				) :
+				new _Api( this );
+		};
+		
+		
+		/**
+		 * Add a single new row or multiple rows of data to the table. Please note
+		 * that this is suitable for client-side processing only - if you are using
+		 * server-side processing (i.e. "bServerSide": true), then to add data, you
+		 * must add it to the data source, i.e. the server-side, through an Ajax call.
+		 *  @param {array|object} data The data to be added to the table. This can be:
+		 *    <ul>
+		 *      <li>1D array of data - add a single row with the data provided</li>
+		 *      <li>2D array of arrays - add multiple rows in a single call</li>
+		 *      <li>object - data object when using <i>mData</i></li>
+		 *      <li>array of objects - multiple data objects when using <i>mData</i></li>
+		 *    </ul>
+		 *  @param {bool} [redraw=true] redraw the table or not
+		 *  @returns {array} An array of integers, representing the list of indexes in
+		 *    <i>aoData</i> ({@link DataTable.models.oSettings}) that have been added to
+		 *    the table.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    // Global var for counter
+		 *    var giCount = 2;
+		 *
+		 *    $(document).ready(function() {
+		 *      $('#example').dataTable();
+		 *    } );
+		 *
+		 *    function fnClickAddRow() {
+		 *      $('#example').dataTable().fnAddData( [
+		 *        giCount+".1",
+		 *        giCount+".2",
+		 *        giCount+".3",
+		 *        giCount+".4" ]
+		 *      );
+		 *
+		 *      giCount++;
+		 *    }
+		 */
+		this.fnAddData = function( data, redraw )
+		{
+			var api = this.api( true );
+		
+			/* Check if we want to add multiple rows or not */
+			var rows = $.isArray(data) && ( $.isArray(data[0]) || $.isPlainObject(data[0]) ) ?
+				api.rows.add( data ) :
+				api.row.add( data );
+		
+			if ( redraw === undefined || redraw ) {
+				api.draw();
+			}
+		
+			return rows.flatten().toArray();
+		};
+		
+		
+		/**
+		 * This function will make DataTables recalculate the column sizes, based on the data
+		 * contained in the table and the sizes applied to the columns (in the DOM, CSS or
+		 * through the sWidth parameter). This can be useful when the width of the table's
+		 * parent element changes (for example a window resize).
+		 *  @param {boolean} [bRedraw=true] Redraw the table or not, you will typically want to
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable( {
+		 *        "sScrollY": "200px",
+		 *        "bPaginate": false
+		 *      } );
+		 *
+		 *      $(window).bind('resize', function () {
+		 *        oTable.fnAdjustColumnSizing();
+		 *      } );
+		 *    } );
+		 */
+		this.fnAdjustColumnSizing = function ( bRedraw )
+		{
+			var api = this.api( true ).columns.adjust();
+			var settings = api.settings()[0];
+			var scroll = settings.oScroll;
+		
+			if ( bRedraw === undefined || bRedraw ) {
+				api.draw( false );
+			}
+			else if ( scroll.sX !== "" || scroll.sY !== "" ) {
+				/* If not redrawing, but scrolling, we want to apply the new column sizes anyway */
+				_fnScrollDraw( settings );
+			}
+		};
+		
+		
+		/**
+		 * Quickly and simply clear a table
+		 *  @param {bool} [bRedraw=true] redraw the table or not
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Immediately 'nuke' the current rows (perhaps waiting for an Ajax callback...)
+		 *      oTable.fnClearTable();
+		 *    } );
+		 */
+		this.fnClearTable = function( bRedraw )
+		{
+			var api = this.api( true ).clear();
+		
+			if ( bRedraw === undefined || bRedraw ) {
+				api.draw();
+			}
+		};
+		
+		
+		/**
+		 * The exact opposite of 'opening' a row, this function will close any rows which
+		 * are currently 'open'.
+		 *  @param {node} nTr the table row to 'close'
+		 *  @returns {int} 0 on success, or 1 if failed (can't find the row)
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable;
+		 *
+		 *      // 'open' an information row when a row is clicked on
+		 *      $('#example tbody tr').click( function () {
+		 *        if ( oTable.fnIsOpen(this) ) {
+		 *          oTable.fnClose( this );
+		 *        } else {
+		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+		 *        }
+		 *      } );
+		 *
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnClose = function( nTr )
+		{
+			this.api( true ).row( nTr ).child.hide();
+		};
+		
+		
+		/**
+		 * Remove a row for the table
+		 *  @param {mixed} target The index of the row from aoData to be deleted, or
+		 *    the TR element you want to delete
+		 *  @param {function|null} [callBack] Callback function
+		 *  @param {bool} [redraw=true] Redraw the table or not
+		 *  @returns {array} The row that was deleted
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Immediately remove the first row
+		 *      oTable.fnDeleteRow( 0 );
+		 *    } );
+		 */
+		this.fnDeleteRow = function( target, callback, redraw )
+		{
+			var api = this.api( true );
+			var rows = api.rows( target );
+			var settings = rows.settings()[0];
+			var data = settings.aoData[ rows[0][0] ];
+		
+			rows.remove();
+		
+			if ( callback ) {
+				callback.call( this, settings, data );
+			}
+		
+			if ( redraw === undefined || redraw ) {
+				api.draw();
+			}
+		
+			return data;
+		};
+		
+		
+		/**
+		 * Restore the table to it's original state in the DOM by removing all of DataTables
+		 * enhancements, alterations to the DOM structure of the table and event listeners.
+		 *  @param {boolean} [remove=false] Completely remove the table from the DOM
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      // This example is fairly pointless in reality, but shows how fnDestroy can be used
+		 *      var oTable = $('#example').dataTable();
+		 *      oTable.fnDestroy();
+		 *    } );
+		 */
+		this.fnDestroy = function ( remove )
+		{
+			this.api( true ).destroy( remove );
+		};
+		
+		
+		/**
+		 * Redraw the table
+		 *  @param {bool} [complete=true] Re-filter and resort (if enabled) the table before the draw.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Re-draw the table - you wouldn't want to do it here, but it's an example :-)
+		 *      oTable.fnDraw();
+		 *    } );
+		 */
+		this.fnDraw = function( complete )
+		{
+			// Note that this isn't an exact match to the old call to _fnDraw - it takes
+			// into account the new data, but can hold position.
+			this.api( true ).draw( complete );
+		};
+		
+		
+		/**
+		 * Filter the input based on data
+		 *  @param {string} sInput String to filter the table on
+		 *  @param {int|null} [iColumn] Column to limit filtering to
+		 *  @param {bool} [bRegex=false] Treat as regular expression or not
+		 *  @param {bool} [bSmart=true] Perform smart filtering or not
+		 *  @param {bool} [bShowGlobal=true] Show the input global filter in it's input box(es)
+		 *  @param {bool} [bCaseInsensitive=true] Do case-insensitive matching (true) or not (false)
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Sometime later - filter...
+		 *      oTable.fnFilter( 'test string' );
+		 *    } );
+		 */
+		this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseInsensitive )
+		{
+			var api = this.api( true );
+		
+			if ( iColumn === null || iColumn === undefined ) {
+				api.search( sInput, bRegex, bSmart, bCaseInsensitive );
+			}
+			else {
+				api.column( iColumn ).search( sInput, bRegex, bSmart, bCaseInsensitive );
+			}
+		
+			api.draw();
+		};
+		
+		
+		/**
+		 * Get the data for the whole table, an individual row or an individual cell based on the
+		 * provided parameters.
+		 *  @param {int|node} [src] A TR row node, TD/TH cell node or an integer. If given as
+		 *    a TR node then the data source for the whole row will be returned. If given as a
+		 *    TD/TH cell node then iCol will be automatically calculated and the data for the
+		 *    cell returned. If given as an integer, then this is treated as the aoData internal
+		 *    data index for the row (see fnGetPosition) and the data for that row used.
+		 *  @param {int} [col] Optional column index that you want the data of.
+		 *  @returns {array|object|string} If mRow is undefined, then the data for all rows is
+		 *    returned. If mRow is defined, just data for that row, and is iCol is
+		 *    defined, only data for the designated cell is returned.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    // Row data
+		 *    $(document).ready(function() {
+		 *      oTable = $('#example').dataTable();
+		 *
+		 *      oTable.$('tr').click( function () {
+		 *        var data = oTable.fnGetData( this );
+		 *        // ... do something with the array / object of data for the row
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Individual cell data
+		 *    $(document).ready(function() {
+		 *      oTable = $('#example').dataTable();
+		 *
+		 *      oTable.$('td').click( function () {
+		 *        var sData = oTable.fnGetData( this );
+		 *        alert( 'The cell clicked on had the value of '+sData );
+		 *      } );
+		 *    } );
+		 */
+		this.fnGetData = function( src, col )
+		{
+			var api = this.api( true );
+		
+			if ( src !== undefined ) {
+				var type = src.nodeName ? src.nodeName.toLowerCase() : '';
+		
+				return col !== undefined || type == 'td' || type == 'th' ?
+					api.cell( src, col ).data() :
+					api.row( src ).data() || null;
+			}
+		
+			return api.data().toArray();
+		};
+		
+		
+		/**
+		 * Get an array of the TR nodes that are used in the table's body. Note that you will
+		 * typically want to use the '$' API method in preference to this as it is more
+		 * flexible.
+		 *  @param {int} [iRow] Optional row index for the TR element you want
+		 *  @returns {array|node} If iRow is undefined, returns an array of all TR elements
+		 *    in the table's body, or iRow is defined, just the TR element requested.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Get the nodes from the table
+		 *      var nNodes = oTable.fnGetNodes( );
+		 *    } );
+		 */
+		this.fnGetNodes = function( iRow )
+		{
+			var api = this.api( true );
+		
+			return iRow !== undefined ?
+				api.row( iRow ).node() :
+				api.rows().nodes().flatten().toArray();
+		};
+		
+		
+		/**
+		 * Get the array indexes of a particular cell from it's DOM element
+		 * and column index including hidden columns
+		 *  @param {node} node this can either be a TR, TD or TH in the table's body
+		 *  @returns {int} If nNode is given as a TR, then a single index is returned, or
+		 *    if given as a cell, an array of [row index, column index (visible),
+		 *    column index (all)] is given.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      $('#example tbody td').click( function () {
+		 *        // Get the position of the current data from the node
+		 *        var aPos = oTable.fnGetPosition( this );
+		 *
+		 *        // Get the data array for this row
+		 *        var aData = oTable.fnGetData( aPos[0] );
+		 *
+		 *        // Update the data array and return the value
+		 *        aData[ aPos[1] ] = 'clicked';
+		 *        this.innerHTML = 'clicked';
+		 *      } );
+		 *
+		 *      // Init DataTables
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnGetPosition = function( node )
+		{
+			var api = this.api( true );
+			var nodeName = node.nodeName.toUpperCase();
+		
+			if ( nodeName == 'TR' ) {
+				return api.row( node ).index();
+			}
+			else if ( nodeName == 'TD' || nodeName == 'TH' ) {
+				var cell = api.cell( node ).index();
+		
+				return [
+					cell.row,
+					cell.columnVisible,
+					cell.column
+				];
+			}
+			return null;
+		};
+		
+		
+		/**
+		 * Check to see if a row is 'open' or not.
+		 *  @param {node} nTr the table row to check
+		 *  @returns {boolean} true if the row is currently open, false otherwise
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable;
+		 *
+		 *      // 'open' an information row when a row is clicked on
+		 *      $('#example tbody tr').click( function () {
+		 *        if ( oTable.fnIsOpen(this) ) {
+		 *          oTable.fnClose( this );
+		 *        } else {
+		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+		 *        }
+		 *      } );
+		 *
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnIsOpen = function( nTr )
+		{
+			return this.api( true ).row( nTr ).child.isShown();
+		};
+		
+		
+		/**
+		 * This function will place a new row directly after a row which is currently
+		 * on display on the page, with the HTML contents that is passed into the
+		 * function. This can be used, for example, to ask for confirmation that a
+		 * particular record should be deleted.
+		 *  @param {node} nTr The table row to 'open'
+		 *  @param {string|node|jQuery} mHtml The HTML to put into the row
+		 *  @param {string} sClass Class to give the new TD cell
+		 *  @returns {node} The row opened. Note that if the table row passed in as the
+		 *    first parameter, is not found in the table, this method will silently
+		 *    return.
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable;
+		 *
+		 *      // 'open' an information row when a row is clicked on
+		 *      $('#example tbody tr').click( function () {
+		 *        if ( oTable.fnIsOpen(this) ) {
+		 *          oTable.fnClose( this );
+		 *        } else {
+		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
+		 *        }
+		 *      } );
+		 *
+		 *      oTable = $('#example').dataTable();
+		 *    } );
+		 */
+		this.fnOpen = function( nTr, mHtml, sClass )
+		{
+			return this.api( true )
+				.row( nTr )
+				.child( mHtml, sClass )
+				.show()
+				.child()[0];
+		};
+		
+		
+		/**
+		 * Change the pagination - provides the internal logic for pagination in a simple API
+		 * function. With this function you can have a DataTables table go to the next,
+		 * previous, first or last pages.
+		 *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
+		 *    or page number to jump to (integer), note that page 0 is the first page.
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      oTable.fnPageChange( 'next' );
+		 *    } );
+		 */
+		this.fnPageChange = function ( mAction, bRedraw )
+		{
+			var api = this.api( true ).page( mAction );
+		
+			if ( bRedraw === undefined || bRedraw ) {
+				api.draw(false);
+			}
+		};
+		
+		
+		/**
+		 * Show a particular column
+		 *  @param {int} iCol The column whose display should be changed
+		 *  @param {bool} bShow Show (true) or hide (false) the column
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Hide the second column after initialisation
+		 *      oTable.fnSetColumnVis( 1, false );
+		 *    } );
+		 */
+		this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
+		{
+			var api = this.api( true ).column( iCol ).visible( bShow );
+		
+			if ( bRedraw === undefined || bRedraw ) {
+				api.columns.adjust().draw();
+			}
+		};
+		
+		
+		/**
+		 * Get the settings for a particular table for external manipulation
+		 *  @returns {object} DataTables settings object. See
+		 *    {@link DataTable.models.oSettings}
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      var oSettings = oTable.fnSettings();
+		 *
+		 *      // Show an example parameter from the settings
+		 *      alert( oSettings._iDisplayStart );
+		 *    } );
+		 */
+		this.fnSettings = function()
+		{
+			return _fnSettingsFromNode( this[_ext.iApiIndex] );
+		};
+		
+		
+		/**
+		 * Sort the table by a particular column
+		 *  @param {int} iCol the data index to sort on. Note that this will not match the
+		 *    'display index' if you have hidden data entries
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Sort immediately with columns 0 and 1
+		 *      oTable.fnSort( [ [0,'asc'], [1,'asc'] ] );
+		 *    } );
+		 */
+		this.fnSort = function( aaSort )
+		{
+			this.api( true ).order( aaSort ).draw();
+		};
+		
+		
+		/**
+		 * Attach a sort listener to an element for a given column
+		 *  @param {node} nNode the element to attach the sort listener to
+		 *  @param {int} iColumn the column that a click on this node will sort on
+		 *  @param {function} [fnCallback] callback function when sort is run
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *
+		 *      // Sort on column 1, when 'sorter' is clicked on
+		 *      oTable.fnSortListener( document.getElementById('sorter'), 1 );
+		 *    } );
+		 */
+		this.fnSortListener = function( nNode, iColumn, fnCallback )
+		{
+			this.api( true ).order.listener( nNode, iColumn, fnCallback );
+		};
+		
+		
+		/**
+		 * Update a table cell or row - this method will accept either a single value to
+		 * update the cell with, an array of values with one element for each column or
+		 * an object in the same format as the original data source. The function is
+		 * self-referencing in order to make the multi column updates easier.
+		 *  @param {object|array|string} mData Data to update the cell/row with
+		 *  @param {node|int} mRow TR element you want to update or the aoData index
+		 *  @param {int} [iColumn] The column to update, give as null or undefined to
+		 *    update a whole row.
+		 *  @param {bool} [bRedraw=true] Redraw the table or not
+		 *  @param {bool} [bAction=true] Perform pre-draw actions or not
+		 *  @returns {int} 0 on success, 1 on error
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      oTable.fnUpdate( 'Example update', 0, 0 ); // Single cell
+		 *      oTable.fnUpdate( ['a', 'b', 'c', 'd', 'e'], $('tbody tr')[0] ); // Row
+		 *    } );
+		 */
+		this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
+		{
+			var api = this.api( true );
+		
+			if ( iColumn === undefined || iColumn === null ) {
+				api.row( mRow ).data( mData );
+			}
+			else {
+				api.cell( mRow, iColumn ).data( mData );
+			}
+		
+			if ( bAction === undefined || bAction ) {
+				api.columns.adjust();
+			}
+		
+			if ( bRedraw === undefined || bRedraw ) {
+				api.draw();
+			}
+			return 0;
+		};
+		
+		
+		/**
+		 * Provide a common method for plug-ins to check the version of DataTables being used, in order
+		 * to ensure compatibility.
+		 *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
+		 *    formats "X" and "X.Y" are also acceptable.
+		 *  @returns {boolean} true if this version of DataTables is greater or equal to the required
+		 *    version, or false if this version of DataTales is not suitable
+		 *  @method
+		 *  @dtopt API
+		 *  @deprecated Since v1.10
+		 *
+		 *  @example
+		 *    $(document).ready(function() {
+		 *      var oTable = $('#example').dataTable();
+		 *      alert( oTable.fnVersionCheck( '1.9.0' ) );
+		 *    } );
+		 */
+		this.fnVersionCheck = _ext.fnVersionCheck;
+		
+
+		var _that = this;
+		var emptyInit = options === undefined;
+		var len = this.length;
+
+		if ( emptyInit ) {
+			options = {};
+		}
+
+		this.oApi = this.internal = _ext.internal;
+
+		// Extend with old style plug-in API methods
+		for ( var fn in DataTable.ext.internal ) {
+			if ( fn ) {
+				this[fn] = _fnExternApiFunc(fn);
+			}
+		}
+
+		this.each(function() {
+			// For each initialisation we want to give it a clean initialisation
+			// object that can be bashed around
+			var o = {};
+			var oInit = len > 1 ? // optimisation for single table case
+				_fnExtend( o, options, true ) :
+				options;
+
+			/*global oInit,_that,emptyInit*/
+			var i=0, iLen, j, jLen, k, kLen;
+			var sId = this.getAttribute( 'id' );
+			var bInitHandedOff = false;
+			var defaults = DataTable.defaults;
+			var $this = $(this);
+			
+			
+			/* Sanity check */
+			if ( this.nodeName.toLowerCase() != 'table' )
+			{
+				_fnLog( null, 0, 'Non-table node initialisation ('+this.nodeName+')', 2 );
+				return;
+			}
+			
+			/* Backwards compatibility for the defaults */
+			_fnCompatOpts( defaults );
+			_fnCompatCols( defaults.column );
+			
+			/* Convert the camel-case defaults to Hungarian */
+			_fnCamelToHungarian( defaults, defaults, true );
+			_fnCamelToHungarian( defaults.column, defaults.column, true );
+			
+			/* Setting up the initialisation object */
+			_fnCamelToHungarian( defaults, $.extend( oInit, $this.data() ) );
+			
+			
+			
+			/* Check to see if we are re-initialising a table */
+			var allSettings = DataTable.settings;
+			for ( i=0, iLen=allSettings.length ; i<iLen ; i++ )
+			{
+				var s = allSettings[i];
+			
+				/* Base check on table node */
+				if ( s.nTable == this || s.nTHead.parentNode == this || (s.nTFoot && s.nTFoot.parentNode == this) )
+				{
+					var bRetrieve = oInit.bRetrieve !== undefined ? oInit.bRetrieve : defaults.bRetrieve;
+					var bDestroy = oInit.bDestroy !== undefined ? oInit.bDestroy : defaults.bDestroy;
+			
+					if ( emptyInit || bRetrieve )
+					{
+						return s.oInstance;
+					}
+					else if ( bDestroy )
+					{
+						s.oInstance.fnDestroy();
+						break;
+					}
+					else
+					{
+						_fnLog( s, 0, 'Cannot reinitialise DataTable', 3 );
+						return;
+					}
+				}
+			
+				/* If the element we are initialising has the same ID as a table which was previously
+				 * initialised, but the table nodes don't match (from before) then we destroy the old
+				 * instance by simply deleting it. This is under the assumption that the table has been
+				 * destroyed by other methods. Anyone using non-id selectors will need to do this manually
+				 */
+				if ( s.sTableId == this.id )
+				{
+					allSettings.splice( i, 1 );
+					break;
+				}
+			}
+			
+			/* Ensure the table has an ID - required for accessibility */
+			if ( sId === null || sId === "" )
+			{
+				sId = "DataTables_Table_"+(DataTable.ext._unique++);
+				this.id = sId;
+			}
+			
+			/* Create the settings object for this table and set some of the default parameters */
+			var oSettings = $.extend( true, {}, DataTable.models.oSettings, {
+				"sDestroyWidth": $this[0].style.width,
+				"sInstance":     sId,
+				"sTableId":      sId
+			} );
+			oSettings.nTable = this;
+			oSettings.oApi   = _that.internal;
+			oSettings.oInit  = oInit;
+			
+			allSettings.push( oSettings );
+			
+			// Need to add the instance after the instance after the settings object has been added
+			// to the settings array, so we can self reference the table instance if more than one
+			oSettings.oInstance = (_that.length===1) ? _that : $this.dataTable();
+			
+			// Backwards compatibility, before we apply all the defaults
+			_fnCompatOpts( oInit );
+			
+			if ( oInit.oLanguage )
+			{
+				_fnLanguageCompat( oInit.oLanguage );
+			}
+			
+			// If the length menu is given, but the init display length is not, use the length menu
+			if ( oInit.aLengthMenu && ! oInit.iDisplayLength )
+			{
+				oInit.iDisplayLength = $.isArray( oInit.aLengthMenu[0] ) ?
+					oInit.aLengthMenu[0][0] : oInit.aLengthMenu[0];
+			}
+			
+			// Apply the defaults and init options to make a single init object will all
+			// options defined from defaults and instance options.
+			oInit = _fnExtend( $.extend( true, {}, defaults ), oInit );
+			
+			
+			// Map the initialisation options onto the settings object
+			_fnMap( oSettings.oFeatures, oInit, [
+				"bPaginate",
+				"bLengthChange",
+				"bFilter",
+				"bSort",
+				"bSortMulti",
+				"bInfo",
+				"bProcessing",
+				"bAutoWidth",
+				"bSortClasses",
+				"bServerSide",
+				"bDeferRender"
+			] );
+			_fnMap( oSettings, oInit, [
+				"asStripeClasses",
+				"ajax",
+				"fnServerData",
+				"fnFormatNumber",
+				"sServerMethod",
+				"aaSorting",
+				"aaSortingFixed",
+				"aLengthMenu",
+				"sPaginationType",
+				"sAjaxSource",
+				"sAjaxDataProp",
+				"iStateDuration",
+				"sDom",
+				"bSortCellsTop",
+				"iTabIndex",
+				"fnStateLoadCallback",
+				"fnStateSaveCallback",
+				"renderer",
+				"searchDelay",
+				"rowId",
+				[ "iCookieDuration", "iStateDuration" ], // backwards compat
+				[ "oSearch", "oPreviousSearch" ],
+				[ "aoSearchCols", "aoPreSearchCols" ],
+				[ "iDisplayLength", "_iDisplayLength" ],
+				[ "bJQueryUI", "bJUI" ]
+			] );
+			_fnMap( oSettings.oScroll, oInit, [
+				[ "sScrollX", "sX" ],
+				[ "sScrollXInner", "sXInner" ],
+				[ "sScrollY", "sY" ],
+				[ "bScrollCollapse", "bCollapse" ]
+			] );
+			_fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
+			
+			/* Callback functions which are array driven */
+			_fnCallbackReg( oSettings, 'aoDrawCallback',       oInit.fnDrawCallback,      'user' );
+			_fnCallbackReg( oSettings, 'aoServerParams',       oInit.fnServerParams,      'user' );
+			_fnCallbackReg( oSettings, 'aoStateSaveParams',    oInit.fnStateSaveParams,   'user' );
+			_fnCallbackReg( oSettings, 'aoStateLoadParams',    oInit.fnStateLoadParams,   'user' );
+			_fnCallbackReg( oSettings, 'aoStateLoaded',        oInit.fnStateLoaded,       'user' );
+			_fnCallbackReg( oSettings, 'aoRowCallback',        oInit.fnRowCallback,       'user' );
+			_fnCallbackReg( oSettings, 'aoRowCreatedCallback', oInit.fnCreatedRow,        'user' );
+			_fnCallbackReg( oSettings, 'aoHeaderCallback',     oInit.fnHeaderCallback,    'user' );
+			_fnCallbackReg( oSettings, 'aoFooterCallback',     oInit.fnFooterCallback,    'user' );
+			_fnCallbackReg( oSettings, 'aoInitComplete',       oInit.fnInitComplete,      'user' );
+			_fnCallbackReg( oSettings, 'aoPreDrawCallback',    oInit.fnPreDrawCallback,   'user' );
+			
+			oSettings.rowIdFn = _fnGetObjectDataFn( oInit.rowId );
+			
+			var oClasses = oSettings.oClasses;
+			
+			// @todo Remove in 1.11
+			if ( oInit.bJQueryUI )
+			{
+				/* Use the JUI classes object for display. You could clone the oStdClasses object if
+				 * you want to have multiple tables with multiple independent classes
+				 */
+				$.extend( oClasses, DataTable.ext.oJUIClasses, oInit.oClasses );
+			
+				if ( oInit.sDom === defaults.sDom && defaults.sDom === "lfrtip" )
+				{
+					/* Set the DOM to use a layout suitable for jQuery UI's theming */
+					oSettings.sDom = '<"H"lfr>t<"F"ip>';
+				}
+			
+				if ( ! oSettings.renderer ) {
+					oSettings.renderer = 'jqueryui';
+				}
+				else if ( $.isPlainObject( oSettings.renderer ) && ! oSettings.renderer.header ) {
+					oSettings.renderer.header = 'jqueryui';
+				}
+			}
+			else
+			{
+				$.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
+			}
+			$this.addClass( oClasses.sTable );
+			
+			/* Calculate the scroll bar width and cache it for use later on */
+			if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
+			{
+				oSettings.oScroll.iBarWidth = _fnScrollBarWidth();
+			}
+			
+			if ( oSettings.iInitDisplayStart === undefined )
+			{
+				/* Display start point, taking into account the save saving */
+				oSettings.iInitDisplayStart = oInit.iDisplayStart;
+				oSettings._iDisplayStart = oInit.iDisplayStart;
+			}
+			
+			if ( oInit.iDeferLoading !== null )
+			{
+				oSettings.bDeferLoading = true;
+				var tmp = $.isArray( oInit.iDeferLoading );
+				oSettings._iRecordsDisplay = tmp ? oInit.iDeferLoading[0] : oInit.iDeferLoading;
+				oSettings._iRecordsTotal = tmp ? oInit.iDeferLoading[1] : oInit.iDeferLoading;
+			}
+			
+			/* Language definitions */
+			var oLanguage = oSettings.oLanguage;
+			$.extend( true, oLanguage, oInit.oLanguage );
+			
+			if ( oLanguage.sUrl !== "" )
+			{
+				/* Get the language definitions from a file - because this Ajax call makes the language
+				 * get async to the remainder of this function we use bInitHandedOff to indicate that
+				 * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor
+				 */
+				$.ajax( {
+					dataType: 'json',
+					url: oLanguage.sUrl,
+					success: function ( json ) {
+						_fnLanguageCompat( json );
+						_fnCamelToHungarian( defaults.oLanguage, json );
+						$.extend( true, oLanguage, json );
+						_fnInitialise( oSettings );
+					},
+					error: function () {
+						// Error occurred loading language file, continue on as best we can
+						_fnInitialise( oSettings );
+					}
+				} );
+				bInitHandedOff = true;
+			}
+			
+			/*
+			 * Stripes
+			 */
+			if ( oInit.asStripeClasses === null )
+			{
+				oSettings.asStripeClasses =[
+					oClasses.sStripeOdd,
+					oClasses.sStripeEven
+				];
+			}
+			
+			/* Remove row stripe classes if they are already on the table row */
+			var stripeClasses = oSettings.asStripeClasses;
+			var rowOne = $this.children('tbody').find('tr').eq(0);
+			if ( $.inArray( true, $.map( stripeClasses, function(el, i) {
+				return rowOne.hasClass(el);
+			} ) ) !== -1 ) {
+				$('tbody tr', this).removeClass( stripeClasses.join(' ') );
+				oSettings.asDestroyStripes = stripeClasses.slice();
+			}
+			
+			/*
+			 * Columns
+			 * See if we should load columns automatically or use defined ones
+			 */
+			var anThs = [];
+			var aoColumnsInit;
+			var nThead = this.getElementsByTagName('thead');
+			if ( nThead.length !== 0 )
+			{
+				_fnDetectHeader( oSettings.aoHeader, nThead[0] );
+				anThs = _fnGetUniqueThs( oSettings );
+			}
+			
+			/* If not given a column array, generate one with nulls */
+			if ( oInit.aoColumns === null )
+			{
+				aoColumnsInit = [];
+				for ( i=0, iLen=anThs.length ; i<iLen ; i++ )
+				{
+					aoColumnsInit.push( null );
+				}
+			}
+			else
+			{
+				aoColumnsInit = oInit.aoColumns;
+			}
+			
+			/* Add the columns */
+			for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
+			{
+				_fnAddColumn( oSettings, anThs ? anThs[i] : null );
+			}
+			
+			/* Apply the column definitions */
+			_fnApplyColumnDefs( oSettings, oInit.aoColumnDefs, aoColumnsInit, function (iCol, oDef) {
+				_fnColumnOptions( oSettings, iCol, oDef );
+			} );
+			
+			/* HTML5 attribute detection - build an mData object automatically if the
+			 * attributes are found
+			 */
+			if ( rowOne.length ) {
+				var a = function ( cell, name ) {
+					return cell.getAttribute( 'data-'+name ) !== null ? name : null;
+				};
+			
+				$.each( _fnGetRowElements( oSettings, rowOne[0] ).cells, function (i, cell) {
+					var col = oSettings.aoColumns[i];
+			
+					if ( col.mData === i ) {
+						var sort = a( cell, 'sort' ) || a( cell, 'order' );
+						var filter = a( cell, 'filter' ) || a( cell, 'search' );
+			
+						if ( sort !== null || filter !== null ) {
+							col.mData = {
+								_:      i+'.display',
+								sort:   sort !== null   ? i+'.@data-'+sort   : undefined,
+								type:   sort !== null   ? i+'.@data-'+sort   : undefined,
+								filter: filter !== null ? i+'.@data-'+filter : undefined
+							};
+			
+							_fnColumnOptions( oSettings, i );
+						}
+					}
+				} );
+			}
+			
+			var features = oSettings.oFeatures;
+			
+			/* Must be done after everything which can be overridden by the state saving! */
+			if ( oInit.bStateSave )
+			{
+				features.bStateSave = true;
+				_fnLoadState( oSettings, oInit );
+				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' );
+			}
+			
+			
+			/*
+			 * Sorting
+			 * @todo For modularisation (1.11) this needs to do into a sort start up handler
+			 */
+			
+			// If aaSorting is not defined, then we use the first indicator in asSorting
+			// in case that has been altered, so the default sort reflects that option
+			if ( oInit.aaSorting === undefined )
+			{
+				var sorting = oSettings.aaSorting;
+				for ( i=0, iLen=sorting.length ; i<iLen ; i++ )
+				{
+					sorting[i][1] = oSettings.aoColumns[ i ].asSorting[0];
+				}
+			}
+			
+			/* Do a first pass on the sorting classes (allows any size changes to be taken into
+			 * account, and also will apply sorting disabled classes if disabled
+			 */
+			_fnSortingClasses( oSettings );
+			
+			if ( features.bSort )
+			{
+				_fnCallbackReg( oSettings, 'aoDrawCallback', function () {
+					if ( oSettings.bSorted ) {
+						var aSort = _fnSortFlatten( oSettings );
+						var sortedColumns = {};
+			
+						$.each( aSort, function (i, val) {
+							sortedColumns[ val.src ] = val.dir;
+						} );
+			
+						_fnCallbackFire( oSettings, null, 'order', [oSettings, aSort, sortedColumns] );
+						_fnSortAria( oSettings );
+					}
+				} );
+			}
+			
+			_fnCallbackReg( oSettings, 'aoDrawCallback', function () {
+				if ( oSettings.bSorted || _fnDataSource( oSettings ) === 'ssp' || features.bDeferRender ) {
+					_fnSortingClasses( oSettings );
+				}
+			}, 'sc' );
+			
+			
+			/*
+			 * Final init
+			 * Cache the header, body and footer as required, creating them if needed
+			 */
+			
+			/* Browser support detection */
+			_fnBrowserDetect( oSettings );
+			
+			// Work around for Webkit bug 83867 - store the caption-side before removing from doc
+			var captions = $this.children('caption').each( function () {
+				this._captionSide = $this.css('caption-side');
+			} );
+			
+			var thead = $this.children('thead');
+			if ( thead.length === 0 )
+			{
+				thead = $('<thead/>').appendTo(this);
+			}
+			oSettings.nTHead = thead[0];
+			
+			var tbody = $this.children('tbody');
+			if ( tbody.length === 0 )
+			{
+				tbody = $('<tbody/>').appendTo(this);
+			}
+			oSettings.nTBody = tbody[0];
+			
+			var tfoot = $this.children('tfoot');
+			if ( tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
+			{
+				// If we are a scrolling table, and no footer has been given, then we need to create
+				// a tfoot element for the caption element to be appended to
+				tfoot = $('<tfoot/>').appendTo(this);
+			}
+			
+			if ( tfoot.length === 0 || tfoot.children().length === 0 ) {
+				$this.addClass( oClasses.sNoFooter );
+			}
+			else if ( tfoot.length > 0 ) {
+				oSettings.nTFoot = tfoot[0];
+				_fnDetectHeader( oSettings.aoFooter, oSettings.nTFoot );
+			}
+			
+			/* Check if there is data passing into the constructor */
+			if ( oInit.aaData )
+			{
+				for ( i=0 ; i<oInit.aaData.length ; i++ )
+				{
+					_fnAddData( oSettings, oInit.aaData[ i ] );
+				}
+			}
+			else if ( oSettings.bDeferLoading || _fnDataSource( oSettings ) == 'dom' )
+			{
+				/* Grab the data from the page - only do this when deferred loading or no Ajax
+				 * source since there is no point in reading the DOM data if we are then going
+				 * to replace it with Ajax data
+				 */
+				_fnAddTr( oSettings, $(oSettings.nTBody).children('tr') );
+			}
+			
+			/* Copy the data index array */
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			/* Initialisation complete - table can be drawn */
+			oSettings.bInitialised = true;
+			
+			/* Check if we need to initialise the table (it might not have been handed off to the
+			 * language processor)
+			 */
+			if ( bInitHandedOff === false )
+			{
+				_fnInitialise( oSettings );
+			}
+		} );
+		_that = null;
+		return this;
+	};
+
+	
+	
+	/**
+	 * Computed structure of the DataTables API, defined by the options passed to
+	 * `DataTable.Api.register()` when building the API.
+	 *
+	 * The structure is built in order to speed creation and extension of the Api
+	 * objects since the extensions are effectively pre-parsed.
+	 *
+	 * The array is an array of objects with the following structure, where this
+	 * base array represents the Api prototype base:
+	 *
+	 *     [
+	 *       {
+	 *         name:      'data'                -- string   - Property name
+	 *         val:       function () {},       -- function - Api method (or undefined if just an object
+	 *         methodExt: [ ... ],              -- array    - Array of Api object definitions to extend the method result
+	 *         propExt:   [ ... ]               -- array    - Array of Api object definitions to extend the property
+	 *       },
+	 *       {
+	 *         name:     'row'
+	 *         val:       {},
+	 *         methodExt: [ ... ],
+	 *         propExt:   [
+	 *           {
+	 *             name:      'data'
+	 *             val:       function () {},
+	 *             methodExt: [ ... ],
+	 *             propExt:   [ ... ]
+	 *           },
+	 *           ...
+	 *         ]
+	 *       }
+	 *     ]
+	 *
+	 * @type {Array}
+	 * @ignore
+	 */
+	var __apiStruct = [];
+	
+	
+	/**
+	 * `Array.prototype` reference.
+	 *
+	 * @type object
+	 * @ignore
+	 */
+	var __arrayProto = Array.prototype;
+	
+	
+	/**
+	 * Abstraction for `context` parameter of the `Api` constructor to allow it to
+	 * take several different forms for ease of use.
+	 *
+	 * Each of the input parameter types will be converted to a DataTables settings
+	 * object where possible.
+	 *
+	 * @param  {string|node|jQuery|object} mixed DataTable identifier. Can be one
+	 *   of:
+	 *
+	 *   * `string` - jQuery selector. Any DataTables' matching the given selector
+	 *     with be found and used.
+	 *   * `node` - `TABLE` node which has already been formed into a DataTable.
+	 *   * `jQuery` - A jQuery object of `TABLE` nodes.
+	 *   * `object` - DataTables settings object
+	 *   * `DataTables.Api` - API instance
+	 * @return {array|null} Matching DataTables settings objects. `null` or
+	 *   `undefined` is returned if no matching DataTable is found.
+	 * @ignore
+	 */
+	var _toSettings = function ( mixed )
+	{
+		var idx, jq;
+		var settings = DataTable.settings;
+		var tables = $.map( settings, function (el, i) {
+			return el.nTable;
+		} );
+	
+		if ( ! mixed ) {
+			return [];
+		}
+		else if ( mixed.nTable && mixed.oApi ) {
+			// DataTables settings object
+			return [ mixed ];
+		}
+		else if ( mixed.nodeName && mixed.nodeName.toLowerCase() === 'table' ) {
+			// Table node
+			idx = $.inArray( mixed, tables );
+			return idx !== -1 ? [ settings[idx] ] : null;
+		}
+		else if ( mixed && typeof mixed.settings === 'function' ) {
+			return mixed.settings().toArray();
+		}
+		else if ( typeof mixed === 'string' ) {
+			// jQuery selector
+			jq = $(mixed);
+		}
+		else if ( mixed instanceof $ ) {
+			// jQuery object (also DataTables instance)
+			jq = mixed;
+		}
+	
+		if ( jq ) {
+			return jq.map( function(i) {
+				idx = $.inArray( this, tables );
+				return idx !== -1 ? settings[idx] : null;
+			} ).toArray();
+		}
+	};
+	
+	
+	/**
+	 * DataTables API class - used to control and interface with  one or more
+	 * DataTables enhanced tables.
+	 *
+	 * The API class is heavily based on jQuery, presenting a chainable interface
+	 * that you can use to interact with tables. Each instance of the API class has
+	 * a "context" - i.e. the tables that it will operate on. This could be a single
+	 * table, all tables on a page or a sub-set thereof.
+	 *
+	 * Additionally the API is designed to allow you to easily work with the data in
+	 * the tables, retrieving and manipulating it as required. This is done by
+	 * presenting the API class as an array like interface. The contents of the
+	 * array depend upon the actions requested by each method (for example
+	 * `rows().nodes()` will return an array of nodes, while `rows().data()` will
+	 * return an array of objects or arrays depending upon your table's
+	 * configuration). The API object has a number of array like methods (`push`,
+	 * `pop`, `reverse` etc) as well as additional helper methods (`each`, `pluck`,
+	 * `unique` etc) to assist your working with the data held in a table.
+	 *
+	 * Most methods (those which return an Api instance) are chainable, which means
+	 * the return from a method call also has all of the methods available that the
+	 * top level object had. For example, these two calls are equivalent:
+	 *
+	 *     // Not chained
+	 *     api.row.add( {...} );
+	 *     api.draw();
+	 *
+	 *     // Chained
+	 *     api.row.add( {...} ).draw();
+	 *
+	 * @class DataTable.Api
+	 * @param {array|object|string|jQuery} context DataTable identifier. This is
+	 *   used to define which DataTables enhanced tables this API will operate on.
+	 *   Can be one of:
+	 *
+	 *   * `string` - jQuery selector. Any DataTables' matching the given selector
+	 *     with be found and used.
+	 *   * `node` - `TABLE` node which has already been formed into a DataTable.
+	 *   * `jQuery` - A jQuery object of `TABLE` nodes.
+	 *   * `object` - DataTables settings object
+	 * @param {array} [data] Data to initialise the Api instance with.
+	 *
+	 * @example
+	 *   // Direct initialisation during DataTables construction
+	 *   var api = $('#example').DataTable();
+	 *
+	 * @example
+	 *   // Initialisation using a DataTables jQuery object
+	 *   var api = $('#example').dataTable().api();
+	 *
+	 * @example
+	 *   // Initialisation as a constructor
+	 *   var api = new $.fn.DataTable.Api( 'table.dataTable' );
+	 */
+	_Api = function ( context, data )
+	{
+		if ( ! (this instanceof _Api) ) {
+			return new _Api( context, data );
+		}
+	
+		var settings = [];
+		var ctxSettings = function ( o ) {
+			var a = _toSettings( o );
+			if ( a ) {
+				settings.push.apply( settings, a );
+			}
+		};
+	
+		if ( $.isArray( context ) ) {
+			for ( var i=0, ien=context.length ; i<ien ; i++ ) {
+				ctxSettings( context[i] );
+			}
+		}
+		else {
+			ctxSettings( context );
+		}
+	
+		// Remove duplicates
+		this.context = _unique( settings );
+	
+		// Initial data
+		if ( data ) {
+			this.push.apply( this, data.toArray ? data.toArray() : data );
+		}
+	
+		// selector
+		this.selector = {
+			rows: null,
+			cols: null,
+			opts: null
+		};
+	
+		_Api.extend( this, this, __apiStruct );
+	};
+	
+	DataTable.Api = _Api;
+	
+	_Api.prototype = /** @lends DataTables.Api */{
+		any: function ()
+		{
+			return this.count() !== 0;
+		},
+	
+	
+		concat:  __arrayProto.concat,
+	
+	
+		context: [], // array of table settings objects
+	
+	
+		count: function ()
+		{
+			return this.flatten().length;
+		},
+	
+	
+		each: function ( fn )
+		{
+			for ( var i=0, ien=this.length ; i<ien; i++ ) {
+				fn.call( this, this[i], i, this );
+			}
+	
+			return this;
+		},
+	
+	
+		eq: function ( idx )
+		{
+			var ctx = this.context;
+	
+			return ctx.length > idx ?
+				new _Api( ctx[idx], this[idx] ) :
+				null;
+		},
+	
+	
+		filter: function ( fn )
+		{
+			var a = [];
+	
+			if ( __arrayProto.filter ) {
+				a = __arrayProto.filter.call( this, fn, this );
+			}
+			else {
+				// Compatibility for browsers without EMCA-252-5 (JS 1.6)
+				for ( var i=0, ien=this.length ; i<ien ; i++ ) {
+					if ( fn.call( this, this[i], i, this ) ) {
+						a.push( this[i] );
+					}
+				}
+			}
+	
+			return new _Api( this.context, a );
+		},
+	
+	
+		flatten: function ()
+		{
+			var a = [];
+			return new _Api( this.context, a.concat.apply( a, this.toArray() ) );
+		},
+	
+	
+		join:    __arrayProto.join,
+	
+	
+		indexOf: __arrayProto.indexOf || function (obj, start)
+		{
+			for ( var i=(start || 0), ien=this.length ; i<ien ; i++ ) {
+				if ( this[i] === obj ) {
+					return i;
+				}
+			}
+			return -1;
+		},
+	
+		iterator: function ( flatten, type, fn, alwaysNew ) {
+			var
+				a = [], ret,
+				i, ien, j, jen,
+				context = this.context,
+				rows, items, item,
+				selector = this.selector;
+	
+			// Argument shifting
+			if ( typeof flatten === 'string' ) {
+				alwaysNew = fn;
+				fn = type;
+				type = flatten;
+				flatten = false;
+			}
+	
+			for ( i=0, ien=context.length ; i<ien ; i++ ) {
+				var apiInst = new _Api( context[i] );
+	
+				if ( type === 'table' ) {
+					ret = fn.call( apiInst, context[i], i );
+	
+					if ( ret !== undefined ) {
+						a.push( ret );
+					}
+				}
+				else if ( type === 'columns' || type === 'rows' ) {
+					// this has same length as context - one entry for each table
+					ret = fn.call( apiInst, context[i], this[i], i );
+	
+					if ( ret !== undefined ) {
+						a.push( ret );
+					}
+				}
+				else if ( type === 'column' || type === 'column-rows' || type === 'row' || type === 'cell' ) {
+					// columns and rows share the same structure.
+					// 'this' is an array of column indexes for each context
+					items = this[i];
+	
+					if ( type === 'column-rows' ) {
+						rows = _selector_row_indexes( context[i], selector.opts );
+					}
+	
+					for ( j=0, jen=items.length ; j<jen ; j++ ) {
+						item = items[j];
+	
+						if ( type === 'cell' ) {
+							ret = fn.call( apiInst, context[i], item.row, item.column, i, j );
+						}
+						else {
+							ret = fn.call( apiInst, context[i], item, i, j, rows );
+						}
+	
+						if ( ret !== undefined ) {
+							a.push( ret );
+						}
+					}
+				}
+			}
+	
+			if ( a.length || alwaysNew ) {
+				var api = new _Api( context, flatten ? a.concat.apply( [], a ) : a );
+				var apiSelector = api.selector;
+				apiSelector.rows = selector.rows;
+				apiSelector.cols = selector.cols;
+				apiSelector.opts = selector.opts;
+				return api;
+			}
+			return this;
+		},
+	
+	
+		lastIndexOf: __arrayProto.lastIndexOf || function (obj, start)
+		{
+			// Bit cheeky...
+			return this.indexOf.apply( this.toArray.reverse(), arguments );
+		},
+	
+	
+		length:  0,
+	
+	
+		map: function ( fn )
+		{
+			var a = [];
+	
+			if ( __arrayProto.map ) {
+				a = __arrayProto.map.call( this, fn, this );
+			}
+			else {
+				// Compatibility for browsers without EMCA-252-5 (JS 1.6)
+				for ( var i=0, ien=this.length ; i<ien ; i++ ) {
+					a.push( fn.call( this, this[i], i ) );
+				}
+			}
+	
+			return new _Api( this.context, a );
+		},
+	
+	
+		pluck: function ( prop )
+		{
+			return this.map( function ( el ) {
+				return el[ prop ];
+			} );
+		},
+	
+		pop:     __arrayProto.pop,
+	
+	
+		push:    __arrayProto.push,
+	
+	
+		// Does not return an API instance
+		reduce: __arrayProto.reduce || function ( fn, init )
+		{
+			return _fnReduce( this, fn, init, 0, this.length, 1 );
+		},
+	
+	
+		reduceRight: __arrayProto.reduceRight || function ( fn, init )
+		{
+			return _fnReduce( this, fn, init, this.length-1, -1, -1 );
+		},
+	
+	
+		reverse: __arrayProto.reverse,
+	
+	
+		// Object with rows, columns and opts
+		selector: null,
+	
+	
+		shift:   __arrayProto.shift,
+	
+	
+		sort:    __arrayProto.sort, // ? name - order?
+	
+	
+		splice:  __arrayProto.splice,
+	
+	
+		toArray: function ()
+		{
+			return __arrayProto.slice.call( this );
+		},
+	
+	
+		to$: function ()
+		{
+			return $( this );
+		},
+	
+	
+		toJQuery: function ()
+		{
+			return $( this );
+		},
+	
+	
+		unique: function ()
+		{
+			return new _Api( this.context, _unique(this) );
+		},
+	
+	
+		unshift: __arrayProto.unshift
+	};
+	
+	
+	_Api.extend = function ( scope, obj, ext )
+	{
+		// Only extend API instances and static properties of the API
+		if ( ! ext.length || ! obj || ( ! (obj instanceof _Api) && ! obj.__dt_wrapper ) ) {
+			return;
+		}
+	
+		var
+			i, ien,
+			j, jen,
+			struct, inner,
+			methodScoping = function ( scope, fn, struc ) {
+				return function () {
+					var ret = fn.apply( scope, arguments );
+	
+					// Method extension
+					_Api.extend( ret, ret, struc.methodExt );
+					return ret;
+				};
+			};
+	
+		for ( i=0, ien=ext.length ; i<ien ; i++ ) {
+			struct = ext[i];
+	
+			// Value
+			obj[ struct.name ] = typeof struct.val === 'function' ?
+				methodScoping( scope, struct.val, struct ) :
+				$.isPlainObject( struct.val ) ?
+					{} :
+					struct.val;
+	
+			obj[ struct.name ].__dt_wrapper = true;
+	
+			// Property extension
+			_Api.extend( scope, obj[ struct.name ], struct.propExt );
+		}
+	};
+	
+	
+	// @todo - Is there need for an augment function?
+	// _Api.augment = function ( inst, name )
+	// {
+	// 	// Find src object in the structure from the name
+	// 	var parts = name.split('.');
+	
+	// 	_Api.extend( inst, obj );
+	// };
+	
+	
+	//     [
+	//       {
+	//         name:      'data'                -- string   - Property name
+	//         val:       function () {},       -- function - Api method (or undefined if just an object
+	//         methodExt: [ ... ],              -- array    - Array of Api object definitions to extend the method result
+	//         propExt:   [ ... ]               -- array    - Array of Api object definitions to extend the property
+	//       },
+	//       {
+	//         name:     'row'
+	//         val:       {},
+	//         methodExt: [ ... ],
+	//         propExt:   [
+	//           {
+	//             name:      'data'
+	//             val:       function () {},
+	//             methodExt: [ ... ],
+	//             propExt:   [ ... ]
+	//           },
+	//           ...
+	//         ]
+	//       }
+	//     ]
+	
+	_Api.register = _api_register = function ( name, val )
+	{
+		if ( $.isArray( name ) ) {
+			for ( var j=0, jen=name.length ; j<jen ; j++ ) {
+				_Api.register( name[j], val );
+			}
+			return;
+		}
+	
+		var
+			i, ien,
+			heir = name.split('.'),
+			struct = __apiStruct,
+			key, method;
+	
+		var find = function ( src, name ) {
+			for ( var i=0, ien=src.length ; i<ien ; i++ ) {
+				if ( src[i].name === name ) {
+					return src[i];
+				}
+			}
+			return null;
+		};
+	
+		for ( i=0, ien=heir.length ; i<ien ; i++ ) {
+			method = heir[i].indexOf('()') !== -1;
+			key = method ?
+				heir[i].replace('()', '') :
+				heir[i];
+	
+			var src = find( struct, key );
+			if ( ! src ) {
+				src = {
+					name:      key,
+					val:       {},
+					methodExt: [],
+					propExt:   []
+				};
+				struct.push( src );
+			}
+	
+			if ( i === ien-1 ) {
+				src.val = val;
+			}
+			else {
+				struct = method ?
+					src.methodExt :
+					src.propExt;
+			}
+		}
+	};
+	
+	
+	_Api.registerPlural = _api_registerPlural = function ( pluralName, singularName, val ) {
+		_Api.register( pluralName, val );
+	
+		_Api.register( singularName, function () {
+			var ret = val.apply( this, arguments );
+	
+			if ( ret === this ) {
+				// Returned item is the API instance that was passed in, return it
+				return this;
+			}
+			else if ( ret instanceof _Api ) {
+				// New API instance returned, want the value from the first item
+				// in the returned array for the singular result.
+				return ret.length ?
+					$.isArray( ret[0] ) ?
+						new _Api( ret.context, ret[0] ) : // Array results are 'enhanced'
+						ret[0] :
+					undefined;
+			}
+	
+			// Non-API return - just fire it back
+			return ret;
+		} );
+	};
+	
+	
+	/**
+	 * Selector for HTML tables. Apply the given selector to the give array of
+	 * DataTables settings objects.
+	 *
+	 * @param {string|integer} [selector] jQuery selector string or integer
+	 * @param  {array} Array of DataTables settings objects to be filtered
+	 * @return {array}
+	 * @ignore
+	 */
+	var __table_selector = function ( selector, a )
+	{
+		// Integer is used to pick out a table by index
+		if ( typeof selector === 'number' ) {
+			return [ a[ selector ] ];
+		}
+	
+		// Perform a jQuery selector on the table nodes
+		var nodes = $.map( a, function (el, i) {
+			return el.nTable;
+		} );
+	
+		return $(nodes)
+			.filter( selector )
+			.map( function (i) {
+				// Need to translate back from the table node to the settings
+				var idx = $.inArray( this, nodes );
+				return a[ idx ];
+			} )
+			.toArray();
+	};
+	
+	
+	
+	/**
+	 * Context selector for the API's context (i.e. the tables the API instance
+	 * refers to.
+	 *
+	 * @name    DataTable.Api#tables
+	 * @param {string|integer} [selector] Selector to pick which tables the iterator
+	 *   should operate on. If not given, all tables in the current context are
+	 *   used. This can be given as a jQuery selector (for example `':gt(0)'`) to
+	 *   select multiple tables or as an integer to select a single table.
+	 * @returns {DataTable.Api} Returns a new API instance if a selector is given.
+	 */
+	_api_register( 'tables()', function ( selector ) {
+		// A new instance is created if there was a selector specified
+		return selector ?
+			new _Api( __table_selector( selector, this.context ) ) :
+			this;
+	} );
+	
+	
+	_api_register( 'table()', function ( selector ) {
+		var tables = this.tables( selector );
+		var ctx = tables.context;
+	
+		// Truncate to the first matched table
+		return ctx.length ?
+			new _Api( ctx[0] ) :
+			tables;
+	} );
+	
+	
+	_api_registerPlural( 'tables().nodes()', 'table().node()' , function () {
+		return this.iterator( 'table', function ( ctx ) {
+			return ctx.nTable;
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'tables().body()', 'table().body()' , function () {
+		return this.iterator( 'table', function ( ctx ) {
+			return ctx.nTBody;
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'tables().header()', 'table().header()' , function () {
+		return this.iterator( 'table', function ( ctx ) {
+			return ctx.nTHead;
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'tables().footer()', 'table().footer()' , function () {
+		return this.iterator( 'table', function ( ctx ) {
+			return ctx.nTFoot;
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'tables().containers()', 'table().container()' , function () {
+		return this.iterator( 'table', function ( ctx ) {
+			return ctx.nTableWrapper;
+		}, 1 );
+	} );
+	
+	
+	
+	/**
+	 * Redraw the tables in the current context.
+	 */
+	_api_register( 'draw()', function ( paging ) {
+		return this.iterator( 'table', function ( settings ) {
+			if ( paging === 'page' ) {
+				_fnDraw( settings );
+			}
+			else {
+				if ( typeof paging === 'string' ) {
+					paging = paging === 'full-hold' ?
+						false :
+						true;
+				}
+	
+				_fnReDraw( settings, paging===false );
+			}
+		} );
+	} );
+	
+	
+	
+	/**
+	 * Get the current page index.
+	 *
+	 * @return {integer} Current page index (zero based)
+	 *//**
+	 * Set the current page.
+	 *
+	 * Note that if you attempt to show a page which does not exist, DataTables will
+	 * not throw an error, but rather reset the paging.
+	 *
+	 * @param {integer|string} action The paging action to take. This can be one of:
+	 *  * `integer` - The page index to jump to
+	 *  * `string` - An action to take:
+	 *    * `first` - Jump to first page.
+	 *    * `next` - Jump to the next page
+	 *    * `previous` - Jump to previous page
+	 *    * `last` - Jump to the last page.
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'page()', function ( action ) {
+		if ( action === undefined ) {
+			return this.page.info().page; // not an expensive call
+		}
+	
+		// else, have an action to take on all tables
+		return this.iterator( 'table', function ( settings ) {
+			_fnPageChange( settings, action );
+		} );
+	} );
+	
+	
+	/**
+	 * Paging information for the first table in the current context.
+	 *
+	 * If you require paging information for another table, use the `table()` method
+	 * with a suitable selector.
+	 *
+	 * @return {object} Object with the following properties set:
+	 *  * `page` - Current page index (zero based - i.e. the first page is `0`)
+	 *  * `pages` - Total number of pages
+	 *  * `start` - Display index for the first record shown on the current page
+	 *  * `end` - Display index for the last record shown on the current page
+	 *  * `length` - Display length (number of records). Note that generally `start
+	 *    + length = end`, but this is not always true, for example if there are
+	 *    only 2 records to show on the final page, with a length of 10.
+	 *  * `recordsTotal` - Full data set length
+	 *  * `recordsDisplay` - Data set length once the current filtering criterion
+	 *    are applied.
+	 */
+	_api_register( 'page.info()', function ( action ) {
+		if ( this.context.length === 0 ) {
+			return undefined;
+		}
+	
+		var
+			settings   = this.context[0],
+			start      = settings._iDisplayStart,
+			len        = settings._iDisplayLength,
+			visRecords = settings.fnRecordsDisplay(),
+			all        = len === -1;
+	
+		return {
+			"page":           all ? 0 : Math.floor( start / len ),
+			"pages":          all ? 1 : Math.ceil( visRecords / len ),
+			"start":          start,
+			"end":            settings.fnDisplayEnd(),
+			"length":         len,
+			"recordsTotal":   settings.fnRecordsTotal(),
+			"recordsDisplay": visRecords,
+			"serverSide":     _fnDataSource( settings ) === 'ssp'
+		};
+	} );
+	
+	
+	/**
+	 * Get the current page length.
+	 *
+	 * @return {integer} Current page length. Note `-1` indicates that all records
+	 *   are to be shown.
+	 *//**
+	 * Set the current page length.
+	 *
+	 * @param {integer} Page length to set. Use `-1` to show all records.
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'page.len()', function ( len ) {
+		// Note that we can't call this function 'length()' because `length`
+		// is a Javascript property of functions which defines how many arguments
+		// the function expects.
+		if ( len === undefined ) {
+			return this.context.length !== 0 ?
+				this.context[0]._iDisplayLength :
+				undefined;
+		}
+	
+		// else, set the page length
+		return this.iterator( 'table', function ( settings ) {
+			_fnLengthChange( settings, len );
+		} );
+	} );
+	
+	
+	
+	var __reload = function ( settings, holdPosition, callback ) {
+		// Use the draw event to trigger a callback
+		if ( callback ) {
+			var api = new _Api( settings );
+	
+			api.one( 'draw', function () {
+				callback( api.ajax.json() );
+			} );
+		}
+	
+		if ( _fnDataSource( settings ) == 'ssp' ) {
+			_fnReDraw( settings, holdPosition );
+		}
+		else {
+			_fnProcessingDisplay( settings, true );
+	
+			// Cancel an existing request
+			var xhr = settings.jqXHR;
+			if ( xhr && xhr.readyState !== 4 ) {
+				xhr.abort();
+			}
+	
+			// Trigger xhr
+			_fnBuildAjax( settings, [], function( json ) {
+				_fnClearTable( settings );
+	
+				var data = _fnAjaxDataSrc( settings, json );
+				for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+					_fnAddData( settings, data[i] );
+				}
+	
+				_fnReDraw( settings, holdPosition );
+				_fnProcessingDisplay( settings, false );
+			} );
+		}
+	};
+	
+	
+	/**
+	 * Get the JSON response from the last Ajax request that DataTables made to the
+	 * server. Note that this returns the JSON from the first table in the current
+	 * context.
+	 *
+	 * @return {object} JSON received from the server.
+	 */
+	_api_register( 'ajax.json()', function () {
+		var ctx = this.context;
+	
+		if ( ctx.length > 0 ) {
+			return ctx[0].json;
+		}
+	
+		// else return undefined;
+	} );
+	
+	
+	/**
+	 * Get the data submitted in the last Ajax request
+	 */
+	_api_register( 'ajax.params()', function () {
+		var ctx = this.context;
+	
+		if ( ctx.length > 0 ) {
+			return ctx[0].oAjaxData;
+		}
+	
+		// else return undefined;
+	} );
+	
+	
+	/**
+	 * Reload tables from the Ajax data source. Note that this function will
+	 * automatically re-draw the table when the remote data has been loaded.
+	 *
+	 * @param {boolean} [reset=true] Reset (default) or hold the current paging
+	 *   position. A full re-sort and re-filter is performed when this method is
+	 *   called, which is why the pagination reset is the default action.
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'ajax.reload()', function ( callback, resetPaging ) {
+		return this.iterator( 'table', function (settings) {
+			__reload( settings, resetPaging===false, callback );
+		} );
+	} );
+	
+	
+	/**
+	 * Get the current Ajax URL. Note that this returns the URL from the first
+	 * table in the current context.
+	 *
+	 * @return {string} Current Ajax source URL
+	 *//**
+	 * Set the Ajax URL. Note that this will set the URL for all tables in the
+	 * current context.
+	 *
+	 * @param {string} url URL to set.
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'ajax.url()', function ( url ) {
+		var ctx = this.context;
+	
+		if ( url === undefined ) {
+			// get
+			if ( ctx.length === 0 ) {
+				return undefined;
+			}
+			ctx = ctx[0];
+	
+			return ctx.ajax ?
+				$.isPlainObject( ctx.ajax ) ?
+					ctx.ajax.url :
+					ctx.ajax :
+				ctx.sAjaxSource;
+		}
+	
+		// set
+		return this.iterator( 'table', function ( settings ) {
+			if ( $.isPlainObject( settings.ajax ) ) {
+				settings.ajax.url = url;
+			}
+			else {
+				settings.ajax = url;
+			}
+			// No need to consider sAjaxSource here since DataTables gives priority
+			// to `ajax` over `sAjaxSource`. So setting `ajax` here, renders any
+			// value of `sAjaxSource` redundant.
+		} );
+	} );
+	
+	
+	/**
+	 * Load data from the newly set Ajax URL. Note that this method is only
+	 * available when `ajax.url()` is used to set a URL. Additionally, this method
+	 * has the same effect as calling `ajax.reload()` but is provided for
+	 * convenience when setting a new URL. Like `ajax.reload()` it will
+	 * automatically redraw the table once the remote data has been loaded.
+	 *
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'ajax.url().load()', function ( callback, resetPaging ) {
+		// Same as a reload, but makes sense to present it for easy access after a
+		// url change
+		return this.iterator( 'table', function ( ctx ) {
+			__reload( ctx, resetPaging===false, callback );
+		} );
+	} );
+	
+	
+	
+	
+	var _selector_run = function ( type, selector, selectFn, settings, opts )
+	{
+		var
+			out = [], res,
+			a, i, ien, j, jen,
+			selectorType = typeof selector;
+	
+		// Can't just check for isArray here, as an API or jQuery instance might be
+		// given with their array like look
+		if ( ! selector || selectorType === 'string' || selectorType === 'function' || selector.length === undefined ) {
+			selector = [ selector ];
+		}
+	
+		for ( i=0, ien=selector.length ; i<ien ; i++ ) {
+			a = selector[i] && selector[i].split ?
+				selector[i].split(',') :
+				[ selector[i] ];
+	
+			for ( j=0, jen=a.length ; j<jen ; j++ ) {
+				res = selectFn( typeof a[j] === 'string' ? $.trim(a[j]) : a[j] );
+	
+				if ( res && res.length ) {
+					out.push.apply( out, res );
+				}
+			}
+		}
+	
+		// selector extensions
+		var ext = _ext.selector[ type ];
+		if ( ext.length ) {
+			for ( i=0, ien=ext.length ; i<ien ; i++ ) {
+				out = ext[i]( settings, opts, out );
+			}
+		}
+	
+		return out;
+	};
+	
+	
+	var _selector_opts = function ( opts )
+	{
+		if ( ! opts ) {
+			opts = {};
+		}
+	
+		// Backwards compatibility for 1.9- which used the terminology filter rather
+		// than search
+		if ( opts.filter && opts.search === undefined ) {
+			opts.search = opts.filter;
+		}
+	
+		return $.extend( {
+			search: 'none',
+			order: 'current',
+			page: 'all'
+		}, opts );
+	};
+	
+	
+	var _selector_first = function ( inst )
+	{
+		// Reduce the API instance to the first item found
+		for ( var i=0, ien=inst.length ; i<ien ; i++ ) {
+			if ( inst[i].length > 0 ) {
+				// Assign the first element to the first item in the instance
+				// and truncate the instance and context
+				inst[0] = inst[i];
+				inst[0].length = 1;
+				inst.length = 1;
+				inst.context = [ inst.context[i] ];
+	
+				return inst;
+			}
+		}
+	
+		// Not found - return an empty instance
+		inst.length = 0;
+		return inst;
+	};
+	
+	
+	var _selector_row_indexes = function ( settings, opts )
+	{
+		var
+			i, ien, tmp, a=[],
+			displayFiltered = settings.aiDisplay,
+			displayMaster = settings.aiDisplayMaster;
+	
+		var
+			search = opts.search,  // none, applied, removed
+			order  = opts.order,   // applied, current, index (original - compatibility with 1.9)
+			page   = opts.page;    // all, current
+	
+		if ( _fnDataSource( settings ) == 'ssp' ) {
+			// In server-side processing mode, most options are irrelevant since
+			// rows not shown don't exist and the index order is the applied order
+			// Removed is a special case - for consistency just return an empty
+			// array
+			return search === 'removed' ?
+				[] :
+				_range( 0, displayMaster.length );
+		}
+		else if ( page == 'current' ) {
+			// Current page implies that order=current and fitler=applied, since it is
+			// fairly senseless otherwise, regardless of what order and search actually
+			// are
+			for ( i=settings._iDisplayStart, ien=settings.fnDisplayEnd() ; i<ien ; i++ ) {
+				a.push( displayFiltered[i] );
+			}
+		}
+		else if ( order == 'current' || order == 'applied' ) {
+			a = search == 'none' ?
+				displayMaster.slice() :                      // no search
+				search == 'applied' ?
+					displayFiltered.slice() :                // applied search
+					$.map( displayMaster, function (el, i) { // removed search
+						return $.inArray( el, displayFiltered ) === -1 ? el : null;
+					} );
+		}
+		else if ( order == 'index' || order == 'original' ) {
+			for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+				if ( search == 'none' ) {
+					a.push( i );
+				}
+				else { // applied | removed
+					tmp = $.inArray( i, displayFiltered );
+	
+					if ((tmp === -1 && search == 'removed') ||
+						(tmp >= 0   && search == 'applied') )
+					{
+						a.push( i );
+					}
+				}
+			}
+		}
+	
+		return a;
+	};
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Rows
+	 *
+	 * {}          - no selector - use all available rows
+	 * {integer}   - row aoData index
+	 * {node}      - TR node
+	 * {string}    - jQuery selector to apply to the TR elements
+	 * {array}     - jQuery array of nodes, or simply an array of TR nodes
+	 *
+	 */
+	
+	
+	var __row_selector = function ( settings, selector, opts )
+	{
+		var run = function ( sel ) {
+			var selInt = _intVal( sel );
+			var i, ien;
+	
+			// Short cut - selector is a number and no options provided (default is
+			// all records, so no need to check if the index is in there, since it
+			// must be - dev error if the index doesn't exist).
+			if ( selInt !== null && ! opts ) {
+				return [ selInt ];
+			}
+	
+			var rows = _selector_row_indexes( settings, opts );
+	
+			if ( selInt !== null && $.inArray( selInt, rows ) !== -1 ) {
+				// Selector - integer
+				return [ selInt ];
+			}
+			else if ( ! sel ) {
+				// Selector - none
+				return rows;
+			}
+	
+			// Selector - function
+			if ( typeof sel === 'function' ) {
+				return $.map( rows, function (idx) {
+					var row = settings.aoData[ idx ];
+					return sel( idx, row._aData, row.nTr ) ? idx : null;
+				} );
+			}
+	
+			// Get nodes in the order from the `rows` array with null values removed
+			var nodes = _removeEmpty(
+				_pluck_order( settings.aoData, rows, 'nTr' )
+			);
+	
+			// Selector - node
+			if ( sel.nodeName ) {
+				if ( $.inArray( sel, nodes ) !== -1 ) {
+					return [ sel._DT_RowIndex ]; // sel is a TR node that is in the table
+					                             // and DataTables adds a prop for fast lookup
+				}
+			}
+	
+			// ID selector. Want to always be able to select rows by id, regardless
+			// of if the tr element has been created or not, so can't rely upon
+			// jQuery here - hence a custom implementation. This does not match
+			// Sizzle's fast selector or HTML4 - in HTML5 the ID can be anything,
+			// but to select it using a CSS selector engine (like Sizzle or
+			// querySelect) it would need to need to be escaped for some characters.
+			// DataTables simplifies this for row selectors since you can select
+			// only a row. A # indicates an id any anything that follows is the id -
+			// unescaped.
+			if ( typeof sel === 'string' && sel.charAt(0) === '#' ) {
+				// get row index from id
+				var rowObj = settings.aIds[ sel.replace( /^#/, '' ) ];
+				if ( rowObj !== undefined ) {
+					return [ rowObj.idx ];
+				}
+	
+				// need to fall through to jQuery in case there is DOM id that
+				// matches
+			}
+	
+			// Selector - jQuery selector string, array of nodes or jQuery object/
+			// As jQuery's .filter() allows jQuery objects to be passed in filter,
+			// it also allows arrays, so this will cope with all three options
+			return $(nodes)
+				.filter( sel )
+				.map( function () {
+					return this._DT_RowIndex;
+				} )
+				.toArray();
+		};
+	
+		return _selector_run( 'row', selector, run, settings, opts );
+	};
+	
+	
+	_api_register( 'rows()', function ( selector, opts ) {
+		// argument shifting
+		if ( selector === undefined ) {
+			selector = '';
+		}
+		else if ( $.isPlainObject( selector ) ) {
+			opts = selector;
+			selector = '';
+		}
+	
+		opts = _selector_opts( opts );
+	
+		var inst = this.iterator( 'table', function ( settings ) {
+			return __row_selector( settings, selector, opts );
+		}, 1 );
+	
+		// Want argument shifting here and in __row_selector?
+		inst.selector.rows = selector;
+		inst.selector.opts = opts;
+	
+		return inst;
+	} );
+	
+	_api_register( 'rows().nodes()', function () {
+		return this.iterator( 'row', function ( settings, row ) {
+			return settings.aoData[ row ].nTr || undefined;
+		}, 1 );
+	} );
+	
+	_api_register( 'rows().data()', function () {
+		return this.iterator( true, 'rows', function ( settings, rows ) {
+			return _pluck_order( settings.aoData, rows, '_aData' );
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'rows().cache()', 'row().cache()', function ( type ) {
+		return this.iterator( 'row', function ( settings, row ) {
+			var r = settings.aoData[ row ];
+			return type === 'search' ? r._aFilterData : r._aSortData;
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'rows().invalidate()', 'row().invalidate()', function ( src ) {
+		return this.iterator( 'row', function ( settings, row ) {
+			_fnInvalidate( settings, row, src );
+		} );
+	} );
+	
+	_api_registerPlural( 'rows().indexes()', 'row().index()', function () {
+		return this.iterator( 'row', function ( settings, row ) {
+			return row;
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'rows().ids()', 'row().id()', function ( hash ) {
+		var a = [];
+		var context = this.context;
+	
+		// `iterator` will drop undefined values, but in this case we want them
+		for ( var i=0, ien=context.length ; i<ien ; i++ ) {
+			for ( var j=0, jen=this[i].length ; j<jen ; j++ ) {
+				var id = context[i].rowIdFn( context[i].aoData[ this[i][j] ]._aData );
+				a.push( (hash === true ? '#' : '' )+ id );
+			}
+		}
+	
+		return new _Api( context, a );
+	} );
+	
+	_api_registerPlural( 'rows().remove()', 'row().remove()', function () {
+		var that = this;
+	
+		this.iterator( 'row', function ( settings, row, thatIdx ) {
+			var data = settings.aoData;
+	
+			data.splice( row, 1 );
+	
+			// Update the _DT_RowIndex parameter on all rows in the table
+			for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+				if ( data[i].nTr !== null ) {
+					data[i].nTr._DT_RowIndex = i;
+				}
+			}
+	
+			// Delete from the display arrays
+			_fnDeleteIndex( settings.aiDisplayMaster, row );
+			_fnDeleteIndex( settings.aiDisplay, row );
+			_fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes
+	
+			// Check for an 'overflow' they case for displaying the table
+			_fnLengthOverflow( settings );
+		} );
+	
+		this.iterator( 'table', function ( settings ) {
+			for ( var i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
+				settings.aoData[i].idx = i;
+			}
+		} );
+	
+		return this;
+	} );
+	
+	
+	_api_register( 'rows.add()', function ( rows ) {
+		var newRows = this.iterator( 'table', function ( settings ) {
+				var row, i, ien;
+				var out = [];
+	
+				for ( i=0, ien=rows.length ; i<ien ; i++ ) {
+					row = rows[i];
+	
+					if ( row.nodeName && row.nodeName.toUpperCase() === 'TR' ) {
+						out.push( _fnAddTr( settings, row )[0] );
+					}
+					else {
+						out.push( _fnAddData( settings, row ) );
+					}
+				}
+	
+				return out;
+			}, 1 );
+	
+		// Return an Api.rows() extended instance, so rows().nodes() etc can be used
+		var modRows = this.rows( -1 );
+		modRows.pop();
+		modRows.push.apply( modRows, newRows.toArray() );
+	
+		return modRows;
+	} );
+	
+	
+	
+	
+	
+	/**
+	 *
+	 */
+	_api_register( 'row()', function ( selector, opts ) {
+		return _selector_first( this.rows( selector, opts ) );
+	} );
+	
+	
+	_api_register( 'row().data()', function ( data ) {
+		var ctx = this.context;
+	
+		if ( data === undefined ) {
+			// Get
+			return ctx.length && this.length ?
+				ctx[0].aoData[ this[0] ]._aData :
+				undefined;
+		}
+	
+		// Set
+		ctx[0].aoData[ this[0] ]._aData = data;
+	
+		// Automatically invalidate
+		_fnInvalidate( ctx[0], this[0], 'data' );
+	
+		return this;
+	} );
+	
+	
+	_api_register( 'row().node()', function () {
+		var ctx = this.context;
+	
+		return ctx.length && this.length ?
+			ctx[0].aoData[ this[0] ].nTr || null :
+			null;
+	} );
+	
+	
+	_api_register( 'row.add()', function ( row ) {
+		// Allow a jQuery object to be passed in - only a single row is added from
+		// it though - the first element in the set
+		if ( row instanceof $ && row.length ) {
+			row = row[0];
+		}
+	
+		var rows = this.iterator( 'table', function ( settings ) {
+			if ( row.nodeName && row.nodeName.toUpperCase() === 'TR' ) {
+				return _fnAddTr( settings, row )[0];
+			}
+			return _fnAddData( settings, row );
+		} );
+	
+		// Return an Api.rows() extended instance, with the newly added row selected
+		return this.row( rows[0] );
+	} );
+	
+	
+	
+	var __details_add = function ( ctx, row, data, klass )
+	{
+		// Convert to array of TR elements
+		var rows = [];
+		var addRow = function ( r, k ) {
+			// Recursion to allow for arrays of jQuery objects
+			if ( $.isArray( r ) || r instanceof $ ) {
+				for ( var i=0, ien=r.length ; i<ien ; i++ ) {
+					addRow( r[i], k );
+				}
+				return;
+			}
+	
+			// If we get a TR element, then just add it directly - up to the dev
+			// to add the correct number of columns etc
+			if ( r.nodeName && r.nodeName.toLowerCase() === 'tr' ) {
+				rows.push( r );
+			}
+			else {
+				// Otherwise create a row with a wrapper
+				var created = $('<tr><td/></tr>').addClass( k );
+				$('td', created)
+					.addClass( k )
+					.html( r )
+					[0].colSpan = _fnVisbleColumns( ctx );
+	
+				rows.push( created[0] );
+			}
+		};
+	
+		addRow( data, klass );
+	
+		if ( row._details ) {
+			row._details.remove();
+		}
+	
+		row._details = $(rows);
+	
+		// If the children were already shown, that state should be retained
+		if ( row._detailsShow ) {
+			row._details.insertAfter( row.nTr );
+		}
+	};
+	
+	
+	var __details_remove = function ( api, idx )
+	{
+		var ctx = api.context;
+	
+		if ( ctx.length ) {
+			var row = ctx[0].aoData[ idx !== undefined ? idx : api[0] ];
+	
+			if ( row && row._details ) {
+				row._details.remove();
+	
+				row._detailsShow = undefined;
+				row._details = undefined;
+			}
+		}
+	};
+	
+	
+	var __details_display = function ( api, show ) {
+		var ctx = api.context;
+	
+		if ( ctx.length && api.length ) {
+			var row = ctx[0].aoData[ api[0] ];
+	
+			if ( row._details ) {
+				row._detailsShow = show;
+	
+				if ( show ) {
+					row._details.insertAfter( row.nTr );
+				}
+				else {
+					row._details.detach();
+				}
+	
+				__details_events( ctx[0] );
+			}
+		}
+	};
+	
+	
+	var __details_events = function ( settings )
+	{
+		var api = new _Api( settings );
+		var namespace = '.dt.DT_details';
+		var drawEvent = 'draw'+namespace;
+		var colvisEvent = 'column-visibility'+namespace;
+		var destroyEvent = 'destroy'+namespace;
+		var data = settings.aoData;
+	
+		api.off( drawEvent +' '+ colvisEvent +' '+ destroyEvent );
+	
+		if ( _pluck( data, '_details' ).length > 0 ) {
+			// On each draw, insert the required elements into the document
+			api.on( drawEvent, function ( e, ctx ) {
+				if ( settings !== ctx ) {
+					return;
+				}
+	
+				api.rows( {page:'current'} ).eq(0).each( function (idx) {
+					// Internal data grab
+					var row = data[ idx ];
+	
+					if ( row._detailsShow ) {
+						row._details.insertAfter( row.nTr );
+					}
+				} );
+			} );
+	
+			// Column visibility change - update the colspan
+			api.on( colvisEvent, function ( e, ctx, idx, vis ) {
+				if ( settings !== ctx ) {
+					return;
+				}
+	
+				// Update the colspan for the details rows (note, only if it already has
+				// a colspan)
+				var row, visible = _fnVisbleColumns( ctx );
+	
+				for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+					row = data[i];
+	
+					if ( row._details ) {
+						row._details.children('td[colspan]').attr('colspan', visible );
+					}
+				}
+			} );
+	
+			// Table destroyed - nuke any child rows
+			api.on( destroyEvent, function ( e, ctx ) {
+				if ( settings !== ctx ) {
+					return;
+				}
+	
+				for ( var i=0, ien=data.length ; i<ien ; i++ ) {
+					if ( data[i]._details ) {
+						__details_remove( api, i );
+					}
+				}
+			} );
+		}
+	};
+	
+	// Strings for the method names to help minification
+	var _emp = '';
+	var _child_obj = _emp+'row().child';
+	var _child_mth = _child_obj+'()';
+	
+	// data can be:
+	//  tr
+	//  string
+	//  jQuery or array of any of the above
+	_api_register( _child_mth, function ( data, klass ) {
+		var ctx = this.context;
+	
+		if ( data === undefined ) {
+			// get
+			return ctx.length && this.length ?
+				ctx[0].aoData[ this[0] ]._details :
+				undefined;
+		}
+		else if ( data === true ) {
+			// show
+			this.child.show();
+		}
+		else if ( data === false ) {
+			// remove
+			__details_remove( this );
+		}
+		else if ( ctx.length && this.length ) {
+			// set
+			__details_add( ctx[0], ctx[0].aoData[ this[0] ], data, klass );
+		}
+	
+		return this;
+	} );
+	
+	
+	_api_register( [
+		_child_obj+'.show()',
+		_child_mth+'.show()' // only when `child()` was called with parameters (without
+	], function ( show ) {   // it returns an object and this method is not executed)
+		__details_display( this, true );
+		return this;
+	} );
+	
+	
+	_api_register( [
+		_child_obj+'.hide()',
+		_child_mth+'.hide()' // only when `child()` was called with parameters (without
+	], function () {         // it returns an object and this method is not executed)
+		__details_display( this, false );
+		return this;
+	} );
+	
+	
+	_api_register( [
+		_child_obj+'.remove()',
+		_child_mth+'.remove()' // only when `child()` was called with parameters (without
+	], function () {           // it returns an object and this method is not executed)
+		__details_remove( this );
+		return this;
+	} );
+	
+	
+	_api_register( _child_obj+'.isShown()', function () {
+		var ctx = this.context;
+	
+		if ( ctx.length && this.length ) {
+			// _detailsShown as false or undefined will fall through to return false
+			return ctx[0].aoData[ this[0] ]._detailsShow || false;
+		}
+		return false;
+	} );
+	
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Columns
+	 *
+	 * {integer}           - column index (>=0 count from left, <0 count from right)
+	 * "{integer}:visIdx"  - visible column index (i.e. translate to column index)  (>=0 count from left, <0 count from right)
+	 * "{integer}:visible" - alias for {integer}:visIdx  (>=0 count from left, <0 count from right)
+	 * "{string}:name"     - column name
+	 * "{string}"          - jQuery selector on column header nodes
+	 *
+	 */
+	
+	// can be an array of these items, comma separated list, or an array of comma
+	// separated lists
+	
+	var __re_column_selector = /^(.+):(name|visIdx|visible)$/;
+	
+	
+	// r1 and r2 are redundant - but it means that the parameters match for the
+	// iterator callback in columns().data()
+	var __columnData = function ( settings, column, r1, r2, rows ) {
+		var a = [];
+		for ( var row=0, ien=rows.length ; row<ien ; row++ ) {
+			a.push( _fnGetCellData( settings, rows[row], column ) );
+		}
+		return a;
+	};
+	
+	
+	var __column_selector = function ( settings, selector, opts )
+	{
+		var
+			columns = settings.aoColumns,
+			names = _pluck( columns, 'sName' ),
+			nodes = _pluck( columns, 'nTh' );
+	
+		var run = function ( s ) {
+			var selInt = _intVal( s );
+	
+			// Selector - all
+			if ( s === '' ) {
+				return _range( columns.length );
+			}
+			
+			// Selector - index
+			if ( selInt !== null ) {
+				return [ selInt >= 0 ?
+					selInt : // Count from left
+					columns.length + selInt // Count from right (+ because its a negative value)
+				];
+			}
+			
+			// Selector = function
+			if ( typeof s === 'function' ) {
+				var rows = _selector_row_indexes( settings, opts );
+	
+				return $.map( columns, function (col, idx) {
+					return s(
+							idx,
+							__columnData( settings, idx, 0, 0, rows ),
+							nodes[ idx ]
+						) ? idx : null;
+				} );
+			}
+	
+			// jQuery or string selector
+			var match = typeof s === 'string' ?
+				s.match( __re_column_selector ) :
+				'';
+	
+			if ( match ) {
+				switch( match[2] ) {
+					case 'visIdx':
+					case 'visible':
+						var idx = parseInt( match[1], 10 );
+						// Visible index given, convert to column index
+						if ( idx < 0 ) {
+							// Counting from the right
+							var visColumns = $.map( columns, function (col,i) {
+								return col.bVisible ? i : null;
+							} );
+							return [ visColumns[ visColumns.length + idx ] ];
+						}
+						// Counting from the left
+						return [ _fnVisibleToColumnIndex( settings, idx ) ];
+	
+					case 'name':
+						// match by name. `names` is column index complete and in order
+						return $.map( names, function (name, i) {
+							return name === match[1] ? i : null;
+						} );
+				}
+			}
+			else {
+				// jQuery selector on the TH elements for the columns
+				return $( nodes )
+					.filter( s )
+					.map( function () {
+						return $.inArray( this, nodes ); // `nodes` is column index complete and in order
+					} )
+					.toArray();
+			}
+		};
+	
+		return _selector_run( 'column', selector, run, settings, opts );
+	};
+	
+	
+	var __setColumnVis = function ( settings, column, vis, recalc ) {
+		var
+			cols = settings.aoColumns,
+			col  = cols[ column ],
+			data = settings.aoData,
+			row, cells, i, ien, tr;
+	
+		// Get
+		if ( vis === undefined ) {
+			return col.bVisible;
+		}
+	
+		// Set
+		// No change
+		if ( col.bVisible === vis ) {
+			return;
+		}
+	
+		if ( vis ) {
+			// Insert column
+			// Need to decide if we should use appendChild or insertBefore
+			var insertBefore = $.inArray( true, _pluck(cols, 'bVisible'), column+1 );
+	
+			for ( i=0, ien=data.length ; i<ien ; i++ ) {
+				tr = data[i].nTr;
+				cells = data[i].anCells;
+	
+				if ( tr ) {
+					// insertBefore can act like appendChild if 2nd arg is null
+					tr.insertBefore( cells[ column ], cells[ insertBefore ] || null );
+				}
+			}
+		}
+		else {
+			// Remove column
+			$( _pluck( settings.aoData, 'anCells', column ) ).detach();
+		}
+	
+		// Common actions
+		col.bVisible = vis;
+		_fnDrawHead( settings, settings.aoHeader );
+		_fnDrawHead( settings, settings.aoFooter );
+	
+		if ( recalc === undefined || recalc ) {
+			// Automatically adjust column sizing
+			_fnAdjustColumnSizing( settings );
+	
+			// Realign columns for scrolling
+			if ( settings.oScroll.sX || settings.oScroll.sY ) {
+				_fnScrollDraw( settings );
+			}
+		}
+	
+		_fnCallbackFire( settings, null, 'column-visibility', [settings, column, vis] );
+	
+		_fnSaveState( settings );
+	};
+	
+	
+	_api_register( 'columns()', function ( selector, opts ) {
+		// argument shifting
+		if ( selector === undefined ) {
+			selector = '';
+		}
+		else if ( $.isPlainObject( selector ) ) {
+			opts = selector;
+			selector = '';
+		}
+	
+		opts = _selector_opts( opts );
+	
+		var inst = this.iterator( 'table', function ( settings ) {
+			return __column_selector( settings, selector, opts );
+		}, 1 );
+	
+		// Want argument shifting here and in _row_selector?
+		inst.selector.cols = selector;
+		inst.selector.opts = opts;
+	
+		return inst;
+	} );
+	
+	_api_registerPlural( 'columns().header()', 'column().header()', function ( selector, opts ) {
+		return this.iterator( 'column', function ( settings, column ) {
+			return settings.aoColumns[column].nTh;
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'columns().footer()', 'column().footer()', function ( selector, opts ) {
+		return this.iterator( 'column', function ( settings, column ) {
+			return settings.aoColumns[column].nTf;
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'columns().data()', 'column().data()', function () {
+		return this.iterator( 'column-rows', __columnData, 1 );
+	} );
+	
+	_api_registerPlural( 'columns().dataSrc()', 'column().dataSrc()', function () {
+		return this.iterator( 'column', function ( settings, column ) {
+			return settings.aoColumns[column].mData;
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'columns().cache()', 'column().cache()', function ( type ) {
+		return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
+			return _pluck_order( settings.aoData, rows,
+				type === 'search' ? '_aFilterData' : '_aSortData', column
+			);
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'columns().nodes()', 'column().nodes()', function () {
+		return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
+			return _pluck_order( settings.aoData, rows, 'anCells', column ) ;
+		}, 1 );
+	} );
+	
+	_api_registerPlural( 'columns().visible()', 'column().visible()', function ( vis, calc ) {
+		return this.iterator( 'column', function ( settings, column ) {
+			if ( vis === undefined ) {
+				return settings.aoColumns[ column ].bVisible;
+			} // else
+			__setColumnVis( settings, column, vis, calc );
+		} );
+	} );
+	
+	_api_registerPlural( 'columns().indexes()', 'column().index()', function ( type ) {
+		return this.iterator( 'column', function ( settings, column ) {
+			return type === 'visible' ?
+				_fnColumnIndexToVisible( settings, column ) :
+				column;
+		}, 1 );
+	} );
+	
+	_api_register( 'columns.adjust()', function () {
+		return this.iterator( 'table', function ( settings ) {
+			_fnAdjustColumnSizing( settings );
+		}, 1 );
+	} );
+	
+	_api_register( 'column.index()', function ( type, idx ) {
+		if ( this.context.length !== 0 ) {
+			var ctx = this.context[0];
+	
+			if ( type === 'fromVisible' || type === 'toData' ) {
+				return _fnVisibleToColumnIndex( ctx, idx );
+			}
+			else if ( type === 'fromData' || type === 'toVisible' ) {
+				return _fnColumnIndexToVisible( ctx, idx );
+			}
+		}
+	} );
+	
+	_api_register( 'column()', function ( selector, opts ) {
+		return _selector_first( this.columns( selector, opts ) );
+	} );
+	
+	
+	
+	
+	var __cell_selector = function ( settings, selector, opts )
+	{
+		var data = settings.aoData;
+		var rows = _selector_row_indexes( settings, opts );
+		var cells = _removeEmpty( _pluck_order( data, rows, 'anCells' ) );
+		var allCells = $( [].concat.apply([], cells) );
+		var row;
+		var columns = settings.aoColumns.length;
+		var a, i, ien, j, o, host;
+	
+		var run = function ( s ) {
+			var fnSelector = typeof s === 'function';
+	
+			if ( s === null || s === undefined || fnSelector ) {
+				// All cells and function selectors
+				a = [];
+	
+				for ( i=0, ien=rows.length ; i<ien ; i++ ) {
+					row = rows[i];
+	
+					for ( j=0 ; j<columns ; j++ ) {
+						o = {
+							row: row,
+							column: j
+						};
+	
+						if ( fnSelector ) {
+							// Selector - function
+							host = settings.aoData[ row ];
+	
+							if ( s( o, _fnGetCellData(settings, row, j), host.anCells ? host.anCells[j] : null ) ) {
+								a.push( o );
+							}
+						}
+						else {
+							// Selector - all
+							a.push( o );
+						}
+					}
+				}
+	
+				return a;
+			}
+			
+			// Selector - index
+			if ( $.isPlainObject( s ) ) {
+				return [s];
+			}
+	
+			// Selector - jQuery filtered cells
+			return allCells
+				.filter( s )
+				.map( function (i, el) {
+					row = el.parentNode._DT_RowIndex;
+	
+					return {
+						row: row,
+						column: $.inArray( el, data[ row ].anCells )
+					};
+				} )
+				.toArray();
+		};
+	
+		return _selector_run( 'cell', selector, run, settings, opts );
+	};
+	
+	
+	
+	
+	_api_register( 'cells()', function ( rowSelector, columnSelector, opts ) {
+		// Argument shifting
+		if ( $.isPlainObject( rowSelector ) ) {
+			// Indexes
+			if ( rowSelector.row === undefined ) {
+				// Selector options in first parameter
+				opts = rowSelector;
+				rowSelector = null;
+			}
+			else {
+				// Cell index objects in first parameter
+				opts = columnSelector;
+				columnSelector = null;
+			}
+		}
+		if ( $.isPlainObject( columnSelector ) ) {
+			opts = columnSelector;
+			columnSelector = null;
+		}
+	
+		// Cell selector
+		if ( columnSelector === null || columnSelector === undefined ) {
+			return this.iterator( 'table', function ( settings ) {
+				return __cell_selector( settings, rowSelector, _selector_opts( opts ) );
+			} );
+		}
+	
+		// Row + column selector
+		var columns = this.columns( columnSelector, opts );
+		var rows = this.rows( rowSelector, opts );
+		var a, i, ien, j, jen;
+	
+		var cells = this.iterator( 'table', function ( settings, idx ) {
+			a = [];
+	
+			for ( i=0, ien=rows[idx].length ; i<ien ; i++ ) {
+				for ( j=0, jen=columns[idx].length ; j<jen ; j++ ) {
+					a.push( {
+						row:    rows[idx][i],
+						column: columns[idx][j]
+					} );
+				}
+			}
+	
+			return a;
+		}, 1 );
+	
+		$.extend( cells.selector, {
+			cols: columnSelector,
+			rows: rowSelector,
+			opts: opts
+		} );
+	
+		return cells;
+	} );
+	
+	
+	_api_registerPlural( 'cells().nodes()', 'cell().node()', function () {
+		return this.iterator( 'cell', function ( settings, row, column ) {
+			var cells = settings.aoData[ row ].anCells;
+			return cells ?
+				cells[ column ] :
+				undefined;
+		}, 1 );
+	} );
+	
+	
+	_api_register( 'cells().data()', function () {
+		return this.iterator( 'cell', function ( settings, row, column ) {
+			return _fnGetCellData( settings, row, column );
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'cells().cache()', 'cell().cache()', function ( type ) {
+		type = type === 'search' ? '_aFilterData' : '_aSortData';
+	
+		return this.iterator( 'cell', function ( settings, row, column ) {
+			return settings.aoData[ row ][ type ][ column ];
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'cells().render()', 'cell().render()', function ( type ) {
+		return this.iterator( 'cell', function ( settings, row, column ) {
+			return _fnGetCellData( settings, row, column, type );
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'cells().indexes()', 'cell().index()', function () {
+		return this.iterator( 'cell', function ( settings, row, column ) {
+			return {
+				row: row,
+				column: column,
+				columnVisible: _fnColumnIndexToVisible( settings, column )
+			};
+		}, 1 );
+	} );
+	
+	
+	_api_registerPlural( 'cells().invalidate()', 'cell().invalidate()', function ( src ) {
+		return this.iterator( 'cell', function ( settings, row, column ) {
+			_fnInvalidate( settings, row, src, column );
+		} );
+	} );
+	
+	
+	
+	_api_register( 'cell()', function ( rowSelector, columnSelector, opts ) {
+		return _selector_first( this.cells( rowSelector, columnSelector, opts ) );
+	} );
+	
+	
+	_api_register( 'cell().data()', function ( data ) {
+		var ctx = this.context;
+		var cell = this[0];
+	
+		if ( data === undefined ) {
+			// Get
+			return ctx.length && cell.length ?
+				_fnGetCellData( ctx[0], cell[0].row, cell[0].column ) :
+				undefined;
+		}
+	
+		// Set
+		_fnSetCellData( ctx[0], cell[0].row, cell[0].column, data );
+		_fnInvalidate( ctx[0], cell[0].row, 'data', cell[0].column );
+	
+		return this;
+	} );
+	
+	
+	
+	/**
+	 * Get current ordering (sorting) that has been applied to the table.
+	 *
+	 * @returns {array} 2D array containing the sorting information for the first
+	 *   table in the current context. Each element in the parent array represents
+	 *   a column being sorted upon (i.e. multi-sorting with two columns would have
+	 *   2 inner arrays). The inner arrays may have 2 or 3 elements. The first is
+	 *   the column index that the sorting condition applies to, the second is the
+	 *   direction of the sort (`desc` or `asc`) and, optionally, the third is the
+	 *   index of the sorting order from the `column.sorting` initialisation array.
+	 *//**
+	 * Set the ordering for the table.
+	 *
+	 * @param {integer} order Column index to sort upon.
+	 * @param {string} direction Direction of the sort to be applied (`asc` or `desc`)
+	 * @returns {DataTables.Api} this
+	 *//**
+	 * Set the ordering for the table.
+	 *
+	 * @param {array} order 1D array of sorting information to be applied.
+	 * @param {array} [...] Optional additional sorting conditions
+	 * @returns {DataTables.Api} this
+	 *//**
+	 * Set the ordering for the table.
+	 *
+	 * @param {array} order 2D array of sorting information to be applied.
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'order()', function ( order, dir ) {
+		var ctx = this.context;
+	
+		if ( order === undefined ) {
+			// get
+			return ctx.length !== 0 ?
+				ctx[0].aaSorting :
+				undefined;
+		}
+	
+		// set
+		if ( typeof order === 'number' ) {
+			// Simple column / direction passed in
+			order = [ [ order, dir ] ];
+		}
+		else if ( ! $.isArray( order[0] ) ) {
+			// Arguments passed in (list of 1D arrays)
+			order = Array.prototype.slice.call( arguments );
+		}
+		// otherwise a 2D array was passed in
+	
+		return this.iterator( 'table', function ( settings ) {
+			settings.aaSorting = order.slice();
+		} );
+	} );
+	
+	
+	/**
+	 * Attach a sort listener to an element for a given column
+	 *
+	 * @param {node|jQuery|string} node Identifier for the element(s) to attach the
+	 *   listener to. This can take the form of a single DOM node, a jQuery
+	 *   collection of nodes or a jQuery selector which will identify the node(s).
+	 * @param {integer} column the column that a click on this node will sort on
+	 * @param {function} [callback] callback function when sort is run
+	 * @returns {DataTables.Api} this
+	 */
+	_api_register( 'order.listener()', function ( node, column, callback ) {
+		return this.iterator( 'table', function ( settings ) {
+			_fnSortAttachListener( settings, node, column, callback );
+		} );
+	} );
+	
+	
+	// Order by the selected column(s)
+	_api_register( [
+		'columns().order()',
+		'column().order()'
+	], function ( dir ) {
+		var that = this;
+	
+		return this.iterator( 'table', function ( settings, i ) {
+			var sort = [];
+	
+			$.each( that[i], function (j, col) {
+				sort.push( [ col, dir ] );
+			} );
+	
+			settings.aaSorting = sort;
+		} );
+	} );
+	
+	
+	
+	_api_register( 'search()', function ( input, regex, smart, caseInsen ) {
+		var ctx = this.context;
+	
+		if ( input === undefined ) {
+			// get
+			return ctx.length !== 0 ?
+				ctx[0].oPreviousSearch.sSearch :
+				undefined;
+		}
+	
+		// set
+		return this.iterator( 'table', function ( settings ) {
+			if ( ! settings.oFeatures.bFilter ) {
+				return;
+			}
+	
+			_fnFilterComplete( settings, $.extend( {}, settings.oPreviousSearch, {
+				"sSearch": input+"",
+				"bRegex":  regex === null ? false : regex,
+				"bSmart":  smart === null ? true  : smart,
+				"bCaseInsensitive": caseInsen === null ? true : caseInsen
+			} ), 1 );
+		} );
+	} );
+	
+	
+	_api_registerPlural(
+		'columns().search()',
+		'column().search()',
+		function ( input, regex, smart, caseInsen ) {
+			return this.iterator( 'column', function ( settings, column ) {
+				var preSearch = settings.aoPreSearchCols;
+	
+				if ( input === undefined ) {
+					// get
+					return preSearch[ column ].sSearch;
+				}
+	
+				// set
+				if ( ! settings.oFeatures.bFilter ) {
+					return;
+				}
+	
+				$.extend( preSearch[ column ], {
+					"sSearch": input+"",
+					"bRegex":  regex === null ? false : regex,
+					"bSmart":  smart === null ? true  : smart,
+					"bCaseInsensitive": caseInsen === null ? true : caseInsen
+				} );
+	
+				_fnFilterComplete( settings, settings.oPreviousSearch, 1 );
+			} );
+		}
+	);
+	
+	/*
+	 * State API methods
+	 */
+	
+	_api_register( 'state()', function () {
+		return this.context.length ?
+			this.context[0].oSavedState :
+			null;
+	} );
+	
+	
+	_api_register( 'state.clear()', function () {
+		return this.iterator( 'table', function ( settings ) {
+			// Save an empty object
+			settings.fnStateSaveCallback.call( settings.oInstance, settings, {} );
+		} );
+	} );
+	
+	
+	_api_register( 'state.loaded()', function () {
+		return this.context.length ?
+			this.context[0].oLoadedState :
+			null;
+	} );
+	
+	
+	_api_register( 'state.save()', function () {
+		return this.iterator( 'table', function ( settings ) {
+			_fnSaveState( settings );
+		} );
+	} );
+	
+	
+	
+	/**
+	 * Provide a common method for plug-ins to check the version of DataTables being
+	 * used, in order to ensure compatibility.
+	 *
+	 *  @param {string} version Version string to check for, in the format "X.Y.Z".
+	 *    Note that the formats "X" and "X.Y" are also acceptable.
+	 *  @returns {boolean} true if this version of DataTables is greater or equal to
+	 *    the required version, or false if this version of DataTales is not
+	 *    suitable
+	 *  @static
+	 *  @dtopt API-Static
+	 *
+	 *  @example
+	 *    alert( $.fn.dataTable.versionCheck( '1.9.0' ) );
+	 */
+	DataTable.versionCheck = DataTable.fnVersionCheck = function( version )
+	{
+		var aThis = DataTable.version.split('.');
+		var aThat = version.split('.');
+		var iThis, iThat;
+	
+		for ( var i=0, iLen=aThat.length ; i<iLen ; i++ ) {
+			iThis = parseInt( aThis[i], 10 ) || 0;
+			iThat = parseInt( aThat[i], 10 ) || 0;
+	
+			// Parts are the same, keep comparing
+			if (iThis === iThat) {
+				continue;
+			}
+	
+			// Parts are different, return immediately
+			return iThis > iThat;
+		}
+	
+		return true;
+	};
+	
+	
+	/**
+	 * Check if a `<table>` node is a DataTable table already or not.
+	 *
+	 *  @param {node|jquery|string} table Table node, jQuery object or jQuery
+	 *      selector for the table to test. Note that if more than more than one
+	 *      table is passed on, only the first will be checked
+	 *  @returns {boolean} true the table given is a DataTable, or false otherwise
+	 *  @static
+	 *  @dtopt API-Static
+	 *
+	 *  @example
+	 *    if ( ! $.fn.DataTable.isDataTable( '#example' ) ) {
+	 *      $('#example').dataTable();
+	 *    }
+	 */
+	DataTable.isDataTable = DataTable.fnIsDataTable = function ( table )
+	{
+		var t = $(table).get(0);
+		var is = false;
+	
+		$.each( DataTable.settings, function (i, o) {
+			var head = o.nScrollHead ? $('table', o.nScrollHead)[0] : null;
+			var foot = o.nScrollFoot ? $('table', o.nScrollFoot)[0] : null;
+	
+			if ( o.nTable === t || head === t || foot === t ) {
+				is = true;
+			}
+		} );
+	
+		return is;
+	};
+	
+	
+	/**
+	 * Get all DataTable tables that have been initialised - optionally you can
+	 * select to get only currently visible tables.
+	 *
+	 *  @param {boolean} [visible=false] Flag to indicate if you want all (default)
+	 *    or visible tables only.
+	 *  @returns {array} Array of `table` nodes (not DataTable instances) which are
+	 *    DataTables
+	 *  @static
+	 *  @dtopt API-Static
+	 *
+	 *  @example
+	 *    $.each( $.fn.dataTable.tables(true), function () {
+	 *      $(table).DataTable().columns.adjust();
+	 *    } );
+	 */
+	DataTable.tables = DataTable.fnTables = function ( visible )
+	{
+		var api = false;
+	
+		if ( $.isPlainObject( visible ) ) {
+			api = visible.api;
+			visible = visible.visible;
+		}
+	
+		var a = $.map( DataTable.settings, function (o) {
+			if ( !visible || (visible && $(o.nTable).is(':visible')) ) {
+				return o.nTable;
+			}
+		} );
+	
+		return api ?
+			new _Api( a ) :
+			a;
+	};
+	
+	
+	/**
+	 * DataTables utility methods
+	 * 
+	 * This namespace provides helper methods that DataTables uses internally to
+	 * create a DataTable, but which are not exclusively used only for DataTables.
+	 * These methods can be used by extension authors to save the duplication of
+	 * code.
+	 *
+	 *  @namespace
+	 */
+	DataTable.util = {
+		/**
+		 * Throttle the calls to a function. Arguments and context are maintained
+		 * for the throttled function.
+		 *
+		 * @param {function} fn Function to be called
+		 * @param {integer} freq Call frequency in mS
+		 * @return {function} Wrapped function
+		 */
+		throttle: _fnThrottle,
+	
+	
+		/**
+		 * Escape a string such that it can be used in a regular expression
+		 *
+		 *  @param {string} sVal string to escape
+		 *  @returns {string} escaped string
+		 */
+		escapeRegex: _fnEscapeRegex
+	};
+	
+	
+	/**
+	 * Convert from camel case parameters to Hungarian notation. This is made public
+	 * for the extensions to provide the same ability as DataTables core to accept
+	 * either the 1.9 style Hungarian notation, or the 1.10+ style camelCase
+	 * parameters.
+	 *
+	 *  @param {object} src The model object which holds all parameters that can be
+	 *    mapped.
+	 *  @param {object} user The object to convert from camel case to Hungarian.
+	 *  @param {boolean} force When set to `true`, properties which already have a
+	 *    Hungarian value in the `user` object will be overwritten. Otherwise they
+	 *    won't be.
+	 */
+	DataTable.camelToHungarian = _fnCamelToHungarian;
+	
+	
+	
+	/**
+	 *
+	 */
+	_api_register( '$()', function ( selector, opts ) {
+		var
+			rows   = this.rows( opts ).nodes(), // Get all rows
+			jqRows = $(rows);
+	
+		return $( [].concat(
+			jqRows.filter( selector ).toArray(),
+			jqRows.find( selector ).toArray()
+		) );
+	} );
+	
+	
+	// jQuery functions to operate on the tables
+	$.each( [ 'on', 'one', 'off' ], function (i, key) {
+		_api_register( key+'()', function ( /* event, handler */ ) {
+			var args = Array.prototype.slice.call(arguments);
+	
+			// Add the `dt` namespace automatically if it isn't already present
+			if ( ! args[0].match(/\.dt\b/) ) {
+				args[0] += '.dt';
+			}
+	
+			var inst = $( this.tables().nodes() );
+			inst[key].apply( inst, args );
+			return this;
+		} );
+	} );
+	
+	
+	_api_register( 'clear()', function () {
+		return this.iterator( 'table', function ( settings ) {
+			_fnClearTable( settings );
+		} );
+	} );
+	
+	
+	_api_register( 'settings()', function () {
+		return new _Api( this.context, this.context );
+	} );
+	
+	
+	_api_register( 'init()', function () {
+		var ctx = this.context;
+		return ctx.length ? ctx[0].oInit : null;
+	} );
+	
+	
+	_api_register( 'data()', function () {
+		return this.iterator( 'table', function ( settings ) {
+			return _pluck( settings.aoData, '_aData' );
+		} ).flatten();
+	} );
+	
+	
+	_api_register( 'destroy()', function ( remove ) {
+		remove = remove || false;
+	
+		return this.iterator( 'table', function ( settings ) {
+			var orig      = settings.nTableWrapper.parentNode;
+			var classes   = settings.oClasses;
+			var table     = settings.nTable;
+			var tbody     = settings.nTBody;
+			var thead     = settings.nTHead;
+			var tfoot     = settings.nTFoot;
+			var jqTable   = $(table);
+			var jqTbody   = $(tbody);
+			var jqWrapper = $(settings.nTableWrapper);
+			var rows      = $.map( settings.aoData, function (r) { return r.nTr; } );
+			var i, ien;
+	
+			// Flag to note that the table is currently being destroyed - no action
+			// should be taken
+			settings.bDestroying = true;
+	
+			// Fire off the destroy callbacks for plug-ins etc
+			_fnCallbackFire( settings, "aoDestroyCallback", "destroy", [settings] );
+	
+			// If not being removed from the document, make all columns visible
+			if ( ! remove ) {
+				new _Api( settings ).columns().visible( true );
+			}
+	
+			// Blitz all `DT` namespaced events (these are internal events, the
+			// lowercase, `dt` events are user subscribed and they are responsible
+			// for removing them
+			jqWrapper.unbind('.DT').find(':not(tbody *)').unbind('.DT');
+			$(window).unbind('.DT-'+settings.sInstance);
+	
+			// When scrolling we had to break the table up - restore it
+			if ( table != thead.parentNode ) {
+				jqTable.children('thead').detach();
+				jqTable.append( thead );
+			}
+	
+			if ( tfoot && table != tfoot.parentNode ) {
+				jqTable.children('tfoot').detach();
+				jqTable.append( tfoot );
+			}
+	
+			settings.aaSorting = [];
+			settings.aaSortingFixed = [];
+			_fnSortingClasses( settings );
+	
+			$( rows ).removeClass( settings.asStripeClasses.join(' ') );
+	
+			$('th, td', thead).removeClass( classes.sSortable+' '+
+				classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone
+			);
+	
+			if ( settings.bJUI ) {
+				$('th span.'+classes.sSortIcon+ ', td span.'+classes.sSortIcon, thead).detach();
+				$('th, td', thead).each( function () {
+					var wrapper = $('div.'+classes.sSortJUIWrapper, this);
+					$(this).append( wrapper.contents() );
+					wrapper.detach();
+				} );
+			}
+	
+			// Add the TR elements back into the table in their original order
+			jqTbody.children().detach();
+			jqTbody.append( rows );
+	
+			// Remove the DataTables generated nodes, events and classes
+			var removedMethod = remove ? 'remove' : 'detach';
+			jqTable[ removedMethod ]();
+			jqWrapper[ removedMethod ]();
+	
+			// If we need to reattach the table to the document
+			if ( ! remove && orig ) {
+				// insertBefore acts like appendChild if !arg[1]
+				orig.insertBefore( table, settings.nTableReinsertBefore );
+	
+				// Restore the width of the original table - was read from the style property,
+				// so we can restore directly to that
+				jqTable
+					.css( 'width', settings.sDestroyWidth )
+					.removeClass( classes.sTable );
+	
+				// If the were originally stripe classes - then we add them back here.
+				// Note this is not fool proof (for example if not all rows had stripe
+				// classes - but it's a good effort without getting carried away
+				ien = settings.asDestroyStripes.length;
+	
+				if ( ien ) {
+					jqTbody.children().each( function (i) {
+						$(this).addClass( settings.asDestroyStripes[i % ien] );
+					} );
+				}
+			}
+	
+			/* Remove the settings object from the settings array */
+			var idx = $.inArray( settings, DataTable.settings );
+			if ( idx !== -1 ) {
+				DataTable.settings.splice( idx, 1 );
+			}
+		} );
+	} );
+	
+	
+	// Add the `every()` method for rows, columns and cells in a compact form
+	$.each( [ 'column', 'row', 'cell' ], function ( i, type ) {
+		_api_register( type+'s().every()', function ( fn ) {
+			return this.iterator( type, function ( settings, arg1, arg2, arg3, arg4 ) {
+				// Rows and columns:
+				//  arg1 - index
+				//  arg2 - table counter
+				//  arg3 - loop counter
+				//  arg4 - undefined
+				// Cells:
+				//  arg1 - row index
+				//  arg2 - column index
+				//  arg3 - table counter
+				//  arg4 - loop counter
+				fn.call(
+					new _Api( settings )[ type ]( arg1, type==='cell' ? arg2 : undefined ),
+					arg1, arg2, arg3, arg4
+				);
+			} );
+		} );
+	} );
+	
+	
+	// i18n method for extensions to be able to use the language object from the
+	// DataTable
+	_api_register( 'i18n()', function ( token, def, plural ) {
+		var ctx = this.context[0];
+		var resolved = _fnGetObjectDataFn( token )( ctx.oLanguage );
+	
+		if ( resolved === undefined ) {
+			resolved = def;
+		}
+	
+		if ( plural !== undefined && $.isPlainObject( resolved ) ) {
+			resolved = resolved[ plural ] !== undefined ?
+				resolved[ plural ] :
+				resolved._;
+		}
+	
+		return resolved.replace( '%d', plural ); // nb: plural might be undefined,
+	} );
+
+	/**
+	 * Version string for plug-ins to check compatibility. Allowed format is
+	 * `a.b.c-d` where: a:int, b:int, c:int, d:string(dev|beta|alpha). `d` is used
+	 * only for non-release builds. See http://semver.org/ for more information.
+	 *  @member
+	 *  @type string
+	 *  @default Version number
+	 */
+	DataTable.version = "1.10.8";
+
+	/**
+	 * Private data store, containing all of the settings objects that are
+	 * created for the tables on a given page.
+	 *
+	 * Note that the `DataTable.settings` object is aliased to
+	 * `jQuery.fn.dataTableExt` through which it may be accessed and
+	 * manipulated, or `jQuery.fn.dataTable.settings`.
+	 *  @member
+	 *  @type array
+	 *  @default []
+	 *  @private
+	 */
+	DataTable.settings = [];
+
+	/**
+	 * Object models container, for the various models that DataTables has
+	 * available to it. These models define the objects that are used to hold
+	 * the active state and configuration of the table.
+	 *  @namespace
+	 */
+	DataTable.models = {};
+	
+	
+	
+	/**
+	 * Template object for the way in which DataTables holds information about
+	 * search information for the global filter and individual column filters.
+	 *  @namespace
+	 */
+	DataTable.models.oSearch = {
+		/**
+		 * Flag to indicate if the filtering should be case insensitive or not
+		 *  @type boolean
+		 *  @default true
+		 */
+		"bCaseInsensitive": true,
+	
+		/**
+		 * Applied search term
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 */
+		"sSearch": "",
+	
+		/**
+		 * Flag to indicate if the search term should be interpreted as a
+		 * regular expression (true) or not (false) and therefore and special
+		 * regex characters escaped.
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bRegex": false,
+	
+		/**
+		 * Flag to indicate if DataTables is to use its smart filtering or not.
+		 *  @type boolean
+		 *  @default true
+		 */
+		"bSmart": true
+	};
+	
+	
+	
+	
+	/**
+	 * Template object for the way in which DataTables holds information about
+	 * each individual row. This is the object format used for the settings
+	 * aoData array.
+	 *  @namespace
+	 */
+	DataTable.models.oRow = {
+		/**
+		 * TR element for the row
+		 *  @type node
+		 *  @default null
+		 */
+		"nTr": null,
+	
+		/**
+		 * Array of TD elements for each row. This is null until the row has been
+		 * created.
+		 *  @type array nodes
+		 *  @default []
+		 */
+		"anCells": null,
+	
+		/**
+		 * Data object from the original data source for the row. This is either
+		 * an array if using the traditional form of DataTables, or an object if
+		 * using mData options. The exact type will depend on the passed in
+		 * data from the data source, or will be an array if using DOM a data
+		 * source.
+		 *  @type array|object
+		 *  @default []
+		 */
+		"_aData": [],
+	
+		/**
+		 * Sorting data cache - this array is ostensibly the same length as the
+		 * number of columns (although each index is generated only as it is
+		 * needed), and holds the data that is used for sorting each column in the
+		 * row. We do this cache generation at the start of the sort in order that
+		 * the formatting of the sort data need be done only once for each cell
+		 * per sort. This array should not be read from or written to by anything
+		 * other than the master sorting methods.
+		 *  @type array
+		 *  @default null
+		 *  @private
+		 */
+		"_aSortData": null,
+	
+		/**
+		 * Per cell filtering data cache. As per the sort data cache, used to
+		 * increase the performance of the filtering in DataTables
+		 *  @type array
+		 *  @default null
+		 *  @private
+		 */
+		"_aFilterData": null,
+	
+		/**
+		 * Filtering data cache. This is the same as the cell filtering cache, but
+		 * in this case a string rather than an array. This is easily computed with
+		 * a join on `_aFilterData`, but is provided as a cache so the join isn't
+		 * needed on every search (memory traded for performance)
+		 *  @type array
+		 *  @default null
+		 *  @private
+		 */
+		"_sFilterRow": null,
+	
+		/**
+		 * Cache of the class name that DataTables has applied to the row, so we
+		 * can quickly look at this variable rather than needing to do a DOM check
+		 * on className for the nTr property.
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 *  @private
+		 */
+		"_sRowStripe": "",
+	
+		/**
+		 * Denote if the original data source was from the DOM, or the data source
+		 * object. This is used for invalidating data, so DataTables can
+		 * automatically read data from the original source, unless uninstructed
+		 * otherwise.
+		 *  @type string
+		 *  @default null
+		 *  @private
+		 */
+		"src": null,
+	
+		/**
+		 * Index in the aoData array. This saves an indexOf lookup when we have the
+		 * object, but want to know the index
+		 *  @type integer
+		 *  @default -1
+		 *  @private
+		 */
+		"idx": -1
+	};
+	
+	
+	/**
+	 * Template object for the column information object in DataTables. This object
+	 * is held in the settings aoColumns array and contains all the information that
+	 * DataTables needs about each individual column.
+	 *
+	 * Note that this object is related to {@link DataTable.defaults.column}
+	 * but this one is the internal data store for DataTables's cache of columns.
+	 * It should NOT be manipulated outside of DataTables. Any configuration should
+	 * be done through the initialisation options.
+	 *  @namespace
+	 */
+	DataTable.models.oColumn = {
+		/**
+		 * Column index. This could be worked out on-the-fly with $.inArray, but it
+		 * is faster to just hold it as a variable
+		 *  @type integer
+		 *  @default null
+		 */
+		"idx": null,
+	
+		/**
+		 * A list of the columns that sorting should occur on when this column
+		 * is sorted. That this property is an array allows multi-column sorting
+		 * to be defined for a column (for example first name / last name columns
+		 * would benefit from this). The values are integers pointing to the
+		 * columns to be sorted on (typically it will be a single integer pointing
+		 * at itself, but that doesn't need to be the case).
+		 *  @type array
+		 */
+		"aDataSort": null,
+	
+		/**
+		 * Define the sorting directions that are applied to the column, in sequence
+		 * as the column is repeatedly sorted upon - i.e. the first value is used
+		 * as the sorting direction when the column if first sorted (clicked on).
+		 * Sort it again (click again) and it will move on to the next index.
+		 * Repeat until loop.
+		 *  @type array
+		 */
+		"asSorting": null,
+	
+		/**
+		 * Flag to indicate if the column is searchable, and thus should be included
+		 * in the filtering or not.
+		 *  @type boolean
+		 */
+		"bSearchable": null,
+	
+		/**
+		 * Flag to indicate if the column is sortable or not.
+		 *  @type boolean
+		 */
+		"bSortable": null,
+	
+		/**
+		 * Flag to indicate if the column is currently visible in the table or not
+		 *  @type boolean
+		 */
+		"bVisible": null,
+	
+		/**
+		 * Store for manual type assignment using the `column.type` option. This
+		 * is held in store so we can manipulate the column's `sType` property.
+		 *  @type string
+		 *  @default null
+		 *  @private
+		 */
+		"_sManualType": null,
+	
+		/**
+		 * Flag to indicate if HTML5 data attributes should be used as the data
+		 * source for filtering or sorting. True is either are.
+		 *  @type boolean
+		 *  @default false
+		 *  @private
+		 */
+		"_bAttrSrc": false,
+	
+		/**
+		 * Developer definable function that is called whenever a cell is created (Ajax source,
+		 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
+		 * allowing you to modify the DOM element (add background colour for example) when the
+		 * element is available.
+		 *  @type function
+		 *  @param {element} nTd The TD node that has been created
+		 *  @param {*} sData The Data for the cell
+		 *  @param {array|object} oData The data for the whole row
+		 *  @param {int} iRow The row index for the aoData data store
+		 *  @default null
+		 */
+		"fnCreatedCell": null,
+	
+		/**
+		 * Function to get data from a cell in a column. You should <b>never</b>
+		 * access data directly through _aData internally in DataTables - always use
+		 * the method attached to this property. It allows mData to function as
+		 * required. This function is automatically assigned by the column
+		 * initialisation method
+		 *  @type function
+		 *  @param {array|object} oData The data array/object for the array
+		 *    (i.e. aoData[]._aData)
+		 *  @param {string} sSpecific The specific data type you want to get -
+		 *    'display', 'type' 'filter' 'sort'
+		 *  @returns {*} The data for the cell from the given row's data
+		 *  @default null
+		 */
+		"fnGetData": null,
+	
+		/**
+		 * Function to set data for a cell in the column. You should <b>never</b>
+		 * set the data directly to _aData internally in DataTables - always use
+		 * this method. It allows mData to function as required. This function
+		 * is automatically assigned by the column initialisation method
+		 *  @type function
+		 *  @param {array|object} oData The data array/object for the array
+		 *    (i.e. aoData[]._aData)
+		 *  @param {*} sValue Value to set
+		 *  @default null
+		 */
+		"fnSetData": null,
+	
+		/**
+		 * Property to read the value for the cells in the column from the data
+		 * source array / object. If null, then the default content is used, if a
+		 * function is given then the return from the function is used.
+		 *  @type function|int|string|null
+		 *  @default null
+		 */
+		"mData": null,
+	
+		/**
+		 * Partner property to mData which is used (only when defined) to get
+		 * the data - i.e. it is basically the same as mData, but without the
+		 * 'set' option, and also the data fed to it is the result from mData.
+		 * This is the rendering method to match the data method of mData.
+		 *  @type function|int|string|null
+		 *  @default null
+		 */
+		"mRender": null,
+	
+		/**
+		 * Unique header TH/TD element for this column - this is what the sorting
+		 * listener is attached to (if sorting is enabled.)
+		 *  @type node
+		 *  @default null
+		 */
+		"nTh": null,
+	
+		/**
+		 * Unique footer TH/TD element for this column (if there is one). Not used
+		 * in DataTables as such, but can be used for plug-ins to reference the
+		 * footer for each column.
+		 *  @type node
+		 *  @default null
+		 */
+		"nTf": null,
+	
+		/**
+		 * The class to apply to all TD elements in the table's TBODY for the column
+		 *  @type string
+		 *  @default null
+		 */
+		"sClass": null,
+	
+		/**
+		 * When DataTables calculates the column widths to assign to each column,
+		 * it finds the longest string in each column and then constructs a
+		 * temporary table and reads the widths from that. The problem with this
+		 * is that "mmm" is much wider then "iiii", but the latter is a longer
+		 * string - thus the calculation can go wrong (doing it properly and putting
+		 * it into an DOM object and measuring that is horribly(!) slow). Thus as
+		 * a "work around" we provide this option. It will append its value to the
+		 * text that is found to be the longest string for the column - i.e. padding.
+		 *  @type string
+		 */
+		"sContentPadding": null,
+	
+		/**
+		 * Allows a default value to be given for a column's data, and will be used
+		 * whenever a null data source is encountered (this can be because mData
+		 * is set to null, or because the data source itself is null).
+		 *  @type string
+		 *  @default null
+		 */
+		"sDefaultContent": null,
+	
+		/**
+		 * Name for the column, allowing reference to the column by name as well as
+		 * by index (needs a lookup to work by name).
+		 *  @type string
+		 */
+		"sName": null,
+	
+		/**
+		 * Custom sorting data type - defines which of the available plug-ins in
+		 * afnSortData the custom sorting will use - if any is defined.
+		 *  @type string
+		 *  @default std
+		 */
+		"sSortDataType": 'std',
+	
+		/**
+		 * Class to be applied to the header element when sorting on this column
+		 *  @type string
+		 *  @default null
+		 */
+		"sSortingClass": null,
+	
+		/**
+		 * Class to be applied to the header element when sorting on this column -
+		 * when jQuery UI theming is used.
+		 *  @type string
+		 *  @default null
+		 */
+		"sSortingClassJUI": null,
+	
+		/**
+		 * Title of the column - what is seen in the TH element (nTh).
+		 *  @type string
+		 */
+		"sTitle": null,
+	
+		/**
+		 * Column sorting and filtering type
+		 *  @type string
+		 *  @default null
+		 */
+		"sType": null,
+	
+		/**
+		 * Width of the column
+		 *  @type string
+		 *  @default null
+		 */
+		"sWidth": null,
+	
+		/**
+		 * Width of the column when it was first "encountered"
+		 *  @type string
+		 *  @default null
+		 */
+		"sWidthOrig": null
+	};
+	
+	
+	/*
+	 * Developer note: The properties of the object below are given in Hungarian
+	 * notation, that was used as the interface for DataTables prior to v1.10, however
+	 * from v1.10 onwards the primary interface is camel case. In order to avoid
+	 * breaking backwards compatibility utterly with this change, the Hungarian
+	 * version is still, internally the primary interface, but is is not documented
+	 * - hence the @name tags in each doc comment. This allows a Javascript function
+	 * to create a map from Hungarian notation to camel case (going the other direction
+	 * would require each property to be listed, which would at around 3K to the size
+	 * of DataTables, while this method is about a 0.5K hit.
+	 *
+	 * Ultimately this does pave the way for Hungarian notation to be dropped
+	 * completely, but that is a massive amount of work and will break current
+	 * installs (therefore is on-hold until v2).
+	 */
+	
+	/**
+	 * Initialisation options that can be given to DataTables at initialisation
+	 * time.
+	 *  @namespace
+	 */
+	DataTable.defaults = {
+		/**
+		 * An array of data to use for the table, passed in at initialisation which
+		 * will be used in preference to any data which is already in the DOM. This is
+		 * particularly useful for constructing tables purely in Javascript, for
+		 * example with a custom Ajax call.
+		 *  @type array
+		 *  @default null
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.data
+		 *
+		 *  @example
+		 *    // Using a 2D array data source
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "data": [
+		 *          ['Trident', 'Internet Explorer 4.0', 'Win 95+', 4, 'X'],
+		 *          ['Trident', 'Internet Explorer 5.0', 'Win 95+', 5, 'C'],
+		 *        ],
+		 *        "columns": [
+		 *          { "title": "Engine" },
+		 *          { "title": "Browser" },
+		 *          { "title": "Platform" },
+		 *          { "title": "Version" },
+		 *          { "title": "Grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using an array of objects as a data source (`data`)
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "data": [
+		 *          {
+		 *            "engine":   "Trident",
+		 *            "browser":  "Internet Explorer 4.0",
+		 *            "platform": "Win 95+",
+		 *            "version":  4,
+		 *            "grade":    "X"
+		 *          },
+		 *          {
+		 *            "engine":   "Trident",
+		 *            "browser":  "Internet Explorer 5.0",
+		 *            "platform": "Win 95+",
+		 *            "version":  5,
+		 *            "grade":    "C"
+		 *          }
+		 *        ],
+		 *        "columns": [
+		 *          { "title": "Engine",   "data": "engine" },
+		 *          { "title": "Browser",  "data": "browser" },
+		 *          { "title": "Platform", "data": "platform" },
+		 *          { "title": "Version",  "data": "version" },
+		 *          { "title": "Grade",    "data": "grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"aaData": null,
+	
+	
+		/**
+		 * If ordering is enabled, then DataTables will perform a first pass sort on
+		 * initialisation. You can define which column(s) the sort is performed
+		 * upon, and the sorting direction, with this variable. The `sorting` array
+		 * should contain an array for each column to be sorted initially containing
+		 * the column's index and a direction string ('asc' or 'desc').
+		 *  @type array
+		 *  @default [[0,'asc']]
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.order
+		 *
+		 *  @example
+		 *    // Sort by 3rd column first, and then 4th column
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "order": [[2,'asc'], [3,'desc']]
+		 *      } );
+		 *    } );
+		 *
+		 *    // No initial sorting
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "order": []
+		 *      } );
+		 *    } );
+		 */
+		"aaSorting": [[0,'asc']],
+	
+	
+		/**
+		 * This parameter is basically identical to the `sorting` parameter, but
+		 * cannot be overridden by user interaction with the table. What this means
+		 * is that you could have a column (visible or hidden) which the sorting
+		 * will always be forced on first - any sorting after that (from the user)
+		 * will then be performed as required. This can be useful for grouping rows
+		 * together.
+		 *  @type array
+		 *  @default null
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.orderFixed
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "orderFixed": [[0,'asc']]
+		 *      } );
+		 *    } )
+		 */
+		"aaSortingFixed": [],
+	
+	
+		/**
+		 * DataTables can be instructed to load data to display in the table from a
+		 * Ajax source. This option defines how that Ajax call is made and where to.
+		 *
+		 * The `ajax` property has three different modes of operation, depending on
+		 * how it is defined. These are:
+		 *
+		 * * `string` - Set the URL from where the data should be loaded from.
+		 * * `object` - Define properties for `jQuery.ajax`.
+		 * * `function` - Custom data get function
+		 *
+		 * `string`
+		 * --------
+		 *
+		 * As a string, the `ajax` property simply defines the URL from which
+		 * DataTables will load data.
+		 *
+		 * `object`
+		 * --------
+		 *
+		 * As an object, the parameters in the object are passed to
+		 * [jQuery.ajax](http://api.jquery.com/jQuery.ajax/) allowing fine control
+		 * of the Ajax request. DataTables has a number of default parameters which
+		 * you can override using this option. Please refer to the jQuery
+		 * documentation for a full description of the options available, although
+		 * the following parameters provide additional options in DataTables or
+		 * require special consideration:
+		 *
+		 * * `data` - As with jQuery, `data` can be provided as an object, but it
+		 *   can also be used as a function to manipulate the data DataTables sends
+		 *   to the server. The function takes a single parameter, an object of
+		 *   parameters with the values that DataTables has readied for sending. An
+		 *   object may be returned which will be merged into the DataTables
+		 *   defaults, or you can add the items to the object that was passed in and
+		 *   not return anything from the function. This supersedes `fnServerParams`
+		 *   from DataTables 1.9-.
+		 *
+		 * * `dataSrc` - By default DataTables will look for the property `data` (or
+		 *   `aaData` for compatibility with DataTables 1.9-) when obtaining data
+		 *   from an Ajax source or for server-side processing - this parameter
+		 *   allows that property to be changed. You can use Javascript dotted
+		 *   object notation to get a data source for multiple levels of nesting, or
+		 *   it my be used as a function. As a function it takes a single parameter,
+		 *   the JSON returned from the server, which can be manipulated as
+		 *   required, with the returned value being that used by DataTables as the
+		 *   data source for the table. This supersedes `sAjaxDataProp` from
+		 *   DataTables 1.9-.
+		 *
+		 * * `success` - Should not be overridden it is used internally in
+		 *   DataTables. To manipulate / transform the data returned by the server
+		 *   use `ajax.dataSrc`, or use `ajax` as a function (see below).
+		 *
+		 * `function`
+		 * ----------
+		 *
+		 * As a function, making the Ajax call is left up to yourself allowing
+		 * complete control of the Ajax request. Indeed, if desired, a method other
+		 * than Ajax could be used to obtain the required data, such as Web storage
+		 * or an AIR database.
+		 *
+		 * The function is given four parameters and no return is required. The
+		 * parameters are:
+		 *
+		 * 1. _object_ - Data to send to the server
+		 * 2. _function_ - Callback function that must be executed when the required
+		 *    data has been obtained. That data should be passed into the callback
+		 *    as the only parameter
+		 * 3. _object_ - DataTables settings object for the table
+		 *
+		 * Note that this supersedes `fnServerData` from DataTables 1.9-.
+		 *
+		 *  @type string|object|function
+		 *  @default null
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.ajax
+		 *  @since 1.10.0
+		 *
+		 * @example
+		 *   // Get JSON data from a file via Ajax.
+		 *   // Note DataTables expects data in the form `{ data: [ ...data... ] }` by default).
+		 *   $('#example').dataTable( {
+		 *     "ajax": "data.json"
+		 *   } );
+		 *
+		 * @example
+		 *   // Get JSON data from a file via Ajax, using `dataSrc` to change
+		 *   // `data` to `tableData` (i.e. `{ tableData: [ ...data... ] }`)
+		 *   $('#example').dataTable( {
+		 *     "ajax": {
+		 *       "url": "data.json",
+		 *       "dataSrc": "tableData"
+		 *     }
+		 *   } );
+		 *
+		 * @example
+		 *   // Get JSON data from a file via Ajax, using `dataSrc` to read data
+		 *   // from a plain array rather than an array in an object
+		 *   $('#example').dataTable( {
+		 *     "ajax": {
+		 *       "url": "data.json",
+		 *       "dataSrc": ""
+		 *     }
+		 *   } );
+		 *
+		 * @example
+		 *   // Manipulate the data returned from the server - add a link to data
+		 *   // (note this can, should, be done using `render` for the column - this
+		 *   // is just a simple example of how the data can be manipulated).
+		 *   $('#example').dataTable( {
+		 *     "ajax": {
+		 *       "url": "data.json",
+		 *       "dataSrc": function ( json ) {
+		 *         for ( var i=0, ien=json.length ; i<ien ; i++ ) {
+		 *           json[i][0] = '<a href="/message/'+json[i][0]+'>View message</a>';
+		 *         }
+		 *         return json;
+		 *       }
+		 *     }
+		 *   } );
+		 *
+		 * @example
+		 *   // Add data to the request
+		 *   $('#example').dataTable( {
+		 *     "ajax": {
+		 *       "url": "data.json",
+		 *       "data": function ( d ) {
+		 *         return {
+		 *           "extra_search": $('#extra').val()
+		 *         };
+		 *       }
+		 *     }
+		 *   } );
+		 *
+		 * @example
+		 *   // Send request as POST
+		 *   $('#example').dataTable( {
+		 *     "ajax": {
+		 *       "url": "data.json",
+		 *       "type": "POST"
+		 *     }
+		 *   } );
+		 *
+		 * @example
+		 *   // Get the data from localStorage (could interface with a form for
+		 *   // adding, editing and removing rows).
+		 *   $('#example').dataTable( {
+		 *     "ajax": function (data, callback, settings) {
+		 *       callback(
+		 *         JSON.parse( localStorage.getItem('dataTablesData') )
+		 *       );
+		 *     }
+		 *   } );
+		 */
+		"ajax": null,
+	
+	
+		/**
+		 * This parameter allows you to readily specify the entries in the length drop
+		 * down menu that DataTables shows when pagination is enabled. It can be
+		 * either a 1D array of options which will be used for both the displayed
+		 * option and the value, or a 2D array which will use the array in the first
+		 * position as the value, and the array in the second position as the
+		 * displayed options (useful for language strings such as 'All').
+		 *
+		 * Note that the `pageLength` property will be automatically set to the
+		 * first value given in this array, unless `pageLength` is also provided.
+		 *  @type array
+		 *  @default [ 10, 25, 50, 100 ]
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.lengthMenu
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "lengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]]
+		 *      } );
+		 *    } );
+		 */
+		"aLengthMenu": [ 10, 25, 50, 100 ],
+	
+	
+		/**
+		 * The `columns` option in the initialisation parameter allows you to define
+		 * details about the way individual columns behave. For a full list of
+		 * column options that can be set, please see
+		 * {@link DataTable.defaults.column}. Note that if you use `columns` to
+		 * define your columns, you must have an entry in the array for every single
+		 * column that you have in your table (these can be null if you don't which
+		 * to specify any options).
+		 *  @member
+		 *
+		 *  @name DataTable.defaults.column
+		 */
+		"aoColumns": null,
+	
+		/**
+		 * Very similar to `columns`, `columnDefs` allows you to target a specific
+		 * column, multiple columns, or all columns, using the `targets` property of
+		 * each object in the array. This allows great flexibility when creating
+		 * tables, as the `columnDefs` arrays can be of any length, targeting the
+		 * columns you specifically want. `columnDefs` may use any of the column
+		 * options available: {@link DataTable.defaults.column}, but it _must_
+		 * have `targets` defined in each object in the array. Values in the `targets`
+		 * array may be:
+		 *   <ul>
+		 *     <li>a string - class name will be matched on the TH for the column</li>
+		 *     <li>0 or a positive integer - column index counting from the left</li>
+		 *     <li>a negative integer - column index counting from the right</li>
+		 *     <li>the string "_all" - all columns (i.e. assign a default)</li>
+		 *   </ul>
+		 *  @member
+		 *
+		 *  @name DataTable.defaults.columnDefs
+		 */
+		"aoColumnDefs": null,
+	
+	
+		/**
+		 * Basically the same as `search`, this parameter defines the individual column
+		 * filtering state at initialisation time. The array must be of the same size
+		 * as the number of columns, and each element be an object with the parameters
+		 * `search` and `escapeRegex` (the latter is optional). 'null' is also
+		 * accepted and the default will be used.
+		 *  @type array
+		 *  @default []
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.searchCols
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "searchCols": [
+		 *          null,
+		 *          { "search": "My filter" },
+		 *          null,
+		 *          { "search": "^[0-9]", "escapeRegex": false }
+		 *        ]
+		 *      } );
+		 *    } )
+		 */
+		"aoSearchCols": [],
+	
+	
+		/**
+		 * An array of CSS classes that should be applied to displayed rows. This
+		 * array may be of any length, and DataTables will apply each class
+		 * sequentially, looping when required.
+		 *  @type array
+		 *  @default null <i>Will take the values determined by the `oClasses.stripe*`
+		 *    options</i>
+		 *
+		 *  @dtopt Option
+		 *  @name DataTable.defaults.stripeClasses
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stripeClasses": [ 'strip1', 'strip2', 'strip3' ]
+		 *      } );
+		 *    } )
+		 */
+		"asStripeClasses": null,
+	
+	
+		/**
+		 * Enable or disable automatic column width calculation. This can be disabled
+		 * as an optimisation (it takes some time to calculate the widths) if the
+		 * tables widths are passed in using `columns`.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.autoWidth
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "autoWidth": false
+		 *      } );
+		 *    } );
+		 */
+		"bAutoWidth": true,
+	
+	
+		/**
+		 * Deferred rendering can provide DataTables with a huge speed boost when you
+		 * are using an Ajax or JS data source for the table. This option, when set to
+		 * true, will cause DataTables to defer the creation of the table elements for
+		 * each row until they are needed for a draw - saving a significant amount of
+		 * time.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.deferRender
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "ajax": "sources/arrays.txt",
+		 *        "deferRender": true
+		 *      } );
+		 *    } );
+		 */
+		"bDeferRender": false,
+	
+	
+		/**
+		 * Replace a DataTable which matches the given selector and replace it with
+		 * one which has the properties of the new initialisation object passed. If no
+		 * table matches the selector, then the new DataTable will be constructed as
+		 * per normal.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.destroy
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "srollY": "200px",
+		 *        "paginate": false
+		 *      } );
+		 *
+		 *      // Some time later....
+		 *      $('#example').dataTable( {
+		 *        "filter": false,
+		 *        "destroy": true
+		 *      } );
+		 *    } );
+		 */
+		"bDestroy": false,
+	
+	
+		/**
+		 * Enable or disable filtering of data. Filtering in DataTables is "smart" in
+		 * that it allows the end user to input multiple words (space separated) and
+		 * will match a row containing those words, even if not in the order that was
+		 * specified (this allow matching across multiple columns). Note that if you
+		 * wish to use filtering in DataTables this must remain 'true' - to remove the
+		 * default filtering input box and retain filtering abilities, please use
+		 * {@link DataTable.defaults.dom}.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.searching
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "searching": false
+		 *      } );
+		 *    } );
+		 */
+		"bFilter": true,
+	
+	
+		/**
+		 * Enable or disable the table information display. This shows information
+		 * about the data that is currently visible on the page, including information
+		 * about filtered data if that action is being performed.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.info
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "info": false
+		 *      } );
+		 *    } );
+		 */
+		"bInfo": true,
+	
+	
+		/**
+		 * Enable jQuery UI ThemeRoller support (required as ThemeRoller requires some
+		 * slightly different and additional mark-up from what DataTables has
+		 * traditionally used).
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.jQueryUI
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "jQueryUI": true
+		 *      } );
+		 *    } );
+		 */
+		"bJQueryUI": false,
+	
+	
+		/**
+		 * Allows the end user to select the size of a formatted page from a select
+		 * menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`).
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.lengthChange
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "lengthChange": false
+		 *      } );
+		 *    } );
+		 */
+		"bLengthChange": true,
+	
+	
+		/**
+		 * Enable or disable pagination.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.paging
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "paging": false
+		 *      } );
+		 *    } );
+		 */
+		"bPaginate": true,
+	
+	
+		/**
+		 * Enable or disable the display of a 'processing' indicator when the table is
+		 * being processed (e.g. a sort). This is particularly useful for tables with
+		 * large amounts of data where it can take a noticeable amount of time to sort
+		 * the entries.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.processing
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "processing": true
+		 *      } );
+		 *    } );
+		 */
+		"bProcessing": false,
+	
+	
+		/**
+		 * Retrieve the DataTables object for the given selector. Note that if the
+		 * table has already been initialised, this parameter will cause DataTables
+		 * to simply return the object that has already been set up - it will not take
+		 * account of any changes you might have made to the initialisation object
+		 * passed to DataTables (setting this parameter to true is an acknowledgement
+		 * that you understand this). `destroy` can be used to reinitialise a table if
+		 * you need.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.retrieve
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      initTable();
+		 *      tableActions();
+		 *    } );
+		 *
+		 *    function initTable ()
+		 *    {
+		 *      return $('#example').dataTable( {
+		 *        "scrollY": "200px",
+		 *        "paginate": false,
+		 *        "retrieve": true
+		 *      } );
+		 *    }
+		 *
+		 *    function tableActions ()
+		 *    {
+		 *      var table = initTable();
+		 *      // perform API operations with oTable
+		 *    }
+		 */
+		"bRetrieve": false,
+	
+	
+		/**
+		 * When vertical (y) scrolling is enabled, DataTables will force the height of
+		 * the table's viewport to the given height at all times (useful for layout).
+		 * However, this can look odd when filtering data down to a small data set,
+		 * and the footer is left "floating" further down. This parameter (when
+		 * enabled) will cause DataTables to collapse the table's viewport down when
+		 * the result set will fit within the given Y height.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.scrollCollapse
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "scrollY": "200",
+		 *        "scrollCollapse": true
+		 *      } );
+		 *    } );
+		 */
+		"bScrollCollapse": false,
+	
+	
+		/**
+		 * Configure DataTables to use server-side processing. Note that the
+		 * `ajax` parameter must also be given in order to give DataTables a
+		 * source to obtain the required data for each draw.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Features
+		 *  @dtopt Server-side
+		 *  @name DataTable.defaults.serverSide
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "serverSide": true,
+		 *        "ajax": "xhr.php"
+		 *      } );
+		 *    } );
+		 */
+		"bServerSide": false,
+	
+	
+		/**
+		 * Enable or disable sorting of columns. Sorting of individual columns can be
+		 * disabled by the `sortable` option for each column.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.ordering
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "ordering": false
+		 *      } );
+		 *    } );
+		 */
+		"bSort": true,
+	
+	
+		/**
+		 * Enable or display DataTables' ability to sort multiple columns at the
+		 * same time (activated by shift-click by the user).
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.orderMulti
+		 *
+		 *  @example
+		 *    // Disable multiple column sorting ability
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "orderMulti": false
+		 *      } );
+		 *    } );
+		 */
+		"bSortMulti": true,
+	
+	
+		/**
+		 * Allows control over whether DataTables should use the top (true) unique
+		 * cell that is found for a single column, or the bottom (false - default).
+		 * This is useful when using complex headers.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.orderCellsTop
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "orderCellsTop": true
+		 *      } );
+		 *    } );
+		 */
+		"bSortCellsTop": false,
+	
+	
+		/**
+		 * Enable or disable the addition of the classes `sorting\_1`, `sorting\_2` and
+		 * `sorting\_3` to the columns which are currently being sorted on. This is
+		 * presented as a feature switch as it can increase processing time (while
+		 * classes are removed and added) so for large data sets you might want to
+		 * turn this off.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.orderClasses
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "orderClasses": false
+		 *      } );
+		 *    } );
+		 */
+		"bSortClasses": true,
+	
+	
+		/**
+		 * Enable or disable state saving. When enabled HTML5 `localStorage` will be
+		 * used to save table display information such as pagination information,
+		 * display length, filtering and sorting. As such when the end user reloads
+		 * the page the display display will match what thy had previously set up.
+		 *
+		 * Due to the use of `localStorage` the default state saving is not supported
+		 * in IE6 or 7. If state saving is required in those browsers, use
+		 * `stateSaveCallback` to provide a storage solution such as cookies.
+		 *  @type boolean
+		 *  @default false
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.stateSave
+		 *
+		 *  @example
+		 *    $(document).ready( function () {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true
+		 *      } );
+		 *    } );
+		 */
+		"bStateSave": false,
+	
+	
+		/**
+		 * This function is called when a TR element is created (and all TD child
+		 * elements have been inserted), or registered if using a DOM source, allowing
+		 * manipulation of the TR element (adding classes etc).
+		 *  @type function
+		 *  @param {node} row "TR" element for the current row
+		 *  @param {array} data Raw data array for this row
+		 *  @param {int} dataIndex The index of this row in the internal aoData array
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.createdRow
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "createdRow": function( row, data, dataIndex ) {
+		 *          // Bold the grade for all 'A' grade browsers
+		 *          if ( data[4] == "A" )
+		 *          {
+		 *            $('td:eq(4)', row).html( '<b>A</b>' );
+		 *          }
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnCreatedRow": null,
+	
+	
+		/**
+		 * This function is called on every 'draw' event, and allows you to
+		 * dynamically modify any aspect you want about the created DOM.
+		 *  @type function
+		 *  @param {object} settings DataTables settings object
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.drawCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "drawCallback": function( settings ) {
+		 *          alert( 'DataTables has redrawn the table' );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnDrawCallback": null,
+	
+	
+		/**
+		 * Identical to fnHeaderCallback() but for the table footer this function
+		 * allows you to modify the table footer on every 'draw' event.
+		 *  @type function
+		 *  @param {node} foot "TR" element for the footer
+		 *  @param {array} data Full table data (as derived from the original HTML)
+		 *  @param {int} start Index for the current display starting point in the
+		 *    display array
+		 *  @param {int} end Index for the current display ending point in the
+		 *    display array
+		 *  @param {array int} display Index array to translate the visual position
+		 *    to the full data array
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.footerCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "footerCallback": function( tfoot, data, start, end, display ) {
+		 *          tfoot.getElementsByTagName('th')[0].innerHTML = "Starting index is "+start;
+		 *        }
+		 *      } );
+		 *    } )
+		 */
+		"fnFooterCallback": null,
+	
+	
+		/**
+		 * When rendering large numbers in the information element for the table
+		 * (i.e. "Showing 1 to 10 of 57 entries") DataTables will render large numbers
+		 * to have a comma separator for the 'thousands' units (e.g. 1 million is
+		 * rendered as "1,000,000") to help readability for the end user. This
+		 * function will override the default method DataTables uses.
+		 *  @type function
+		 *  @member
+		 *  @param {int} toFormat number to be formatted
+		 *  @returns {string} formatted string for DataTables to show the number
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.formatNumber
+		 *
+		 *  @example
+		 *    // Format a number using a single quote for the separator (note that
+		 *    // this can also be done with the language.thousands option)
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "formatNumber": function ( toFormat ) {
+		 *          return toFormat.toString().replace(
+		 *            /\B(?=(\d{3})+(?!\d))/g, "'"
+		 *          );
+		 *        };
+		 *      } );
+		 *    } );
+		 */
+		"fnFormatNumber": function ( toFormat ) {
+			return toFormat.toString().replace(
+				/\B(?=(\d{3})+(?!\d))/g,
+				this.oLanguage.sThousands
+			);
+		},
+	
+	
+		/**
+		 * This function is called on every 'draw' event, and allows you to
+		 * dynamically modify the header row. This can be used to calculate and
+		 * display useful information about the table.
+		 *  @type function
+		 *  @param {node} head "TR" element for the header
+		 *  @param {array} data Full table data (as derived from the original HTML)
+		 *  @param {int} start Index for the current display starting point in the
+		 *    display array
+		 *  @param {int} end Index for the current display ending point in the
+		 *    display array
+		 *  @param {array int} display Index array to translate the visual position
+		 *    to the full data array
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.headerCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "fheaderCallback": function( head, data, start, end, display ) {
+		 *          head.getElementsByTagName('th')[0].innerHTML = "Displaying "+(end-start)+" records";
+		 *        }
+		 *      } );
+		 *    } )
+		 */
+		"fnHeaderCallback": null,
+	
+	
+		/**
+		 * The information element can be used to convey information about the current
+		 * state of the table. Although the internationalisation options presented by
+		 * DataTables are quite capable of dealing with most customisations, there may
+		 * be times where you wish to customise the string further. This callback
+		 * allows you to do exactly that.
+		 *  @type function
+		 *  @param {object} oSettings DataTables settings object
+		 *  @param {int} start Starting position in data for the draw
+		 *  @param {int} end End position in data for the draw
+		 *  @param {int} max Total number of rows in the table (regardless of
+		 *    filtering)
+		 *  @param {int} total Total number of rows in the data set, after filtering
+		 *  @param {string} pre The string that DataTables has formatted using it's
+		 *    own rules
+		 *  @returns {string} The string to be displayed in the information element.
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.infoCallback
+		 *
+		 *  @example
+		 *    $('#example').dataTable( {
+		 *      "infoCallback": function( settings, start, end, max, total, pre ) {
+		 *        return start +" to "+ end;
+		 *      }
+		 *    } );
+		 */
+		"fnInfoCallback": null,
+	
+	
+		/**
+		 * Called when the table has been initialised. Normally DataTables will
+		 * initialise sequentially and there will be no need for this function,
+		 * however, this does not hold true when using external language information
+		 * since that is obtained using an async XHR call.
+		 *  @type function
+		 *  @param {object} settings DataTables settings object
+		 *  @param {object} json The JSON object request from the server - only
+		 *    present if client-side Ajax sourced data is used
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.initComplete
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "initComplete": function(settings, json) {
+		 *          alert( 'DataTables has finished its initialisation.' );
+		 *        }
+		 *      } );
+		 *    } )
+		 */
+		"fnInitComplete": null,
+	
+	
+		/**
+		 * Called at the very start of each table draw and can be used to cancel the
+		 * draw by returning false, any other return (including undefined) results in
+		 * the full draw occurring).
+		 *  @type function
+		 *  @param {object} settings DataTables settings object
+		 *  @returns {boolean} False will cancel the draw, anything else (including no
+		 *    return) will allow it to complete.
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.preDrawCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "preDrawCallback": function( settings ) {
+		 *          if ( $('#test').val() == 1 ) {
+		 *            return false;
+		 *          }
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnPreDrawCallback": null,
+	
+	
+		/**
+		 * This function allows you to 'post process' each row after it have been
+		 * generated for each table draw, but before it is rendered on screen. This
+		 * function might be used for setting the row class name etc.
+		 *  @type function
+		 *  @param {node} row "TR" element for the current row
+		 *  @param {array} data Raw data array for this row
+		 *  @param {int} displayIndex The display index for the current table draw
+		 *  @param {int} displayIndexFull The index of the data in the full list of
+		 *    rows (after filtering)
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.rowCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "rowCallback": function( row, data, displayIndex, displayIndexFull ) {
+		 *          // Bold the grade for all 'A' grade browsers
+		 *          if ( data[4] == "A" ) {
+		 *            $('td:eq(4)', row).html( '<b>A</b>' );
+		 *          }
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnRowCallback": null,
+	
+	
+		/**
+		 * __Deprecated__ The functionality provided by this parameter has now been
+		 * superseded by that provided through `ajax`, which should be used instead.
+		 *
+		 * This parameter allows you to override the default function which obtains
+		 * the data from the server so something more suitable for your application.
+		 * For example you could use POST data, or pull information from a Gears or
+		 * AIR database.
+		 *  @type function
+		 *  @member
+		 *  @param {string} source HTTP source to obtain the data from (`ajax`)
+		 *  @param {array} data A key/value pair object containing the data to send
+		 *    to the server
+		 *  @param {function} callback to be called on completion of the data get
+		 *    process that will draw the data on the page.
+		 *  @param {object} settings DataTables settings object
+		 *
+		 *  @dtopt Callbacks
+		 *  @dtopt Server-side
+		 *  @name DataTable.defaults.serverData
+		 *
+		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
+		 */
+		"fnServerData": null,
+	
+	
+		/**
+		 * __Deprecated__ The functionality provided by this parameter has now been
+		 * superseded by that provided through `ajax`, which should be used instead.
+		 *
+		 *  It is often useful to send extra data to the server when making an Ajax
+		 * request - for example custom filtering information, and this callback
+		 * function makes it trivial to send extra information to the server. The
+		 * passed in parameter is the data set that has been constructed by
+		 * DataTables, and you can add to this or modify it as you require.
+		 *  @type function
+		 *  @param {array} data Data array (array of objects which are name/value
+		 *    pairs) that has been constructed by DataTables and will be sent to the
+		 *    server. In the case of Ajax sourced data with server-side processing
+		 *    this will be an empty array, for server-side processing there will be a
+		 *    significant number of parameters!
+		 *  @returns {undefined} Ensure that you modify the data array passed in,
+		 *    as this is passed by reference.
+		 *
+		 *  @dtopt Callbacks
+		 *  @dtopt Server-side
+		 *  @name DataTable.defaults.serverParams
+		 *
+		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
+		 */
+		"fnServerParams": null,
+	
+	
+		/**
+		 * Load the table state. With this function you can define from where, and how, the
+		 * state of a table is loaded. By default DataTables will load from `localStorage`
+		 * but you might wish to use a server-side database or cookies.
+		 *  @type function
+		 *  @member
+		 *  @param {object} settings DataTables settings object
+		 *  @return {object} The DataTables state object to be loaded
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.stateLoadCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true,
+		 *        "stateLoadCallback": function (settings) {
+		 *          var o;
+		 *
+		 *          // Send an Ajax request to the server to get the data. Note that
+		 *          // this is a synchronous request.
+		 *          $.ajax( {
+		 *            "url": "/state_load",
+		 *            "async": false,
+		 *            "dataType": "json",
+		 *            "success": function (json) {
+		 *              o = json;
+		 *            }
+		 *          } );
+		 *
+		 *          return o;
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateLoadCallback": function ( settings ) {
+			try {
+				return JSON.parse(
+					(settings.iStateDuration === -1 ? sessionStorage : localStorage).getItem(
+						'DataTables_'+settings.sInstance+'_'+location.pathname
+					)
+				);
+			} catch (e) {}
+		},
+	
+	
+		/**
+		 * Callback which allows modification of the saved state prior to loading that state.
+		 * This callback is called when the table is loading state from the stored data, but
+		 * prior to the settings object being modified by the saved state. Note that for
+		 * plug-in authors, you should use the `stateLoadParams` event to load parameters for
+		 * a plug-in.
+		 *  @type function
+		 *  @param {object} settings DataTables settings object
+		 *  @param {object} data The state object that is to be loaded
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.stateLoadParams
+		 *
+		 *  @example
+		 *    // Remove a saved filter, so filtering is never loaded
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true,
+		 *        "stateLoadParams": function (settings, data) {
+		 *          data.oSearch.sSearch = "";
+		 *        }
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Disallow state loading by returning false
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true,
+		 *        "stateLoadParams": function (settings, data) {
+		 *          return false;
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateLoadParams": null,
+	
+	
+		/**
+		 * Callback that is called when the state has been loaded from the state saving method
+		 * and the DataTables settings object has been modified as a result of the loaded state.
+		 *  @type function
+		 *  @param {object} settings DataTables settings object
+		 *  @param {object} data The state object that was loaded
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.stateLoaded
+		 *
+		 *  @example
+		 *    // Show an alert with the filtering value that was saved
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true,
+		 *        "stateLoaded": function (settings, data) {
+		 *          alert( 'Saved filter was: '+data.oSearch.sSearch );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateLoaded": null,
+	
+	
+		/**
+		 * Save the table state. This function allows you to define where and how the state
+		 * information for the table is stored By default DataTables will use `localStorage`
+		 * but you might wish to use a server-side database or cookies.
+		 *  @type function
+		 *  @member
+		 *  @param {object} settings DataTables settings object
+		 *  @param {object} data The state object to be saved
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.stateSaveCallback
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true,
+		 *        "stateSaveCallback": function (settings, data) {
+		 *          // Send an Ajax request to the server with the state object
+		 *          $.ajax( {
+		 *            "url": "/state_save",
+		 *            "data": data,
+		 *            "dataType": "json",
+		 *            "method": "POST"
+		 *            "success": function () {}
+		 *          } );
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateSaveCallback": function ( settings, data ) {
+			try {
+				(settings.iStateDuration === -1 ? sessionStorage : localStorage).setItem(
+					'DataTables_'+settings.sInstance+'_'+location.pathname,
+					JSON.stringify( data )
+				);
+			} catch (e) {}
+		},
+	
+	
+		/**
+		 * Callback which allows modification of the state to be saved. Called when the table
+		 * has changed state a new state save is required. This method allows modification of
+		 * the state saving object prior to actually doing the save, including addition or
+		 * other state properties or modification. Note that for plug-in authors, you should
+		 * use the `stateSaveParams` event to save parameters for a plug-in.
+		 *  @type function
+		 *  @param {object} settings DataTables settings object
+		 *  @param {object} data The state object to be saved
+		 *
+		 *  @dtopt Callbacks
+		 *  @name DataTable.defaults.stateSaveParams
+		 *
+		 *  @example
+		 *    // Remove a saved filter, so filtering is never saved
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateSave": true,
+		 *        "stateSaveParams": function (settings, data) {
+		 *          data.oSearch.sSearch = "";
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"fnStateSaveParams": null,
+	
+	
+		/**
+		 * Duration for which the saved state information is considered valid. After this period
+		 * has elapsed the state will be returned to the default.
+		 * Value is given in seconds.
+		 *  @type int
+		 *  @default 7200 <i>(2 hours)</i>
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.stateDuration
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "stateDuration": 60*60*24; // 1 day
+		 *      } );
+		 *    } )
+		 */
+		"iStateDuration": 7200,
+	
+	
+		/**
+		 * When enabled DataTables will not make a request to the server for the first
+		 * page draw - rather it will use the data already on the page (no sorting etc
+		 * will be applied to it), thus saving on an XHR at load time. `deferLoading`
+		 * is used to indicate that deferred loading is required, but it is also used
+		 * to tell DataTables how many records there are in the full table (allowing
+		 * the information element and pagination to be displayed correctly). In the case
+		 * where a filtering is applied to the table on initial load, this can be
+		 * indicated by giving the parameter as an array, where the first element is
+		 * the number of records available after filtering and the second element is the
+		 * number of records without filtering (allowing the table information element
+		 * to be shown correctly).
+		 *  @type int | array
+		 *  @default null
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.deferLoading
+		 *
+		 *  @example
+		 *    // 57 records available in the table, no filtering applied
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "serverSide": true,
+		 *        "ajax": "scripts/server_processing.php",
+		 *        "deferLoading": 57
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // 57 records after filtering, 100 without filtering (an initial filter applied)
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "serverSide": true,
+		 *        "ajax": "scripts/server_processing.php",
+		 *        "deferLoading": [ 57, 100 ],
+		 *        "search": {
+		 *          "search": "my_filter"
+		 *        }
+		 *      } );
+		 *    } );
+		 */
+		"iDeferLoading": null,
+	
+	
+		/**
+		 * Number of rows to display on a single page when using pagination. If
+		 * feature enabled (`lengthChange`) then the end user will be able to override
+		 * this to a custom setting using a pop-up menu.
+		 *  @type int
+		 *  @default 10
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.pageLength
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "pageLength": 50
+		 *      } );
+		 *    } )
+		 */
+		"iDisplayLength": 10,
+	
+	
+		/**
+		 * Define the starting point for data display when using DataTables with
+		 * pagination. Note that this parameter is the number of records, rather than
+		 * the page number, so if you have 10 records per page and want to start on
+		 * the third page, it should be "20".
+		 *  @type int
+		 *  @default 0
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.displayStart
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "displayStart": 20
+		 *      } );
+		 *    } )
+		 */
+		"iDisplayStart": 0,
+	
+	
+		/**
+		 * By default DataTables allows keyboard navigation of the table (sorting, paging,
+		 * and filtering) by adding a `tabindex` attribute to the required elements. This
+		 * allows you to tab through the controls and press the enter key to activate them.
+		 * The tabindex is default 0, meaning that the tab follows the flow of the document.
+		 * You can overrule this using this parameter if you wish. Use a value of -1 to
+		 * disable built-in keyboard navigation.
+		 *  @type int
+		 *  @default 0
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.tabIndex
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "tabIndex": 1
+		 *      } );
+		 *    } );
+		 */
+		"iTabIndex": 0,
+	
+	
+		/**
+		 * Classes that DataTables assigns to the various components and features
+		 * that it adds to the HTML table. This allows classes to be configured
+		 * during initialisation in addition to through the static
+		 * {@link DataTable.ext.oStdClasses} object).
+		 *  @namespace
+		 *  @name DataTable.defaults.classes
+		 */
+		"oClasses": {},
+	
+	
+		/**
+		 * All strings that DataTables uses in the user interface that it creates
+		 * are defined in this object, allowing you to modified them individually or
+		 * completely replace them all as required.
+		 *  @namespace
+		 *  @name DataTable.defaults.language
+		 */
+		"oLanguage": {
+			/**
+			 * Strings that are used for WAI-ARIA labels and controls only (these are not
+			 * actually visible on the page, but will be read by screenreaders, and thus
+			 * must be internationalised as well).
+			 *  @namespace
+			 *  @name DataTable.defaults.language.aria
+			 */
+			"oAria": {
+				/**
+				 * ARIA label that is added to the table headers when the column may be
+				 * sorted ascending by activing the column (click or return when focused).
+				 * Note that the column header is prefixed to this string.
+				 *  @type string
+				 *  @default : activate to sort column ascending
+				 *
+				 *  @dtopt Language
+				 *  @name DataTable.defaults.language.aria.sortAscending
+				 *
+				 *  @example
+				 *    $(document).ready( function() {
+				 *      $('#example').dataTable( {
+				 *        "language": {
+				 *          "aria": {
+				 *            "sortAscending": " - click/return to sort ascending"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sSortAscending": ": activate to sort column ascending",
+	
+				/**
+				 * ARIA label that is added to the table headers when the column may be
+				 * sorted descending by activing the column (click or return when focused).
+				 * Note that the column header is prefixed to this string.
+				 *  @type string
+				 *  @default : activate to sort column ascending
+				 *
+				 *  @dtopt Language
+				 *  @name DataTable.defaults.language.aria.sortDescending
+				 *
+				 *  @example
+				 *    $(document).ready( function() {
+				 *      $('#example').dataTable( {
+				 *        "language": {
+				 *          "aria": {
+				 *            "sortDescending": " - click/return to sort descending"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sSortDescending": ": activate to sort column descending"
+			},
+	
+			/**
+			 * Pagination string used by DataTables for the built-in pagination
+			 * control types.
+			 *  @namespace
+			 *  @name DataTable.defaults.language.paginate
+			 */
+			"oPaginate": {
+				/**
+				 * Text to use when using the 'full_numbers' type of pagination for the
+				 * button to take the user to the first page.
+				 *  @type string
+				 *  @default First
+				 *
+				 *  @dtopt Language
+				 *  @name DataTable.defaults.language.paginate.first
+				 *
+				 *  @example
+				 *    $(document).ready( function() {
+				 *      $('#example').dataTable( {
+				 *        "language": {
+				 *          "paginate": {
+				 *            "first": "First page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sFirst": "First",
+	
+	
+				/**
+				 * Text to use when using the 'full_numbers' type of pagination for the
+				 * button to take the user to the last page.
+				 *  @type string
+				 *  @default Last
+				 *
+				 *  @dtopt Language
+				 *  @name DataTable.defaults.language.paginate.last
+				 *
+				 *  @example
+				 *    $(document).ready( function() {
+				 *      $('#example').dataTable( {
+				 *        "language": {
+				 *          "paginate": {
+				 *            "last": "Last page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sLast": "Last",
+	
+	
+				/**
+				 * Text to use for the 'next' pagination button (to take the user to the
+				 * next page).
+				 *  @type string
+				 *  @default Next
+				 *
+				 *  @dtopt Language
+				 *  @name DataTable.defaults.language.paginate.next
+				 *
+				 *  @example
+				 *    $(document).ready( function() {
+				 *      $('#example').dataTable( {
+				 *        "language": {
+				 *          "paginate": {
+				 *            "next": "Next page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sNext": "Next",
+	
+	
+				/**
+				 * Text to use for the 'previous' pagination button (to take the user to
+				 * the previous page).
+				 *  @type string
+				 *  @default Previous
+				 *
+				 *  @dtopt Language
+				 *  @name DataTable.defaults.language.paginate.previous
+				 *
+				 *  @example
+				 *    $(document).ready( function() {
+				 *      $('#example').dataTable( {
+				 *        "language": {
+				 *          "paginate": {
+				 *            "previous": "Previous page"
+				 *          }
+				 *        }
+				 *      } );
+				 *    } );
+				 */
+				"sPrevious": "Previous"
+			},
+	
+			/**
+			 * This string is shown in preference to `zeroRecords` when the table is
+			 * empty of data (regardless of filtering). Note that this is an optional
+			 * parameter - if it is not given, the value of `zeroRecords` will be used
+			 * instead (either the default or given value).
+			 *  @type string
+			 *  @default No data available in table
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.emptyTable
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "emptyTable": "No data available in table"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sEmptyTable": "No data available in table",
+	
+	
+			/**
+			 * This string gives information to the end user about the information
+			 * that is current on display on the page. The following tokens can be
+			 * used in the string and will be dynamically replaced as the table
+			 * display updates. This tokens can be placed anywhere in the string, or
+			 * removed as needed by the language requires:
+			 *
+			 * * `\_START\_` - Display index of the first record on the current page
+			 * * `\_END\_` - Display index of the last record on the current page
+			 * * `\_TOTAL\_` - Number of records in the table after filtering
+			 * * `\_MAX\_` - Number of records in the table without filtering
+			 * * `\_PAGE\_` - Current page number
+			 * * `\_PAGES\_` - Total number of pages of data in the table
+			 *
+			 *  @type string
+			 *  @default Showing _START_ to _END_ of _TOTAL_ entries
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.info
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "info": "Showing page _PAGE_ of _PAGES_"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
+	
+	
+			/**
+			 * Display information string for when the table is empty. Typically the
+			 * format of this string should match `info`.
+			 *  @type string
+			 *  @default Showing 0 to 0 of 0 entries
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.infoEmpty
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "infoEmpty": "No entries to show"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoEmpty": "Showing 0 to 0 of 0 entries",
+	
+	
+			/**
+			 * When a user filters the information in a table, this string is appended
+			 * to the information (`info`) to give an idea of how strong the filtering
+			 * is. The variable _MAX_ is dynamically updated.
+			 *  @type string
+			 *  @default (filtered from _MAX_ total entries)
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.infoFiltered
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "infoFiltered": " - filtering from _MAX_ records"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoFiltered": "(filtered from _MAX_ total entries)",
+	
+	
+			/**
+			 * If can be useful to append extra information to the info string at times,
+			 * and this variable does exactly that. This information will be appended to
+			 * the `info` (`infoEmpty` and `infoFiltered` in whatever combination they are
+			 * being used) at all times.
+			 *  @type string
+			 *  @default <i>Empty string</i>
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.infoPostFix
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "infoPostFix": "All records shown are derived from real information."
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sInfoPostFix": "",
+	
+	
+			/**
+			 * This decimal place operator is a little different from the other
+			 * language options since DataTables doesn't output floating point
+			 * numbers, so it won't ever use this for display of a number. Rather,
+			 * what this parameter does is modify the sort methods of the table so
+			 * that numbers which are in a format which has a character other than
+			 * a period (`.`) as a decimal place will be sorted numerically.
+			 *
+			 * Note that numbers with different decimal places cannot be shown in
+			 * the same table and still be sortable, the table must be consistent.
+			 * However, multiple different tables on the page can use different
+			 * decimal place characters.
+			 *  @type string
+			 *  @default 
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.decimal
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "decimal": ","
+			 *          "thousands": "."
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sDecimal": "",
+	
+	
+			/**
+			 * DataTables has a build in number formatter (`formatNumber`) which is
+			 * used to format large numbers that are used in the table information.
+			 * By default a comma is used, but this can be trivially changed to any
+			 * character you wish with this parameter.
+			 *  @type string
+			 *  @default ,
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.thousands
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "thousands": "'"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sThousands": ",",
+	
+	
+			/**
+			 * Detail the action that will be taken when the drop down menu for the
+			 * pagination length option is changed. The '_MENU_' variable is replaced
+			 * with a default select list of 10, 25, 50 and 100, and can be replaced
+			 * with a custom select box if required.
+			 *  @type string
+			 *  @default Show _MENU_ entries
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.lengthMenu
+			 *
+			 *  @example
+			 *    // Language change only
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "lengthMenu": "Display _MENU_ records"
+			 *        }
+			 *      } );
+			 *    } );
+			 *
+			 *  @example
+			 *    // Language and options change
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "lengthMenu": 'Display <select>'+
+			 *            '<option value="10">10</option>'+
+			 *            '<option value="20">20</option>'+
+			 *            '<option value="30">30</option>'+
+			 *            '<option value="40">40</option>'+
+			 *            '<option value="50">50</option>'+
+			 *            '<option value="-1">All</option>'+
+			 *            '</select> records'
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sLengthMenu": "Show _MENU_ entries",
+	
+	
+			/**
+			 * When using Ajax sourced data and during the first draw when DataTables is
+			 * gathering the data, this message is shown in an empty row in the table to
+			 * indicate to the end user the the data is being loaded. Note that this
+			 * parameter is not used when loading data by server-side processing, just
+			 * Ajax sourced data with client-side processing.
+			 *  @type string
+			 *  @default Loading...
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.loadingRecords
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "loadingRecords": "Please wait - loading..."
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sLoadingRecords": "Loading...",
+	
+	
+			/**
+			 * Text which is displayed when the table is processing a user action
+			 * (usually a sort command or similar).
+			 *  @type string
+			 *  @default Processing...
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.processing
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "processing": "DataTables is currently busy"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sProcessing": "Processing...",
+	
+	
+			/**
+			 * Details the actions that will be taken when the user types into the
+			 * filtering input text box. The variable "_INPUT_", if used in the string,
+			 * is replaced with the HTML text box for the filtering input allowing
+			 * control over where it appears in the string. If "_INPUT_" is not given
+			 * then the input box is appended to the string automatically.
+			 *  @type string
+			 *  @default Search:
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.search
+			 *
+			 *  @example
+			 *    // Input text box will be appended at the end automatically
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "search": "Filter records:"
+			 *        }
+			 *      } );
+			 *    } );
+			 *
+			 *  @example
+			 *    // Specify where the filter should appear
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "search": "Apply filter _INPUT_ to table"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sSearch": "Search:",
+	
+	
+			/**
+			 * Assign a `placeholder` attribute to the search `input` element
+			 *  @type string
+			 *  @default 
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.searchPlaceholder
+			 */
+			"sSearchPlaceholder": "",
+	
+	
+			/**
+			 * All of the language information can be stored in a file on the
+			 * server-side, which DataTables will look up if this parameter is passed.
+			 * It must store the URL of the language file, which is in a JSON format,
+			 * and the object has the same properties as the oLanguage object in the
+			 * initialiser object (i.e. the above parameters). Please refer to one of
+			 * the example language files to see how this works in action.
+			 *  @type string
+			 *  @default <i>Empty string - i.e. disabled</i>
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.url
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "url": "http://www.sprymedia.co.uk/dataTables/lang.txt"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sUrl": "",
+	
+	
+			/**
+			 * Text shown inside the table records when the is no information to be
+			 * displayed after filtering. `emptyTable` is shown when there is simply no
+			 * information in the table at all (regardless of filtering).
+			 *  @type string
+			 *  @default No matching records found
+			 *
+			 *  @dtopt Language
+			 *  @name DataTable.defaults.language.zeroRecords
+			 *
+			 *  @example
+			 *    $(document).ready( function() {
+			 *      $('#example').dataTable( {
+			 *        "language": {
+			 *          "zeroRecords": "No records to display"
+			 *        }
+			 *      } );
+			 *    } );
+			 */
+			"sZeroRecords": "No matching records found"
+		},
+	
+	
+		/**
+		 * This parameter allows you to have define the global filtering state at
+		 * initialisation time. As an object the `search` parameter must be
+		 * defined, but all other parameters are optional. When `regex` is true,
+		 * the search string will be treated as a regular expression, when false
+		 * (default) it will be treated as a straight string. When `smart`
+		 * DataTables will use it's smart filtering methods (to word match at
+		 * any point in the data), when false this will not be done.
+		 *  @namespace
+		 *  @extends DataTable.models.oSearch
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.search
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "search": {"search": "Initial search"}
+		 *      } );
+		 *    } )
+		 */
+		"oSearch": $.extend( {}, DataTable.models.oSearch ),
+	
+	
+		/**
+		 * __Deprecated__ The functionality provided by this parameter has now been
+		 * superseded by that provided through `ajax`, which should be used instead.
+		 *
+		 * By default DataTables will look for the property `data` (or `aaData` for
+		 * compatibility with DataTables 1.9-) when obtaining data from an Ajax
+		 * source or for server-side processing - this parameter allows that
+		 * property to be changed. You can use Javascript dotted object notation to
+		 * get a data source for multiple levels of nesting.
+		 *  @type string
+		 *  @default data
+		 *
+		 *  @dtopt Options
+		 *  @dtopt Server-side
+		 *  @name DataTable.defaults.ajaxDataProp
+		 *
+		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
+		 */
+		"sAjaxDataProp": "data",
+	
+	
+		/**
+		 * __Deprecated__ The functionality provided by this parameter has now been
+		 * superseded by that provided through `ajax`, which should be used instead.
+		 *
+		 * You can instruct DataTables to load data from an external
+		 * source using this parameter (use aData if you want to pass data in you
+		 * already have). Simply provide a url a JSON object can be obtained from.
+		 *  @type string
+		 *  @default null
+		 *
+		 *  @dtopt Options
+		 *  @dtopt Server-side
+		 *  @name DataTable.defaults.ajaxSource
+		 *
+		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
+		 */
+		"sAjaxSource": null,
+	
+	
+		/**
+		 * This initialisation variable allows you to specify exactly where in the
+		 * DOM you want DataTables to inject the various controls it adds to the page
+		 * (for example you might want the pagination controls at the top of the
+		 * table). DIV elements (with or without a custom class) can also be added to
+		 * aid styling. The follow syntax is used:
+		 *   <ul>
+		 *     <li>The following options are allowed:
+		 *       <ul>
+		 *         <li>'l' - Length changing</li>
+		 *         <li>'f' - Filtering input</li>
+		 *         <li>'t' - The table!</li>
+		 *         <li>'i' - Information</li>
+		 *         <li>'p' - Pagination</li>
+		 *         <li>'r' - pRocessing</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>The following constants are allowed:
+		 *       <ul>
+		 *         <li>'H' - jQueryUI theme "header" classes ('fg-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix')</li>
+		 *         <li>'F' - jQueryUI theme "footer" classes ('fg-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix')</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>The following syntax is expected:
+		 *       <ul>
+		 *         <li>'&lt;' and '&gt;' - div elements</li>
+		 *         <li>'&lt;"class" and '&gt;' - div with a class</li>
+		 *         <li>'&lt;"#id" and '&gt;' - div with an ID</li>
+		 *       </ul>
+		 *     </li>
+		 *     <li>Examples:
+		 *       <ul>
+		 *         <li>'&lt;"wrapper"flipt&gt;'</li>
+		 *         <li>'&lt;lf&lt;t&gt;ip&gt;'</li>
+		 *       </ul>
+		 *     </li>
+		 *   </ul>
+		 *  @type string
+		 *  @default lfrtip <i>(when `jQueryUI` is false)</i> <b>or</b>
+		 *    <"H"lfr>t<"F"ip> <i>(when `jQueryUI` is true)</i>
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.dom
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "dom": '&lt;"top"i&gt;rt&lt;"bottom"flp&gt;&lt;"clear"&gt;'
+		 *      } );
+		 *    } );
+		 */
+		"sDom": "lfrtip",
+	
+	
+		/**
+		 * Search delay option. This will throttle full table searches that use the
+		 * DataTables provided search input element (it does not effect calls to
+		 * `dt-api search()`, providing a delay before the search is made.
+		 *  @type integer
+		 *  @default 0
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.searchDelay
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "searchDelay": 200
+		 *      } );
+		 *    } )
+		 */
+		"searchDelay": null,
+	
+	
+		/**
+		 * DataTables features four different built-in options for the buttons to
+		 * display for pagination control:
+		 *
+		 * * `simple` - 'Previous' and 'Next' buttons only
+		 * * 'simple_numbers` - 'Previous' and 'Next' buttons, plus page numbers
+		 * * `full` - 'First', 'Previous', 'Next' and 'Last' buttons
+		 * * `full_numbers` - 'First', 'Previous', 'Next' and 'Last' buttons, plus
+		 *   page numbers
+		 *  
+		 * Further methods can be added using {@link DataTable.ext.oPagination}.
+		 *  @type string
+		 *  @default simple_numbers
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.pagingType
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "pagingType": "full_numbers"
+		 *      } );
+		 *    } )
+		 */
+		"sPaginationType": "simple_numbers",
+	
+	
+		/**
+		 * Enable horizontal scrolling. When a table is too wide to fit into a
+		 * certain layout, or you have a large number of columns in the table, you
+		 * can enable x-scrolling to show the table in a viewport, which can be
+		 * scrolled. This property can be `true` which will allow the table to
+		 * scroll horizontally when needed, or any CSS unit, or a number (in which
+		 * case it will be treated as a pixel measurement). Setting as simply `true`
+		 * is recommended.
+		 *  @type boolean|string
+		 *  @default <i>blank string - i.e. disabled</i>
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.scrollX
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "scrollX": true,
+		 *        "scrollCollapse": true
+		 *      } );
+		 *    } );
+		 */
+		"sScrollX": "",
+	
+	
+		/**
+		 * This property can be used to force a DataTable to use more width than it
+		 * might otherwise do when x-scrolling is enabled. For example if you have a
+		 * table which requires to be well spaced, this parameter is useful for
+		 * "over-sizing" the table, and thus forcing scrolling. This property can by
+		 * any CSS unit, or a number (in which case it will be treated as a pixel
+		 * measurement).
+		 *  @type string
+		 *  @default <i>blank string - i.e. disabled</i>
+		 *
+		 *  @dtopt Options
+		 *  @name DataTable.defaults.scrollXInner
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "scrollX": "100%",
+		 *        "scrollXInner": "110%"
+		 *      } );
+		 *    } );
+		 */
+		"sScrollXInner": "",
+	
+	
+		/**
+		 * Enable vertical scrolling. Vertical scrolling will constrain the DataTable
+		 * to the given height, and enable scrolling for any data which overflows the
+		 * current viewport. This can be used as an alternative to paging to display
+		 * a lot of data in a small area (although paging and scrolling can both be
+		 * enabled at the same time). This property can be any CSS unit, or a number
+		 * (in which case it will be treated as a pixel measurement).
+		 *  @type string
+		 *  @default <i>blank string - i.e. disabled</i>
+		 *
+		 *  @dtopt Features
+		 *  @name DataTable.defaults.scrollY
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "scrollY": "200px",
+		 *        "paginate": false
+		 *      } );
+		 *    } );
+		 */
+		"sScrollY": "",
+	
+	
+		/**
+		 * __Deprecated__ The functionality provided by this parameter has now been
+		 * superseded by that provided through `ajax`, which should be used instead.
+		 *
+		 * Set the HTTP method that is used to make the Ajax call for server-side
+		 * processing or Ajax sourced data.
+		 *  @type string
+		 *  @default GET
+		 *
+		 *  @dtopt Options
+		 *  @dtopt Server-side
+		 *  @name DataTable.defaults.serverMethod
+		 *
+		 *  @deprecated 1.10. Please use `ajax` for this functionality now.
+		 */
+		"sServerMethod": "GET",
+	
+	
+		/**
+		 * DataTables makes use of renderers when displaying HTML elements for
+		 * a table. These renderers can be added or modified by plug-ins to
+		 * generate suitable mark-up for a site. For example the Bootstrap
+		 * integration plug-in for DataTables uses a paging button renderer to
+		 * display pagination buttons in the mark-up required by Bootstrap.
+		 *
+		 * For further information about the renderers available see
+		 * DataTable.ext.renderer
+		 *  @type string|object
+		 *  @default null
+		 *
+		 *  @name DataTable.defaults.renderer
+		 *
+		 */
+		"renderer": null,
+	
+	
+		/**
+		 * Set the data property name that DataTables should use to get a row's id
+		 * to set as the `id` property in the node.
+		 *  @type string
+		 *  @default DT_RowId
+		 *
+		 *  @name DataTable.defaults.rowId
+		 */
+		"rowId": "DT_RowId"
+	};
+	
+	_fnHungarianMap( DataTable.defaults );
+	
+	
+	
+	/*
+	 * Developer note - See note in model.defaults.js about the use of Hungarian
+	 * notation and camel case.
+	 */
+	
+	/**
+	 * Column options that can be given to DataTables at initialisation time.
+	 *  @namespace
+	 */
+	DataTable.defaults.column = {
+		/**
+		 * Define which column(s) an order will occur on for this column. This
+		 * allows a column's ordering to take multiple columns into account when
+		 * doing a sort or use the data from a different column. For example first
+		 * name / last name columns make sense to do a multi-column sort over the
+		 * two columns.
+		 *  @type array|int
+		 *  @default null <i>Takes the value of the column index automatically</i>
+		 *
+		 *  @name DataTable.defaults.column.orderData
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "orderData": [ 0, 1 ], "targets": [ 0 ] },
+		 *          { "orderData": [ 1, 0 ], "targets": [ 1 ] },
+		 *          { "orderData": 2, "targets": [ 2 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "orderData": [ 0, 1 ] },
+		 *          { "orderData": [ 1, 0 ] },
+		 *          { "orderData": 2 },
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"aDataSort": null,
+		"iDataSort": -1,
+	
+	
+		/**
+		 * You can control the default ordering direction, and even alter the
+		 * behaviour of the sort handler (i.e. only allow ascending ordering etc)
+		 * using this parameter.
+		 *  @type array
+		 *  @default [ 'asc', 'desc' ]
+		 *
+		 *  @name DataTable.defaults.column.orderSequence
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "orderSequence": [ "asc" ], "targets": [ 1 ] },
+		 *          { "orderSequence": [ "desc", "asc", "asc" ], "targets": [ 2 ] },
+		 *          { "orderSequence": [ "desc" ], "targets": [ 3 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          null,
+		 *          { "orderSequence": [ "asc" ] },
+		 *          { "orderSequence": [ "desc", "asc", "asc" ] },
+		 *          { "orderSequence": [ "desc" ] },
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"asSorting": [ 'asc', 'desc' ],
+	
+	
+		/**
+		 * Enable or disable filtering on the data in this column.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @name DataTable.defaults.column.searchable
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "searchable": false, "targets": [ 0 ] }
+		 *        ] } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "searchable": false },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ] } );
+		 *    } );
+		 */
+		"bSearchable": true,
+	
+	
+		/**
+		 * Enable or disable ordering on this column.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @name DataTable.defaults.column.orderable
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "orderable": false, "targets": [ 0 ] }
+		 *        ] } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "orderable": false },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ] } );
+		 *    } );
+		 */
+		"bSortable": true,
+	
+	
+		/**
+		 * Enable or disable the display of this column.
+		 *  @type boolean
+		 *  @default true
+		 *
+		 *  @name DataTable.defaults.column.visible
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "visible": false, "targets": [ 0 ] }
+		 *        ] } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "visible": false },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ] } );
+		 *    } );
+		 */
+		"bVisible": true,
+	
+	
+		/**
+		 * Developer definable function that is called whenever a cell is created (Ajax source,
+		 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
+		 * allowing you to modify the DOM element (add background colour for example) when the
+		 * element is available.
+		 *  @type function
+		 *  @param {element} td The TD node that has been created
+		 *  @param {*} cellData The Data for the cell
+		 *  @param {array|object} rowData The data for the whole row
+		 *  @param {int} row The row index for the aoData data store
+		 *  @param {int} col The column index for aoColumns
+		 *
+		 *  @name DataTable.defaults.column.createdCell
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [3],
+		 *          "createdCell": function (td, cellData, rowData, row, col) {
+		 *            if ( cellData == "1.7" ) {
+		 *              $(td).css('color', 'blue')
+		 *            }
+		 *          }
+		 *        } ]
+		 *      });
+		 *    } );
+		 */
+		"fnCreatedCell": null,
+	
+	
+		/**
+		 * This parameter has been replaced by `data` in DataTables to ensure naming
+		 * consistency. `dataProp` can still be used, as there is backwards
+		 * compatibility in DataTables for this option, but it is strongly
+		 * recommended that you use `data` in preference to `dataProp`.
+		 *  @name DataTable.defaults.column.dataProp
+		 */
+	
+	
+		/**
+		 * This property can be used to read data from any data source property,
+		 * including deeply nested objects / properties. `data` can be given in a
+		 * number of different ways which effect its behaviour:
+		 *
+		 * * `integer` - treated as an array index for the data source. This is the
+		 *   default that DataTables uses (incrementally increased for each column).
+		 * * `string` - read an object property from the data source. There are
+		 *   three 'special' options that can be used in the string to alter how
+		 *   DataTables reads the data from the source object:
+		 *    * `.` - Dotted Javascript notation. Just as you use a `.` in
+		 *      Javascript to read from nested objects, so to can the options
+		 *      specified in `data`. For example: `browser.version` or
+		 *      `browser.name`. If your object parameter name contains a period, use
+		 *      `\\` to escape it - i.e. `first\\.name`.
+		 *    * `[]` - Array notation. DataTables can automatically combine data
+		 *      from and array source, joining the data with the characters provided
+		 *      between the two brackets. For example: `name[, ]` would provide a
+		 *      comma-space separated list from the source array. If no characters
+		 *      are provided between the brackets, the original array source is
+		 *      returned.
+		 *    * `()` - Function notation. Adding `()` to the end of a parameter will
+		 *      execute a function of the name given. For example: `browser()` for a
+		 *      simple function on the data source, `browser.version()` for a
+		 *      function in a nested property or even `browser().version` to get an
+		 *      object property if the function called returns an object. Note that
+		 *      function notation is recommended for use in `render` rather than
+		 *      `data` as it is much simpler to use as a renderer.
+		 * * `null` - use the original data source for the row rather than plucking
+		 *   data directly from it. This action has effects on two other
+		 *   initialisation options:
+		 *    * `defaultContent` - When null is given as the `data` option and
+		 *      `defaultContent` is specified for the column, the value defined by
+		 *      `defaultContent` will be used for the cell.
+		 *    * `render` - When null is used for the `data` option and the `render`
+		 *      option is specified for the column, the whole data source for the
+		 *      row is used for the renderer.
+		 * * `function` - the function given will be executed whenever DataTables
+		 *   needs to set or get the data for a cell in the column. The function
+		 *   takes three parameters:
+		 *    * Parameters:
+		 *      * `{array|object}` The data source for the row
+		 *      * `{string}` The type call data requested - this will be 'set' when
+		 *        setting data or 'filter', 'display', 'type', 'sort' or undefined
+		 *        when gathering data. Note that when `undefined` is given for the
+		 *        type DataTables expects to get the raw data for the object back<
+		 *      * `{*}` Data to set when the second parameter is 'set'.
+		 *    * Return:
+		 *      * The return value from the function is not required when 'set' is
+		 *        the type of call, but otherwise the return is what will be used
+		 *        for the data requested.
+		 *
+		 * Note that `data` is a getter and setter option. If you just require
+		 * formatting of data for output, you will likely want to use `render` which
+		 * is simply a getter and thus simpler to use.
+		 *
+		 * Note that prior to DataTables 1.9.2 `data` was called `mDataProp`. The
+		 * name change reflects the flexibility of this property and is consistent
+		 * with the naming of mRender. If 'mDataProp' is given, then it will still
+		 * be used by DataTables, as it automatically maps the old name to the new
+		 * if required.
+		 *
+		 *  @type string|int|function|null
+		 *  @default null <i>Use automatically calculated column index</i>
+		 *
+		 *  @name DataTable.defaults.column.data
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Read table data from objects
+		 *    // JSON structure for each row:
+		 *    //   {
+		 *    //      "engine": {value},
+		 *    //      "browser": {value},
+		 *    //      "platform": {value},
+		 *    //      "version": {value},
+		 *    //      "grade": {value}
+		 *    //   }
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "ajaxSource": "sources/objects.txt",
+		 *        "columns": [
+		 *          { "data": "engine" },
+		 *          { "data": "browser" },
+		 *          { "data": "platform" },
+		 *          { "data": "version" },
+		 *          { "data": "grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Read information from deeply nested objects
+		 *    // JSON structure for each row:
+		 *    //   {
+		 *    //      "engine": {value},
+		 *    //      "browser": {value},
+		 *    //      "platform": {
+		 *    //         "inner": {value}
+		 *    //      },
+		 *    //      "details": [
+		 *    //         {value}, {value}
+		 *    //      ]
+		 *    //   }
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "ajaxSource": "sources/deep.txt",
+		 *        "columns": [
+		 *          { "data": "engine" },
+		 *          { "data": "browser" },
+		 *          { "data": "platform.inner" },
+		 *          { "data": "platform.details.0" },
+		 *          { "data": "platform.details.1" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `data` as a function to provide different information for
+		 *    // sorting, filtering and display. In this case, currency (price)
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "data": function ( source, type, val ) {
+		 *            if (type === 'set') {
+		 *              source.price = val;
+		 *              // Store the computed dislay and filter values for efficiency
+		 *              source.price_display = val=="" ? "" : "$"+numberFormat(val);
+		 *              source.price_filter  = val=="" ? "" : "$"+numberFormat(val)+" "+val;
+		 *              return;
+		 *            }
+		 *            else if (type === 'display') {
+		 *              return source.price_display;
+		 *            }
+		 *            else if (type === 'filter') {
+		 *              return source.price_filter;
+		 *            }
+		 *            // 'sort', 'type' and undefined all just use the integer
+		 *            return source.price;
+		 *          }
+		 *        } ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using default content
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "data": null,
+		 *          "defaultContent": "Click to edit"
+		 *        } ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using array notation - outputting a list from an array
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "data": "name[, ]"
+		 *        } ]
+		 *      } );
+		 *    } );
+		 *
+		 */
+		"mData": null,
+	
+	
+		/**
+		 * This property is the rendering partner to `data` and it is suggested that
+		 * when you want to manipulate data for display (including filtering,
+		 * sorting etc) without altering the underlying data for the table, use this
+		 * property. `render` can be considered to be the the read only companion to
+		 * `data` which is read / write (then as such more complex). Like `data`
+		 * this option can be given in a number of different ways to effect its
+		 * behaviour:
+		 *
+		 * * `integer` - treated as an array index for the data source. This is the
+		 *   default that DataTables uses (incrementally increased for each column).
+		 * * `string` - read an object property from the data source. There are
+		 *   three 'special' options that can be used in the string to alter how
+		 *   DataTables reads the data from the source object:
+		 *    * `.` - Dotted Javascript notation. Just as you use a `.` in
+		 *      Javascript to read from nested objects, so to can the options
+		 *      specified in `data`. For example: `browser.version` or
+		 *      `browser.name`. If your object parameter name contains a period, use
+		 *      `\\` to escape it - i.e. `first\\.name`.
+		 *    * `[]` - Array notation. DataTables can automatically combine data
+		 *      from and array source, joining the data with the characters provided
+		 *      between the two brackets. For example: `name[, ]` would provide a
+		 *      comma-space separated list from the source array. If no characters
+		 *      are provided between the brackets, the original array source is
+		 *      returned.
+		 *    * `()` - Function notation. Adding `()` to the end of a parameter will
+		 *      execute a function of the name given. For example: `browser()` for a
+		 *      simple function on the data source, `browser.version()` for a
+		 *      function in a nested property or even `browser().version` to get an
+		 *      object property if the function called returns an object.
+		 * * `object` - use different data for the different data types requested by
+		 *   DataTables ('filter', 'display', 'type' or 'sort'). The property names
+		 *   of the object is the data type the property refers to and the value can
+		 *   defined using an integer, string or function using the same rules as
+		 *   `render` normally does. Note that an `_` option _must_ be specified.
+		 *   This is the default value to use if you haven't specified a value for
+		 *   the data type requested by DataTables.
+		 * * `function` - the function given will be executed whenever DataTables
+		 *   needs to set or get the data for a cell in the column. The function
+		 *   takes three parameters:
+		 *    * Parameters:
+		 *      * {array|object} The data source for the row (based on `data`)
+		 *      * {string} The type call data requested - this will be 'filter',
+		 *        'display', 'type' or 'sort'.
+		 *      * {array|object} The full data source for the row (not based on
+		 *        `data`)
+		 *    * Return:
+		 *      * The return value from the function is what will be used for the
+		 *        data requested.
+		 *
+		 *  @type string|int|function|object|null
+		 *  @default null Use the data source value.
+		 *
+		 *  @name DataTable.defaults.column.render
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Create a comma separated list from an array of objects
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "ajaxSource": "sources/deep.txt",
+		 *        "columns": [
+		 *          { "data": "engine" },
+		 *          { "data": "browser" },
+		 *          {
+		 *            "data": "platform",
+		 *            "render": "[, ].name"
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Execute a function to obtain data
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "data": null, // Use the full data source object for the renderer's source
+		 *          "render": "browserName()"
+		 *        } ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // As an object, extracting different data for the different types
+		 *    // This would be used with a data source such as:
+		 *    //   { "phone": 5552368, "phone_filter": "5552368 555-2368", "phone_display": "555-2368" }
+		 *    // Here the `phone` integer is used for sorting and type detection, while `phone_filter`
+		 *    // (which has both forms) is used for filtering for if a user inputs either format, while
+		 *    // the formatted phone number is the one that is shown in the table.
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "data": null, // Use the full data source object for the renderer's source
+		 *          "render": {
+		 *            "_": "phone",
+		 *            "filter": "phone_filter",
+		 *            "display": "phone_display"
+		 *          }
+		 *        } ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Use as a function to create a link from the data source
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "data": "download_link",
+		 *          "render": function ( data, type, full ) {
+		 *            return '<a href="'+data+'">Download</a>';
+		 *          }
+		 *        } ]
+		 *      } );
+		 *    } );
+		 */
+		"mRender": null,
+	
+	
+		/**
+		 * Change the cell type created for the column - either TD cells or TH cells. This
+		 * can be useful as TH cells have semantic meaning in the table body, allowing them
+		 * to act as a header for a row (you may wish to add scope='row' to the TH elements).
+		 *  @type string
+		 *  @default td
+		 *
+		 *  @name DataTable.defaults.column.cellType
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Make the first column use TH cells
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [ {
+		 *          "targets": [ 0 ],
+		 *          "cellType": "th"
+		 *        } ]
+		 *      } );
+		 *    } );
+		 */
+		"sCellType": "td",
+	
+	
+		/**
+		 * Class to give to each cell in this column.
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 *
+		 *  @name DataTable.defaults.column.class
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "class": "my_class", "targets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "class": "my_class" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sClass": "",
+	
+		/**
+		 * When DataTables calculates the column widths to assign to each column,
+		 * it finds the longest string in each column and then constructs a
+		 * temporary table and reads the widths from that. The problem with this
+		 * is that "mmm" is much wider then "iiii", but the latter is a longer
+		 * string - thus the calculation can go wrong (doing it properly and putting
+		 * it into an DOM object and measuring that is horribly(!) slow). Thus as
+		 * a "work around" we provide this option. It will append its value to the
+		 * text that is found to be the longest string for the column - i.e. padding.
+		 * Generally you shouldn't need this!
+		 *  @type string
+		 *  @default <i>Empty string<i>
+		 *
+		 *  @name DataTable.defaults.column.contentPadding
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          {
+		 *            "contentPadding": "mmm"
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sContentPadding": "",
+	
+	
+		/**
+		 * Allows a default value to be given for a column's data, and will be used
+		 * whenever a null data source is encountered (this can be because `data`
+		 * is set to null, or because the data source itself is null).
+		 *  @type string
+		 *  @default null
+		 *
+		 *  @name DataTable.defaults.column.defaultContent
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          {
+		 *            "data": null,
+		 *            "defaultContent": "Edit",
+		 *            "targets": [ -1 ]
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          {
+		 *            "data": null,
+		 *            "defaultContent": "Edit"
+		 *          }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sDefaultContent": null,
+	
+	
+		/**
+		 * This parameter is only used in DataTables' server-side processing. It can
+		 * be exceptionally useful to know what columns are being displayed on the
+		 * client side, and to map these to database fields. When defined, the names
+		 * also allow DataTables to reorder information from the server if it comes
+		 * back in an unexpected order (i.e. if you switch your columns around on the
+		 * client-side, your server-side code does not also need updating).
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 *
+		 *  @name DataTable.defaults.column.name
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "name": "engine", "targets": [ 0 ] },
+		 *          { "name": "browser", "targets": [ 1 ] },
+		 *          { "name": "platform", "targets": [ 2 ] },
+		 *          { "name": "version", "targets": [ 3 ] },
+		 *          { "name": "grade", "targets": [ 4 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "name": "engine" },
+		 *          { "name": "browser" },
+		 *          { "name": "platform" },
+		 *          { "name": "version" },
+		 *          { "name": "grade" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sName": "",
+	
+	
+		/**
+		 * Defines a data source type for the ordering which can be used to read
+		 * real-time information from the table (updating the internally cached
+		 * version) prior to ordering. This allows ordering to occur on user
+		 * editable elements such as form inputs.
+		 *  @type string
+		 *  @default std
+		 *
+		 *  @name DataTable.defaults.column.orderDataType
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "orderDataType": "dom-text", "targets": [ 2, 3 ] },
+		 *          { "type": "numeric", "targets": [ 3 ] },
+		 *          { "orderDataType": "dom-select", "targets": [ 4 ] },
+		 *          { "orderDataType": "dom-checkbox", "targets": [ 5 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          null,
+		 *          null,
+		 *          { "orderDataType": "dom-text" },
+		 *          { "orderDataType": "dom-text", "type": "numeric" },
+		 *          { "orderDataType": "dom-select" },
+		 *          { "orderDataType": "dom-checkbox" }
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sSortDataType": "std",
+	
+	
+		/**
+		 * The title of this column.
+		 *  @type string
+		 *  @default null <i>Derived from the 'TH' value for this column in the
+		 *    original HTML table.</i>
+		 *
+		 *  @name DataTable.defaults.column.title
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "title": "My column title", "targets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "title": "My column title" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sTitle": null,
+	
+	
+		/**
+		 * The type allows you to specify how the data for this column will be
+		 * ordered. Four types (string, numeric, date and html (which will strip
+		 * HTML tags before ordering)) are currently available. Note that only date
+		 * formats understood by Javascript's Date() object will be accepted as type
+		 * date. For example: "Mar 26, 2008 5:03 PM". May take the values: 'string',
+		 * 'numeric', 'date' or 'html' (by default). Further types can be adding
+		 * through plug-ins.
+		 *  @type string
+		 *  @default null <i>Auto-detected from raw data</i>
+		 *
+		 *  @name DataTable.defaults.column.type
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "type": "html", "targets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "type": "html" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sType": null,
+	
+	
+		/**
+		 * Defining the width of the column, this parameter may take any CSS value
+		 * (3em, 20px etc). DataTables applies 'smart' widths to columns which have not
+		 * been given a specific width through this interface ensuring that the table
+		 * remains readable.
+		 *  @type string
+		 *  @default null <i>Automatic</i>
+		 *
+		 *  @name DataTable.defaults.column.width
+		 *  @dtopt Columns
+		 *
+		 *  @example
+		 *    // Using `columnDefs`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columnDefs": [
+		 *          { "width": "20%", "targets": [ 0 ] }
+		 *        ]
+		 *      } );
+		 *    } );
+		 *
+		 *  @example
+		 *    // Using `columns`
+		 *    $(document).ready( function() {
+		 *      $('#example').dataTable( {
+		 *        "columns": [
+		 *          { "width": "20%" },
+		 *          null,
+		 *          null,
+		 *          null,
+		 *          null
+		 *        ]
+		 *      } );
+		 *    } );
+		 */
+		"sWidth": null
+	};
+	
+	_fnHungarianMap( DataTable.defaults.column );
+	
+	
+	
+	/**
+	 * DataTables settings object - this holds all the information needed for a
+	 * given table, including configuration, data and current application of the
+	 * table options. DataTables does not have a single instance for each DataTable
+	 * with the settings attached to that instance, but rather instances of the
+	 * DataTable "class" are created on-the-fly as needed (typically by a
+	 * $().dataTable() call) and the settings object is then applied to that
+	 * instance.
+	 *
+	 * Note that this object is related to {@link DataTable.defaults} but this
+	 * one is the internal data store for DataTables's cache of columns. It should
+	 * NOT be manipulated outside of DataTables. Any configuration should be done
+	 * through the initialisation options.
+	 *  @namespace
+	 *  @todo Really should attach the settings object to individual instances so we
+	 *    don't need to create new instances on each $().dataTable() call (if the
+	 *    table already exists). It would also save passing oSettings around and
+	 *    into every single function. However, this is a very significant
+	 *    architecture change for DataTables and will almost certainly break
+	 *    backwards compatibility with older installations. This is something that
+	 *    will be done in 2.0.
+	 */
+	DataTable.models.oSettings = {
+		/**
+		 * Primary features of DataTables and their enablement state.
+		 *  @namespace
+		 */
+		"oFeatures": {
+	
+			/**
+			 * Flag to say if DataTables should automatically try to calculate the
+			 * optimum table and columns widths (true) or not (false).
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bAutoWidth": null,
+	
+			/**
+			 * Delay the creation of TR and TD elements until they are actually
+			 * needed by a driven page draw. This can give a significant speed
+			 * increase for Ajax source and Javascript source data, but makes no
+			 * difference at all fro DOM and server-side processing tables.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bDeferRender": null,
+	
+			/**
+			 * Enable filtering on the table or not. Note that if this is disabled
+			 * then there is no filtering at all on the table, including fnFilter.
+			 * To just remove the filtering input use sDom and remove the 'f' option.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bFilter": null,
+	
+			/**
+			 * Table information element (the 'Showing x of y records' div) enable
+			 * flag.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bInfo": null,
+	
+			/**
+			 * Present a user control allowing the end user to change the page size
+			 * when pagination is enabled.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bLengthChange": null,
+	
+			/**
+			 * Pagination enabled or not. Note that if this is disabled then length
+			 * changing must also be disabled.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bPaginate": null,
+	
+			/**
+			 * Processing indicator enable flag whenever DataTables is enacting a
+			 * user request - typically an Ajax request for server-side processing.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bProcessing": null,
+	
+			/**
+			 * Server-side processing enabled flag - when enabled DataTables will
+			 * get all data from the server for every draw - there is no filtering,
+			 * sorting or paging done on the client-side.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bServerSide": null,
+	
+			/**
+			 * Sorting enablement flag.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bSort": null,
+	
+			/**
+			 * Multi-column sorting
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bSortMulti": null,
+	
+			/**
+			 * Apply a class to the columns which are being sorted to provide a
+			 * visual highlight or not. This can slow things down when enabled since
+			 * there is a lot of DOM interaction.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bSortClasses": null,
+	
+			/**
+			 * State saving enablement flag.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bStateSave": null
+		},
+	
+	
+		/**
+		 * Scrolling settings for a table.
+		 *  @namespace
+		 */
+		"oScroll": {
+			/**
+			 * When the table is shorter in height than sScrollY, collapse the
+			 * table container down to the height of the table (when true).
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type boolean
+			 */
+			"bCollapse": null,
+	
+			/**
+			 * Width of the scrollbar for the web-browser's platform. Calculated
+			 * during table initialisation.
+			 *  @type int
+			 *  @default 0
+			 */
+			"iBarWidth": 0,
+	
+			/**
+			 * Viewport width for horizontal scrolling. Horizontal scrolling is
+			 * disabled if an empty string.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type string
+			 */
+			"sX": null,
+	
+			/**
+			 * Width to expand the table to when using x-scrolling. Typically you
+			 * should not need to use this.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type string
+			 *  @deprecated
+			 */
+			"sXInner": null,
+	
+			/**
+			 * Viewport height for vertical scrolling. Vertical scrolling is disabled
+			 * if an empty string.
+			 * Note that this parameter will be set by the initialisation routine. To
+			 * set a default use {@link DataTable.defaults}.
+			 *  @type string
+			 */
+			"sY": null
+		},
+	
+		/**
+		 * Language information for the table.
+		 *  @namespace
+		 *  @extends DataTable.defaults.oLanguage
+		 */
+		"oLanguage": {
+			/**
+			 * Information callback function. See
+			 * {@link DataTable.defaults.fnInfoCallback}
+			 *  @type function
+			 *  @default null
+			 */
+			"fnInfoCallback": null
+		},
+	
+		/**
+		 * Browser support parameters
+		 *  @namespace
+		 */
+		"oBrowser": {
+			/**
+			 * Indicate if the browser incorrectly calculates width:100% inside a
+			 * scrolling element (IE6/7)
+			 *  @type boolean
+			 *  @default false
+			 */
+			"bScrollOversize": false,
+	
+			/**
+			 * Determine if the vertical scrollbar is on the right or left of the
+			 * scrolling container - needed for rtl language layout, although not
+			 * all browsers move the scrollbar (Safari).
+			 *  @type boolean
+			 *  @default false
+			 */
+			"bScrollbarLeft": false,
+	
+			/**
+			 * Flag for if `getBoundingClientRect` is fully supported or not
+			 *  @type boolean
+			 *  @default false
+			 */
+			"bBounding": false
+		},
+	
+	
+		"ajax": null,
+	
+	
+		/**
+		 * Array referencing the nodes which are used for the features. The
+		 * parameters of this object match what is allowed by sDom - i.e.
+		 *   <ul>
+		 *     <li>'l' - Length changing</li>
+		 *     <li>'f' - Filtering input</li>
+		 *     <li>'t' - The table!</li>
+		 *     <li>'i' - Information</li>
+		 *     <li>'p' - Pagination</li>
+		 *     <li>'r' - pRocessing</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 */
+		"aanFeatures": [],
+	
+		/**
+		 * Store data information - see {@link DataTable.models.oRow} for detailed
+		 * information.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoData": [],
+	
+		/**
+		 * Array of indexes which are in the current display (after filtering etc)
+		 *  @type array
+		 *  @default []
+		 */
+		"aiDisplay": [],
+	
+		/**
+		 * Array of indexes for display - no filtering
+		 *  @type array
+		 *  @default []
+		 */
+		"aiDisplayMaster": [],
+	
+		/**
+		 * Map of row ids to data indexes
+		 *  @type object
+		 *  @default {}
+		 */
+		"aIds": {},
+	
+		/**
+		 * Store information about each column that is in use
+		 *  @type array
+		 *  @default []
+		 */
+		"aoColumns": [],
+	
+		/**
+		 * Store information about the table's header
+		 *  @type array
+		 *  @default []
+		 */
+		"aoHeader": [],
+	
+		/**
+		 * Store information about the table's footer
+		 *  @type array
+		 *  @default []
+		 */
+		"aoFooter": [],
+	
+		/**
+		 * Store the applied global search information in case we want to force a
+		 * research or compare the old search to a new one.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @namespace
+		 *  @extends DataTable.models.oSearch
+		 */
+		"oPreviousSearch": {},
+	
+		/**
+		 * Store the applied search for each column - see
+		 * {@link DataTable.models.oSearch} for the format that is used for the
+		 * filtering information for each column.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoPreSearchCols": [],
+	
+		/**
+		 * Sorting that is applied to the table. Note that the inner arrays are
+		 * used in the following manner:
+		 * <ul>
+		 *   <li>Index 0 - column number</li>
+		 *   <li>Index 1 - current sorting direction</li>
+		 * </ul>
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @todo These inner arrays should really be objects
+		 */
+		"aaSorting": null,
+	
+		/**
+		 * Sorting that is always applied to the table (i.e. prefixed in front of
+		 * aaSorting).
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @default []
+		 */
+		"aaSortingFixed": [],
+	
+		/**
+		 * Classes to use for the striping of a table.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @default []
+		 */
+		"asStripeClasses": null,
+	
+		/**
+		 * If restoring a table - we should restore its striping classes as well
+		 *  @type array
+		 *  @default []
+		 */
+		"asDestroyStripes": [],
+	
+		/**
+		 * If restoring a table - we should restore its width
+		 *  @type int
+		 *  @default 0
+		 */
+		"sDestroyWidth": 0,
+	
+		/**
+		 * Callback functions array for every time a row is inserted (i.e. on a draw).
+		 *  @type array
+		 *  @default []
+		 */
+		"aoRowCallback": [],
+	
+		/**
+		 * Callback functions for the header on each draw.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoHeaderCallback": [],
+	
+		/**
+		 * Callback function for the footer on each draw.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoFooterCallback": [],
+	
+		/**
+		 * Array of callback functions for draw callback functions
+		 *  @type array
+		 *  @default []
+		 */
+		"aoDrawCallback": [],
+	
+		/**
+		 * Array of callback functions for row created function
+		 *  @type array
+		 *  @default []
+		 */
+		"aoRowCreatedCallback": [],
+	
+		/**
+		 * Callback functions for just before the table is redrawn. A return of
+		 * false will be used to cancel the draw.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoPreDrawCallback": [],
+	
+		/**
+		 * Callback functions for when the table has been initialised.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoInitComplete": [],
+	
+	
+		/**
+		 * Callbacks for modifying the settings to be stored for state saving, prior to
+		 * saving state.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateSaveParams": [],
+	
+		/**
+		 * Callbacks for modifying the settings that have been stored for state saving
+		 * prior to using the stored values to restore the state.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateLoadParams": [],
+	
+		/**
+		 * Callbacks for operating on the settings object once the saved state has been
+		 * loaded
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateLoaded": [],
+	
+		/**
+		 * Cache the table ID for quick access
+		 *  @type string
+		 *  @default <i>Empty string</i>
+		 */
+		"sTableId": "",
+	
+		/**
+		 * The TABLE node for the main table
+		 *  @type node
+		 *  @default null
+		 */
+		"nTable": null,
+	
+		/**
+		 * Permanent ref to the thead element
+		 *  @type node
+		 *  @default null
+		 */
+		"nTHead": null,
+	
+		/**
+		 * Permanent ref to the tfoot element - if it exists
+		 *  @type node
+		 *  @default null
+		 */
+		"nTFoot": null,
+	
+		/**
+		 * Permanent ref to the tbody element
+		 *  @type node
+		 *  @default null
+		 */
+		"nTBody": null,
+	
+		/**
+		 * Cache the wrapper node (contains all DataTables controlled elements)
+		 *  @type node
+		 *  @default null
+		 */
+		"nTableWrapper": null,
+	
+		/**
+		 * Indicate if when using server-side processing the loading of data
+		 * should be deferred until the second draw.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bDeferLoading": false,
+	
+		/**
+		 * Indicate if all required information has been read in
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bInitialised": false,
+	
+		/**
+		 * Information about open rows. Each object in the array has the parameters
+		 * 'nTr' and 'nParent'
+		 *  @type array
+		 *  @default []
+		 */
+		"aoOpenRows": [],
+	
+		/**
+		 * Dictate the positioning of DataTables' control elements - see
+		 * {@link DataTable.model.oInit.sDom}.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 *  @default null
+		 */
+		"sDom": null,
+	
+		/**
+		 * Search delay (in mS)
+		 *  @type integer
+		 *  @default null
+		 */
+		"searchDelay": null,
+	
+		/**
+		 * Which type of pagination should be used.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 *  @default two_button
+		 */
+		"sPaginationType": "two_button",
+	
+		/**
+		 * The state duration (for `stateSave`) in seconds.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type int
+		 *  @default 0
+		 */
+		"iStateDuration": 0,
+	
+		/**
+		 * Array of callback functions for state saving. Each array element is an
+		 * object with the following parameters:
+		 *   <ul>
+		 *     <li>function:fn - function to call. Takes two parameters, oSettings
+		 *       and the JSON string to save that has been thus far created. Returns
+		 *       a JSON string to be inserted into a json object
+		 *       (i.e. '"param": [ 0, 1, 2]')</li>
+		 *     <li>string:sName - name of callback</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateSave": [],
+	
+		/**
+		 * Array of callback functions for state loading. Each array element is an
+		 * object with the following parameters:
+		 *   <ul>
+		 *     <li>function:fn - function to call. Takes two parameters, oSettings
+		 *       and the object stored. May return false to cancel state loading</li>
+		 *     <li>string:sName - name of callback</li>
+		 *   </ul>
+		 *  @type array
+		 *  @default []
+		 */
+		"aoStateLoad": [],
+	
+		/**
+		 * State that was saved. Useful for back reference
+		 *  @type object
+		 *  @default null
+		 */
+		"oSavedState": null,
+	
+		/**
+		 * State that was loaded. Useful for back reference
+		 *  @type object
+		 *  @default null
+		 */
+		"oLoadedState": null,
+	
+		/**
+		 * Source url for AJAX data for the table.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 *  @default null
+		 */
+		"sAjaxSource": null,
+	
+		/**
+		 * Property from a given object from which to read the table data from. This
+		 * can be an empty string (when not server-side processing), in which case
+		 * it is  assumed an an array is given directly.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 */
+		"sAjaxDataProp": null,
+	
+		/**
+		 * Note if draw should be blocked while getting data
+		 *  @type boolean
+		 *  @default true
+		 */
+		"bAjaxDataGet": true,
+	
+		/**
+		 * The last jQuery XHR object that was used for server-side data gathering.
+		 * This can be used for working with the XHR information in one of the
+		 * callbacks
+		 *  @type object
+		 *  @default null
+		 */
+		"jqXHR": null,
+	
+		/**
+		 * JSON returned from the server in the last Ajax request
+		 *  @type object
+		 *  @default undefined
+		 */
+		"json": undefined,
+	
+		/**
+		 * Data submitted as part of the last Ajax request
+		 *  @type object
+		 *  @default undefined
+		 */
+		"oAjaxData": undefined,
+	
+		/**
+		 * Function to get the server-side data.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type function
+		 */
+		"fnServerData": null,
+	
+		/**
+		 * Functions which are called prior to sending an Ajax request so extra
+		 * parameters can easily be sent to the server
+		 *  @type array
+		 *  @default []
+		 */
+		"aoServerParams": [],
+	
+		/**
+		 * Send the XHR HTTP method - GET or POST (could be PUT or DELETE if
+		 * required).
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type string
+		 */
+		"sServerMethod": null,
+	
+		/**
+		 * Format numbers for display.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type function
+		 */
+		"fnFormatNumber": null,
+	
+		/**
+		 * List of options that can be used for the user selectable length menu.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type array
+		 *  @default []
+		 */
+		"aLengthMenu": null,
+	
+		/**
+		 * Counter for the draws that the table does. Also used as a tracker for
+		 * server-side processing
+		 *  @type int
+		 *  @default 0
+		 */
+		"iDraw": 0,
+	
+		/**
+		 * Indicate if a redraw is being done - useful for Ajax
+		 *  @type boolean
+		 *  @default false
+		 */
+		"bDrawing": false,
+	
+		/**
+		 * Draw index (iDraw) of the last error when parsing the returned data
+		 *  @type int
+		 *  @default -1
+		 */
+		"iDrawError": -1,
+	
+		/**
+		 * Paging display length
+		 *  @type int
+		 *  @default 10
+		 */
+		"_iDisplayLength": 10,
+	
+		/**
+		 * Paging start point - aiDisplay index
+		 *  @type int
+		 *  @default 0
+		 */
+		"_iDisplayStart": 0,
+	
+		/**
+		 * Server-side processing - number of records in the result set
+		 * (i.e. before filtering), Use fnRecordsTotal rather than
+		 * this property to get the value of the number of records, regardless of
+		 * the server-side processing setting.
+		 *  @type int
+		 *  @default 0
+		 *  @private
+		 */
+		"_iRecordsTotal": 0,
+	
+		/**
+		 * Server-side processing - number of records in the current display set
+		 * (i.e. after filtering). Use fnRecordsDisplay rather than
+		 * this property to get the value of the number of records, regardless of
+		 * the server-side processing setting.
+		 *  @type boolean
+		 *  @default 0
+		 *  @private
+		 */
+		"_iRecordsDisplay": 0,
+	
+		/**
+		 * Flag to indicate if jQuery UI marking and classes should be used.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type boolean
+		 */
+		"bJUI": null,
+	
+		/**
+		 * The classes to use for the table
+		 *  @type object
+		 *  @default {}
+		 */
+		"oClasses": {},
+	
+		/**
+		 * Flag attached to the settings object so you can check in the draw
+		 * callback if filtering has been done in the draw. Deprecated in favour of
+		 * events.
+		 *  @type boolean
+		 *  @default false
+		 *  @deprecated
+		 */
+		"bFiltered": false,
+	
+		/**
+		 * Flag attached to the settings object so you can check in the draw
+		 * callback if sorting has been done in the draw. Deprecated in favour of
+		 * events.
+		 *  @type boolean
+		 *  @default false
+		 *  @deprecated
+		 */
+		"bSorted": false,
+	
+		/**
+		 * Indicate that if multiple rows are in the header and there is more than
+		 * one unique cell per column, if the top one (true) or bottom one (false)
+		 * should be used for sorting / title by DataTables.
+		 * Note that this parameter will be set by the initialisation routine. To
+		 * set a default use {@link DataTable.defaults}.
+		 *  @type boolean
+		 */
+		"bSortCellsTop": null,
+	
+		/**
+		 * Initialisation object that is used for the table
+		 *  @type object
+		 *  @default null
+		 */
+		"oInit": null,
+	
+		/**
+		 * Destroy callback functions - for plug-ins to attach themselves to the
+		 * destroy so they can clean up markup and events.
+		 *  @type array
+		 *  @default []
+		 */
+		"aoDestroyCallback": [],
+	
+	
+		/**
+		 * Get the number of records in the current record set, before filtering
+		 *  @type function
+		 */
+		"fnRecordsTotal": function ()
+		{
+			return _fnDataSource( this ) == 'ssp' ?
+				this._iRecordsTotal * 1 :
+				this.aiDisplayMaster.length;
+		},
+	
+		/**
+		 * Get the number of records in the current record set, after filtering
+		 *  @type function
+		 */
+		"fnRecordsDisplay": function ()
+		{
+			return _fnDataSource( this ) == 'ssp' ?
+				this._iRecordsDisplay * 1 :
+				this.aiDisplay.length;
+		},
+	
+		/**
+		 * Get the display end point - aiDisplay index
+		 *  @type function
+		 */
+		"fnDisplayEnd": function ()
+		{
+			var
+				len      = this._iDisplayLength,
+				start    = this._iDisplayStart,
+				calc     = start + len,
+				records  = this.aiDisplay.length,
+				features = this.oFeatures,
+				paginate = features.bPaginate;
+	
+			if ( features.bServerSide ) {
+				return paginate === false || len === -1 ?
+					start + records :
+					Math.min( start+len, this._iRecordsDisplay );
+			}
+			else {
+				return ! paginate || calc>records || len===-1 ?
+					records :
+					calc;
+			}
+		},
+	
+		/**
+		 * The DataTables object for this table
+		 *  @type object
+		 *  @default null
+		 */
+		"oInstance": null,
+	
+		/**
+		 * Unique identifier for each instance of the DataTables object. If there
+		 * is an ID on the table node, then it takes that value, otherwise an
+		 * incrementing internal counter is used.
+		 *  @type string
+		 *  @default null
+		 */
+		"sInstance": null,
+	
+		/**
+		 * tabindex attribute value that is added to DataTables control elements, allowing
+		 * keyboard navigation of the table and its controls.
+		 */
+		"iTabIndex": 0,
+	
+		/**
+		 * DIV container for the footer scrolling table if scrolling
+		 */
+		"nScrollHead": null,
+	
+		/**
+		 * DIV container for the footer scrolling table if scrolling
+		 */
+		"nScrollFoot": null,
+	
+		/**
+		 * Last applied sort
+		 *  @type array
+		 *  @default []
+		 */
+		"aLastSort": [],
+	
+		/**
+		 * Stored plug-in instances
+		 *  @type object
+		 *  @default {}
+		 */
+		"oPlugins": {},
+	
+		/**
+		 * Function used to get a row's id from the row's data
+		 *  @type function
+		 *  @default null
+		 */
+		"rowIdFn": null,
+	
+		/**
+		 * Data location where to store a row's id
+		 *  @type string
+		 *  @default null
+		 */
+		"rowId": null
+	};
+
+	/**
+	 * Extension object for DataTables that is used to provide all extension
+	 * options.
+	 *
+	 * Note that the `DataTable.ext` object is available through
+	 * `jQuery.fn.dataTable.ext` where it may be accessed and manipulated. It is
+	 * also aliased to `jQuery.fn.dataTableExt` for historic reasons.
+	 *  @namespace
+	 *  @extends DataTable.models.ext
+	 */
+	
+	
+	/**
+	 * DataTables extensions
+	 * 
+	 * This namespace acts as a collection area for plug-ins that can be used to
+	 * extend DataTables capabilities. Indeed many of the build in methods
+	 * use this method to provide their own capabilities (sorting methods for
+	 * example).
+	 *
+	 * Note that this namespace is aliased to `jQuery.fn.dataTableExt` for legacy
+	 * reasons
+	 *
+	 *  @namespace
+	 */
+	DataTable.ext = _ext = {
+		/**
+		 * Buttons. For use with the Buttons extension for DataTables. This is
+		 * defined here so other extensions can define buttons regardless of load
+		 * order. It is _not_ used by DataTables core.
+		 *
+		 *  @type object
+		 *  @default {}
+		 */
+		buttons: {},
+	
+	
+		/**
+		 * Element class names
+		 *
+		 *  @type object
+		 *  @default {}
+		 */
+		classes: {},
+	
+	
+		/**
+		 * Error reporting.
+		 * 
+		 * How should DataTables report an error. Can take the value 'alert',
+		 * 'throw', 'none' or a function.
+		 *
+		 *  @type string|function
+		 *  @default alert
+		 */
+		errMode: "alert",
+	
+	
+		/**
+		 * Feature plug-ins.
+		 * 
+		 * This is an array of objects which describe the feature plug-ins that are
+		 * available to DataTables. These feature plug-ins are then available for
+		 * use through the `dom` initialisation option.
+		 * 
+		 * Each feature plug-in is described by an object which must have the
+		 * following properties:
+		 * 
+		 * * `fnInit` - function that is used to initialise the plug-in,
+		 * * `cFeature` - a character so the feature can be enabled by the `dom`
+		 *   instillation option. This is case sensitive.
+		 *
+		 * The `fnInit` function has the following input parameters:
+		 *
+		 * 1. `{object}` DataTables settings object: see
+		 *    {@link DataTable.models.oSettings}
+		 *
+		 * And the following return is expected:
+		 * 
+		 * * {node|null} The element which contains your feature. Note that the
+		 *   return may also be void if your plug-in does not require to inject any
+		 *   DOM elements into DataTables control (`dom`) - for example this might
+		 *   be useful when developing a plug-in which allows table control via
+		 *   keyboard entry
+		 *
+		 *  @type array
+		 *
+		 *  @example
+		 *    $.fn.dataTable.ext.features.push( {
+		 *      "fnInit": function( oSettings ) {
+		 *        return new TableTools( { "oDTSettings": oSettings } );
+		 *      },
+		 *      "cFeature": "T"
+		 *    } );
+		 */
+		feature: [],
+	
+	
+		/**
+		 * Row searching.
+		 * 
+		 * This method of searching is complimentary to the default type based
+		 * searching, and a lot more comprehensive as it allows you complete control
+		 * over the searching logic. Each element in this array is a function
+		 * (parameters described below) that is called for every row in the table,
+		 * and your logic decides if it should be included in the searching data set
+		 * or not.
+		 *
+		 * Searching functions have the following input parameters:
+		 *
+		 * 1. `{object}` DataTables settings object: see
+		 *    {@link DataTable.models.oSettings}
+		 * 2. `{array|object}` Data for the row to be processed (same as the
+		 *    original format that was passed in as the data source, or an array
+		 *    from a DOM data source
+		 * 3. `{int}` Row index ({@link DataTable.models.oSettings.aoData}), which
+		 *    can be useful to retrieve the `TR` element if you need DOM interaction.
+		 *
+		 * And the following return is expected:
+		 *
+		 * * {boolean} Include the row in the searched result set (true) or not
+		 *   (false)
+		 *
+		 * Note that as with the main search ability in DataTables, technically this
+		 * is "filtering", since it is subtractive. However, for consistency in
+		 * naming we call it searching here.
+		 *
+		 *  @type array
+		 *  @default []
+		 *
+		 *  @example
+		 *    // The following example shows custom search being applied to the
+		 *    // fourth column (i.e. the data[3] index) based on two input values
+		 *    // from the end-user, matching the data in a certain range.
+		 *    $.fn.dataTable.ext.search.push(
+		 *      function( settings, data, dataIndex ) {
+		 *        var min = document.getElementById('min').value * 1;
+		 *        var max = document.getElementById('max').value * 1;
+		 *        var version = data[3] == "-" ? 0 : data[3]*1;
+		 *
+		 *        if ( min == "" && max == "" ) {
+		 *          return true;
+		 *        }
+		 *        else if ( min == "" && version < max ) {
+		 *          return true;
+		 *        }
+		 *        else if ( min < version && "" == max ) {
+		 *          return true;
+		 *        }
+		 *        else if ( min < version && version < max ) {
+		 *          return true;
+		 *        }
+		 *        return false;
+		 *      }
+		 *    );
+		 */
+		search: [],
+	
+	
+		/**
+		 * Selector extensions
+		 *
+		 * The `selector` option can be used to extend the options available for the
+		 * selector modifier options (`selector-modifier` object data type) that
+		 * each of the three built in selector types offer (row, column and cell +
+		 * their plural counterparts). For example the Select extension uses this
+		 * mechanism to provide an option to select only rows, columns and cells
+		 * that have been marked as selected by the end user (`{selected: true}`),
+		 * which can be used in conjunction with the existing built in selector
+		 * options.
+		 *
+		 * Each property is an array to which functions can be pushed. The functions
+		 * take three attributes:
+		 *
+		 * * Settings object for the host table
+		 * * Options object (`selector-modifier` object type)
+		 * * Array of selected item indexes
+		 *
+		 * The return is an array of the resulting item indexes after the custom
+		 * selector has been applied.
+		 *
+		 *  @type object
+		 */
+		selector: {
+			cell: [],
+			column: [],
+			row: []
+		},
+	
+	
+		/**
+		 * Internal functions, exposed for used in plug-ins.
+		 * 
+		 * Please note that you should not need to use the internal methods for
+		 * anything other than a plug-in (and even then, try to avoid if possible).
+		 * The internal function may change between releases.
+		 *
+		 *  @type object
+		 *  @default {}
+		 */
+		internal: {},
+	
+	
+		/**
+		 * Legacy configuration options. Enable and disable legacy options that
+		 * are available in DataTables.
+		 *
+		 *  @type object
+		 */
+		legacy: {
+			/**
+			 * Enable / disable DataTables 1.9 compatible server-side processing
+			 * requests
+			 *
+			 *  @type boolean
+			 *  @default null
+			 */
+			ajax: null
+		},
+	
+	
+		/**
+		 * Pagination plug-in methods.
+		 * 
+		 * Each entry in this object is a function and defines which buttons should
+		 * be shown by the pagination rendering method that is used for the table:
+		 * {@link DataTable.ext.renderer.pageButton}. The renderer addresses how the
+		 * buttons are displayed in the document, while the functions here tell it
+		 * what buttons to display. This is done by returning an array of button
+		 * descriptions (what each button will do).
+		 *
+		 * Pagination types (the four built in options and any additional plug-in
+		 * options defined here) can be used through the `paginationType`
+		 * initialisation parameter.
+		 *
+		 * The functions defined take two parameters:
+		 *
+		 * 1. `{int} page` The current page index
+		 * 2. `{int} pages` The number of pages in the table
+		 *
+		 * Each function is expected to return an array where each element of the
+		 * array can be one of:
+		 *
+		 * * `first` - Jump to first page when activated
+		 * * `last` - Jump to last page when activated
+		 * * `previous` - Show previous page when activated
+		 * * `next` - Show next page when activated
+		 * * `{int}` - Show page of the index given
+		 * * `{array}` - A nested array containing the above elements to add a
+		 *   containing 'DIV' element (might be useful for styling).
+		 *
+		 * Note that DataTables v1.9- used this object slightly differently whereby
+		 * an object with two functions would be defined for each plug-in. That
+		 * ability is still supported by DataTables 1.10+ to provide backwards
+		 * compatibility, but this option of use is now decremented and no longer
+		 * documented in DataTables 1.10+.
+		 *
+		 *  @type object
+		 *  @default {}
+		 *
+		 *  @example
+		 *    // Show previous, next and current page buttons only
+		 *    $.fn.dataTableExt.oPagination.current = function ( page, pages ) {
+		 *      return [ 'previous', page, 'next' ];
+		 *    };
+		 */
+		pager: {},
+	
+	
+		renderer: {
+			pageButton: {},
+			header: {}
+		},
+	
+	
+		/**
+		 * Ordering plug-ins - custom data source
+		 * 
+		 * The extension options for ordering of data available here is complimentary
+		 * to the default type based ordering that DataTables typically uses. It
+		 * allows much greater control over the the data that is being used to
+		 * order a column, but is necessarily therefore more complex.
+		 * 
+		 * This type of ordering is useful if you want to do ordering based on data
+		 * live from the DOM (for example the contents of an 'input' element) rather
+		 * than just the static string that DataTables knows of.
+		 * 
+		 * The way these plug-ins work is that you create an array of the values you
+		 * wish to be ordering for the column in question and then return that
+		 * array. The data in the array much be in the index order of the rows in
+		 * the table (not the currently ordering order!). Which order data gathering
+		 * function is run here depends on the `dt-init columns.orderDataType`
+		 * parameter that is used for the column (if any).
+		 *
+		 * The functions defined take two parameters:
+		 *
+		 * 1. `{object}` DataTables settings object: see
+		 *    {@link DataTable.models.oSettings}
+		 * 2. `{int}` Target column index
+		 *
+		 * Each function is expected to return an array:
+		 *
+		 * * `{array}` Data for the column to be ordering upon
+		 *
+		 *  @type array
+		 *
+		 *  @example
+		 *    // Ordering using `input` node values
+		 *    $.fn.dataTable.ext.order['dom-text'] = function  ( settings, col )
+		 *    {
+		 *      return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
+		 *        return $('input', td).val();
+		 *      } );
+		 *    }
+		 */
+		order: {},
+	
+	
+		/**
+		 * Type based plug-ins.
+		 *
+		 * Each column in DataTables has a type assigned to it, either by automatic
+		 * detection or by direct assignment using the `type` option for the column.
+		 * The type of a column will effect how it is ordering and search (plug-ins
+		 * can also make use of the column type if required).
+		 *
+		 * @namespace
+		 */
+		type: {
+			/**
+			 * Type detection functions.
+			 *
+			 * The functions defined in this object are used to automatically detect
+			 * a column's type, making initialisation of DataTables super easy, even
+			 * when complex data is in the table.
+			 *
+			 * The functions defined take two parameters:
+			 *
+		     *  1. `{*}` Data from the column cell to be analysed
+		     *  2. `{settings}` DataTables settings object. This can be used to
+		     *     perform context specific type detection - for example detection
+		     *     based on language settings such as using a comma for a decimal
+		     *     place. Generally speaking the options from the settings will not
+		     *     be required
+			 *
+			 * Each function is expected to return:
+			 *
+			 * * `{string|null}` Data type detected, or null if unknown (and thus
+			 *   pass it on to the other type detection functions.
+			 *
+			 *  @type array
+			 *
+			 *  @example
+			 *    // Currency type detection plug-in:
+			 *    $.fn.dataTable.ext.type.detect.push(
+			 *      function ( data, settings ) {
+			 *        // Check the numeric part
+			 *        if ( ! $.isNumeric( data.substring(1) ) ) {
+			 *          return null;
+			 *        }
+			 *
+			 *        // Check prefixed by currency
+			 *        if ( data.charAt(0) == '$' || data.charAt(0) == '&pound;' ) {
+			 *          return 'currency';
+			 *        }
+			 *        return null;
+			 *      }
+			 *    );
+			 */
+			detect: [],
+	
+	
+			/**
+			 * Type based search formatting.
+			 *
+			 * The type based searching functions can be used to pre-format the
+			 * data to be search on. For example, it can be used to strip HTML
+			 * tags or to de-format telephone numbers for numeric only searching.
+			 *
+			 * Note that is a search is not defined for a column of a given type,
+			 * no search formatting will be performed.
+			 * 
+			 * Pre-processing of searching data plug-ins - When you assign the sType
+			 * for a column (or have it automatically detected for you by DataTables
+			 * or a type detection plug-in), you will typically be using this for
+			 * custom sorting, but it can also be used to provide custom searching
+			 * by allowing you to pre-processing the data and returning the data in
+			 * the format that should be searched upon. This is done by adding
+			 * functions this object with a parameter name which matches the sType
+			 * for that target column. This is the corollary of <i>afnSortData</i>
+			 * for searching data.
+			 *
+			 * The functions defined take a single parameter:
+			 *
+		     *  1. `{*}` Data from the column cell to be prepared for searching
+			 *
+			 * Each function is expected to return:
+			 *
+			 * * `{string|null}` Formatted string that will be used for the searching.
+			 *
+			 *  @type object
+			 *  @default {}
+			 *
+			 *  @example
+			 *    $.fn.dataTable.ext.type.search['title-numeric'] = function ( d ) {
+			 *      return d.replace(/\n/g," ").replace( /<.*?>/g, "" );
+			 *    }
+			 */
+			search: {},
+	
+	
+			/**
+			 * Type based ordering.
+			 *
+			 * The column type tells DataTables what ordering to apply to the table
+			 * when a column is sorted upon. The order for each type that is defined,
+			 * is defined by the functions available in this object.
+			 *
+			 * Each ordering option can be described by three properties added to
+			 * this object:
+			 *
+			 * * `{type}-pre` - Pre-formatting function
+			 * * `{type}-asc` - Ascending order function
+			 * * `{type}-desc` - Descending order function
+			 *
+			 * All three can be used together, only `{type}-pre` or only
+			 * `{type}-asc` and `{type}-desc` together. It is generally recommended
+			 * that only `{type}-pre` is used, as this provides the optimal
+			 * implementation in terms of speed, although the others are provided
+			 * for compatibility with existing Javascript sort functions.
+			 *
+			 * `{type}-pre`: Functions defined take a single parameter:
+			 *
+		     *  1. `{*}` Data from the column cell to be prepared for ordering
+			 *
+			 * And return:
+			 *
+			 * * `{*}` Data to be sorted upon
+			 *
+			 * `{type}-asc` and `{type}-desc`: Functions are typical Javascript sort
+			 * functions, taking two parameters:
+			 *
+		     *  1. `{*}` Data to compare to the second parameter
+		     *  2. `{*}` Data to compare to the first parameter
+			 *
+			 * And returning:
+			 *
+			 * * `{*}` Ordering match: <0 if first parameter should be sorted lower
+			 *   than the second parameter, ===0 if the two parameters are equal and
+			 *   >0 if the first parameter should be sorted height than the second
+			 *   parameter.
+			 * 
+			 *  @type object
+			 *  @default {}
+			 *
+			 *  @example
+			 *    // Numeric ordering of formatted numbers with a pre-formatter
+			 *    $.extend( $.fn.dataTable.ext.type.order, {
+			 *      "string-pre": function(x) {
+			 *        a = (a === "-" || a === "") ? 0 : a.replace( /[^\d\-\.]/g, "" );
+			 *        return parseFloat( a );
+			 *      }
+			 *    } );
+			 *
+			 *  @example
+			 *    // Case-sensitive string ordering, with no pre-formatting method
+			 *    $.extend( $.fn.dataTable.ext.order, {
+			 *      "string-case-asc": function(x,y) {
+			 *        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+			 *      },
+			 *      "string-case-desc": function(x,y) {
+			 *        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+			 *      }
+			 *    } );
+			 */
+			order: {}
+		},
+	
+		/**
+		 * Unique DataTables instance counter
+		 *
+		 * @type int
+		 * @private
+		 */
+		_unique: 0,
+	
+	
+		//
+		// Depreciated
+		// The following properties are retained for backwards compatiblity only.
+		// The should not be used in new projects and will be removed in a future
+		// version
+		//
+	
+		/**
+		 * Version check function.
+		 *  @type function
+		 *  @depreciated Since 1.10
+		 */
+		fnVersionCheck: DataTable.fnVersionCheck,
+	
+	
+		/**
+		 * Index for what 'this' index API functions should use
+		 *  @type int
+		 *  @deprecated Since v1.10
+		 */
+		iApiIndex: 0,
+	
+	
+		/**
+		 * jQuery UI class container
+		 *  @type object
+		 *  @deprecated Since v1.10
+		 */
+		oJUIClasses: {},
+	
+	
+		/**
+		 * Software version
+		 *  @type string
+		 *  @deprecated Since v1.10
+		 */
+		sVersion: DataTable.version
+	};
+	
+	
+	//
+	// Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts
+	//
+	$.extend( _ext, {
+		afnFiltering: _ext.search,
+		aTypes:       _ext.type.detect,
+		ofnSearch:    _ext.type.search,
+		oSort:        _ext.type.order,
+		afnSortData:  _ext.order,
+		aoFeatures:   _ext.feature,
+		oApi:         _ext.internal,
+		oStdClasses:  _ext.classes,
+		oPagination:  _ext.pager
+	} );
+	
+	
+	$.extend( DataTable.ext.classes, {
+		"sTable": "dataTable",
+		"sNoFooter": "no-footer",
+	
+		/* Paging buttons */
+		"sPageButton": "paginate_button",
+		"sPageButtonActive": "current",
+		"sPageButtonDisabled": "disabled",
+	
+		/* Striping classes */
+		"sStripeOdd": "odd",
+		"sStripeEven": "even",
+	
+		/* Empty row */
+		"sRowEmpty": "dataTables_empty",
+	
+		/* Features */
+		"sWrapper": "dataTables_wrapper",
+		"sFilter": "dataTables_filter",
+		"sInfo": "dataTables_info",
+		"sPaging": "dataTables_paginate paging_", /* Note that the type is postfixed */
+		"sLength": "dataTables_length",
+		"sProcessing": "dataTables_processing",
+	
+		/* Sorting */
+		"sSortAsc": "sorting_asc",
+		"sSortDesc": "sorting_desc",
+		"sSortable": "sorting", /* Sortable in both directions */
+		"sSortableAsc": "sorting_asc_disabled",
+		"sSortableDesc": "sorting_desc_disabled",
+		"sSortableNone": "sorting_disabled",
+		"sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
+	
+		/* Filtering */
+		"sFilterInput": "",
+	
+		/* Page length */
+		"sLengthSelect": "",
+	
+		/* Scrolling */
+		"sScrollWrapper": "dataTables_scroll",
+		"sScrollHead": "dataTables_scrollHead",
+		"sScrollHeadInner": "dataTables_scrollHeadInner",
+		"sScrollBody": "dataTables_scrollBody",
+		"sScrollFoot": "dataTables_scrollFoot",
+		"sScrollFootInner": "dataTables_scrollFootInner",
+	
+		/* Misc */
+		"sHeaderTH": "",
+		"sFooterTH": "",
+	
+		// Deprecated
+		"sSortJUIAsc": "",
+		"sSortJUIDesc": "",
+		"sSortJUI": "",
+		"sSortJUIAscAllowed": "",
+		"sSortJUIDescAllowed": "",
+		"sSortJUIWrapper": "",
+		"sSortIcon": "",
+		"sJUIHeader": "",
+		"sJUIFooter": ""
+	} );
+	
+	
+	(function() {
+	
+	// Reused strings for better compression. Closure compiler appears to have a
+	// weird edge case where it is trying to expand strings rather than use the
+	// variable version. This results in about 200 bytes being added, for very
+	// little preference benefit since it this run on script load only.
+	var _empty = '';
+	_empty = '';
+	
+	var _stateDefault = _empty + 'ui-state-default';
+	var _sortIcon     = _empty + 'css_right ui-icon ui-icon-';
+	var _headerFooter = _empty + 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix';
+	
+	$.extend( DataTable.ext.oJUIClasses, DataTable.ext.classes, {
+		/* Full numbers paging buttons */
+		"sPageButton":         "fg-button ui-button "+_stateDefault,
+		"sPageButtonActive":   "ui-state-disabled",
+		"sPageButtonDisabled": "ui-state-disabled",
+	
+		/* Features */
+		"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
+			"ui-buttonset-multi paging_", /* Note that the type is postfixed */
+	
+		/* Sorting */
+		"sSortAsc":            _stateDefault+" sorting_asc",
+		"sSortDesc":           _stateDefault+" sorting_desc",
+		"sSortable":           _stateDefault+" sorting",
+		"sSortableAsc":        _stateDefault+" sorting_asc_disabled",
+		"sSortableDesc":       _stateDefault+" sorting_desc_disabled",
+		"sSortableNone":       _stateDefault+" sorting_disabled",
+		"sSortJUIAsc":         _sortIcon+"triangle-1-n",
+		"sSortJUIDesc":        _sortIcon+"triangle-1-s",
+		"sSortJUI":            _sortIcon+"carat-2-n-s",
+		"sSortJUIAscAllowed":  _sortIcon+"carat-1-n",
+		"sSortJUIDescAllowed": _sortIcon+"carat-1-s",
+		"sSortJUIWrapper":     "DataTables_sort_wrapper",
+		"sSortIcon":           "DataTables_sort_icon",
+	
+		/* Scrolling */
+		"sScrollHead": "dataTables_scrollHead "+_stateDefault,
+		"sScrollFoot": "dataTables_scrollFoot "+_stateDefault,
+	
+		/* Misc */
+		"sHeaderTH":  _stateDefault,
+		"sFooterTH":  _stateDefault,
+		"sJUIHeader": _headerFooter+" ui-corner-tl ui-corner-tr",
+		"sJUIFooter": _headerFooter+" ui-corner-bl ui-corner-br"
+	} );
+	
+	}());
+	
+	
+	
+	var extPagination = DataTable.ext.pager;
+	
+	function _numbers ( page, pages ) {
+		var
+			numbers = [],
+			buttons = extPagination.numbers_length,
+			half = Math.floor( buttons / 2 ),
+			i = 1;
+	
+		if ( pages <= buttons ) {
+			numbers = _range( 0, pages );
+		}
+		else if ( page <= half ) {
+			numbers = _range( 0, buttons-2 );
+			numbers.push( 'ellipsis' );
+			numbers.push( pages-1 );
+		}
+		else if ( page >= pages - 1 - half ) {
+			numbers = _range( pages-(buttons-2), pages );
+			numbers.splice( 0, 0, 'ellipsis' ); // no unshift in ie6
+			numbers.splice( 0, 0, 0 );
+		}
+		else {
+			numbers = _range( page-half+2, page+half-1 );
+			numbers.push( 'ellipsis' );
+			numbers.push( pages-1 );
+			numbers.splice( 0, 0, 'ellipsis' );
+			numbers.splice( 0, 0, 0 );
+		}
+	
+		numbers.DT_el = 'span';
+		return numbers;
+	}
+	
+	
+	$.extend( extPagination, {
+		simple: function ( page, pages ) {
+			return [ 'previous', 'next' ];
+		},
+	
+		full: function ( page, pages ) {
+			return [  'first', 'previous', 'next', 'last' ];
+		},
+	
+		numbers: function ( page, pages ) {
+			return [ _numbers(page, pages) ];
+		},
+	
+		simple_numbers: function ( page, pages ) {
+			return [ 'previous', _numbers(page, pages), 'next' ];
+		},
+	
+		full_numbers: function ( page, pages ) {
+			return [ 'first', 'previous', _numbers(page, pages), 'next', 'last' ];
+		},
+	
+		// For testing and plug-ins to use
+		_numbers: _numbers,
+	
+		// Number of number buttons (including ellipsis) to show. _Must be odd!_
+		numbers_length: 7
+	} );
+	
+	
+	$.extend( true, DataTable.ext.renderer, {
+		pageButton: {
+			_: function ( settings, host, idx, buttons, page, pages ) {
+				var classes = settings.oClasses;
+				var lang = settings.oLanguage.oPaginate;
+				var btnDisplay, btnClass, counter=0;
+	
+				var attach = function( container, buttons ) {
+					var i, ien, node, button;
+					var clickHandler = function ( e ) {
+						_fnPageChange( settings, e.data.action, true );
+					};
+	
+					for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+						button = buttons[i];
+	
+						if ( $.isArray( button ) ) {
+							var inner = $( '<'+(button.DT_el || 'div')+'/>' )
+								.appendTo( container );
+							attach( inner, button );
+						}
+						else {
+							btnDisplay = null;
+							btnClass = '';
+	
+							switch ( button ) {
+								case 'ellipsis':
+									container.append('<span class="ellipsis">&#x2026;</span>');
+									break;
+	
+								case 'first':
+									btnDisplay = lang.sFirst;
+									btnClass = button + (page > 0 ?
+										'' : ' '+classes.sPageButtonDisabled);
+									break;
+	
+								case 'previous':
+									btnDisplay = lang.sPrevious;
+									btnClass = button + (page > 0 ?
+										'' : ' '+classes.sPageButtonDisabled);
+									break;
+	
+								case 'next':
+									btnDisplay = lang.sNext;
+									btnClass = button + (page < pages-1 ?
+										'' : ' '+classes.sPageButtonDisabled);
+									break;
+	
+								case 'last':
+									btnDisplay = lang.sLast;
+									btnClass = button + (page < pages-1 ?
+										'' : ' '+classes.sPageButtonDisabled);
+									break;
+	
+								default:
+									btnDisplay = button + 1;
+									btnClass = page === button ?
+										classes.sPageButtonActive : '';
+									break;
+							}
+	
+							if ( btnDisplay !== null ) {
+								node = $('<a>', {
+										'class': classes.sPageButton+' '+btnClass,
+										'aria-controls': settings.sTableId,
+										'data-dt-idx': counter,
+										'tabindex': settings.iTabIndex,
+										'id': idx === 0 && typeof button === 'string' ?
+											settings.sTableId +'_'+ button :
+											null
+									} )
+									.html( btnDisplay )
+									.appendTo( container );
+	
+								_fnBindAction(
+									node, {action: button}, clickHandler
+								);
+	
+								counter++;
+							}
+						}
+					}
+				};
+	
+				// IE9 throws an 'unknown error' if document.activeElement is used
+				// inside an iframe or frame. Try / catch the error. Not good for
+				// accessibility, but neither are frames.
+				var activeEl;
+	
+				try {
+					// Because this approach is destroying and recreating the paging
+					// elements, focus is lost on the select button which is bad for
+					// accessibility. So we want to restore focus once the draw has
+					// completed
+					activeEl = $(host).find(document.activeElement).data('dt-idx');
+				}
+				catch (e) {}
+	
+				attach( $(host).empty(), buttons );
+	
+				if ( activeEl ) {
+					$(host).find( '[data-dt-idx='+activeEl+']' ).focus();
+				}
+			}
+		}
+	} );
+	
+	
+	
+	// Built in type detection. See model.ext.aTypes for information about
+	// what is required from this methods.
+	$.extend( DataTable.ext.type.detect, [
+		// Plain numbers - first since V8 detects some plain numbers as dates
+		// e.g. Date.parse('55') (but not all, e.g. Date.parse('22')...).
+		function ( d, settings )
+		{
+			var decimal = settings.oLanguage.sDecimal;
+			return _isNumber( d, decimal ) ? 'num'+decimal : null;
+		},
+	
+		// Dates (only those recognised by the browser's Date.parse)
+		function ( d, settings )
+		{
+			// V8 will remove any unknown characters at the start and end of the
+			// expression, leading to false matches such as `$245.12` or `10%` being
+			// a valid date. See forum thread 18941 for detail.
+			if ( d && !(d instanceof Date) && ( ! _re_date_start.test(d) || ! _re_date_end.test(d) ) ) {
+				return null;
+			}
+			var parsed = Date.parse(d);
+			return (parsed !== null && !isNaN(parsed)) || _empty(d) ? 'date' : null;
+		},
+	
+		// Formatted numbers
+		function ( d, settings )
+		{
+			var decimal = settings.oLanguage.sDecimal;
+			return _isNumber( d, decimal, true ) ? 'num-fmt'+decimal : null;
+		},
+	
+		// HTML numeric
+		function ( d, settings )
+		{
+			var decimal = settings.oLanguage.sDecimal;
+			return _htmlNumeric( d, decimal ) ? 'html-num'+decimal : null;
+		},
+	
+		// HTML numeric, formatted
+		function ( d, settings )
+		{
+			var decimal = settings.oLanguage.sDecimal;
+			return _htmlNumeric( d, decimal, true ) ? 'html-num-fmt'+decimal : null;
+		},
+	
+		// HTML (this is strict checking - there must be html)
+		function ( d, settings )
+		{
+			return _empty( d ) || (typeof d === 'string' && d.indexOf('<') !== -1) ?
+				'html' : null;
+		}
+	] );
+	
+	
+	
+	// Filter formatting functions. See model.ext.ofnSearch for information about
+	// what is required from these methods.
+	// 
+	// Note that additional search methods are added for the html numbers and
+	// html formatted numbers by `_addNumericSort()` when we know what the decimal
+	// place is
+	
+	
+	$.extend( DataTable.ext.type.search, {
+		html: function ( data ) {
+			return _empty(data) ?
+				data :
+				typeof data === 'string' ?
+					data
+						.replace( _re_new_lines, " " )
+						.replace( _re_html, "" ) :
+					'';
+		},
+	
+		string: function ( data ) {
+			return _empty(data) ?
+				data :
+				typeof data === 'string' ?
+					data.replace( _re_new_lines, " " ) :
+					data;
+		}
+	} );
+	
+	
+	
+	var __numericReplace = function ( d, decimalPlace, re1, re2 ) {
+		if ( d !== 0 && (!d || d === '-') ) {
+			return -Infinity;
+		}
+	
+		// If a decimal place other than `.` is used, it needs to be given to the
+		// function so we can detect it and replace with a `.` which is the only
+		// decimal place Javascript recognises - it is not locale aware.
+		if ( decimalPlace ) {
+			d = _numToDecimal( d, decimalPlace );
+		}
+	
+		if ( d.replace ) {
+			if ( re1 ) {
+				d = d.replace( re1, '' );
+			}
+	
+			if ( re2 ) {
+				d = d.replace( re2, '' );
+			}
+		}
+	
+		return d * 1;
+	};
+	
+	
+	// Add the numeric 'deformatting' functions for sorting and search. This is done
+	// in a function to provide an easy ability for the language options to add
+	// additional methods if a non-period decimal place is used.
+	function _addNumericSort ( decimalPlace ) {
+		$.each(
+			{
+				// Plain numbers
+				"num": function ( d ) {
+					return __numericReplace( d, decimalPlace );
+				},
+	
+				// Formatted numbers
+				"num-fmt": function ( d ) {
+					return __numericReplace( d, decimalPlace, _re_formatted_numeric );
+				},
+	
+				// HTML numeric
+				"html-num": function ( d ) {
+					return __numericReplace( d, decimalPlace, _re_html );
+				},
+	
+				// HTML numeric, formatted
+				"html-num-fmt": function ( d ) {
+					return __numericReplace( d, decimalPlace, _re_html, _re_formatted_numeric );
+				}
+			},
+			function ( key, fn ) {
+				// Add the ordering method
+				_ext.type.order[ key+decimalPlace+'-pre' ] = fn;
+	
+				// For HTML types add a search formatter that will strip the HTML
+				if ( key.match(/^html\-/) ) {
+					_ext.type.search[ key+decimalPlace ] = _ext.type.search.html;
+				}
+			}
+		);
+	}
+	
+	
+	// Default sort methods
+	$.extend( _ext.type.order, {
+		// Dates
+		"date-pre": function ( d ) {
+			return Date.parse( d ) || 0;
+		},
+	
+		// html
+		"html-pre": function ( a ) {
+			return _empty(a) ?
+				'' :
+				a.replace ?
+					a.replace( /<.*?>/g, "" ).toLowerCase() :
+					a+'';
+		},
+	
+		// string
+		"string-pre": function ( a ) {
+			// This is a little complex, but faster than always calling toString,
+			// http://jsperf.com/tostring-v-check
+			return _empty(a) ?
+				'' :
+				typeof a === 'string' ?
+					a.toLowerCase() :
+					! a.toString ?
+						'' :
+						a.toString();
+		},
+	
+		// string-asc and -desc are retained only for compatibility with the old
+		// sort methods
+		"string-asc": function ( x, y ) {
+			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+		},
+	
+		"string-desc": function ( x, y ) {
+			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+		}
+	} );
+	
+	
+	// Numeric sorting types - order doesn't matter here
+	_addNumericSort( '' );
+	
+	
+	$.extend( true, DataTable.ext.renderer, {
+		header: {
+			_: function ( settings, cell, column, classes ) {
+				// No additional mark-up required
+				// Attach a sort listener to update on sort - note that using the
+				// `DT` namespace will allow the event to be removed automatically
+				// on destroy, while the `dt` namespaced event is the one we are
+				// listening for
+				$(settings.nTable).on( 'order.dt.DT', function ( e, ctx, sorting, columns ) {
+					if ( settings !== ctx ) { // need to check this this is the host
+						return;               // table, not a nested one
+					}
+	
+					var colIdx = column.idx;
+	
+					cell
+						.removeClass(
+							column.sSortingClass +' '+
+							classes.sSortAsc +' '+
+							classes.sSortDesc
+						)
+						.addClass( columns[ colIdx ] == 'asc' ?
+							classes.sSortAsc : columns[ colIdx ] == 'desc' ?
+								classes.sSortDesc :
+								column.sSortingClass
+						);
+				} );
+			},
+	
+			jqueryui: function ( settings, cell, column, classes ) {
+				$('<div/>')
+					.addClass( classes.sSortJUIWrapper )
+					.append( cell.contents() )
+					.append( $('<span/>')
+						.addClass( classes.sSortIcon+' '+column.sSortingClassJUI )
+					)
+					.appendTo( cell );
+	
+				// Attach a sort listener to update on sort
+				$(settings.nTable).on( 'order.dt.DT', function ( e, ctx, sorting, columns ) {
+					if ( settings !== ctx ) {
+						return;
+					}
+	
+					var colIdx = column.idx;
+	
+					cell
+						.removeClass( classes.sSortAsc +" "+classes.sSortDesc )
+						.addClass( columns[ colIdx ] == 'asc' ?
+							classes.sSortAsc : columns[ colIdx ] == 'desc' ?
+								classes.sSortDesc :
+								column.sSortingClass
+						);
+	
+					cell
+						.find( 'span.'+classes.sSortIcon )
+						.removeClass(
+							classes.sSortJUIAsc +" "+
+							classes.sSortJUIDesc +" "+
+							classes.sSortJUI +" "+
+							classes.sSortJUIAscAllowed +" "+
+							classes.sSortJUIDescAllowed
+						)
+						.addClass( columns[ colIdx ] == 'asc' ?
+							classes.sSortJUIAsc : columns[ colIdx ] == 'desc' ?
+								classes.sSortJUIDesc :
+								column.sSortingClassJUI
+						);
+				} );
+			}
+		}
+	} );
+	
+	/*
+	 * Public helper functions. These aren't used internally by DataTables, or
+	 * called by any of the options passed into DataTables, but they can be used
+	 * externally by developers working with DataTables. They are helper functions
+	 * to make working with DataTables a little bit easier.
+	 */
+	
+	/**
+	 * Helpers for `columns.render`.
+	 *
+	 * The options defined here can be used with the `columns.render` initialisation
+	 * option to provide a display renderer. The following functions are defined:
+	 *
+	 * * `number` - Will format numeric data (defined by `columns.data`) for
+	 *   display, retaining the original unformatted data for sorting and filtering.
+	 *   It takes 5 parameters:
+	 *   * `string` - Thousands grouping separator
+	 *   * `string` - Decimal point indicator
+	 *   * `integer` - Number of decimal points to show
+	 *   * `string` (optional) - Prefix.
+	 *   * `string` (optional) - Postfix (/suffix).
+	 *
+	 * @example
+	 *   // Column definition using the number renderer
+	 *   {
+	 *     data: "salary",
+	 *     render: $.fn.dataTable.render.number( '\'', '.', 0, '$' )
+	 *   }
+	 *
+	 * @namespace
+	 */
+	DataTable.render = {
+		number: function ( thousands, decimal, precision, prefix, postfix ) {
+			return {
+				display: function ( d ) {
+					if ( typeof d !== 'number' && typeof d !== 'string' ) {
+						return d;
+					}
+	
+					var negative = d < 0 ? '-' : '';
+					d = Math.abs( parseFloat( d ) );
+	
+					var intPart = parseInt( d, 10 );
+					var floatPart = precision ?
+						decimal+(d - intPart).toFixed( precision ).substring( 2 ):
+						'';
+	
+					return negative + (prefix||'') +
+						intPart.toString().replace(
+							/\B(?=(\d{3})+(?!\d))/g, thousands
+						) +
+						floatPart +
+						(postfix||'');
+				}
+			};
+		}
+	};
+	
+	
+	/*
+	 * This is really a good bit rubbish this method of exposing the internal methods
+	 * publicly... - To be fixed in 2.0 using methods on the prototype
+	 */
+	
+	
+	/**
+	 * Create a wrapper function for exporting an internal functions to an external API.
+	 *  @param {string} fn API function name
+	 *  @returns {function} wrapped function
+	 *  @memberof DataTable#internal
+	 */
+	function _fnExternApiFunc (fn)
+	{
+		return function() {
+			var args = [_fnSettingsFromNode( this[DataTable.ext.iApiIndex] )].concat(
+				Array.prototype.slice.call(arguments)
+			);
+			return DataTable.ext.internal[fn].apply( this, args );
+		};
+	}
+	
+	
+	/**
+	 * Reference to internal functions for use by plug-in developers. Note that
+	 * these methods are references to internal functions and are considered to be
+	 * private. If you use these methods, be aware that they are liable to change
+	 * between versions.
+	 *  @namespace
+	 */
+	$.extend( DataTable.ext.internal, {
+		_fnExternApiFunc: _fnExternApiFunc,
+		_fnBuildAjax: _fnBuildAjax,
+		_fnAjaxUpdate: _fnAjaxUpdate,
+		_fnAjaxParameters: _fnAjaxParameters,
+		_fnAjaxUpdateDraw: _fnAjaxUpdateDraw,
+		_fnAjaxDataSrc: _fnAjaxDataSrc,
+		_fnAddColumn: _fnAddColumn,
+		_fnColumnOptions: _fnColumnOptions,
+		_fnAdjustColumnSizing: _fnAdjustColumnSizing,
+		_fnVisibleToColumnIndex: _fnVisibleToColumnIndex,
+		_fnColumnIndexToVisible: _fnColumnIndexToVisible,
+		_fnVisbleColumns: _fnVisbleColumns,
+		_fnGetColumns: _fnGetColumns,
+		_fnColumnTypes: _fnColumnTypes,
+		_fnApplyColumnDefs: _fnApplyColumnDefs,
+		_fnHungarianMap: _fnHungarianMap,
+		_fnCamelToHungarian: _fnCamelToHungarian,
+		_fnLanguageCompat: _fnLanguageCompat,
+		_fnBrowserDetect: _fnBrowserDetect,
+		_fnAddData: _fnAddData,
+		_fnAddTr: _fnAddTr,
+		_fnNodeToDataIndex: _fnNodeToDataIndex,
+		_fnNodeToColumnIndex: _fnNodeToColumnIndex,
+		_fnGetCellData: _fnGetCellData,
+		_fnSetCellData: _fnSetCellData,
+		_fnSplitObjNotation: _fnSplitObjNotation,
+		_fnGetObjectDataFn: _fnGetObjectDataFn,
+		_fnSetObjectDataFn: _fnSetObjectDataFn,
+		_fnGetDataMaster: _fnGetDataMaster,
+		_fnClearTable: _fnClearTable,
+		_fnDeleteIndex: _fnDeleteIndex,
+		_fnInvalidate: _fnInvalidate,
+		_fnGetRowElements: _fnGetRowElements,
+		_fnCreateTr: _fnCreateTr,
+		_fnBuildHead: _fnBuildHead,
+		_fnDrawHead: _fnDrawHead,
+		_fnDraw: _fnDraw,
+		_fnReDraw: _fnReDraw,
+		_fnAddOptionsHtml: _fnAddOptionsHtml,
+		_fnDetectHeader: _fnDetectHeader,
+		_fnGetUniqueThs: _fnGetUniqueThs,
+		_fnFeatureHtmlFilter: _fnFeatureHtmlFilter,
+		_fnFilterComplete: _fnFilterComplete,
+		_fnFilterCustom: _fnFilterCustom,
+		_fnFilterColumn: _fnFilterColumn,
+		_fnFilter: _fnFilter,
+		_fnFilterCreateSearch: _fnFilterCreateSearch,
+		_fnEscapeRegex: _fnEscapeRegex,
+		_fnFilterData: _fnFilterData,
+		_fnFeatureHtmlInfo: _fnFeatureHtmlInfo,
+		_fnUpdateInfo: _fnUpdateInfo,
+		_fnInfoMacros: _fnInfoMacros,
+		_fnInitialise: _fnInitialise,
+		_fnInitComplete: _fnInitComplete,
+		_fnLengthChange: _fnLengthChange,
+		_fnFeatureHtmlLength: _fnFeatureHtmlLength,
+		_fnFeatureHtmlPaginate: _fnFeatureHtmlPaginate,
+		_fnPageChange: _fnPageChange,
+		_fnFeatureHtmlProcessing: _fnFeatureHtmlProcessing,
+		_fnProcessingDisplay: _fnProcessingDisplay,
+		_fnFeatureHtmlTable: _fnFeatureHtmlTable,
+		_fnScrollDraw: _fnScrollDraw,
+		_fnApplyToChildren: _fnApplyToChildren,
+		_fnCalculateColumnWidths: _fnCalculateColumnWidths,
+		_fnThrottle: _fnThrottle,
+		_fnConvertToWidth: _fnConvertToWidth,
+		_fnGetWidestNode: _fnGetWidestNode,
+		_fnGetMaxLenString: _fnGetMaxLenString,
+		_fnStringToCss: _fnStringToCss,
+		_fnScrollBarWidth: _fnScrollBarWidth,
+		_fnSortFlatten: _fnSortFlatten,
+		_fnSort: _fnSort,
+		_fnSortAria: _fnSortAria,
+		_fnSortListener: _fnSortListener,
+		_fnSortAttachListener: _fnSortAttachListener,
+		_fnSortingClasses: _fnSortingClasses,
+		_fnSortData: _fnSortData,
+		_fnSaveState: _fnSaveState,
+		_fnLoadState: _fnLoadState,
+		_fnSettingsFromNode: _fnSettingsFromNode,
+		_fnLog: _fnLog,
+		_fnMap: _fnMap,
+		_fnBindAction: _fnBindAction,
+		_fnCallbackReg: _fnCallbackReg,
+		_fnCallbackFire: _fnCallbackFire,
+		_fnLengthOverflow: _fnLengthOverflow,
+		_fnRenderer: _fnRenderer,
+		_fnDataSource: _fnDataSource,
+		_fnRowAttributes: _fnRowAttributes,
+		_fnCalculateEnd: function () {} // Used by a lot of plug-ins, but redundant
+		                                // in 1.10, so this dead-end function is
+		                                // added to prevent errors
+	} );
+	
+
+	// jQuery access
+	$.fn.dataTable = DataTable;
+
+	// Legacy aliases
+	$.fn.dataTableSettings = DataTable.settings;
+	$.fn.dataTableExt = DataTable.ext;
+
+	// With a capital `D` we return a DataTables API instance rather than a
+	// jQuery object
+	$.fn.DataTable = function ( opts ) {
+		return $(this).dataTable( opts ).api();
+	};
+
+	// All properties that are available to $.fn.dataTable should also be
+	// available on $.fn.DataTable
+	$.each( DataTable, function ( prop, val ) {
+		$.fn.DataTable[ prop ] = val;
+	} );
+
+
+	// Information about events fired by DataTables - for documentation.
+	/**
+	 * Draw event, fired whenever the table is redrawn on the page, at the same
+	 * point as fnDrawCallback. This may be useful for binding events or
+	 * performing calculations when the table is altered at all.
+	 *  @name DataTable#draw.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Search event, fired when the searching applied to the table (using the
+	 * built-in global search, or column filters) is altered.
+	 *  @name DataTable#search.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Page change event, fired when the paging of the table is altered.
+	 *  @name DataTable#page.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Order event, fired when the ordering applied to the table is altered.
+	 *  @name DataTable#order.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * DataTables initialisation complete event, fired when the table is fully
+	 * drawn, including Ajax data loaded, if Ajax data is required.
+	 *  @name DataTable#init.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The JSON object request from the server - only
+	 *    present if client-side Ajax sourced data is used</li></ol>
+	 */
+
+	/**
+	 * State save event, fired when the table has changed state a new state save
+	 * is required. This event allows modification of the state saving object
+	 * prior to actually doing the save, including addition or other state
+	 * properties (for plug-ins) or modification of a DataTables core property.
+	 *  @name DataTable#stateSaveParams.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The state information to be saved
+	 */
+
+	/**
+	 * State load event, fired when the table is loading state from the stored
+	 * data, but prior to the settings object being modified by the saved state
+	 * - allowing modification of the saved state is required or loading of
+	 * state for a plug-in.
+	 *  @name DataTable#stateLoadParams.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The saved state information
+	 */
+
+	/**
+	 * State loaded event, fired when state has been loaded from stored data and
+	 * the settings object has been modified by the loaded data.
+	 *  @name DataTable#stateLoaded.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {object} json The saved state information
+	 */
+
+	/**
+	 * Processing event, fired when DataTables is doing some kind of processing
+	 * (be it, order, searcg or anything else). It can be used to indicate to
+	 * the end user that there is something happening, or that something has
+	 * finished.
+	 *  @name DataTable#processing.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} oSettings DataTables settings object
+	 *  @param {boolean} bShow Flag for if DataTables is doing processing or not
+	 */
+
+	/**
+	 * Ajax (XHR) event, fired whenever an Ajax request is completed from a
+	 * request to made to the server for new data. This event is called before
+	 * DataTables processed the returned data, so it can also be used to pre-
+	 * process the data returned from the server, if needed.
+	 *
+	 * Note that this trigger is called in `fnServerData`, if you override
+	 * `fnServerData` and which to use this event, you need to trigger it in you
+	 * success function.
+	 *  @name DataTable#xhr.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 *  @param {object} json JSON returned from the server
+	 *
+	 *  @example
+	 *     // Use a custom property returned from the server in another DOM element
+	 *     $('#table').dataTable().on('xhr.dt', function (e, settings, json) {
+	 *       $('#status').html( json.status );
+	 *     } );
+	 *
+	 *  @example
+	 *     // Pre-process the data returned from the server
+	 *     $('#table').dataTable().on('xhr.dt', function (e, settings, json) {
+	 *       for ( var i=0, ien=json.aaData.length ; i<ien ; i++ ) {
+	 *         json.aaData[i].sum = json.aaData[i].one + json.aaData[i].two;
+	 *       }
+	 *       // Note no return - manipulate the data directly in the JSON object.
+	 *     } );
+	 */
+
+	/**
+	 * Destroy event, fired when the DataTable is destroyed by calling fnDestroy
+	 * or passing the bDestroy:true parameter in the initialisation object. This
+	 * can be used to remove bound events, added DOM nodes, etc.
+	 *  @name DataTable#destroy.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Page length change event, fired when number of records to show on each
+	 * page (the length) is changed.
+	 *  @name DataTable#length.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 *  @param {integer} len New length
+	 */
+
+	/**
+	 * Column sizing has changed.
+	 *  @name DataTable#column-sizing.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 */
+
+	/**
+	 * Column visibility has changed.
+	 *  @name DataTable#column-visibility.dt
+	 *  @event
+	 *  @param {event} e jQuery event object
+	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
+	 *  @param {int} column Column index
+	 *  @param {bool} vis `false` if column now hidden, or `true` if visible
+	 */
+
+	return $.fn.dataTable;
+}));
+
+}(window, document));
+
diff --git a/Resources/Public/JavaScript/jquery.dataTables.min.js b/Resources/Public/JavaScript/jquery.dataTables.min.js
new file mode 100644
index 0000000..2668a1c
--- /dev/null
+++ b/Resources/Public/JavaScript/jquery.dataTables.min.js
@@ -0,0 +1,163 @@
+/*!
+ DataTables 1.10.8
+ ©2008-2014 SpryMedia Ltd - datatables.net/license
+*/
+(function(Fa,T,k){var S=function(g){function X(a){var b,c,d={};g.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),d[c]=e,"o"===b[1]&&X(a[e])});a._hungarianMap=d}function I(a,b,c){a._hungarianMap||X(a);var d;g.each(b,function(e){d=a._hungarianMap[e];if(d!==k&&(c||b[d]===k))"o"===d.charAt(0)?(b[d]||(b[d]={}),g.extend(!0,b[d],b[e]),I(a[d],b[d],c)):b[d]=b[e]})}function S(a){var b=m.defaults.oLanguage,c=a.sZeroRecords;
+!a.sEmptyTable&&(c&&"No data available in table"===b.sEmptyTable)&&F(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(c&&"Loading..."===b.sLoadingRecords)&&F(a,a,"sZeroRecords","sLoadingRecords");a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&db(a)}function eb(a){B(a,"ordering","bSort");B(a,"orderMulti","bSortMulti");B(a,"orderClasses","bSortClasses");B(a,"orderCellsTop","bSortCellsTop");B(a,"order","aaSorting");B(a,"orderFixed","aaSortingFixed");B(a,"paging","bPaginate");
+B(a,"pagingType","sPaginationType");B(a,"pageLength","iDisplayLength");B(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&I(m.models.oSearch,a[b])}function fb(a){B(a,"orderable","bSortable");B(a,"orderData","aDataSort");B(a,"orderSequence","asSorting");B(a,"orderDataType","sortDataType");var b=a.aDataSort;b&&!g.isArray(b)&&(a.aDataSort=[b])}function gb(a){var a=a.oBrowser,b=g("<div/>").css({position:"fixed",
+top:0,left:0,height:1,width:1,overflow:"hidden"}).append(g("<div/>").css({position:"absolute",top:1,left:1,width:100,overflow:"scroll"}).append(g('<div class="test"/>').css({width:"100%",height:10}))).appendTo("body"),c=b.find(".test");a.bScrollOversize=100===c[0].offsetWidth;a.bScrollbarLeft=1!==Math.round(c.offset().left);a.bBounding=b[0].getBoundingClientRect().width?!0:!1;b.remove()}function hb(a,b,c,d,e,f){var h,i=!1;c!==k&&(h=c,i=!0);for(;d!==e;)a.hasOwnProperty(d)&&(h=i?b(h,a[d],d,a):a[d],
+i=!0,d+=f);return h}function Ga(a,b){var c=m.defaults.column,d=a.aoColumns.length,c=g.extend({},m.models.oColumn,c,{nTh:b?b:T.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=g.extend({},m.models.oSearch,c[d]);ka(a,d,g(b).data())}function ka(a,b,c){var b=a.aoColumns[b],d=a.oClasses,e=g(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var f=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);
+f&&(b.sWidthOrig=f[1])}c!==k&&null!==c&&(fb(c),I(m.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),g.extend(b,c),F(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),F(b,c,"aDataSort"));var h=b.mData,i=P(h),j=b.mRender?P(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=g.isPlainObject(h)&&(c(h.sort)||c(h.type)||c(h.filter));b.fnGetData=
+function(a,b,c){var d=i(a,b,k,c);return j&&b?j(d,b,a,c):d};b.fnSetData=function(a,b,c){return Q(h)(a,b,c)};"number"!==typeof h&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==g.inArray("asc",b.asSorting);c=-1!==g.inArray("desc",b.asSorting);!b.bSortable||!a&&!c?(b.sSortingClass=d.sSortableNone,b.sSortingClassJUI=""):a&&!c?(b.sSortingClass=d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=
+d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI)}function Y(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Ha(a);for(var c=0,d=b.length;c<d;c++)b[c].nTh.style.width=b[c].sWidth}b=a.oScroll;(""!==b.sY||""!==b.sX)&&Z(a);w(a,null,"column-sizing",[a])}function la(a,b){var c=$(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function aa(a,b){var c=$(a,"bVisible"),c=g.inArray(b,c);return-1!==c?c:null}function ba(a){return $(a,"bVisible").length}function $(a,b){var c=
+[];g.map(a.aoColumns,function(a,e){a[b]&&c.push(e)});return c}function Ia(a){var b=a.aoColumns,c=a.aoData,d=m.ext.type.detect,e,f,h,i,j,g,l,r,q;e=0;for(f=b.length;e<f;e++)if(l=b[e],q=[],!l.sType&&l._sManualType)l.sType=l._sManualType;else if(!l.sType){h=0;for(i=d.length;h<i;h++){j=0;for(g=c.length;j<g;j++){q[j]===k&&(q[j]=y(a,j,e,"type"));r=d[h](q[j],a);if(!r&&h!==d.length-1)break;if("html"===r)break}if(r){l.sType=r;break}}l.sType||(l.sType="string")}}function ib(a,b,c,d){var e,f,h,i,j,n,l=a.aoColumns;
+if(b)for(e=b.length-1;0<=e;e--){n=b[e];var r=n.targets!==k?n.targets:n.aTargets;g.isArray(r)||(r=[r]);f=0;for(h=r.length;f<h;f++)if("number"===typeof r[f]&&0<=r[f]){for(;l.length<=r[f];)Ga(a);d(r[f],n)}else if("number"===typeof r[f]&&0>r[f])d(l.length+r[f],n);else if("string"===typeof r[f]){i=0;for(j=l.length;i<j;i++)("_all"==r[f]||g(l[i].nTh).hasClass(r[f]))&&d(i,n)}}if(c){e=0;for(a=c.length;e<a;e++)d(e,c[e])}}function L(a,b,c,d){var e=a.aoData.length,f=g.extend(!0,{},m.models.oRow,{src:c?"dom":
+"data",idx:e});f._aData=b;a.aoData.push(f);for(var h=a.aoColumns,i=0,j=h.length;i<j;i++)c&&Ja(a,e,i,y(a,e,i)),h[i].sType=null;a.aiDisplayMaster.push(e);b=a.rowIdFn(b);b!==k&&(a.aIds[b]=f);(c||!a.oFeatures.bDeferRender)&&Ka(a,e,c,d);return e}function ma(a,b){var c;b instanceof g||(b=g(b));return b.map(function(b,e){c=na(a,e);return L(a,c.data,e,c.cells)})}function y(a,b,c,d){var e=a.iDraw,f=a.aoColumns[c],h=a.aoData[b]._aData,i=f.sDefaultContent,c=f.fnGetData(h,d,{settings:a,row:b,col:c});if(c===k)return a.iDrawError!=
+e&&null===i&&(J(a,0,"Requested unknown parameter "+("function"==typeof f.mData?"{function}":"'"+f.mData+"'")+" for row "+b,4),a.iDrawError=e),i;if((c===h||null===c)&&null!==i)c=i;else if("function"===typeof c)return c.call(h);return null===c&&"display"==d?"":c}function Ja(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d,{settings:a,row:b,col:c})}function La(a){return g.map(a.match(/(\\.|[^\.])+/g)||[""],function(a){return a.replace(/\\./g,".")})}function P(a){if(g.isPlainObject(a)){var b={};
+g.each(a,function(a,c){c&&(b[a]=P(c))});return function(a,c,f,h){var i=b[c]||b._;return i!==k?i(a,c,f,h):a}}if(null===a)return function(a){return a};if("function"===typeof a)return function(b,c,f,h){return a(b,c,f,h)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var c=function(a,b,f){var h,i;if(""!==f){i=La(f);for(var j=0,g=i.length;j<g;j++){f=i[j].match(ca);h=i[j].match(U);if(f){i[j]=i[j].replace(ca,"");""!==i[j]&&(a=a[i[j]]);h=[];i.splice(0,j+1);i=i.join(".");
+j=0;for(g=a.length;j<g;j++)h.push(c(a[j],b,i));a=f[0].substring(1,f[0].length-1);a=""===a?h:h.join(a);break}else if(h){i[j]=i[j].replace(U,"");a=a[i[j]]();continue}if(null===a||a[i[j]]===k)return k;a=a[i[j]]}}return a};return function(b,e){return c(b,e,a)}}return function(b){return b[a]}}function Q(a){if(g.isPlainObject(a))return Q(a._);if(null===a)return function(){};if("function"===typeof a)return function(b,d,e){a(b,"set",d,e)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||
+-1!==a.indexOf("("))){var b=function(a,d,e){var e=La(e),f;f=e[e.length-1];for(var h,i,j=0,g=e.length-1;j<g;j++){h=e[j].match(ca);i=e[j].match(U);if(h){e[j]=e[j].replace(ca,"");a[e[j]]=[];f=e.slice();f.splice(0,j+1);h=f.join(".");i=0;for(g=d.length;i<g;i++)f={},b(f,d[i],h),a[e[j]].push(f);return}i&&(e[j]=e[j].replace(U,""),a=a[e[j]](d));if(null===a[e[j]]||a[e[j]]===k)a[e[j]]={};a=a[e[j]]}if(f.match(U))a[f.replace(U,"")](d);else a[f.replace(ca,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,
+d){b[a]=d}}function Ma(a){return D(a.aoData,"_aData")}function oa(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0}function pa(a,b,c){for(var d=-1,e=0,f=a.length;e<f;e++)a[e]==b?d=e:a[e]>b&&a[e]--; -1!=d&&c===k&&a.splice(d,1)}function da(a,b,c,d){var e=a.aoData[b],f,h=function(c,f){for(;c.childNodes.length;)c.removeChild(c.firstChild);c.innerHTML=y(a,b,f,"display")};if("dom"===c||(!c||"auto"===c)&&"dom"===e.src)e._aData=na(a,e,d,d===k?k:e._aData).data;else{var i=e.anCells;if(i)if(d!==
+k)h(i[d],d);else{c=0;for(f=i.length;c<f;c++)h(i[c],c)}}e._aSortData=null;e._aFilterData=null;h=a.aoColumns;if(d!==k)h[d].sType=null;else{c=0;for(f=h.length;c<f;c++)h[c].sType=null;Na(a,e)}}function na(a,b,c,d){var e=[],f=b.firstChild,h,i,j=0,n,l=a.aoColumns,r=a._rowReadObject,d=d||r?{}:[],q=function(a,b){if("string"===typeof a){var c=a.indexOf("@");-1!==c&&(c=a.substring(c+1),Q(a)(d,b.getAttribute(c)))}},jb=function(a){if(c===k||c===j)i=l[j],n=g.trim(a.innerHTML),i&&i._bAttrSrc?(Q(i.mData._)(d,n),
+q(i.mData.sort,a),q(i.mData.type,a),q(i.mData.filter,a)):r?(i._setter||(i._setter=Q(i.mData)),i._setter(d,n)):d[j]=n;j++};if(f)for(;f;){h=f.nodeName.toUpperCase();if("TD"==h||"TH"==h)jb(f),e.push(f);f=f.nextSibling}else{e=b.anCells;f=0;for(h=e.length;f<h;f++)jb(e[f])}(b=b.getAttribute("id"))&&Q(a.rowId)(d,b);return{data:d,cells:e}}function Ka(a,b,c,d){var e=a.aoData[b],f=e._aData,h=[],i,j,g,l,r;if(null===e.nTr){i=c||T.createElement("tr");e.nTr=i;e.anCells=h;i._DT_RowIndex=b;Na(a,e);l=0;for(r=a.aoColumns.length;l<
+r;l++){g=a.aoColumns[l];j=c?d[l]:T.createElement(g.sCellType);h.push(j);if(!c||g.mRender||g.mData!==l)j.innerHTML=y(a,b,l,"display");g.sClass&&(j.className+=" "+g.sClass);g.bVisible&&!c?i.appendChild(j):!g.bVisible&&c&&j.parentNode.removeChild(j);g.fnCreatedCell&&g.fnCreatedCell.call(a.oInstance,j,y(a,b,l),f,b,l)}w(a,"aoRowCreatedCallback",null,[i,f,b])}e.nTr.setAttribute("role","row")}function Na(a,b){var c=b.nTr,d=b._aData;if(c){var e=a.rowIdFn(d);e&&(c.id=e);d.DT_RowClass&&(e=d.DT_RowClass.split(" "),
+b.__rowc=b.__rowc?Oa(b.__rowc.concat(e)):e,g(c).removeClass(b.__rowc.join(" ")).addClass(d.DT_RowClass));d.DT_RowAttr&&g(c).attr(d.DT_RowAttr);d.DT_RowData&&g(c).data(d.DT_RowData)}}function kb(a){var b,c,d,e,f,h=a.nTHead,i=a.nTFoot,j=0===g("th, td",h).length,n=a.oClasses,l=a.aoColumns;j&&(e=g("<tr/>").appendTo(h));b=0;for(c=l.length;b<c;b++)f=l[b],d=g(f.nTh).addClass(f.sClass),j&&d.appendTo(e),a.oFeatures.bSort&&(d.addClass(f.sSortingClass),!1!==f.bSortable&&(d.attr("tabindex",a.iTabIndex).attr("aria-controls",
+a.sTableId),Pa(a,f.nTh,b))),f.sTitle!=d[0].innerHTML&&d.html(f.sTitle),Qa(a,"header")(a,d,f,n);j&&ea(a.aoHeader,h);g(h).find(">tr").attr("role","row");g(h).find(">tr>th, >tr>td").addClass(n.sHeaderTH);g(i).find(">tr>th, >tr>td").addClass(n.sFooterTH);if(null!==i){a=a.aoFooter[0];b=0;for(c=a.length;b<c;b++)f=l[b],f.nTf=a[b].cell,f.sClass&&g(f.nTf).addClass(f.sClass)}}function fa(a,b,c){var d,e,f,h=[],i=[],j=a.aoColumns.length,n;if(b){c===k&&(c=!1);d=0;for(e=b.length;d<e;d++){h[d]=b[d].slice();h[d].nTr=
+b[d].nTr;for(f=j-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&h[d].splice(f,1);i.push([])}d=0;for(e=h.length;d<e;d++){if(a=h[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=h[d].length;f<b;f++)if(n=j=1,i[d][f]===k){a.appendChild(h[d][f].cell);for(i[d][f]=1;h[d+j]!==k&&h[d][f].cell==h[d+j][f].cell;)i[d+j][f]=1,j++;for(;h[d][f+n]!==k&&h[d][f].cell==h[d][f+n].cell;){for(c=0;c<j;c++)i[d+c][f+n]=1;n++}g(h[d][f].cell).attr("rowspan",j).attr("colspan",n)}}}}function M(a){var b=w(a,"aoPreDrawCallback",
+"preDraw",[a]);if(-1!==g.inArray(!1,b))C(a,!1);else{var b=[],c=0,d=a.asStripeClasses,e=d.length,f=a.oLanguage,h=a.iInitDisplayStart,i="ssp"==z(a),j=a.aiDisplay;a.bDrawing=!0;h!==k&&-1!==h&&(a._iDisplayStart=i?h:h>=a.fnRecordsDisplay()?0:h,a.iInitDisplayStart=-1);var h=a._iDisplayStart,n=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,C(a,!1);else if(i){if(!a.bDestroying&&!lb(a))return}else a.iDraw++;if(0!==j.length){f=i?a.aoData.length:n;for(i=i?0:h;i<f;i++){var l=j[i],r=a.aoData[l];
+null===r.nTr&&Ka(a,l);l=r.nTr;if(0!==e){var q=d[c%e];r._sRowStripe!=q&&(g(l).removeClass(r._sRowStripe).addClass(q),r._sRowStripe=q)}w(a,"aoRowCallback",null,[l,r._aData,c,i]);b.push(l);c++}}else c=f.sZeroRecords,1==a.iDraw&&"ajax"==z(a)?c=f.sLoadingRecords:f.sEmptyTable&&0===a.fnRecordsTotal()&&(c=f.sEmptyTable),b[0]=g("<tr/>",{"class":e?d[0]:""}).append(g("<td />",{valign:"top",colSpan:ba(a),"class":a.oClasses.sRowEmpty}).html(c))[0];w(a,"aoHeaderCallback","header",[g(a.nTHead).children("tr")[0],
+Ma(a),h,n,j]);w(a,"aoFooterCallback","footer",[g(a.nTFoot).children("tr")[0],Ma(a),h,n,j]);d=g(a.nTBody);d.children().detach();d.append(g(b));w(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function R(a,b){var c=a.oFeatures,d=c.bFilter;c.bSort&&mb(a);d?ga(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;M(a);a._drawHold=!1}function nb(a){var b=a.oClasses,c=g(a.nTable),c=g("<div/>").insertBefore(c),d=a.oFeatures,e=g("<div/>",
+{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var f=a.sDom.split(""),h,i,j,n,l,r,q=0;q<f.length;q++){h=null;i=f[q];if("<"==i){j=g("<div/>")[0];n=f[q+1];if("'"==n||'"'==n){l="";for(r=2;f[q+r]!=n;)l+=f[q+r],r++;"H"==l?l=b.sJUIHeader:"F"==l&&(l=b.sJUIFooter);-1!=l.indexOf(".")?(n=l.split("."),j.id=n[0].substr(1,n[0].length-1),j.className=n[1]):"#"==l.charAt(0)?j.id=l.substr(1,l.length-
+1):j.className=l;q+=r}e.append(j);e=g(j)}else if(">"==i)e=e.parent();else if("l"==i&&d.bPaginate&&d.bLengthChange)h=ob(a);else if("f"==i&&d.bFilter)h=pb(a);else if("r"==i&&d.bProcessing)h=qb(a);else if("t"==i)h=rb(a);else if("i"==i&&d.bInfo)h=sb(a);else if("p"==i&&d.bPaginate)h=tb(a);else if(0!==m.ext.feature.length){j=m.ext.feature;r=0;for(n=j.length;r<n;r++)if(i==j[r].cFeature){h=j[r].fnInit(a);break}}h&&(j=a.aanFeatures,j[i]||(j[i]=[]),j[i].push(h),e.append(h))}c.replaceWith(e);a.nHolding=null}
+function ea(a,b){var c=g(b).children("tr"),d,e,f,h,i,j,n,l,r,q;a.splice(0,a.length);f=0;for(j=c.length;f<j;f++)a.push([]);f=0;for(j=c.length;f<j;f++){d=c[f];for(e=d.firstChild;e;){if("TD"==e.nodeName.toUpperCase()||"TH"==e.nodeName.toUpperCase()){l=1*e.getAttribute("colspan");r=1*e.getAttribute("rowspan");l=!l||0===l||1===l?1:l;r=!r||0===r||1===r?1:r;h=0;for(i=a[f];i[h];)h++;n=h;q=1===l?!0:!1;for(i=0;i<l;i++)for(h=0;h<r;h++)a[f+h][n+i]={cell:e,unique:q},a[f+h].nTr=d}e=e.nextSibling}}}function qa(a,
+b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],ea(c,b)));for(var b=0,e=c.length;b<e;b++)for(var f=0,h=c[b].length;f<h;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function ra(a,b,c){w(a,"aoServerParams","serverParams",[b]);if(b&&g.isArray(b)){var d={},e=/(.*?)\[\]$/;g.each(b,function(a,b){var c=b.name.match(e);c?(c=c[0],d[c]||(d[c]=[]),d[c].push(b.value)):d[b.name]=b.value});b=d}var f,h=a.ajax,i=a.oInstance,j=function(b){w(a,null,"xhr",[a,b,a.jqXHR]);c(b)};if(g.isPlainObject(h)&&
+h.data){f=h.data;var n=g.isFunction(f)?f(b,a):f,b=g.isFunction(f)&&n?n:g.extend(!0,b,n);delete h.data}n={data:b,success:function(b){var c=b.error||b.sError;c&&J(a,0,c);a.json=b;j(b)},dataType:"json",cache:!1,type:a.sServerMethod,error:function(b,c){var f=w(a,null,"xhr",[a,null,a.jqXHR]);-1===g.inArray(!0,f)&&("parsererror"==c?J(a,0,"Invalid JSON response",1):4===b.readyState&&J(a,0,"Ajax error",7));C(a,!1)}};a.oAjaxData=b;w(a,null,"preXhr",[a,b]);a.fnServerData?a.fnServerData.call(i,a.sAjaxSource,
+g.map(b,function(a,b){return{name:b,value:a}}),j,a):a.sAjaxSource||"string"===typeof h?a.jqXHR=g.ajax(g.extend(n,{url:h||a.sAjaxSource})):g.isFunction(h)?a.jqXHR=h.call(i,b,j,a):(a.jqXHR=g.ajax(g.extend(n,h)),h.data=f)}function lb(a){return a.bAjaxDataGet?(a.iDraw++,C(a,!0),ra(a,ub(a),function(b){vb(a,b)}),!1):!0}function ub(a){var b=a.aoColumns,c=b.length,d=a.oFeatures,e=a.oPreviousSearch,f=a.aoPreSearchCols,h,i=[],j,n,l,r=V(a);h=a._iDisplayStart;j=!1!==d.bPaginate?a._iDisplayLength:-1;var q=function(a,
+b){i.push({name:a,value:b})};q("sEcho",a.iDraw);q("iColumns",c);q("sColumns",D(b,"sName").join(","));q("iDisplayStart",h);q("iDisplayLength",j);var k={draw:a.iDraw,columns:[],order:[],start:h,length:j,search:{value:e.sSearch,regex:e.bRegex}};for(h=0;h<c;h++)n=b[h],l=f[h],j="function"==typeof n.mData?"function":n.mData,k.columns.push({data:j,name:n.sName,searchable:n.bSearchable,orderable:n.bSortable,search:{value:l.sSearch,regex:l.bRegex}}),q("mDataProp_"+h,j),d.bFilter&&(q("sSearch_"+h,l.sSearch),
+q("bRegex_"+h,l.bRegex),q("bSearchable_"+h,n.bSearchable)),d.bSort&&q("bSortable_"+h,n.bSortable);d.bFilter&&(q("sSearch",e.sSearch),q("bRegex",e.bRegex));d.bSort&&(g.each(r,function(a,b){k.order.push({column:b.col,dir:b.dir});q("iSortCol_"+a,b.col);q("sSortDir_"+a,b.dir)}),q("iSortingCols",r.length));b=m.ext.legacy.ajax;return null===b?a.sAjaxSource?i:k:b?i:k}function vb(a,b){var c=sa(a,b),d=b.sEcho!==k?b.sEcho:b.draw,e=b.iTotalRecords!==k?b.iTotalRecords:b.recordsTotal,f=b.iTotalDisplayRecords!==
+k?b.iTotalDisplayRecords:b.recordsFiltered;if(d){if(1*d<a.iDraw)return;a.iDraw=1*d}oa(a);a._iRecordsTotal=parseInt(e,10);a._iRecordsDisplay=parseInt(f,10);d=0;for(e=c.length;d<e;d++)L(a,c[d]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;M(a);a._bInitComplete||ta(a,b);a.bAjaxDataGet=!0;C(a,!1)}function sa(a,b){var c=g.isPlainObject(a.ajax)&&a.ajax.dataSrc!==k?a.ajax.dataSrc:a.sAjaxDataProp;return"data"===c?b.aaData||b[c]:""!==c?P(c)(b):b}function pb(a){var b=a.oClasses,c=a.sTableId,d=a.oLanguage,
+e=a.oPreviousSearch,f=a.aanFeatures,h='<input type="search" class="'+b.sFilterInput+'"/>',i=d.sSearch,i=i.match(/_INPUT_/)?i.replace("_INPUT_",h):i+h,b=g("<div/>",{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(g("<label/>").append(i)),f=function(){var b=!this.value?"":this.value;b!=e.sSearch&&(ga(a,{sSearch:b,bRegex:e.bRegex,bSmart:e.bSmart,bCaseInsensitive:e.bCaseInsensitive}),a._iDisplayStart=0,M(a))},h=null!==a.searchDelay?a.searchDelay:"ssp"===z(a)?400:0,j=g("input",b).val(e.sSearch).attr("placeholder",
+d.sSearchPlaceholder).bind("keyup.DT search.DT input.DT paste.DT cut.DT",h?ua(f,h):f).bind("keypress.DT",function(a){if(13==a.keyCode)return!1}).attr("aria-controls",c);g(a.nTable).on("search.dt.DT",function(b,c){if(a===c)try{j[0]!==T.activeElement&&j.val(e.sSearch)}catch(f){}});return b[0]}function ga(a,b,c){var d=a.oPreviousSearch,e=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};Ia(a);if("ssp"!=z(a)){wb(a,b.sSearch,
+c,b.bEscapeRegex!==k?!b.bEscapeRegex:b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<e.length;b++)xb(a,e[b].sSearch,b,e[b].bEscapeRegex!==k?!e[b].bEscapeRegex:e[b].bRegex,e[b].bSmart,e[b].bCaseInsensitive);yb(a)}else f(b);a.bFiltered=!0;w(a,null,"search",[a])}function yb(a){for(var b=m.ext.search,c=a.aiDisplay,d,e,f=0,h=b.length;f<h;f++){for(var i=[],j=0,g=c.length;j<g;j++)e=c[j],d=a.aoData[e],b[f](a,d._aFilterData,e,d._aData,j)&&i.push(e);c.length=0;c.push.apply(c,i)}}function xb(a,b,c,d,e,
+f){if(""!==b)for(var h=a.aiDisplay,d=Ra(b,d,e,f),e=h.length-1;0<=e;e--)b=a.aoData[h[e]]._aFilterData[c],d.test(b)||h.splice(e,1)}function wb(a,b,c,d,e,f){var d=Ra(b,d,e,f),e=a.oPreviousSearch.sSearch,f=a.aiDisplayMaster,h;0!==m.ext.search.length&&(c=!0);h=zb(a);if(0>=b.length)a.aiDisplay=f.slice();else{if(h||c||e.length>b.length||0!==b.indexOf(e)||a.bSorted)a.aiDisplay=f.slice();b=a.aiDisplay;for(c=b.length-1;0<=c;c--)d.test(a.aoData[b[c]]._sFilterRow)||b.splice(c,1)}}function Ra(a,b,c,d){a=b?a:va(a);
+c&&(a="^(?=.*?"+g.map(a.match(/"[^"]+"|[^ ]+/g)||[""],function(a){if('"'===a.charAt(0))var b=a.match(/^"(.*)"$/),a=b?b[1]:a;return a.replace('"',"")}).join(")(?=.*?")+").*$");return RegExp(a,d?"i":"")}function va(a){return a.replace(Zb,"\\$1")}function zb(a){var b=a.aoColumns,c,d,e,f,h,i,j,g,l=m.ext.type.search;c=!1;d=0;for(f=a.aoData.length;d<f;d++)if(g=a.aoData[d],!g._aFilterData){i=[];e=0;for(h=b.length;e<h;e++)c=b[e],c.bSearchable?(j=y(a,d,e,"filter"),l[c.sType]&&(j=l[c.sType](j)),null===j&&(j=
+""),"string"!==typeof j&&j.toString&&(j=j.toString())):j="",j.indexOf&&-1!==j.indexOf("&")&&(wa.innerHTML=j,j=$b?wa.textContent:wa.innerText),j.replace&&(j=j.replace(/[\r\n]/g,"")),i.push(j);g._aFilterData=i;g._sFilterRow=i.join("  ");c=!0}return c}function Ab(a){return{search:a.sSearch,smart:a.bSmart,regex:a.bRegex,caseInsensitive:a.bCaseInsensitive}}function Bb(a){return{sSearch:a.search,bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function sb(a){var b=a.sTableId,c=a.aanFeatures.i,
+d=g("<div/>",{"class":a.oClasses.sInfo,id:!c?b+"_info":null});c||(a.aoDrawCallback.push({fn:Cb,sName:"information"}),d.attr("role","status").attr("aria-live","polite"),g(a.nTable).attr("aria-describedby",b+"_info"));return d[0]}function Cb(a){var b=a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,d=a._iDisplayStart+1,e=a.fnDisplayEnd(),f=a.fnRecordsTotal(),h=a.fnRecordsDisplay(),i=h?c.sInfo:c.sInfoEmpty;h!==f&&(i+=" "+c.sInfoFiltered);i+=c.sInfoPostFix;i=Db(a,i);c=c.fnInfoCallback;null!==c&&(i=
+c.call(a.oInstance,a,d,e,f,h,i));g(b).html(i)}}function Db(a,b){var c=a.fnFormatNumber,d=a._iDisplayStart+1,e=a._iDisplayLength,f=a.fnRecordsDisplay(),h=-1===e;return b.replace(/_START_/g,c.call(a,d)).replace(/_END_/g,c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,c.call(a,f)).replace(/_PAGE_/g,c.call(a,h?1:Math.ceil(d/e))).replace(/_PAGES_/g,c.call(a,h?1:Math.ceil(f/e)))}function ha(a){var b,c,d=a.iInitDisplayStart,e=a.aoColumns,f;c=a.oFeatures;var h=
+a.bDeferLoading;if(a.bInitialised){nb(a);kb(a);fa(a,a.aoHeader);fa(a,a.aoFooter);C(a,!0);c.bAutoWidth&&Ha(a);b=0;for(c=e.length;b<c;b++)f=e[b],f.sWidth&&(f.nTh.style.width=u(f.sWidth));w(a,null,"preInit",[a]);R(a);e=z(a);if("ssp"!=e||h)"ajax"==e?ra(a,[],function(c){var f=sa(a,c);for(b=0;b<f.length;b++)L(a,f[b]);a.iInitDisplayStart=d;R(a);C(a,!1);ta(a,c)},a):(C(a,!1),ta(a))}else setTimeout(function(){ha(a)},200)}function ta(a,b){a._bInitComplete=!0;(b||a.oInit.aaData)&&Y(a);w(a,"aoInitComplete","init",
+[a,b])}function Sa(a,b){var c=parseInt(b,10);a._iDisplayLength=c;Ta(a);w(a,null,"length",[a,c])}function ob(a){for(var b=a.oClasses,c=a.sTableId,d=a.aLengthMenu,e=g.isArray(d[0]),f=e?d[0]:d,d=e?d[1]:d,e=g("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect}),h=0,i=f.length;h<i;h++)e[0][h]=new Option(d[h],f[h]);var j=g("<div><label/></div>").addClass(b.sLength);a.aanFeatures.l||(j[0].id=c+"_length");j.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",e[0].outerHTML));g("select",
+j).val(a._iDisplayLength).bind("change.DT",function(){Sa(a,g(this).val());M(a)});g(a.nTable).bind("length.dt.DT",function(b,c,f){a===c&&g("select",j).val(f)});return j[0]}function tb(a){var b=a.sPaginationType,c=m.ext.pager[b],d="function"===typeof c,e=function(a){M(a)},b=g("<div/>").addClass(a.oClasses.sPaging+b)[0],f=a.aanFeatures;d||c.fnInit(a,b,e);f.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(a){if(d){var b=a._iDisplayStart,g=a._iDisplayLength,n=a.fnRecordsDisplay(),l=-1===
+g,b=l?0:Math.ceil(b/g),g=l?1:Math.ceil(n/g),n=c(b,g),k,l=0;for(k=f.p.length;l<k;l++)Qa(a,"pageButton")(a,f.p[l],l,n,b,g)}else c.fnUpdate(a,e)},sName:"pagination"}));return b}function Ua(a,b,c){var d=a._iDisplayStart,e=a._iDisplayLength,f=a.fnRecordsDisplay();0===f||-1===e?d=0:"number"===typeof b?(d=b*e,d>f&&(d=0)):"first"==b?d=0:"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==b?d+e<f&&(d+=e):"last"==b?d=Math.floor((f-1)/e)*e:J(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==d;a._iDisplayStart=
+d;b&&(w(a,null,"page",[a]),c&&M(a));return b}function qb(a){return g("<div/>",{id:!a.aanFeatures.r?a.sTableId+"_processing":null,"class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function C(a,b){a.oFeatures.bProcessing&&g(a.aanFeatures.r).css("display",b?"block":"none");w(a,null,"processing",[a,b])}function rb(a){var b=g(a.nTable);b.attr("role","grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,f=a.oClasses,h=b.children("caption"),
+i=h.length?h[0]._captionSide:null,j=g(b[0].cloneNode(!1)),n=g(b[0].cloneNode(!1)),l=b.children("tfoot");c.sX&&"100%"===b.attr("width")&&b.removeAttr("width");l.length||(l=null);j=g("<div/>",{"class":f.sScrollWrapper}).append(g("<div/>",{"class":f.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,width:d?!d?null:u(d):"100%"}).append(g("<div/>",{"class":f.sScrollHeadInner}).css({"box-sizing":"content-box",width:c.sXInner||"100%"}).append(j.removeAttr("id").css("margin-left",0).append("top"===
+i?h:null).append(b.children("thead"))))).append(g("<div/>",{"class":f.sScrollBody}).css({position:"relative",overflow:"auto",width:!d?null:u(d)}).append(b));l&&j.append(g("<div/>",{"class":f.sScrollFoot}).css({overflow:"hidden",border:0,width:d?!d?null:u(d):"100%"}).append(g("<div/>",{"class":f.sScrollFootInner}).append(n.removeAttr("id").css("margin-left",0).append("bottom"===i?h:null).append(b.children("tfoot")))));var b=j.children(),k=b[0],f=b[1],q=l?b[2]:null;if(d)g(f).on("scroll.DT",function(){var a=
+this.scrollLeft;k.scrollLeft=a;l&&(q.scrollLeft=a)});g(f).css(e&&c.bCollapse?"max-height":"height",e);a.nScrollHead=k;a.nScrollBody=f;a.nScrollFoot=q;a.aoDrawCallback.push({fn:Z,sName:"scrolling"});return j[0]}function Z(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY,b=b.iBarWidth,f=g(a.nScrollHead),h=f[0].style,i=f.children("div"),j=i[0].style,n=i.children("table"),i=a.nScrollBody,l=g(i),k=i.style,q=g(a.nScrollFoot).children("div"),m=q.children("table"),o=g(a.nTHead),E=g(a.nTable),p=E[0],t=p.style,
+N=a.nTFoot?g(a.nTFoot):null,Eb=a.oBrowser,w=Eb.bScrollOversize,s,v,O,x,y=[],z=[],A=[],B,C=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};E.children("thead, tfoot").remove();x=o.clone().prependTo(E);o=o.find("tr");v=x.find("tr");x.find("th, td").removeAttr("tabindex");N&&(O=N.clone().prependTo(E),s=N.find("tr"),O=O.find("tr"));c||(k.width="100%",f[0].style.width="100%");g.each(qa(a,x),function(b,c){B=la(a,b);c.style.width=a.aoColumns[B].sWidth});
+N&&H(function(a){a.style.width=""},O);f=E.outerWidth();if(""===c){t.width="100%";if(w&&(E.find("tbody").height()>i.offsetHeight||"scroll"==l.css("overflow-y")))t.width=u(E.outerWidth()-b);f=E.outerWidth()}else""!==d&&(t.width=u(d),f=E.outerWidth());H(C,v);H(function(a){A.push(a.innerHTML);y.push(u(g(a).css("width")))},v);H(function(a,b){a.style.width=y[b]},o);g(v).height(0);N&&(H(C,O),H(function(a){z.push(u(g(a).css("width")))},O),H(function(a,b){a.style.width=z[b]},s),g(O).height(0));H(function(a,
+b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+A[b]+"</div>";a.style.width=y[b]},v);N&&H(function(a,b){a.innerHTML="";a.style.width=z[b]},O);if(E.outerWidth()<f){s=i.scrollHeight>i.offsetHeight||"scroll"==l.css("overflow-y")?f+b:f;if(w&&(i.scrollHeight>i.offsetHeight||"scroll"==l.css("overflow-y")))t.width=u(s-b);(""===c||""!==d)&&J(a,1,"Possible column misalignment",6)}else s="100%";k.width=u(s);h.width=u(s);N&&(a.nScrollFoot.style.width=u(s));!e&&w&&(k.height=
+u(p.offsetHeight+b));c=E.outerWidth();n[0].style.width=u(c);j.width=u(c);d=E.height()>i.clientHeight||"scroll"==l.css("overflow-y");e="padding"+(Eb.bScrollbarLeft?"Left":"Right");j[e]=d?b+"px":"0px";N&&(m[0].style.width=u(c),q[0].style.width=u(c),q[0].style[e]=d?b+"px":"0px");l.scroll();if((a.bSorted||a.bFiltered)&&!a._drawHold)i.scrollTop=0}function H(a,b,c){for(var d=0,e=0,f=b.length,h,i;e<f;){h=b[e].firstChild;for(i=c?c[e].firstChild:null;h;)1===h.nodeType&&(c?a(h,i,d):a(h,d),d++),h=h.nextSibling,
+i=c?i.nextSibling:null;e++}}function Ha(a){var b=a.nTable,c=a.aoColumns,d=a.oScroll,e=d.sY,f=d.sX,h=d.sXInner,i=c.length,j=$(a,"bVisible"),n=g("th",a.nTHead),l=b.getAttribute("width"),k=b.parentNode,q=!1,m,o,p;p=a.oBrowser;d=p.bScrollOversize;(m=b.style.width)&&-1!==m.indexOf("%")&&(l=m);for(m=0;m<j.length;m++)o=c[j[m]],null!==o.sWidth&&(o.sWidth=Fb(o.sWidthOrig,k),q=!0);if(d||!q&&!f&&!e&&i==ba(a)&&i==n.length)for(m=0;m<i;m++)c[m].sWidth=u(n.eq(m).width());else{i=g(b).clone().css("visibility","hidden").removeAttr("id");
+i.find("tbody tr").remove();var t=g("<tr/>").appendTo(i.find("tbody"));i.find("thead, tfoot").remove();i.append(g(a.nTHead).clone()).append(g(a.nTFoot).clone());i.find("tfoot th, tfoot td").css("width","");n=qa(a,i.find("thead")[0]);for(m=0;m<j.length;m++)o=c[j[m]],n[m].style.width=null!==o.sWidthOrig&&""!==o.sWidthOrig?u(o.sWidthOrig):"";if(a.aoData.length)for(m=0;m<j.length;m++)q=j[m],o=c[q],g(Gb(a,q)).clone(!1).append(o.sContentPadding).appendTo(t);q=g("<div/>").css(f||e?{position:"absolute",top:0,
+left:0,height:1,right:0,overflow:"hidden"}:{}).append(i).appendTo(k);f&&h?i.width(h):f?(i.css("width","auto"),i.width()<k.clientWidth&&i.width(k.clientWidth)):e?i.width(k.clientWidth):l&&i.width(l);if(f){for(m=h=0;m<j.length;m++)o=c[j[m]],e=p.bBounding?n[m].getBoundingClientRect().width:g(n[m]).outerWidth(),h+=null===o.sWidthOrig?e:parseInt(o.sWidth,10)+e-g(n[m]).width();i.width(u(h));b.style.width=u(h)}for(m=0;m<j.length;m++)if(o=c[j[m]],p=g(n[m]).width())o.sWidth=u(p);b.style.width=u(i.css("width"));
+q.remove()}l&&(b.style.width=u(l));if((l||f)&&!a._reszEvt)b=function(){g(Fa).bind("resize.DT-"+a.sInstance,ua(function(){Y(a)}))},d?setTimeout(b,1E3):b(),a._reszEvt=!0}function ua(a,b){var c=b!==k?b:200,d,e;return function(){var b=this,h=+new Date,i=arguments;d&&h<d+c?(clearTimeout(e),e=setTimeout(function(){d=k;a.apply(b,i)},c)):(d=h,a.apply(b,i))}}function Fb(a,b){if(!a)return 0;var c=g("<div/>").css("width",u(a)).appendTo(b||T.body),d=c[0].offsetWidth;c.remove();return d}function Gb(a,b){var c=
+Hb(a,b);if(0>c)return null;var d=a.aoData[c];return!d.nTr?g("<td/>").html(y(a,c,b,"display"))[0]:d.anCells[b]}function Hb(a,b){for(var c,d=-1,e=-1,f=0,h=a.aoData.length;f<h;f++)c=y(a,f,b,"display")+"",c=c.replace(ac,""),c.length>d&&(d=c.length,e=f);return e}function u(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function Ib(){var a=m.__scrollbarWidth;if(a===k){var b=g("<p/>").css({position:"absolute",top:0,left:0,width:"100%",height:150,padding:0,overflow:"scroll",
+visibility:"hidden"}).appendTo("body"),a=b[0].offsetWidth-b[0].clientWidth;m.__scrollbarWidth=a;b.remove()}return a}function V(a){var b,c,d=[],e=a.aoColumns,f,h,i,j;b=a.aaSortingFixed;c=g.isPlainObject(b);var n=[];f=function(a){a.length&&!g.isArray(a[0])?n.push(a):n.push.apply(n,a)};g.isArray(b)&&f(b);c&&b.pre&&f(b.pre);f(a.aaSorting);c&&b.post&&f(b.post);for(a=0;a<n.length;a++){j=n[a][0];f=e[j].aDataSort;b=0;for(c=f.length;b<c;b++)h=f[b],i=e[h].sType||"string",n[a]._idx===k&&(n[a]._idx=g.inArray(n[a][1],
+e[h].asSorting)),d.push({src:j,col:h,dir:n[a][1],index:n[a]._idx,type:i,formatter:m.ext.type.order[i+"-pre"]})}return d}function mb(a){var b,c,d=[],e=m.ext.type.order,f=a.aoData,h=0,i,g=a.aiDisplayMaster,n;Ia(a);n=V(a);b=0;for(c=n.length;b<c;b++)i=n[b],i.formatter&&h++,Jb(a,i.col);if("ssp"!=z(a)&&0!==n.length){b=0;for(c=g.length;b<c;b++)d[g[b]]=b;h===n.length?g.sort(function(a,b){var c,e,h,i,g=n.length,j=f[a]._aSortData,k=f[b]._aSortData;for(h=0;h<g;h++)if(i=n[h],c=j[i.col],e=k[i.col],c=c<e?-1:c>
+e?1:0,0!==c)return"asc"===i.dir?c:-c;c=d[a];e=d[b];return c<e?-1:c>e?1:0}):g.sort(function(a,b){var c,h,i,g,j=n.length,k=f[a]._aSortData,m=f[b]._aSortData;for(i=0;i<j;i++)if(g=n[i],c=k[g.col],h=m[g.col],g=e[g.type+"-"+g.dir]||e["string-"+g.dir],c=g(c,h),0!==c)return c;c=d[a];h=d[b];return c<h?-1:c>h?1:0})}a.bSorted=!0}function Kb(a){for(var b,c,d=a.aoColumns,e=V(a),a=a.oLanguage.oAria,f=0,h=d.length;f<h;f++){c=d[f];var i=c.asSorting;b=c.sTitle.replace(/<.*?>/g,"");var g=c.nTh;g.removeAttribute("aria-sort");
+c.bSortable&&(0<e.length&&e[0].col==f?(g.setAttribute("aria-sort","asc"==e[0].dir?"ascending":"descending"),c=i[e[0].index+1]||i[0]):c=i[0],b+="asc"===c?a.sSortAscending:a.sSortDescending);g.setAttribute("aria-label",b)}}function Va(a,b,c,d){var e=a.aaSorting,f=a.aoColumns[b].asSorting,h=function(a,b){var c=a._idx;c===k&&(c=g.inArray(a[1],f));return c+1<f.length?c+1:b?null:0};"number"===typeof e[0]&&(e=a.aaSorting=[e]);c&&a.oFeatures.bSortMulti?(c=g.inArray(b,D(e,"0")),-1!==c?(b=h(e[c],!0),null===
+b&&1===e.length&&(b=0),null===b?e.splice(c,1):(e[c][1]=f[b],e[c]._idx=b)):(e.push([b,f[0],0]),e[e.length-1]._idx=0)):e.length&&e[0][0]==b?(b=h(e[0]),e.length=1,e[0][1]=f[b],e[0]._idx=b):(e.length=0,e.push([b,f[0]]),e[0]._idx=0);R(a);"function"==typeof d&&d(a)}function Pa(a,b,c,d){var e=a.aoColumns[c];Wa(b,{},function(b){!1!==e.bSortable&&(a.oFeatures.bProcessing?(C(a,!0),setTimeout(function(){Va(a,c,b.shiftKey,d);"ssp"!==z(a)&&C(a,!1)},0)):Va(a,c,b.shiftKey,d))})}function xa(a){var b=a.aLastSort,
+c=a.oClasses.sSortColumn,d=V(a),e=a.oFeatures,f,h;if(e.bSort&&e.bSortClasses){e=0;for(f=b.length;e<f;e++)h=b[e].src,g(D(a.aoData,"anCells",h)).removeClass(c+(2>e?e+1:3));e=0;for(f=d.length;e<f;e++)h=d[e].src,g(D(a.aoData,"anCells",h)).addClass(c+(2>e?e+1:3))}a.aLastSort=d}function Jb(a,b){var c=a.aoColumns[b],d=m.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,aa(a,b)));for(var f,h=m.ext.type.order[c.sType+"-pre"],i=0,g=a.aoData.length;i<g;i++)if(c=a.aoData[i],c._aSortData||(c._aSortData=
+[]),!c._aSortData[b]||d)f=d?e[i]:y(a,i,b,"sort"),c._aSortData[b]=h?h(f):f}function ya(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:g.extend(!0,[],a.aaSorting),search:Ab(a.oPreviousSearch),columns:g.map(a.aoColumns,function(b,d){return{visible:b.bVisible,search:Ab(a.aoPreSearchCols[d])}})};w(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oSavedState=b;a.fnStateSaveCallback.call(a.oInstance,a,b)}}function Lb(a){var b,c,d=
+a.aoColumns;if(a.oFeatures.bStateSave){var e=a.fnStateLoadCallback.call(a.oInstance,a);if(e&&e.time&&(b=w(a,"aoStateLoadParams","stateLoadParams",[a,e]),-1===g.inArray(!1,b)&&(b=a.iStateDuration,!(0<b&&e.time<+new Date-1E3*b)&&d.length===e.columns.length))){a.oLoadedState=g.extend(!0,{},e);e.start!==k&&(a._iDisplayStart=e.start,a.iInitDisplayStart=e.start);e.length!==k&&(a._iDisplayLength=e.length);e.order!==k&&(a.aaSorting=[],g.each(e.order,function(b,c){a.aaSorting.push(c[0]>=d.length?[0,c[1]]:
+c)}));e.search!==k&&g.extend(a.oPreviousSearch,Bb(e.search));b=0;for(c=e.columns.length;b<c;b++){var f=e.columns[b];f.visible!==k&&(d[b].bVisible=f.visible);f.search!==k&&g.extend(a.aoPreSearchCols[b],Bb(f.search))}w(a,"aoStateLoaded","stateLoaded",[a,e])}}}function za(a){var b=m.settings,a=g.inArray(a,D(b,"nTable"));return-1!==a?b[a]:null}function J(a,b,c,d){c="DataTables warning: "+(a?"table id="+a.sTableId+" - ":"")+c;d&&(c+=". For more information about this error, please see http://datatables.net/tn/"+
+d);if(b)Fa.console&&console.log&&console.log(c);else if(b=m.ext,b=b.sErrMode||b.errMode,a&&w(a,null,"error",[a,d,c]),"alert"==b)alert(c);else{if("throw"==b)throw Error(c);"function"==typeof b&&b(a,d,c)}}function F(a,b,c,d){g.isArray(c)?g.each(c,function(c,f){g.isArray(f)?F(a,b,f[0],f[1]):F(a,b,f)}):(d===k&&(d=c),b[c]!==k&&(a[d]=b[c]))}function Mb(a,b,c){var d,e;for(e in b)b.hasOwnProperty(e)&&(d=b[e],g.isPlainObject(d)?(g.isPlainObject(a[e])||(a[e]={}),g.extend(!0,a[e],d)):a[e]=c&&"data"!==e&&"aaData"!==
+e&&g.isArray(d)?d.slice():d);return a}function Wa(a,b,c){g(a).bind("click.DT",b,function(b){a.blur();c(b)}).bind("keypress.DT",b,function(a){13===a.which&&(a.preventDefault(),c(a))}).bind("selectstart.DT",function(){return!1})}function A(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function w(a,b,c,d){var e=[];b&&(e=g.map(a[b].slice().reverse(),function(b){return b.fn.apply(a.oInstance,d)}));null!==c&&(b=g.Event(c+".dt"),g(a.nTable).trigger(b,d),e.push(b.result));return e}function Ta(a){var b=a._iDisplayStart,
+c=a.fnDisplayEnd(),d=a._iDisplayLength;b>=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function Qa(a,b){var c=a.renderer,d=m.ext.renderer[b];return g.isPlainObject(c)&&c[b]?d[c[b]]||d._:"string"===typeof c?d[c]||d._:d._}function z(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function Aa(a,b){var c=[],c=Nb.numbers_length,d=Math.floor(c/2);b<=c?c=W(0,b):a<=d?(c=W(0,c-2),c.push("ellipsis"),c.push(b-1)):(a>=b-1-d?c=W(b-(c-2),b):(c=W(a-d+2,a+d-1),c.push("ellipsis"),
+c.push(b-1)),c.splice(0,0,"ellipsis"),c.splice(0,0,0));c.DT_el="span";return c}function db(a){g.each({num:function(b){return Ba(b,a)},"num-fmt":function(b){return Ba(b,a,Xa)},"html-num":function(b){return Ba(b,a,Ca)},"html-num-fmt":function(b){return Ba(b,a,Ca,Xa)}},function(b,c){v.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(v.type.search[b+a]=v.type.search.html)})}function Ob(a){return function(){var b=[za(this[m.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return m.ext.internal[a].apply(this,
+b)}}var m,v,t,p,s,Ya={},Pb=/[\r\n]/g,Ca=/<.*?>/g,bc=/^[\w\+\-]/,cc=/[\w\+\-]$/,Zb=RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),Xa=/[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi,K=function(a){return!a||!0===a||"-"===a?!0:!1},Qb=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},Rb=function(a,b){Ya[b]||(Ya[b]=RegExp(va(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,"").replace(Ya[b],"."):a},Za=function(a,b,c){var d="string"===typeof a;
+if(K(a))return!0;b&&d&&(a=Rb(a,b));c&&d&&(a=a.replace(Xa,""));return!isNaN(parseFloat(a))&&isFinite(a)},Sb=function(a,b,c){return K(a)?!0:!(K(a)||"string"===typeof a)?null:Za(a.replace(Ca,""),b,c)?!0:null},D=function(a,b,c){var d=[],e=0,f=a.length;if(c!==k)for(;e<f;e++)a[e]&&a[e][b]&&d.push(a[e][b][c]);else for(;e<f;e++)a[e]&&d.push(a[e][b]);return d},ia=function(a,b,c,d){var e=[],f=0,h=b.length;if(d!==k)for(;f<h;f++)a[b[f]][c]&&e.push(a[b[f]][c][d]);else for(;f<h;f++)e.push(a[b[f]][c]);return e},
+W=function(a,b){var c=[],d;b===k?(b=0,d=a):(d=b,b=a);for(var e=b;e<d;e++)c.push(e);return c},Tb=function(a){for(var b=[],c=0,d=a.length;c<d;c++)a[c]&&b.push(a[c]);return b},Oa=function(a){var b=[],c,d,e=a.length,f,h=0;d=0;a:for(;d<e;d++){c=a[d];for(f=0;f<h;f++)if(b[f]===c)continue a;b.push(c);h++}return b},B=function(a,b,c){a[b]!==k&&(a[c]=a[b])},ca=/\[.*?\]$/,U=/\(\)$/,wa=g("<div>")[0],$b=wa.textContent!==k,ac=/<.*?>/g;m=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,
+b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new t(za(this[v.iApiIndex])):new t(this)};this.fnAddData=function(a,b){var c=this.api(!0),d=g.isArray(a)&&(g.isArray(a[0])||g.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===k||b)&&c.draw();return d.flatten().toArray()};this.fnAdjustColumnSizing=function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],d=c.oScroll;a===k||a?b.draw(!1):(""!==d.sX||""!==d.sY)&&Z(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();
+(a===k||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,b,c){var d=this.api(!0),a=d.rows(a),e=a.settings()[0],g=e.aoData[a[0][0]];a.remove();b&&b.call(this,e,g);(c===k||c)&&d.draw();return g};this.fnDestroy=function(a){this.api(!0).destroy(a)};this.fnDraw=function(a){this.api(!0).draw(a)};this.fnFilter=function(a,b,c,d,e,g){e=this.api(!0);null===b||b===k?e.search(a,c,d,g):e.column(b).search(a,c,d,g);e.draw()};this.fnGetData=function(a,b){var c=
+this.api(!0);if(a!==k){var d=a.nodeName?a.nodeName.toLowerCase():"";return b!==k||"td"==d||"th"==d?c.cell(a,b).data():c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==k?b.row(a).node():b.rows().nodes().flatten().toArray()};this.fnGetPosition=function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};
+this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};this.fnPageChange=function(a,b){var c=this.api(!0).page(a);(b===k||b)&&c.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===k||c)&&a.columns.adjust().draw()};this.fnSettings=function(){return za(this[v.iApiIndex])};this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,d,e){var g=
+this.api(!0);c===k||null===c?g.row(b).data(a):g.cell(b,c).data(a);(e===k||e)&&g.columns.adjust();(d===k||d)&&g.draw();return 0};this.fnVersionCheck=v.fnVersionCheck;var b=this,c=a===k,d=this.length;c&&(a={});this.oApi=this.internal=v.internal;for(var e in m.ext.internal)e&&(this[e]=Ob(e));this.each(function(){var f={},f=1<d?Mb(f,a,!0):a,e=0,i,j=this.getAttribute("id"),n=!1,l=m.defaults,r=g(this);if("table"!=this.nodeName.toLowerCase())J(null,0,"Non-table node initialisation ("+this.nodeName+")",2);
+else{eb(l);fb(l.column);I(l,l,!0);I(l.column,l.column,!0);I(l,g.extend(f,r.data()));var q=m.settings,e=0;for(i=q.length;e<i;e++){var p=q[e];if(p.nTable==this||p.nTHead.parentNode==this||p.nTFoot&&p.nTFoot.parentNode==this){e=f.bRetrieve!==k?f.bRetrieve:l.bRetrieve;if(c||e)return p.oInstance;if(f.bDestroy!==k?f.bDestroy:l.bDestroy){p.oInstance.fnDestroy();break}else{J(p,0,"Cannot reinitialise DataTable",3);return}}if(p.sTableId==this.id){q.splice(e,1);break}}if(null===j||""===j)this.id=j="DataTables_Table_"+
+m.ext._unique++;var o=g.extend(!0,{},m.models.oSettings,{sDestroyWidth:r[0].style.width,sInstance:j,sTableId:j});o.nTable=this;o.oApi=b.internal;o.oInit=f;q.push(o);o.oInstance=1===b.length?b:r.dataTable();eb(f);f.oLanguage&&S(f.oLanguage);f.aLengthMenu&&!f.iDisplayLength&&(f.iDisplayLength=g.isArray(f.aLengthMenu[0])?f.aLengthMenu[0][0]:f.aLengthMenu[0]);f=Mb(g.extend(!0,{},l),f);F(o.oFeatures,f,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));
+F(o,f,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop","iTabIndex","fnStateLoadCallback","fnStateSaveCallback","renderer","searchDelay","rowId",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"],["bJQueryUI","bJUI"]]);F(o.oScroll,f,[["sScrollX","sX"],["sScrollXInner",
+"sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);F(o.oLanguage,f,"fnInfoCallback");A(o,"aoDrawCallback",f.fnDrawCallback,"user");A(o,"aoServerParams",f.fnServerParams,"user");A(o,"aoStateSaveParams",f.fnStateSaveParams,"user");A(o,"aoStateLoadParams",f.fnStateLoadParams,"user");A(o,"aoStateLoaded",f.fnStateLoaded,"user");A(o,"aoRowCallback",f.fnRowCallback,"user");A(o,"aoRowCreatedCallback",f.fnCreatedRow,"user");A(o,"aoHeaderCallback",f.fnHeaderCallback,"user");A(o,"aoFooterCallback",
+f.fnFooterCallback,"user");A(o,"aoInitComplete",f.fnInitComplete,"user");A(o,"aoPreDrawCallback",f.fnPreDrawCallback,"user");o.rowIdFn=P(f.rowId);j=o.oClasses;f.bJQueryUI?(g.extend(j,m.ext.oJUIClasses,f.oClasses),f.sDom===l.sDom&&"lfrtip"===l.sDom&&(o.sDom='<"H"lfr>t<"F"ip>'),o.renderer)?g.isPlainObject(o.renderer)&&!o.renderer.header&&(o.renderer.header="jqueryui"):o.renderer="jqueryui":g.extend(j,m.ext.classes,f.oClasses);r.addClass(j.sTable);if(""!==o.oScroll.sX||""!==o.oScroll.sY)o.oScroll.iBarWidth=
+Ib();o.iInitDisplayStart===k&&(o.iInitDisplayStart=f.iDisplayStart,o._iDisplayStart=f.iDisplayStart);null!==f.iDeferLoading&&(o.bDeferLoading=!0,e=g.isArray(f.iDeferLoading),o._iRecordsDisplay=e?f.iDeferLoading[0]:f.iDeferLoading,o._iRecordsTotal=e?f.iDeferLoading[1]:f.iDeferLoading);var t=o.oLanguage;g.extend(!0,t,f.oLanguage);""!==t.sUrl&&(g.ajax({dataType:"json",url:t.sUrl,success:function(a){S(a);I(l.oLanguage,a);g.extend(true,t,a);ha(o)},error:function(){ha(o)}}),n=!0);null===f.asStripeClasses&&
+(o.asStripeClasses=[j.sStripeOdd,j.sStripeEven]);var e=o.asStripeClasses,s=r.children("tbody").find("tr").eq(0);-1!==g.inArray(!0,g.map(e,function(a){return s.hasClass(a)}))&&(g("tbody tr",this).removeClass(e.join(" ")),o.asDestroyStripes=e.slice());q=[];e=this.getElementsByTagName("thead");0!==e.length&&(ea(o.aoHeader,e[0]),q=qa(o));if(null===f.aoColumns){p=[];e=0;for(i=q.length;e<i;e++)p.push(null)}else p=f.aoColumns;e=0;for(i=p.length;e<i;e++)Ga(o,q?q[e]:null);ib(o,f.aoColumnDefs,p,function(a,
+b){ka(o,a,b)});if(s.length){var u=function(a,b){return a.getAttribute("data-"+b)!==null?b:null};g.each(na(o,s[0]).cells,function(a,b){var c=o.aoColumns[a];if(c.mData===a){var d=u(b,"sort")||u(b,"order"),e=u(b,"filter")||u(b,"search");if(d!==null||e!==null){c.mData={_:a+".display",sort:d!==null?a+".@data-"+d:k,type:d!==null?a+".@data-"+d:k,filter:e!==null?a+".@data-"+e:k};ka(o,a)}}})}var v=o.oFeatures;f.bStateSave&&(v.bStateSave=!0,Lb(o,f),A(o,"aoDrawCallback",ya,"state_save"));if(f.aaSorting===k){q=
+o.aaSorting;e=0;for(i=q.length;e<i;e++)q[e][1]=o.aoColumns[e].asSorting[0]}xa(o);v.bSort&&A(o,"aoDrawCallback",function(){if(o.bSorted){var a=V(o),b={};g.each(a,function(a,c){b[c.src]=c.dir});w(o,null,"order",[o,a,b]);Kb(o)}});A(o,"aoDrawCallback",function(){(o.bSorted||z(o)==="ssp"||v.bDeferRender)&&xa(o)},"sc");gb(o);e=r.children("caption").each(function(){this._captionSide=r.css("caption-side")});i=r.children("thead");0===i.length&&(i=g("<thead/>").appendTo(this));o.nTHead=i[0];i=r.children("tbody");
+0===i.length&&(i=g("<tbody/>").appendTo(this));o.nTBody=i[0];i=r.children("tfoot");if(0===i.length&&0<e.length&&(""!==o.oScroll.sX||""!==o.oScroll.sY))i=g("<tfoot/>").appendTo(this);0===i.length||0===i.children().length?r.addClass(j.sNoFooter):0<i.length&&(o.nTFoot=i[0],ea(o.aoFooter,o.nTFoot));if(f.aaData)for(e=0;e<f.aaData.length;e++)L(o,f.aaData[e]);else(o.bDeferLoading||"dom"==z(o))&&ma(o,g(o.nTBody).children("tr"));o.aiDisplay=o.aiDisplayMaster.slice();o.bInitialised=!0;!1===n&&ha(o)}});b=null;
+return this};var Ub=[],x=Array.prototype,dc=function(a){var b,c,d=m.settings,e=g.map(d,function(a){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase())return b=g.inArray(a,e),-1!==b?[d[b]]:null;if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?c=g(a):a instanceof g&&(c=a)}else return[];if(c)return c.map(function(){b=g.inArray(this,e);return-1!==b?d[b]:null}).toArray()};t=function(a,b){if(!(this instanceof t))return new t(a,
+b);var c=[],d=function(a){(a=dc(a))&&c.push.apply(c,a)};if(g.isArray(a))for(var e=0,f=a.length;e<f;e++)d(a[e]);else d(a);this.context=Oa(c);b&&this.push.apply(this,b.toArray?b.toArray():b);this.selector={rows:null,cols:null,opts:null};t.extend(this,this,Ub)};m.Api=t;t.prototype={any:function(){return 0!==this.count()},concat:x.concat,context:[],count:function(){return this.flatten().length},each:function(a){for(var b=0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=
+this.context;return b.length>a?new t(b[a],this[a]):null},filter:function(a){var b=[];if(x.filter)b=x.filter.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new t(this.context,b)},flatten:function(){var a=[];return new t(this.context,a.concat.apply(a,this.toArray()))},join:x.join,indexOf:x.indexOf||function(a,b){for(var c=b||0,d=this.length;c<d;c++)if(this[c]===a)return c;return-1},iterator:function(a,b,c,d){var e=[],f,h,g,j,n,l=this.context,
+m,q,p=this.selector;"string"===typeof a&&(d=c,c=b,b=a,a=!1);h=0;for(g=l.length;h<g;h++){var o=new t(l[h]);if("table"===b)f=c.call(o,l[h],h),f!==k&&e.push(f);else if("columns"===b||"rows"===b)f=c.call(o,l[h],this[h],h),f!==k&&e.push(f);else if("column"===b||"column-rows"===b||"row"===b||"cell"===b){q=this[h];"column-rows"===b&&(m=Da(l[h],p.opts));j=0;for(n=q.length;j<n;j++)f=q[j],f="cell"===b?c.call(o,l[h],f.row,f.column,h,j):c.call(o,l[h],f,h,j,m),f!==k&&e.push(f)}}return e.length||d?(a=new t(l,a?
+e.concat.apply([],e):e),b=a.selector,b.rows=p.rows,b.cols=p.cols,b.opts=p.opts,a):this},lastIndexOf:x.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(x.map)b=x.map.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)b.push(a.call(this,this[c],c));return new t(this.context,b)},pluck:function(a){return this.map(function(b){return b[a]})},pop:x.pop,push:x.push,reduce:x.reduce||function(a,b){return hb(this,a,b,0,this.length,
+1)},reduceRight:x.reduceRight||function(a,b){return hb(this,a,b,this.length-1,-1,-1)},reverse:x.reverse,selector:null,shift:x.shift,sort:x.sort,splice:x.splice,toArray:function(){return x.slice.call(this)},to$:function(){return g(this)},toJQuery:function(){return g(this)},unique:function(){return new t(this.context,Oa(this))},unshift:x.unshift};t.extend=function(a,b,c){if(c.length&&b&&(b instanceof t||b.__dt_wrapper)){var d,e,f,h=function(a,b,c){return function(){var d=b.apply(a,arguments);t.extend(d,
+d,c.methodExt);return d}};d=0;for(e=c.length;d<e;d++)f=c[d],b[f.name]="function"===typeof f.val?h(a,f.val,f):g.isPlainObject(f.val)?{}:f.val,b[f.name].__dt_wrapper=!0,t.extend(a,b[f.name],f.propExt)}};t.register=p=function(a,b){if(g.isArray(a))for(var c=0,d=a.length;c<d;c++)t.register(a[c],b);else for(var e=a.split("."),f=Ub,h,i,c=0,d=e.length;c<d;c++){h=(i=-1!==e[c].indexOf("()"))?e[c].replace("()",""):e[c];var j;a:{j=0;for(var n=f.length;j<n;j++)if(f[j].name===h){j=f[j];break a}j=null}j||(j={name:h,
+val:{},methodExt:[],propExt:[]},f.push(j));c===d-1?j.val=b:f=i?j.methodExt:j.propExt}};t.registerPlural=s=function(a,b,c){t.register(a,c);t.register(b,function(){var a=c.apply(this,arguments);return a===this?this:a instanceof t?a.length?g.isArray(a[0])?new t(a.context,a[0]):a[0]:k:a})};p("tables()",function(a){var b;if(a){b=t;var c=this.context;if("number"===typeof a)a=[c[a]];else var d=g.map(c,function(a){return a.nTable}),a=g(d).filter(a).map(function(){var a=g.inArray(this,d);return c[a]}).toArray();
+b=new b(a)}else b=this;return b});p("table()",function(a){var a=this.tables(a),b=a.context;return b.length?new t(b[0]):a});s("tables().nodes()","table().node()",function(){return this.iterator("table",function(a){return a.nTable},1)});s("tables().body()","table().body()",function(){return this.iterator("table",function(a){return a.nTBody},1)});s("tables().header()","table().header()",function(){return this.iterator("table",function(a){return a.nTHead},1)});s("tables().footer()","table().footer()",
+function(){return this.iterator("table",function(a){return a.nTFoot},1)});s("tables().containers()","table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper},1)});p("draw()",function(a){return this.iterator("table",function(b){"page"===a?M(b):("string"===typeof a&&(a="full-hold"===a?!1:!0),R(b,!1===a))})});p("page()",function(a){return a===k?this.page.info().page:this.iterator("table",function(b){Ua(b,a)})});p("page.info()",function(){if(0===this.context.length)return k;
+var a=this.context[0],b=a._iDisplayStart,c=a._iDisplayLength,d=a.fnRecordsDisplay(),e=-1===c;return{page:e?0:Math.floor(b/c),pages:e?1:Math.ceil(d/c),start:b,end:a.fnDisplayEnd(),length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:d,serverSide:"ssp"===z(a)}});p("page.len()",function(a){return a===k?0!==this.context.length?this.context[0]._iDisplayLength:k:this.iterator("table",function(b){Sa(b,a)})});var Vb=function(a,b,c){if(c){var d=new t(a);d.one("draw",function(){c(d.ajax.json())})}if("ssp"==
+z(a))R(a,b);else{C(a,!0);var e=a.jqXHR;e&&4!==e.readyState&&e.abort();ra(a,[],function(c){oa(a);for(var c=sa(a,c),d=0,e=c.length;d<e;d++)L(a,c[d]);R(a,b);C(a,!1)})}};p("ajax.json()",function(){var a=this.context;if(0<a.length)return a[0].json});p("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});p("ajax.reload()",function(a,b){return this.iterator("table",function(c){Vb(c,!1===b,a)})});p("ajax.url()",function(a){var b=this.context;if(a===k){if(0===b.length)return k;
+b=b[0];return b.ajax?g.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(b){g.isPlainObject(b.ajax)?b.ajax.url=a:b.ajax=a})});p("ajax.url().load()",function(a,b){return this.iterator("table",function(c){Vb(c,!1===b,a)})});var $a=function(a,b,c,d,e){var f=[],h,i,j,n,l,m;j=typeof b;if(!b||"string"===j||"function"===j||b.length===k)b=[b];j=0;for(n=b.length;j<n;j++){i=b[j]&&b[j].split?b[j].split(","):[b[j]];l=0;for(m=i.length;l<m;l++)(h=c("string"===typeof i[l]?
+g.trim(i[l]):i[l]))&&h.length&&f.push.apply(f,h)}a=v.selector[a];if(a.length){j=0;for(n=a.length;j<n;j++)f=a[j](d,e,f)}return f},ab=function(a){a||(a={});a.filter&&a.search===k&&(a.search=a.filter);return g.extend({search:"none",order:"current",page:"all"},a)},bb=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=a[b],a[0].length=1,a.length=1,a.context=[a.context[b]],a;a.length=0;return a},Da=function(a,b){var c,d,e,f=[],h=a.aiDisplay;c=a.aiDisplayMaster;var i=b.search;d=b.order;
+e=b.page;if("ssp"==z(a))return"removed"===i?[]:W(0,c.length);if("current"==e){c=a._iDisplayStart;for(d=a.fnDisplayEnd();c<d;c++)f.push(h[c])}else if("current"==d||"applied"==d)f="none"==i?c.slice():"applied"==i?h.slice():g.map(c,function(a){return-1===g.inArray(a,h)?a:null});else if("index"==d||"original"==d){c=0;for(d=a.aoData.length;c<d;c++)"none"==i?f.push(c):(e=g.inArray(c,h),(-1===e&&"removed"==i||0<=e&&"applied"==i)&&f.push(c))}return f};p("rows()",function(a,b){a===k?a="":g.isPlainObject(a)&&
+(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=b;return $a("row",a,function(a){var b=Qb(a);if(b!==null&&!e)return[b];var i=Da(c,e);if(b!==null&&g.inArray(b,i)!==-1)return[b];if(!a)return i;if(typeof a==="function")return g.map(i,function(b){var e=c.aoData[b];return a(b,e._aData,e.nTr)?b:null});b=Tb(ia(c.aoData,i,"nTr"));if(a.nodeName&&g.inArray(a,b)!==-1)return[a._DT_RowIndex];if(typeof a==="string"&&a.charAt(0)==="#"){i=c.aIds[a.replace(/^#/,"")];if(i!==k)return[i.idx]}return g(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()},
+c,e)},1);c.selector.rows=a;c.selector.opts=b;return c});p("rows().nodes()",function(){return this.iterator("row",function(a,b){return a.aoData[b].nTr||k},1)});p("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return ia(a.aoData,b,"_aData")},1)});s("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var d=b.aoData[c];return"search"===a?d._aFilterData:d._aSortData},1)});s("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",
+function(b,c){da(b,c,a)})});s("rows().indexes()","row().index()",function(){return this.iterator("row",function(a,b){return b},1)});s("rows().ids()","row().id()",function(a){for(var b=[],c=this.context,d=0,e=c.length;d<e;d++)for(var f=0,g=this[d].length;f<g;f++){var i=c[d].rowIdFn(c[d].aoData[this[d][f]]._aData);b.push((!0===a?"#":"")+i)}return new t(c,b)});s("rows().remove()","row().remove()",function(){var a=this;this.iterator("row",function(b,c,d){var e=b.aoData;e.splice(c,1);for(var f=0,g=e.length;f<
+g;f++)null!==e[f].nTr&&(e[f].nTr._DT_RowIndex=f);pa(b.aiDisplayMaster,c);pa(b.aiDisplay,c);pa(a[d],c,!1);Ta(b)});this.iterator("table",function(a){for(var c=0,d=a.aoData.length;c<d;c++)a.aoData[c].idx=c});return this});p("rows.add()",function(a){var b=this.iterator("table",function(b){var c,f,g,i=[];f=0;for(g=a.length;f<g;f++)c=a[f],c.nodeName&&"TR"===c.nodeName.toUpperCase()?i.push(ma(b,c)[0]):i.push(L(b,c));return i},1),c=this.rows(-1);c.pop();c.push.apply(c,b.toArray());return c});p("row()",function(a,
+b){return bb(this.rows(a,b))});p("row().data()",function(a){var b=this.context;if(a===k)return b.length&&this.length?b[0].aoData[this[0]]._aData:k;b[0].aoData[this[0]]._aData=a;da(b[0],this[0],"data");return this});p("row().node()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]].nTr||null:null});p("row.add()",function(a){a instanceof g&&a.length&&(a=a[0]);var b=this.iterator("table",function(b){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?ma(b,a)[0]:L(b,a)});
+return this.row(b[0])});var cb=function(a,b){var c=a.context;if(c.length&&(c=c[0].aoData[b!==k?b:a[0]])&&c._details)c._details.remove(),c._detailsShow=k,c._details=k},Wb=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];if(d._details){(d._detailsShow=b)?d._details.insertAfter(d.nTr):d._details.detach();var e=c[0],f=new t(e),g=e.aoData;f.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0<D(g,"_details").length&&(f.on("draw.dt.DT_details",function(a,
+b){e===b&&f.rows({page:"current"}).eq(0).each(function(a){a=g[a];a._detailsShow&&a._details.insertAfter(a.nTr)})}),f.on("column-visibility.dt.DT_details",function(a,b){if(e===b)for(var c,d=ba(b),f=0,k=g.length;f<k;f++)c=g[f],c._details&&c._details.children("td[colspan]").attr("colspan",d)}),f.on("destroy.dt.DT_details",function(a,b){if(e===b)for(var c=0,d=g.length;c<d;c++)g[c]._details&&cb(f,c)}))}}};p("row().child()",function(a,b){var c=this.context;if(a===k)return c.length&&this.length?c[0].aoData[this[0]]._details:
+k;if(!0===a)this.child.show();else if(!1===a)cb(this);else if(c.length&&this.length){var d=c[0],c=c[0].aoData[this[0]],e=[],f=function(a,b){if(g.isArray(a)||a instanceof g)for(var c=0,k=a.length;c<k;c++)f(a[c],b);else a.nodeName&&"tr"===a.nodeName.toLowerCase()?e.push(a):(c=g("<tr><td/></tr>").addClass(b),g("td",c).addClass(b).html(a)[0].colSpan=ba(d),e.push(c[0]))};f(a,b);c._details&&c._details.remove();c._details=g(e);c._detailsShow&&c._details.insertAfter(c.nTr)}return this});p(["row().child.show()",
+"row().child().show()"],function(){Wb(this,!0);return this});p(["row().child.hide()","row().child().hide()"],function(){Wb(this,!1);return this});p(["row().child.remove()","row().child().remove()"],function(){cb(this);return this});p("row().child.isShown()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var ec=/^(.+):(name|visIdx|visible)$/,Xb=function(a,b,c,d,e){for(var c=[],d=0,f=e.length;d<f;d++)c.push(y(a,e[d],b));return c};p("columns()",
+function(a,b){a===k?a="":g.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=a,f=b,h=c.aoColumns,i=D(h,"sName"),j=D(h,"nTh");return $a("column",e,function(a){var b=Qb(a);if(a==="")return W(h.length);if(b!==null)return[b>=0?b:h.length+b];if(typeof a==="function"){var e=Da(c,f);return g.map(h,function(b,f){return a(f,Xb(c,f,0,0,e),j[f])?f:null})}var k=typeof a==="string"?a.match(ec):"";if(k)switch(k[2]){case "visIdx":case "visible":b=parseInt(k[1],10);if(b<0){var m=
+g.map(h,function(a,b){return a.bVisible?b:null});return[m[m.length+b]]}return[la(c,b)];case "name":return g.map(i,function(a,b){return a===k[1]?b:null})}else return g(j).filter(a).map(function(){return g.inArray(this,j)}).toArray()},c,f)},1);c.selector.cols=a;c.selector.opts=b;return c});s("columns().header()","column().header()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh},1)});s("columns().footer()","column().footer()",function(){return this.iterator("column",
+function(a,b){return a.aoColumns[b].nTf},1)});s("columns().data()","column().data()",function(){return this.iterator("column-rows",Xb,1)});s("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});s("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,f){return ia(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});s("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",
+function(a,b,c,d,e){return ia(a.aoData,e,"anCells",b)},1)});s("columns().visible()","column().visible()",function(a,b){return this.iterator("column",function(c,d){if(a===k)return c.aoColumns[d].bVisible;var e=c.aoColumns,f=e[d],h=c.aoData,i,j,n;if(a!==k&&f.bVisible!==a){if(a){var l=g.inArray(!0,D(e,"bVisible"),d+1);i=0;for(j=h.length;i<j;i++)n=h[i].nTr,e=h[i].anCells,n&&n.insertBefore(e[d],e[l]||null)}else g(D(c.aoData,"anCells",d)).detach();f.bVisible=a;fa(c,c.aoHeader);fa(c,c.aoFooter);if(b===k||
+b)Y(c),(c.oScroll.sX||c.oScroll.sY)&&Z(c);w(c,null,"column-visibility",[c,d,a]);ya(c)}})});s("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?aa(b,c):c},1)});p("columns.adjust()",function(){return this.iterator("table",function(a){Y(a)},1)});p("column.index()",function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return la(c,b);if("fromData"===a||"toVisible"===a)return aa(c,b)}});p("column()",
+function(a,b){return bb(this.columns(a,b))});p("cells()",function(a,b,c){g.isPlainObject(a)&&(a.row===k?(c=a,a=null):(c=b,b=null));g.isPlainObject(b)&&(c=b,b=null);if(null===b||b===k)return this.iterator("table",function(b){var d=a,e=ab(c),f=b.aoData,h=Da(b,e),i=Tb(ia(f,h,"anCells")),j=g([].concat.apply([],i)),l,n=b.aoColumns.length,m,p,t,s,u,v;return $a("cell",d,function(a){var c=typeof a==="function";if(a===null||a===k||c){m=[];p=0;for(t=h.length;p<t;p++){l=h[p];for(s=0;s<n;s++){u={row:l,column:s};
+if(c){v=b.aoData[l];a(u,y(b,l,s),v.anCells?v.anCells[s]:null)&&m.push(u)}else m.push(u)}}return m}return g.isPlainObject(a)?[a]:j.filter(a).map(function(a,b){l=b.parentNode._DT_RowIndex;return{row:l,column:g.inArray(b,f[l].anCells)}}).toArray()},b,e)});var d=this.columns(b,c),e=this.rows(a,c),f,h,i,j,n,l=this.iterator("table",function(a,b){f=[];h=0;for(i=e[b].length;h<i;h++){j=0;for(n=d[b].length;j<n;j++)f.push({row:e[b][h],column:d[b][j]})}return f},1);g.extend(l.selector,{cols:b,rows:a,opts:c});
+return l});s("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b].anCells)?a[c]:k},1)});p("cells().data()",function(){return this.iterator("cell",function(a,b,c){return y(a,b,c)},1)});s("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,d){return b.aoData[c][a][d]},1)});s("cells().render()","cell().render()",function(a){return this.iterator("cell",function(b,c,d){return y(b,
+c,d,a)},1)});s("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:aa(a,c)}},1)});s("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,c,d){da(b,c,a,d)})});p("cell()",function(a,b,c){return bb(this.cells(a,b,c))});p("cell().data()",function(a){var b=this.context,c=this[0];if(a===k)return b.length&&c.length?y(b[0],c[0].row,c[0].column):k;Ja(b[0],c[0].row,c[0].column,a);da(b[0],c[0].row,
+"data",c[0].column);return this});p("order()",function(a,b){var c=this.context;if(a===k)return 0!==c.length?c[0].aaSorting:k;"number"===typeof a?a=[[a,b]]:g.isArray(a[0])||(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=a.slice()})});p("order.listener()",function(a,b,c){return this.iterator("table",function(d){Pa(d,a,b,c)})});p(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];g.each(b[d],
+function(b,c){e.push([c,a])});c.aaSorting=e})});p("search()",function(a,b,c,d){var e=this.context;return a===k?0!==e.length?e[0].oPreviousSearch.sSearch:k:this.iterator("table",function(e){e.oFeatures.bFilter&&ga(e,g.extend({},e.oPreviousSearch,{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),1)})});s("columns().search()","column().search()",function(a,b,c,d){return this.iterator("column",function(e,f){var h=e.aoPreSearchCols;if(a===k)return h[f].sSearch;e.oFeatures.bFilter&&
+(g.extend(h[f],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),ga(e,e.oPreviousSearch,1))})});p("state()",function(){return this.context.length?this.context[0].oSavedState:null});p("state.clear()",function(){return this.iterator("table",function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});p("state.loaded()",function(){return this.context.length?this.context[0].oLoadedState:null});p("state.save()",function(){return this.iterator("table",function(a){ya(a)})});
+m.versionCheck=m.fnVersionCheck=function(a){for(var b=m.version.split("."),a=a.split("."),c,d,e=0,f=a.length;e<f;e++)if(c=parseInt(b[e],10)||0,d=parseInt(a[e],10)||0,c!==d)return c>d;return!0};m.isDataTable=m.fnIsDataTable=function(a){var b=g(a).get(0),c=!1;g.each(m.settings,function(a,e){var f=e.nScrollHead?g("table",e.nScrollHead)[0]:null,h=e.nScrollFoot?g("table",e.nScrollFoot)[0]:null;if(e.nTable===b||f===b||h===b)c=!0});return c};m.tables=m.fnTables=function(a){var b=!1;g.isPlainObject(a)&&(b=
+a.api,a=a.visible);var c=g.map(m.settings,function(b){if(!a||a&&g(b.nTable).is(":visible"))return b.nTable});return b?new t(c):c};m.util={throttle:ua,escapeRegex:va};m.camelToHungarian=I;p("$()",function(a,b){var c=this.rows(b).nodes(),c=g(c);return g([].concat(c.filter(a).toArray(),c.find(a).toArray()))});g.each(["on","one","off"],function(a,b){p(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0].match(/\.dt\b/)||(a[0]+=".dt");var d=g(this.tables().nodes());d[b].apply(d,a);return this})});
+p("clear()",function(){return this.iterator("table",function(a){oa(a)})});p("settings()",function(){return new t(this.context,this.context)});p("init()",function(){var a=this.context;return a.length?a[0].oInit:null});p("data()",function(){return this.iterator("table",function(a){return D(a.aoData,"_aData")}).flatten()});p("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,d=b.oClasses,e=b.nTable,f=b.nTBody,h=b.nTHead,i=b.nTFoot,j=g(e),f=g(f),
+k=g(b.nTableWrapper),l=g.map(b.aoData,function(a){return a.nTr}),p;b.bDestroying=!0;w(b,"aoDestroyCallback","destroy",[b]);a||(new t(b)).columns().visible(!0);k.unbind(".DT").find(":not(tbody *)").unbind(".DT");g(Fa).unbind(".DT-"+b.sInstance);e!=h.parentNode&&(j.children("thead").detach(),j.append(h));i&&e!=i.parentNode&&(j.children("tfoot").detach(),j.append(i));b.aaSorting=[];b.aaSortingFixed=[];xa(b);g(l).removeClass(b.asStripeClasses.join(" "));g("th, td",h).removeClass(d.sSortable+" "+d.sSortableAsc+
+" "+d.sSortableDesc+" "+d.sSortableNone);b.bJUI&&(g("th span."+d.sSortIcon+", td span."+d.sSortIcon,h).detach(),g("th, td",h).each(function(){var a=g("div."+d.sSortJUIWrapper,this);g(this).append(a.contents());a.detach()}));f.children().detach();f.append(l);h=a?"remove":"detach";j[h]();k[h]();!a&&c&&(c.insertBefore(e,b.nTableReinsertBefore),j.css("width",b.sDestroyWidth).removeClass(d.sTable),(p=b.asDestroyStripes.length)&&f.children().each(function(a){g(this).addClass(b.asDestroyStripes[a%p])}));
+c=g.inArray(b,m.settings);-1!==c&&m.settings.splice(c,1)})});g.each(["column","row","cell"],function(a,b){p(b+"s().every()",function(a){return this.iterator(b,function(d,e,f,g,i){a.call((new t(d))[b](e,"cell"===b?f:k),e,f,g,i)})})});p("i18n()",function(a,b,c){var d=this.context[0],a=P(a)(d.oLanguage);a===k&&(a=b);c!==k&&g.isPlainObject(a)&&(a=a[c]!==k?a[c]:a._);return a.replace("%d",c)});m.version="1.10.8";m.settings=[];m.models={};m.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};
+m.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null,idx:-1};m.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,
+sWidth:null,sWidthOrig:null};m.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,
+this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){}},fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+
+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",
+sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:g.extend({},m.models.oSearch),sAjaxDataProp:"data",sAjaxSource:null,sDom:"lfrtip",searchDelay:null,sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null,rowId:"DT_RowId"};
+X(m.defaults);m.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};X(m.defaults.column);m.models.oSettings={oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,
+bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1,bBounding:!1},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aIds:{},aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],
+aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",iStateDuration:0,aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,json:k,oAjaxData:k,fnServerData:null,aoServerParams:[],
+sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==z(this)?1*this._iRecordsTotal:this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==z(this)?1*this._iRecordsDisplay:this.aiDisplay.length},fnDisplayEnd:function(){var a=this._iDisplayLength,
+b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,f=e.bPaginate;return e.bServerSide?!1===f||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!f||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{},rowIdFn:null,rowId:null};m.ext=v={buttons:{},classes:{},errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{detect:[],
+search:{},order:{}},_unique:0,fnVersionCheck:m.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:m.version};g.extend(v,{afnFiltering:v.search,aTypes:v.type.detect,ofnSearch:v.type.search,oSort:v.type.order,afnSortData:v.order,aoFeatures:v.feature,oApi:v.internal,oStdClasses:v.classes,oPagination:v.pager});g.extend(m.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",
+sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",
+sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sJUIHeader:"",sJUIFooter:""});var Ea="",Ea="",G=Ea+"ui-state-default",ja=Ea+"css_right ui-icon ui-icon-",Yb=Ea+"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix";g.extend(m.ext.oJUIClasses,m.ext.classes,{sPageButton:"fg-button ui-button "+
+G,sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:G+" sorting_asc",sSortDesc:G+" sorting_desc",sSortable:G+" sorting",sSortableAsc:G+" sorting_asc_disabled",sSortableDesc:G+" sorting_desc_disabled",sSortableNone:G+" sorting_disabled",sSortJUIAsc:ja+"triangle-1-n",sSortJUIDesc:ja+"triangle-1-s",sSortJUI:ja+"carat-2-n-s",sSortJUIAscAllowed:ja+"carat-1-n",sSortJUIDescAllowed:ja+
+"carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead "+G,sScrollFoot:"dataTables_scrollFoot "+G,sHeaderTH:G,sFooterTH:G,sJUIHeader:Yb+" ui-corner-tl ui-corner-tr",sJUIFooter:Yb+" ui-corner-bl ui-corner-br"});var Nb=m.ext.pager;g.extend(Nb,{simple:function(){return["previous","next"]},full:function(){return["first","previous","next","last"]},numbers:function(a,b){return[Aa(a,b)]},simple_numbers:function(a,b){return["previous",Aa(a,
+b),"next"]},full_numbers:function(a,b){return["first","previous",Aa(a,b),"next","last"]},_numbers:Aa,numbers_length:7});g.extend(!0,m.ext.renderer,{pageButton:{_:function(a,b,c,d,e,f){var h=a.oClasses,i=a.oLanguage.oPaginate,j,k,l=0,m=function(b,d){var p,q,t,s,u=function(b){Ua(a,b.data.action,true)};p=0;for(q=d.length;p<q;p++){s=d[p];if(g.isArray(s)){t=g("<"+(s.DT_el||"div")+"/>").appendTo(b);m(t,s)}else{j=null;k="";switch(s){case "ellipsis":b.append('<span class="ellipsis">&#x2026;</span>');break;
+case "first":j=i.sFirst;k=s+(e>0?"":" "+h.sPageButtonDisabled);break;case "previous":j=i.sPrevious;k=s+(e>0?"":" "+h.sPageButtonDisabled);break;case "next":j=i.sNext;k=s+(e<f-1?"":" "+h.sPageButtonDisabled);break;case "last":j=i.sLast;k=s+(e<f-1?"":" "+h.sPageButtonDisabled);break;default:j=s+1;k=e===s?h.sPageButtonActive:""}if(j!==null){t=g("<a>",{"class":h.sPageButton+" "+k,"aria-controls":a.sTableId,"data-dt-idx":l,tabindex:a.iTabIndex,id:c===0&&typeof s==="string"?a.sTableId+"_"+s:null}).html(j).appendTo(b);
+Wa(t,{action:s},u);l++}}}},p;try{p=g(b).find(T.activeElement).data("dt-idx")}catch(t){}m(g(b).empty(),d);p&&g(b).find("[data-dt-idx="+p+"]").focus()}}});g.extend(m.ext.type.detect,[function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c)?"num"+c:null},function(a){if(a&&!(a instanceof Date)&&(!bc.test(a)||!cc.test(a)))return null;var b=Date.parse(a);return null!==b&&!isNaN(b)||K(a)?"date":null},function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c,!0)?"num-fmt"+c:null},function(a,b){var c=b.oLanguage.sDecimal;
+return Sb(a,c)?"html-num"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Sb(a,c,!0)?"html-num-fmt"+c:null},function(a){return K(a)||"string"===typeof a&&-1!==a.indexOf("<")?"html":null}]);g.extend(m.ext.type.search,{html:function(a){return K(a)?a:"string"===typeof a?a.replace(Pb," ").replace(Ca,""):""},string:function(a){return K(a)?a:"string"===typeof a?a.replace(Pb," "):a}});var Ba=function(a,b,c,d){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=Rb(a,b));a.replace&&(c&&(a=a.replace(c,"")),
+d&&(a=a.replace(d,"")));return 1*a};g.extend(v.type.order,{"date-pre":function(a){return Date.parse(a)||0},"html-pre":function(a){return K(a)?"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return K(a)?"":"string"===typeof a?a.toLowerCase():!a.toString?"":a.toString()},"string-asc":function(a,b){return a<b?-1:a>b?1:0},"string-desc":function(a,b){return a<b?1:a>b?-1:0}});db("");g.extend(!0,m.ext.renderer,{header:{_:function(a,b,c,d){g(a.nTable).on("order.dt.DT",function(e,
+f,g,i){if(a===f){e=c.idx;b.removeClass(c.sSortingClass+" "+d.sSortAsc+" "+d.sSortDesc).addClass(i[e]=="asc"?d.sSortAsc:i[e]=="desc"?d.sSortDesc:c.sSortingClass)}})},jqueryui:function(a,b,c,d){g("<div/>").addClass(d.sSortJUIWrapper).append(b.contents()).append(g("<span/>").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);g(a.nTable).on("order.dt.DT",function(e,f,g,i){if(a===f){e=c.idx;b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass(i[e]=="asc"?d.sSortAsc:i[e]=="desc"?d.sSortDesc:c.sSortingClass);
+b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+" "+d.sSortJUIDescAllowed).addClass(i[e]=="asc"?d.sSortJUIAsc:i[e]=="desc"?d.sSortJUIDesc:c.sSortingClassJUI)}})}}});m.render={number:function(a,b,c,d,e){return{display:function(f){if("number"!==typeof f&&"string"!==typeof f)return f;var g=0>f?"-":"",f=Math.abs(parseFloat(f)),i=parseInt(f,10),f=c?b+(f-i).toFixed(c).substring(2):"";return g+(d||"")+i.toString().replace(/\B(?=(\d{3})+(?!\d))/g,
+a)+f+(e||"")}}}};g.extend(m.ext.internal,{_fnExternApiFunc:Ob,_fnBuildAjax:ra,_fnAjaxUpdate:lb,_fnAjaxParameters:ub,_fnAjaxUpdateDraw:vb,_fnAjaxDataSrc:sa,_fnAddColumn:Ga,_fnColumnOptions:ka,_fnAdjustColumnSizing:Y,_fnVisibleToColumnIndex:la,_fnColumnIndexToVisible:aa,_fnVisbleColumns:ba,_fnGetColumns:$,_fnColumnTypes:Ia,_fnApplyColumnDefs:ib,_fnHungarianMap:X,_fnCamelToHungarian:I,_fnLanguageCompat:S,_fnBrowserDetect:gb,_fnAddData:L,_fnAddTr:ma,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==
+k?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return g.inArray(c,a.aoData[b].anCells)},_fnGetCellData:y,_fnSetCellData:Ja,_fnSplitObjNotation:La,_fnGetObjectDataFn:P,_fnSetObjectDataFn:Q,_fnGetDataMaster:Ma,_fnClearTable:oa,_fnDeleteIndex:pa,_fnInvalidate:da,_fnGetRowElements:na,_fnCreateTr:Ka,_fnBuildHead:kb,_fnDrawHead:fa,_fnDraw:M,_fnReDraw:R,_fnAddOptionsHtml:nb,_fnDetectHeader:ea,_fnGetUniqueThs:qa,_fnFeatureHtmlFilter:pb,_fnFilterComplete:ga,_fnFilterCustom:yb,_fnFilterColumn:xb,
+_fnFilter:wb,_fnFilterCreateSearch:Ra,_fnEscapeRegex:va,_fnFilterData:zb,_fnFeatureHtmlInfo:sb,_fnUpdateInfo:Cb,_fnInfoMacros:Db,_fnInitialise:ha,_fnInitComplete:ta,_fnLengthChange:Sa,_fnFeatureHtmlLength:ob,_fnFeatureHtmlPaginate:tb,_fnPageChange:Ua,_fnFeatureHtmlProcessing:qb,_fnProcessingDisplay:C,_fnFeatureHtmlTable:rb,_fnScrollDraw:Z,_fnApplyToChildren:H,_fnCalculateColumnWidths:Ha,_fnThrottle:ua,_fnConvertToWidth:Fb,_fnGetWidestNode:Gb,_fnGetMaxLenString:Hb,_fnStringToCss:u,_fnScrollBarWidth:Ib,
+_fnSortFlatten:V,_fnSort:mb,_fnSortAria:Kb,_fnSortListener:Va,_fnSortAttachListener:Pa,_fnSortingClasses:xa,_fnSortData:Jb,_fnSaveState:ya,_fnLoadState:Lb,_fnSettingsFromNode:za,_fnLog:J,_fnMap:F,_fnBindAction:Wa,_fnCallbackReg:A,_fnCallbackFire:w,_fnLengthOverflow:Ta,_fnRenderer:Qa,_fnDataSource:z,_fnRowAttributes:Na,_fnCalculateEnd:function(){}});g.fn.dataTable=m;g.fn.dataTableSettings=m.settings;g.fn.dataTableExt=m.ext;g.fn.DataTable=function(a){return g(this).dataTable(a).api()};g.each(m,function(a,
+b){g.fn.DataTable[a]=b});return g.fn.dataTable};"function"===typeof define&&define.amd?define("datatables",["jquery"],S):"object"===typeof exports?module.exports=S(require("jquery")):jQuery&&!jQuery.fn.dataTable&&S(jQuery)})(window,document);

From ee3e0cd27952c41b1b46b557fb7c92cb66fa6023 Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Wed, 3 Jun 2020 16:26:21 +0200
Subject: [PATCH 56/83] [BUGFIX] Use correct path for require JS config (#188)

---
 Classes/Controller/BaseController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index 4d931b4..8364f84 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -84,7 +84,7 @@ public function initializeAction()
             $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
             $fullJsPath = 'EXT:t3monitoring/Resources/Public/JavaScript/';
             $fullJsPath = GeneralUtility::getFileAbsFileName($fullJsPath);
-            $fullJsPath = PathUtility::getRelativePath(Environment::getProjectPath(), $fullJsPath);
+            $fullJsPath = PathUtility::getRelativePath(Environment::getPublicPath(), $fullJsPath);
             $fullJsPath = rtrim($fullJsPath, '/');
             $pageRenderer->addRequireJsConfiguration([
                 'paths' => [

From a34981ddfe170d500cfabd2002e6f210f5f44b80 Mon Sep 17 00:00:00 2001
From: Jens Jacobsen <jens.jacobsen@web.de>
Date: Wed, 3 Mar 2021 19:39:22 +0100
Subject: [PATCH 57/83] [FEATURE] Add extension key in extra section (#192)

Add the extension key in the composer.json extra section for future TYPO3 versions (https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/ExtensionArchitecture/ComposerJson/Index.html#extra).
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 70ab4dd..9692cfc 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
   "extra": {
     "typo3/cms": {
       "cms-package-dir": "{$vendor-dir}/typo3/cms",
-      "web-dir": ".Build/Web"
+      "web-dir": ".Build/Web",
+      "extension-key": "t3monitoring"
     }
   }
 }

From 4351eaae2d35d220af103a8f14c3953474709ba1 Mon Sep 17 00:00:00 2001
From: Peter Kraume <peter.kraume@gmx.de>
Date: Tue, 20 Jul 2021 19:24:24 +0200
Subject: [PATCH 58/83] [BUGFIX] Fix JavaScript for chart generation (#194)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [BUGFIX] Return proper type in Symfony console commands

Fixes: #183

* [BUGFIX] Fix JavaScript for chart generation

Relates to #191
---
 Resources/Private/Templates/Statistic/Index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index c2b3e5c..68a5513 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -135,7 +135,7 @@
                           <f:if condition="{emConfiguration.useGoogleCharts}">
                             <div style="width: 100%; overflow: hidden;" id="chart_core_versions"></div>
                             <script type="text/javascript">
-                                var dataSet = {coreVersionUsageJson -> f:format.raw()};
+                                var dataSet = <f:format.raw>{coreVersionUsageJson}</f:format.raw>;
                                 // Load the Visualization API and the corechart package.
                                 google.charts.load('current', {'packages':['corechart']});
 

From 35b1f5a87458e20ff0de2a8bc70e1aafb0f65da5 Mon Sep 17 00:00:00 2001
From: Peter Kraume <peter.kraume@gmx.de>
Date: Wed, 21 Jul 2021 13:19:43 +0200
Subject: [PATCH 59/83] [TASK] Increase size of database field extra_warning
 (#195)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [BUGFIX] Return proper type in Symfony console commands

Fixes: #183

* [TASK] Increase size of database field extra_warning
---
 ext_tables.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext_tables.sql b/ext_tables.sql
index 1e1d422..e41727b 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -26,7 +26,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	error_message text DEFAULT '' NOT NULL,
 	error_count int(11) DEFAULT '0' NOT NULL,
 	extra_info text NOT NULL,
-	extra_warning text NOT NULL,
+	extra_warning mediumtext NOT NULL,
 	extra_danger text NOT NULL,
 	last_successful_import int(11) DEFAULT '0' NOT NULL,
 	extensions int(11) unsigned DEFAULT '0' NOT NULL,

From dd5f45c0d871e4978368008f3137cab37714a863 Mon Sep 17 00:00:00 2001
From: Peter Kraume <peter.kraume@gmx.de>
Date: Wed, 22 Sep 2021 20:22:07 +0200
Subject: [PATCH 60/83] =?UTF-8?q?[BUGFIX]=C2=A0Set=20default=20title=20for?=
 =?UTF-8?q?=20mm=20relation=20of=20title=20is=20empty=20(#200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #199
---
 Classes/Service/Import/ClientImport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index e88f1da..0600a82 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -304,7 +304,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
             $relationsToBeAdded[] = [
                 $client,
                 $relationId,
-                $data['title'],
+                ($data['title']) ?: 'extension has no title',
                 array_search($data['state'], Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
                 $data['isLoaded'],
             ];

From 8062eaa456ec9f6815defbd04c01e6a502d55f17 Mon Sep 17 00:00:00 2001
From: Jonas <jonnsn@users.noreply.github.com>
Date: Thu, 21 Oct 2021 18:10:37 +0200
Subject: [PATCH 61/83] [FEATURE] add option to exclude clients from
 (automatic) fetch. Clients can still be fetched explicitly. (#202)

refs #201
---
 Classes/Domain/Model/Client.php               | 21 +++++++++++++++++++
 Classes/Hooks/DataHandlerHook.php             |  2 +-
 Classes/Service/Import/ClientImport.php       |  4 ++++
 .../tx_t3monitoring_domain_model_client.php   | 10 +++++++--
 Resources/Private/Language/locallang.xlf      |  4 ++++
 ext_tables.sql                                |  1 +
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index dbcef66..687d53c 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -40,6 +40,11 @@ class Client extends AbstractEntity
      */
     protected $ignoreCertErrors = false;
 
+    /**
+     * @var bool
+     */
+    protected $excludeFromImport = false;
+
     /**
      * @var string
      */
@@ -283,6 +288,22 @@ public function setIgnoreCertErrors(bool $ignoreCertErrors)
         $this->ignoreCertErrors = $ignoreCertErrors;
     }
 
+    /**
+     * @return bool
+     */
+    public function isExcludeFromImport()
+    {
+        return $this->excludeFromImport;
+    }
+
+    /**
+     * @param bool $ignoreCertErrors
+     */
+    public function setExcludeFromImport(bool $excludeFromImport)
+    {
+        $this->excludeFromImport = $excludeFromImport;
+    }
+
     /**
      * @return string
      */
diff --git a/Classes/Hooks/DataHandlerHook.php b/Classes/Hooks/DataHandlerHook.php
index 5ec1cdd..7d517e7 100644
--- a/Classes/Hooks/DataHandlerHook.php
+++ b/Classes/Hooks/DataHandlerHook.php
@@ -43,7 +43,7 @@ public function processDatamap_afterDatabaseOperations(
             }
 
             $clientRow = BackendUtility::getRecord($table, (int)$recordUid);
-            if ($clientRow) {
+            if ($clientRow && $clientRow['exclude_from_import'] !== 1) {
                 $this->checkDomain($clientRow['domain']);
                 $this->importClient($recordUid);
             }
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 0600a82..61e5394 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -66,6 +66,10 @@ public function run(int $clientId = 0)
             $query->where(
                 $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($clientId, \PDO::PARAM_INT))
             );
+        } else {
+            $query->where(
+                $queryBuilder->expr()->eq('exclude_from_import', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
+            );
         }
 
         $clientRows = $query->execute()->fetchAll();
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 180eb2e..0b1b526 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -14,7 +14,7 @@
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg'
     ],
     'interface' => [
-        'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, host_header, ignore_cert_errors, force_ip_resolve, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
+        'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, host_header, ignore_cert_errors, exclude_from_import, force_ip_resolve, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
     ],
     'types' => [
         1 => [
@@ -31,7 +31,7 @@
         'paletteTitle' => ['showitem' => 'title'],
         'paletteCore' => ['showitem' => 'core, insecure_core, outdated_core,'],
         'paletteExtensions' => ['showitem' => 'extensions, --linebreak--, insecure_extensions, outdated_extensions,'],
-        'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, host_header, --linebreak--, ignore_cert_errors, force_ip_resolve'],
+        'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, host_header, --linebreak--, ignore_cert_errors, exclude_from_import, force_ip_resolve'],
         'paletteVersions' => ['showitem' => 'php_version, mysql_version'],
         'paletteDiskSpace' => ['showitem' => 'disk_total_space, disk_free_space'],
     ],
@@ -102,6 +102,12 @@
                 'type' => 'check',
             ],
         ],
+        'exclude_from_import' => [
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.excludeFromImport',
+            'config' => [
+                'type' => 'check',
+            ],
+        ],
         'force_ip_resolve' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.forceIpResolve',
             'config' => [
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index a1824c2..09b06c2 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -35,6 +35,10 @@
 				<source>Ignore Certificate Errors</source>
 				<context context-type="context">Label for field Ignore Certificate Errors (type checkbox). It's an optional field.</context>
 			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.excludeFromImport">
+				<source>Exclude from Import</source>
+				<context context-type="context">Label for field Exclude from Import (type checkbox). It's an optional field.</context>
+			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.forceIpResolve">
 				<source>Force IP Resolve</source>
 				<context context-type="context">Label for field Force IP Resolve (type select).</context>
diff --git a/ext_tables.sql b/ext_tables.sql
index e41727b..fb6b69c 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -13,6 +13,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	host_header varchar(255) DEFAULT '' NOT NULL,
 	force_ip_resolve enum('', 'v4', 'v6') DEFAULT '' NOT NULL,
 	ignore_cert_errors tinyint(4) unsigned DEFAULT '0' NOT NULL,
+	exclude_from_import tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	secret varchar(255) DEFAULT '' NOT NULL,
 	email varchar(255) DEFAULT '' NOT NULL,
 	php_version varchar(255) DEFAULT '' NOT NULL,

From 37fe26b2b968f59e4b432612fbb54e166e35ce43 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <lehmann@networkteam.com>
Date: Tue, 26 Oct 2021 14:52:55 +0200
Subject: [PATCH 62/83] [TASK] Fetch bulletins with RequestFactory

---
 Classes/Service/BulletinImport.php | 31 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/Classes/Service/BulletinImport.php b/Classes/Service/BulletinImport.php
index 0cc0b93..428f953 100644
--- a/Classes/Service/BulletinImport.php
+++ b/Classes/Service/BulletinImport.php
@@ -8,6 +8,9 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Http\RequestFactory;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * Class BulletinImport
  */
@@ -36,18 +39,24 @@ public function start()
     {
         $feed = [];
         try {
-            $rss = new \DOMDocument();
-            $rss->load($this->url);
-            /** @var \DOMElement $node */
-            foreach ($rss->getElementsByTagName('item') as $node) {
-                $feed[] = [
-                    'title' => $node->getElementsByTagName('title')->item(0)->nodeValue,
-                    'desc' => $node->getElementsByTagName('description')->item(0)->nodeValue,
-                    'link' => $node->getElementsByTagName('link')->item(0)->nodeValue,
-                    'date' => strtotime($node->getElementsByTagName('pubDate')->item(0)->nodeValue),
-                ];
+            /** @var RequestFactory $requestFactory */
+            $requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
+            $response = $requestFactory->request($this->url);
+            if ($response->getStatusCode() == 200) {
+                $rss = new \DOMDocument();
+                $rss->loadXML($response->getBody()->getContents());
+
+                /** @var \DOMElement $node */
+                foreach ($rss->getElementsByTagName('item') as $node) {
+                    $feed[] = [
+                        'title' => $node->getElementsByTagName('title')->item(0)->nodeValue,
+                        'desc' => $node->getElementsByTagName('description')->item(0)->nodeValue,
+                        'link' => $node->getElementsByTagName('link')->item(0)->nodeValue,
+                        'date' => strtotime($node->getElementsByTagName('pubDate')->item(0)->nodeValue),
+                    ];
+                }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             // do nothing
         }
 

From b463f426fe18a8d5e98d7ba63e67501aba852584 Mon Sep 17 00:00:00 2001
From: mueller-sebastian <sebastian.mueller@elementare-teilchen.de>
Date: Tue, 21 Dec 2021 20:23:12 +0100
Subject: [PATCH 63/83] Filter by tag independent from tag position (#206)

Fixes #205
---
 Classes/Domain/Repository/ClientRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Domain/Repository/ClientRepository.php b/Classes/Domain/Repository/ClientRepository.php
index acff50b..1b65d51 100644
--- a/Classes/Domain/Repository/ClientRepository.php
+++ b/Classes/Domain/Repository/ClientRepository.php
@@ -102,7 +102,7 @@ protected function getConstraints(ClientFilterDemand $demand, QueryInterface $qu
 
         // Tag
         if ($demand->getTag()) {
-            $constraints[] = $query->equals('tag', $demand->getTag());
+            $constraints[] = $query->contains('tag', $demand->getTag());
         }
 
         // Search

From 8a56b385f7b334d0a72b0e8e56ae6cf012fb3c87 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <post@christophlehmann.eu>
Date: Thu, 3 Feb 2022 08:17:48 +0100
Subject: [PATCH 64/83] WIP: TYPO3 11 LTS compatibility (#204)

* [TASK] Require TYPO3 v11

* [TASK] Add return type hint

Declaration of T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverterV9::canConvertFrom($source, $targetType) must be compatible with TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter::canConvertFrom($source, string $targetType): bool in /app/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php on line 74

* [TASK] Ignore .Build in Git

* [TASK] Replace occurences of ObjectManager

* [TASK] Use class names in module registration

* [TASK] Add Services.yaml

* [TASK] Drop TYPO3 v9 stuff

* [TASK] Replace $extensionRepository->updateExtList()

The Helper class does not exist anymore.

This also copies splitVersionRange() from VersionNumberUtility since it does not exist anymore.

* [TASK] Require js with absolute path

* [TASK] Replace StringUtility::beginsWith()

The replacement str_starts_with() is available since newer v10

This solves PHPUnit warnings about deprecations

* [TASK] Solve deprecation

Co-authored-by: Christoph Lehmann <lehmann@networkteam.com>
---
 .gitignore                                    |  1 +
 Classes/Command/ImportAllCommand.php          |  8 +--
 Classes/Command/ImportClientsCommand.php      |  4 +-
 Classes/Command/ImportCoreCommand.php         |  4 +-
 Classes/Command/ImportExtensionsCommand.php   |  4 +-
 Classes/Command/ReportAdminCommand.php        |  4 +-
 Classes/Command/ReportClientCommand.php       |  4 +-
 Classes/Controller/BaseController.php         | 46 +++++++---------
 Classes/Controller/CoreController.php         |  3 +-
 Classes/Controller/ExtensionController.php    |  3 +-
 Classes/Controller/StatisticController.php    | 18 +++---
 ...10.php => ClientFilterDemandConverter.php} |  2 +-
 .../ClientFilterDemandConverterV9.php         |  2 +-
 Classes/Hooks/DataHandlerHook.php             |  3 +-
 Classes/Notification/EmailNotification.php    | 27 +++------
 Classes/Service/Import/ClientImport.php       |  3 +-
 Classes/Service/Import/ExtensionImport.php    | 55 ++++++++++++++++---
 Configuration/Commands.php                    | 22 --------
 Configuration/Services.yaml                   | 45 +++++++++++++++
 composer.json                                 |  8 +--
 ext_emconf.php                                |  2 +-
 ext_localconf.php                             |  6 +-
 ext_tables.php                                | 14 ++---
 23 files changed, 158 insertions(+), 130 deletions(-)
 rename Classes/Domain/TypeConverter/{ClientFilterDemandConverterV10.php => ClientFilterDemandConverter.php} (97%)
 delete mode 100644 Configuration/Commands.php
 create mode 100644 Configuration/Services.yaml

diff --git a/.gitignore b/.gitignore
index e43b0f9..9f1ddc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.Build
\ No newline at end of file
diff --git a/Classes/Command/ImportAllCommand.php b/Classes/Command/ImportAllCommand.php
index 5ad3df1..3cecbdf 100644
--- a/Classes/Command/ImportAllCommand.php
+++ b/Classes/Command/ImportAllCommand.php
@@ -15,7 +15,6 @@
 use T3Monitor\T3monitoring\Service\Import\CoreImport;
 use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * Monitoring command controller
@@ -42,10 +41,9 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $objectManager->get(CoreImport::class)->run();
-        $objectManager->get(ExtensionImport::class)->run();
-        $import = $objectManager->get(ClientImport::class);
+        GeneralUtility::makeInstance(CoreImport::class)->run();
+        GeneralUtility::makeInstance(ExtensionImport::class)->run();
+        $import = GeneralUtility::makeInstance(ClientImport::class);
         $import->run();
 
         $result = $import->getResponseCount();
diff --git a/Classes/Command/ImportClientsCommand.php b/Classes/Command/ImportClientsCommand.php
index a950430..caf03f7 100644
--- a/Classes/Command/ImportClientsCommand.php
+++ b/Classes/Command/ImportClientsCommand.php
@@ -13,7 +13,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * Monitoring command controller
@@ -40,8 +39,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $import = $objectManager->get(ClientImport::class);
+        $import = GeneralUtility::makeInstance(ClientImport::class);
         $import->run();
 
         $result = $import->getResponseCount();
diff --git a/Classes/Command/ImportCoreCommand.php b/Classes/Command/ImportCoreCommand.php
index b8e89b1..4e0c7aa 100644
--- a/Classes/Command/ImportCoreCommand.php
+++ b/Classes/Command/ImportCoreCommand.php
@@ -13,7 +13,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use T3Monitor\T3monitoring\Service\Import\CoreImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * Monitoring command controller
@@ -39,8 +38,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $objectManager->get(CoreImport::class)->run();
+        GeneralUtility::makeInstance(CoreImport::class)->run();
         return 0;
     }
 }
diff --git a/Classes/Command/ImportExtensionsCommand.php b/Classes/Command/ImportExtensionsCommand.php
index ff44fa2..c1bdbc8 100644
--- a/Classes/Command/ImportExtensionsCommand.php
+++ b/Classes/Command/ImportExtensionsCommand.php
@@ -13,7 +13,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * Monitoring command controller
@@ -38,8 +37,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $objectManager->get(ExtensionImport::class)->run();
+        GeneralUtility::makeInstance(ExtensionImport::class)->run();
         return 0;
     }
 }
diff --git a/Classes/Command/ReportAdminCommand.php b/Classes/Command/ReportAdminCommand.php
index ac01ff0..975b3d0 100644
--- a/Classes/Command/ReportAdminCommand.php
+++ b/Classes/Command/ReportAdminCommand.php
@@ -20,7 +20,6 @@
 use T3Monitor\T3monitoring\Notification\EmailNotification;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * Report command controller
@@ -43,8 +42,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
     {
         parent::initialize($input, $output);
 
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $this->clients = $objectManager->get(ClientRepository::class)->getAllForReport();
+        $this->clients = GeneralUtility::makeInstance(ClientRepository::class)->getAllForReport();
     }
 
     /**
diff --git a/Classes/Command/ReportClientCommand.php b/Classes/Command/ReportClientCommand.php
index f7f8a2d..9aad1a6 100644
--- a/Classes/Command/ReportClientCommand.php
+++ b/Classes/Command/ReportClientCommand.php
@@ -16,7 +16,6 @@
 use T3Monitor\T3monitoring\Notification\EmailNotification;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * Report command controller
@@ -40,8 +39,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $clients = $objectManager->get(ClientRepository::class)->getAllForReport(true);
+        $clients = GeneralUtility::makeInstance(ClientRepository::class)->getAllForReport(true);
         if (count($clients) === 0) {
             $output->writeln($this->getLabel('noInsecureClients'));
             return 0;
diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index 8364f84..34a3ccc 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -16,16 +16,13 @@
 use T3Monitor\T3monitoring\Domain\Repository\StatisticRepository;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
-use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
@@ -68,31 +65,26 @@ class BaseController extends ActionController
      */
     public function initializeAction()
     {
-        $this->statisticRepository = $this->objectManager->get(StatisticRepository::class);
-        $this->filterDemand = $this->objectManager->get(ClientFilterDemand::class);
-        $this->clientRepository = $this->objectManager->get(ClientRepository::class);
-        $this->coreRepository = $this->objectManager->get(CoreRepository::class);
+        $this->statisticRepository = GeneralUtility::makeInstance(StatisticRepository::class);
+        $this->filterDemand = GeneralUtility::makeInstance(ClientFilterDemand::class);
+        $this->clientRepository = GeneralUtility::makeInstance(ClientRepository::class);
+        $this->coreRepository = GeneralUtility::makeInstance(CoreRepository::class);
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
         $this->registry = GeneralUtility::makeInstance(Registry::class);
         $this->emConfiguration = GeneralUtility::makeInstance(EmMonitoringConfiguration::class);
 
         parent::initializeAction();
 
-        $isv10 = VersionNumberUtility::convertVersionNumberToInteger('10.0')
-            <= VersionNumberUtility::convertVersionNumberToInteger((new Typo3Version())->getBranch());
-        if ($isv10) {
-            $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-            $fullJsPath = 'EXT:t3monitoring/Resources/Public/JavaScript/';
-            $fullJsPath = GeneralUtility::getFileAbsFileName($fullJsPath);
-            $fullJsPath = PathUtility::getRelativePath(Environment::getPublicPath(), $fullJsPath);
-            $fullJsPath = rtrim($fullJsPath, '/');
-            $pageRenderer->addRequireJsConfiguration([
-                'paths' => [
-                    'datatables' => $fullJsPath . '/jquery.dataTables.min',
-                    'datatablesBootstrap' => $fullJsPath . '/dataTables.bootstrap.min',
-                ]
-            ]);
-        }
+        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+        $fullJsPath = 'EXT:t3monitoring/Resources/Public/JavaScript';
+        $fullJsPath = GeneralUtility::getFileAbsFileName($fullJsPath);
+        $fullJsPath = PathUtility::getAbsoluteWebPath($fullJsPath);
+        $pageRenderer->addRequireJsConfiguration([
+            'paths' => [
+                'datatables' => $fullJsPath . '/jquery.dataTables.min',
+                'datatablesBootstrap' => $fullJsPath . '/dataTables.bootstrap.min',
+            ]
+        ]);
     }
 
     /**
@@ -195,7 +187,7 @@ protected function getButtons()
         $addUserGroupButton = $buttonBar->makeLinkButton()
             ->setHref($uriBuilder->buildUriFromRoute('record_edit', $parameters))
             ->setTitle($this->getLabel('createNew.client'))
-            ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-document-new',
+            ->setIcon($this->iconFactory->getIcon('actions-document-new',
                 Icon::SIZE_SMALL));
         $buttonBar->addButton($addUserGroupButton, ButtonBar::BUTTON_POSITION_LEFT);
 
@@ -210,7 +202,7 @@ protected function getButtons()
             $editClientButton = $buttonBar->makeLinkButton()
                 ->setHref($uriBuilder->buildUriFromRoute('record_edit', $parameters))
                 ->setTitle($this->getLabel('edit.client'))
-                ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-open',
+                ->setIcon($this->iconFactory->getIcon('actions-open',
                     Icon::SIZE_SMALL));
             $buttonBar->addButton($editClientButton, ButtonBar::BUTTON_POSITION_LEFT);
 
@@ -218,7 +210,7 @@ protected function getButtons()
             $downloadClientDataButton = $buttonBar->makeLinkButton()
                 ->setHref($this->getUriBuilder()->reset()->uriFor('fetch', ['client' => $clientId], 'Client'))
                 ->setTitle($this->getLabel('fetchClient.link'))
-                ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon('actions-system-extension-download',
+                ->setIcon($this->iconFactory->getIcon('actions-system-extension-download',
                     Icon::SIZE_SMALL));
             $buttonBar->addButton($downloadClientDataButton, ButtonBar::BUTTON_POSITION_LEFT);
         }
@@ -238,7 +230,7 @@ protected function getLabel($key): string
      */
     protected function getUriBuilder(): UriBuilder
     {
-        $uriBuilder = $this->objectManager->get(UriBuilder::class);
+        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
         $uriBuilder->setRequest($this->request);
 
         return $uriBuilder;
@@ -249,7 +241,7 @@ protected function getUriBuilder(): UriBuilder
      */
     protected function getClientFilterDemand(): ClientFilterDemand
     {
-        return $this->objectManager->get(ClientFilterDemand::class);
+        return GeneralUtility::makeInstance(ClientFilterDemand::class);
     }
 
     /**
diff --git a/Classes/Controller/CoreController.php b/Classes/Controller/CoreController.php
index 9045e5f..e1bf87c 100644
--- a/Classes/Controller/CoreController.php
+++ b/Classes/Controller/CoreController.php
@@ -10,6 +10,7 @@
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\CoreFilterDemand;
 use T3Monitor\T3monitoring\Domain\Repository\CoreRepository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * CoreController
@@ -23,7 +24,7 @@ class CoreController extends BaseController
     public function listAction(CoreFilterDemand $filter = null)
     {
         if ($filter === null) {
-            $filter = $this->objectManager->get(CoreFilterDemand::class);
+            $filter = GeneralUtility::makeInstance(CoreFilterDemand::class);
             $filter->setUsage(CoreRepository::USED_ONLY);
         }
 
diff --git a/Classes/Controller/ExtensionController.php b/Classes/Controller/ExtensionController.php
index 761262e..ec4235c 100644
--- a/Classes/Controller/ExtensionController.php
+++ b/Classes/Controller/ExtensionController.php
@@ -9,6 +9,7 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\ExtensionFilterDemand;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * ExtensionController
@@ -35,7 +36,7 @@ public function injectExtensionRepository(\T3Monitor\T3monitoring\Domain\Reposit
     public function listAction(ExtensionFilterDemand $filter = null)
     {
         if ($filter === null) {
-            $filter = $this->objectManager->get(ExtensionFilterDemand::class);
+            $filter = GeneralUtility::makeInstance(ExtensionFilterDemand::class);
         }
 
         $this->view->assignMultiple([
diff --git a/Classes/Controller/StatisticController.php b/Classes/Controller/StatisticController.php
index 125665d..e1f6e1e 100644
--- a/Classes/Controller/StatisticController.php
+++ b/Classes/Controller/StatisticController.php
@@ -43,12 +43,12 @@ class StatisticController extends BaseController
      */
     public function initializeAction()
     {
-        $this->statisticRepository = $this->objectManager->get(StatisticRepository::class);
-        $this->filterDemand = $this->objectManager->get(ClientFilterDemand::class);
-        $this->clientRepository = $this->objectManager->get(ClientRepository::class);
-        $this->coreRepository = $this->objectManager->get(CoreRepository::class);
-        $this->slaRepository = $this->objectManager->get(SlaRepository::class);
-        $this->tagRepository = $this->objectManager->get(TagRepository::class);
+        $this->statisticRepository = GeneralUtility::makeInstance(StatisticRepository::class);
+        $this->filterDemand = GeneralUtility::makeInstance(ClientFilterDemand::class);
+        $this->clientRepository = GeneralUtility::makeInstance(ClientRepository::class);
+        $this->coreRepository = GeneralUtility::makeInstance(CoreRepository::class);
+        $this->slaRepository = GeneralUtility::makeInstance(SlaRepository::class);
+        $this->tagRepository = GeneralUtility::makeInstance(TagRepository::class);
 
         parent::initializeAction();
     }
@@ -121,17 +121,17 @@ public function administrationAction($import = '')
         if (!empty($import)) {
             switch ($import) {
                 case 'clients':
-                    $importService = $this->objectManager->get(ClientImport::class);
+                    $importService = GeneralUtility::makeInstance(ClientImport::class);
                     $importService->run();
                     $success = true;
                     break;
                 case 'extensions':
-                    $importService = $this->objectManager->get(ExtensionImport::class);
+                    $importService = GeneralUtility::makeInstance(ExtensionImport::class);
                     $importService->run();
                     $success = true;
                     break;
                 case 'core':
-                    $importService = $this->objectManager->get(CoreImport::class);
+                    $importService = GeneralUtility::makeInstance(CoreImport::class);
                     $importService->run();
                     $success = true;
                     break;
diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
similarity index 97%
rename from Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php
rename to Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
index df02612..3b1b33d 100644
--- a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV10.php
+++ b/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
@@ -17,7 +17,7 @@
 /**
  * Class ClientFilterDemandConverter
  */
-class ClientFilterDemandConverterV10 extends AbstractTypeConverter
+class ClientFilterDemandConverter extends AbstractTypeConverter
 {
     /**
      * @var array<string>
diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
index c902684..7a3e61e 100644
--- a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
+++ b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
@@ -71,7 +71,7 @@ public function convertFrom(
      * @param string $targetType
      * @return bool
      */
-    public function canConvertFrom($source, $targetType)
+    public function canConvertFrom($source, $targetType): bool
     {
         return $this->isAllowed();
     }
diff --git a/Classes/Hooks/DataHandlerHook.php b/Classes/Hooks/DataHandlerHook.php
index 7d517e7..69e8063 100644
--- a/Classes/Hooks/DataHandlerHook.php
+++ b/Classes/Hooks/DataHandlerHook.php
@@ -14,7 +14,6 @@
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\StringUtility;
 
 /**
  * Class DataHandlerHook
@@ -38,7 +37,7 @@ public function processDatamap_afterDatabaseOperations(
         DataHandler $parentObject
     ) {
         if ($table === 'tx_t3monitoring_domain_model_client') {
-            if (is_string($recordUid) && StringUtility::beginsWith($recordUid, 'NEW')) {
+            if (is_string($recordUid) && str_starts_with($recordUid, 'NEW')) {
                 $recordUid = $parentObject->substNEWwithIDs[$recordUid];
             }
 
diff --git a/Classes/Notification/EmailNotification.php b/Classes/Notification/EmailNotification.php
index e05520f..47097c0 100644
--- a/Classes/Notification/EmailNotification.php
+++ b/Classes/Notification/EmailNotification.php
@@ -14,7 +14,6 @@
 use T3Monitor\T3monitoring\Domain\Model\Client;
 use TYPO3\CMS\Core\Mail\MailMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use UnexpectedValueException;
 
@@ -98,25 +97,13 @@ protected function sendMail(string $to, string $subject, string $plainContent, s
     {
         /** @var MailMessage $mailMessage */
         $mailMessage = GeneralUtility::makeInstance(MailMessage::class);
-        $isv10 = VersionNumberUtility::convertVersionNumberToInteger('10.0') <= VersionNumberUtility::convertVersionNumberToInteger(TYPO3_branch);
-        if ($isv10) {
-            $mailMessage
-                ->setTo($to)
-                ->setSubject($subject)
-                ->text($plainContent)
-                ->addFrom(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()));
-            if (!empty($htmlContent)) {
-                $mailMessage->html($htmlContent);
-            }
-        } else {
-            $mailMessage
-                ->setTo($to)
-                ->setSubject($subject)
-                ->setBody($plainContent)->setContentType('text/plain')
-                ->addFrom($this->getSenderEmailAddress(), $this->getSenderEmailName());
-            if (!empty($htmlContent)) {
-                $mailMessage->addPart($htmlContent, 'text/html');
-            }
+        $mailMessage
+            ->setTo($to)
+            ->setSubject($subject)
+            ->text($plainContent)
+            ->addFrom(new Address($this->getSenderEmailAddress(), $this->getSenderEmailName()));
+        if (!empty($htmlContent)) {
+            $mailMessage->html($htmlContent);
         }
 
         return $mailMessage->send();
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 61e5394..9f5151f 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -18,7 +18,6 @@
 use TYPO3\CMS\Core\Http\RequestFactory;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\StringUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 /**
@@ -229,7 +228,7 @@ protected function requestClientData(array $row)
     protected function unifyDomain($domain)
     {
         $domain = rtrim($domain, '/');
-        if (!StringUtility::beginsWith($domain, 'http://') && !StringUtility::beginsWith($domain, 'https://')) {
+        if (!str_starts_with($domain, 'http://') && !str_starts_with($domain, 'https://')) {
             $domain = 'http://' . $domain;
         }
 
diff --git a/Classes/Service/Import/ExtensionImport.php b/Classes/Service/Import/ExtensionImport.php
index 23861fc..3444ffe 100644
--- a/Classes/Service/Import/ExtensionImport.php
+++ b/Classes/Service/Import/ExtensionImport.php
@@ -12,10 +12,11 @@
 use InvalidArgumentException;
 use T3Monitor\T3monitoring\Service\DataIntegrity;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
-use TYPO3\CMS\Extensionmanager\Utility\Repository\Helper;
+use TYPO3\CMS\Extbase\Mvc\Request;
+use TYPO3\CMS\Extensionmanager\Controller\UpdateFromTerController;
 
 /**
  * Class ExtensionImport
@@ -30,7 +31,6 @@ class ExtensionImport extends BaseImport
      * Run extension import
      *
      * @throws InvalidArgumentException
-     * @throws ExtensionManagerException
      */
     public function run()
     {
@@ -125,18 +125,59 @@ protected function addCoreDependenciesToFields(array &$fields)
             return;
         }
 
-        $split = VersionNumberUtility::splitVersionRange($dependencies['depends']['typo3']);
+        $split = self::splitVersionRange($dependencies['depends']['typo3']);
         $fields['typo3_min_version'] = VersionNumberUtility::convertVersionNumberToInteger($split[0]);
         $fields['typo3_max_version'] = VersionNumberUtility::convertVersionNumberToInteger($split[1]);
     }
 
     /**
      * @return bool TRUE if the extension list was successfully update, FALSE if no update necessary
-     * @throws ExtensionManagerException
      */
     protected function updateExtensionList(): bool
     {
-        $extensionRepository = GeneralUtility::makeInstance(Helper::class);
-        return $extensionRepository->updateExtList();
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() == 10) {
+            return GeneralUtility::makeInstance('TYPO3\CMS\Extensionmanager\Utility\Repository\Helper')->updateExtList();
+        } else {
+            /** @var Request $request */
+            $request = GeneralUtility::makeInstance(Request::class);
+            /** @var UpdateFromTerController $controller */
+            $controller = GeneralUtility::makeInstance(UpdateFromTerController::class);
+            $jsonResponse = $controller->processRequest(
+                $request
+                    ->withControllerActionName('updateExtensionListFromTer')
+                    ->withArgument('forceUpdateCheck', true)
+            );
+            $result = json_decode($jsonResponse->getBody(), true);
+
+            return $result['updated'];
+        }
+    }
+
+    /**
+     * Splits a version range into an array.
+     *
+     * If a single version number is given, it is considered a minimum value.
+     * If a dash is found, the numbers left and right are considered as minimum and maximum. Empty values are allowed.
+     * If no version can be parsed "0.0.0" — "0.0.0" is the result
+     *
+     * @param string $version A string with a version range.
+     * @return array
+     */
+    protected static function splitVersionRange($version)
+    {
+        $versionRange = [];
+        if (strpos($version, '-') !== false) {
+            $versionRange = explode('-', $version, 2);
+        } else {
+            $versionRange[0] = $version;
+            $versionRange[1] = '';
+        }
+        if (!$versionRange[0]) {
+            $versionRange[0] = '0.0.0';
+        }
+        if (!$versionRange[1]) {
+            $versionRange[1] = '0.0.0';
+        }
+        return $versionRange;
     }
 }
diff --git a/Configuration/Commands.php b/Configuration/Commands.php
deleted file mode 100644
index af2376e..0000000
--- a/Configuration/Commands.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-return [
-    'monitoring:importCore' => [
-        'class' => T3Monitor\T3monitoring\Command\ImportCoreCommand::class,
-    ],
-    'monitoring:importExtensions' => [
-        'class' => T3Monitor\T3monitoring\Command\ImportExtensionsCommand::class,
-    ],
-    'monitoring:importClients' => [
-        'class' => T3Monitor\T3monitoring\Command\ImportClientsCommand::class,
-    ],
-    'monitoring:importAll' => [
-        'class' => T3Monitor\T3monitoring\Command\ImportAllCommand::class,
-    ],
-    'reporting:admin' => [
-        'class' => T3Monitor\T3monitoring\Command\ReportAdminCommand::class,
-    ],
-    'reporting:client' => [
-        'class' => T3Monitor\T3monitoring\Command\ReportClientCommand::class,
-    ],
-];
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
new file mode 100644
index 0000000..966074c
--- /dev/null
+++ b/Configuration/Services.yaml
@@ -0,0 +1,45 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  T3Monitor\T3monitoring\:
+    resource: '../Classes/*'
+    exclude: '../Classes/Domain/Model/*'
+
+  T3Monitor\T3monitoring\Command\ImportCoreCommand:
+    tags:
+      - name: 'console.command'
+        command: 'monitoring:importCore'
+        schedulable: true
+
+  T3Monitor\T3monitoring\Command\ImportExtensionsCommand:
+    tags:
+      - name: 'console.command'
+        command: 'monitoring:importExtensions'
+        schedulable: true
+
+  T3Monitor\T3monitoring\Command\ImportClientsCommand:
+    tags:
+      - name: 'console.command'
+        command: 'monitoring:importClients'
+        schedulable: true
+
+  T3Monitor\T3monitoring\Command\ImportAllCommand:
+    tags:
+      - name: 'console.command'
+        command: 'monitoring:importAll'
+        schedulable: true
+
+  T3Monitor\T3monitoring\Command\ReportAdminCommand:
+    tags:
+      - name: 'console.command'
+        command: 'reporting:admin'
+        schedulable: true
+
+  T3Monitor\T3monitoring\Command\ReportClientCommand:
+    tags:
+      - name: 'console.command'
+        command: 'reporting:client'
+        schedulable: true
diff --git a/composer.json b/composer.json
index 9692cfc..491b3af 100644
--- a/composer.json
+++ b/composer.json
@@ -7,12 +7,12 @@
   ],
   "require": {
     "ext-json": "*",
-    "typo3/cms-core": "^9 || ^10",
-    "typo3/cms-backend": "^9 || ^10",
-    "typo3/cms-extbase": "^9 || ^10"
+    "typo3/cms-core": "^10 || ^11",
+    "typo3/cms-backend": "^10 || ^11",
+    "typo3/cms-extbase": "^10 || ^11"
   },
   "require-dev": {
-    "typo3/minimal": "^10",
+    "typo3/minimal": "^11",
     "typo3/testing-framework": "*"
   },
   "autoload": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 43caa04..cd2c3c8 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -10,7 +10,7 @@
     'version' => '2.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.0-10.4.99',
+            'typo3' => '10.4.0-11.5.99',
         ],
         'conflicts' => [],
         'suggests' => [],
diff --git a/ext_localconf.php b/ext_localconf.php
index 1fc98fe..118dead 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -3,12 +3,8 @@
 
 call_user_func(
     function () {
-        $isv10 = \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger('10.0')
-            <= \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_branch);
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerTypeConverter(
-            $isv10
-            ? \T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverterV10::class
-            : \T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverterV9::class
+            \T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverter::class
         );
 
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['t3monitoring']
diff --git a/ext_tables.php b/ext_tables.php
index b90636b..ca8898f 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -4,17 +4,17 @@
 call_user_func(
     function () {
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-            'T3Monitor.t3monitoring',
+            'T3monitoring',
             'tools',
             't3monitor',
             'top',
             [
-                'Statistic' => 'index,administration',
-                'Core' => 'list',
-                'Client' => 'show,fetch',
-                'Extension' => 'list, show',
-                'Sla' => 'list, show',
-                'Tag' => 'list, show',
+                \T3Monitor\T3monitoring\Controller\StatisticController::class => 'index,administration',
+                \T3Monitor\T3monitoring\Controller\CoreController::class => 'list',
+                \T3Monitor\T3monitoring\Controller\ClientController::class => 'show,fetch',
+                \T3Monitor\T3monitoring\Controller\ExtensionController::class => 'list, show',
+                \T3Monitor\T3monitoring\Controller\SlaController::class => 'list, show',
+                \T3Monitor\T3monitoring\Controller\TagController::class => 'list, show',
             ],
             [
                 'access' => 'user,group',

From e0bdee0c1a66cec849114534f40b096e3fe20d80 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Mon, 7 Feb 2022 09:10:52 +0100
Subject: [PATCH 65/83] [TASK] Cleanup TCA

---
 Configuration/TCA/tx_t3monitoring_domain_model_client.php    | 4 ----
 Configuration/TCA/tx_t3monitoring_domain_model_core.php      | 3 ---
 Configuration/TCA/tx_t3monitoring_domain_model_extension.php | 3 ---
 Configuration/TCA/tx_t3monitoring_domain_model_sla.php       | 3 ---
 Configuration/TCA/tx_t3monitoring_domain_model_tag.php       | 3 ---
 5 files changed, 16 deletions(-)

diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 0b1b526..e3d6960 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -13,9 +13,6 @@
         'searchFields' => 'title,domain,secret,email,php_version,mysql_version,disk_total_space,disk_free_space,insecure_core,outdated_core,insecure_extensions,outdated_extensions,error_message,extensions,core,sla,tag',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg'
     ],
-    'interface' => [
-        'showRecordFieldList' => 'hidden, title, domain, secret, basic_auth_username, basic_auth_password, host_header, ignore_cert_errors, exclude_from_import, force_ip_resolve, php_version, mysql_version, disk_total_space, disk_free_space, insecure_core, outdated_core, insecure_extensions, outdated_extensions, error_message, extensions, core, sla, tag',
-    ],
     'types' => [
         1 => [
             'showitem' => '
@@ -146,7 +143,6 @@
         'tag' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.tag',
             'config' => [
-                'enableMultiSelectFilterTextfield' => 1,
                 'type' => 'select',
                 'default' => '',
                 'renderType' => 'selectMultipleSideBySide',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_core.php b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
index a6a0628..8ee8410 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_core.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
@@ -11,9 +11,6 @@
         'searchFields' => 'version,insecure,next_secure_version,type,release_date,latest,stable,is_stable,is_active,is_latest,version_integer,is_used,is_official,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg'
     ],
-    'interface' => [
-        'showRecordFieldList' => 'version, insecure, next_secure_version, type, release_date, latest, stable, is_stable, is_active, is_latest, version_integer, is_used, is_official',
-    ],
     'types' => [
         '1' => ['showitem' => '
          --div--;General,version,--palette--;;paletteVersion, next_secure_version, latest, stable'],
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index 46521d8..8afd80f 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -13,9 +13,6 @@
         'searchFields' => 'name,version,insecure,next_secure_version,title,description,last_updated,author_name,update_comment,state,category,version_integer,is_used,is_official,is_modified,is_latest,last_bugfix_release,last_minor_release,last_major_release,serialized_dependencies,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg'
     ],
-    'interface' => [
-        'showRecordFieldList' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest, last_bugfix_release, last_minor_release, last_major_release, serialized_dependencies',
-    ],
     'types' => [
         1 => ['showitem' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest,last_bugfix_release, last_minor_release, last_major_release, typo3_min_version,typo3_max_version,serialized_dependencies'],
     ],
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
index 171061d..1508240 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
@@ -14,9 +14,6 @@
         'searchFields' => 'title,description,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg'
     ],
-    'interface' => [
-        'showRecordFieldList' => 'hidden, title, description',
-    ],
     'types' => [
         1 => ['showitem' => 'title, description,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
index a74af2b..070b319 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
@@ -14,9 +14,6 @@
         'searchFields' => 'title,description,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg'
     ],
-    'interface' => [
-        'showRecordFieldList' => 'hidden, title, description',
-    ],
     'types' => [
         1 => ['showitem' => 'title, description, 
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,

From 02f45b60ff02a4f5af67d2381807d0c78629b921 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Mon, 7 Feb 2022 09:17:49 +0100
Subject: [PATCH 66/83] [TASK] Remove sponsoring info

---
 .../Private/Templates/Statistic/Administration.html    | 10 +---------
 Resources/Public/Img/logo_supseven.svg                 |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 Resources/Public/Img/logo_supseven.svg

diff --git a/Resources/Private/Templates/Statistic/Administration.html b/Resources/Private/Templates/Statistic/Administration.html
index 4f02ac8..abfb9b5 100644
--- a/Resources/Private/Templates/Statistic/Administration.html
+++ b/Resources/Private/Templates/Statistic/Administration.html
@@ -39,13 +39,5 @@ <h3>{f:translate(key:'administration.import.headline')}</h3>
 			</div>
 		</f:if>
 	</div>
-	<hr>
-	<h3>{f:translate(key:'administration.sponsors.headline')}</h3>
-	<p>{f:translate(key:'administration.sponsors.description')}</p>
-	<div class="row">
-		<div class="col-md-2">
-			<a href="https://www.supseven.at/" rel=nofollow” target="_blank" class="thumbnail">
-				<img src="{f:uri.resource(path:'Img/logo_supseven.svg')}" /> </a>
-		</div>
-	</div>
+
 </f:section>
diff --git a/Resources/Public/Img/logo_supseven.svg b/Resources/Public/Img/logo_supseven.svg
deleted file mode 100644
index 201eb33..0000000
--- a/Resources/Public/Img/logo_supseven.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 701.1 180.9"><path d="M211.9 95.1c-7.5-2.6-8.1-3.7-8.1-4.8 0-2.3 3.4-2.5 4.8-2.5 4.8 0 9.7 2 11.8 3.1.6.3 1.3.4 2 .1.6-.3 1.1-.8 1.3-1.5l3.2-12.8c.2-1-.2-2-1.2-2.5-4.7-2.4-11.3-3.8-17.6-3.8-15.5 0-26.4 9-26.4 21.7-.1 6.3 3 14.8 18.5 20 7.1 2.4 7.1 3.5 7.1 4.8 0 .7 0 2.6-5.7 2.6-4.8 0-11.5-2.1-14.8-4.1-.6-.4-1.3-.4-2-.2-.7.3-1.1.8-1.3 1.5l-3.3 13.1c-.2 1 .2 2 1.1 2.5 5.3 2.9 12.7 4.5 20.2 4.5 17.2 0 28.6-8.2 28.6-21.6-.1-9.5-6.4-16-18.2-20.1zm82.8-21c0-1.2-1-2.2-2.2-2.2H274c-1.2 0-2.2 1-2.2 2.2v35.3c0 1.3-.2 2.3-.5 3.1v.1c-.9 2.3-3.3 5-7.2 5-2 0-7.1 0-7.1-11.6V74.1c0-1.2-1-2.2-2.2-2.2h-18.5c-1.2 0-2.2 1-2.2 2.2V109c0 17.8 8.4 28.1 23.1 28.1 8.4 0 13.9-3.5 17.2-6.8l.4 3.5c.1 1.1 1.1 2 2.2 2h16c.6 0 1.2-.2 1.6-.7.4-.4.6-1 .6-1.6-.2-4.6-.5-10.9-.5-19V74.1zm45.9-3.5c-7.4 0-13.6 2.3-18.3 6.7l-.4-3.4c-.1-1.1-1.1-2-2.2-2h-16c-.6 0-1.2.2-1.6.7-.4.4-.6 1-.6 1.6.3 5.8.5 12.2.5 19.8v56.1c0 1.2 1 2.2 2.2 2.2h18.5c1.2 0 2.2-1 2.2-2.2V133c3.5 2.5 8.2 3.9 13.5 3.9 14.1 0 29.2-10.7 29.2-34-.1-21.2-13.7-32.3-27-32.3zm-6.8 47.8c-4.1 0-7.6-2.8-8.6-7-.2-1.1-.3-2.1-.3-3.4v-8.1c0-1 .1-2 .3-2.8 1-4.4 4.7-7.6 8.9-7.6 2.4 0 10.3 1 10.3 14.4-.1 9.1-4 14.5-10.6 14.5zm67.4-23.3c-7.5-2.6-8.1-3.7-8.1-4.8 0-2.3 3.4-2.5 4.8-2.5 4.8 0 9.7 2 11.8 3.1.6.3 1.3.4 2 .1.6-.3 1.1-.8 1.3-1.5l3.2-12.8c.2-1-.2-2-1.2-2.5-4.7-2.4-11.3-3.8-17.6-3.8-15.5 0-26.4 9-26.4 21.7-.2 12 11.5 17.7 18.5 20 7.1 2.4 7.1 3.5 7.1 4.8 0 .7 0 2.6-5.7 2.6-4.8 0-11.5-2.1-14.8-4.1-.6-.4-1.3-.4-2-.2-.7.3-1.1.8-1.3 1.5l-3.3 13.1c-.2 1 .2 2 1.1 2.5 5.3 2.9 12.7 4.5 20.2 4.5 17.2 0 27.8-8.2 27.8-21.6 0-9.5-5.6-16-17.4-20.1zm53-24.5c-10.1 0-18.6 3.8-24.5 11-4.9 6.1-7.8 14.4-7.8 22.9 0 20 13 32.5 33.9 32.5 8.6 0 16.1-1.3 22.4-3.9 1-.4 1.5-1.4 1.3-2.5l-2.4-12.5c-.1-.6-.5-1.2-1.1-1.5-.6-.3-1.2-.4-1.8-.2-4.9 1.7-9.8 2.4-15.7 2.4-5.6 0-12.2-1.8-14.1-6.9H480c1.1 0 2-.8 2.2-1.8.3-1.7.6-4.6.6-7.7 0-8.4-2.3-16.1-6.5-21.7-4.9-6.6-12.6-10.1-22.1-10.1zm-9.8 24.3c1-3.5 3.5-7.6 8.7-7.6 5.9 0 7.6 4.5 8.1 7.6h-16.8zm103.2-22c-.4-.6-1.1-1-1.8-1h-19.4c-1 0-1.9.7-2.1 1.6l-7.7 27.6c-.5 1.9-.9 3.7-1.3 5.4-.4-1.8-.9-3.6-1.4-5.5l-8-27.6c-.3-.9-1.1-1.6-2.1-1.6h-20c-.7 0-1.4.4-1.8.9-.4.6-.5 1.3-.3 2l21.6 59.4c.3.9 1.2 1.5 2.1 1.5h18.5c.9 0 1.8-.6 2.1-1.4l22.1-59.4c.1-.6 0-1.3-.5-1.9zm30.2-2.3c-10.1 0-18.6 3.8-24.5 11-4.9 6.1-7.8 14.4-7.8 22.9 0 20 13 32.5 33.9 32.5 8.6 0 16.1-1.3 22.4-3.9 1-.4 1.5-1.4 1.3-2.5l-2.4-12.5c-.1-.6-.5-1.2-1.1-1.5-.6-.3-1.2-.4-1.8-.2-4.9 1.7-9.8 2.4-15.7 2.4-5.6 0-12.2-1.8-14.1-6.9h35.6c1.1 0 2-.8 2.2-1.8.3-1.7.6-4.6.6-7.7 0-8.4-2.3-16.1-6.5-21.7-5-6.6-12.6-10.1-22.1-10.1zm-9.9 24.3c1-3.5 3.5-7.6 8.7-7.6 5.9 0 7.6 4.5 8.1 7.6h-16.8zm80.8-24.3c-8.3 0-13.8 3.6-17 6.7l-.3-3.4c-.1-1.1-1.1-2-2.2-2h-16c-.6 0-1.2.2-1.6.7s-.6 1-.6 1.6c.3 5.5.5 11.6.5 18.8v40.4c0 1.2 1 2.2 2.2 2.2h18.5c1.2 0 2.2-1 2.2-2.2V99.3c0-1.8.2-3 .5-3.8.7-1.7 2.7-5.5 7.4-5.5 1.8 0 7.1 0 7.1 10.7v32.9c0 1.2 1 2.2 2.2 2.2H670c1.2 0 2.2-1 2.2-2.2V98.4c0-17.4-8.8-27.8-23.5-27.8zM139.1 41.4c.3-.6.7-1.2 1-1.8l.3-.6c.3-.6.5-1.2.8-1.9.1-.2.2-.5.3-.7.2-.6.4-1.3.5-1.9.1-.3.1-.5.2-.8.1-.7.2-1.3.3-2 0-.2.1-.4.1-.7v-.2c.1-.6.1-1.1.1-1.7 0-.4.1-.8.1-1.2v-.2c0-.4 0-.8-.1-1.1 0-.5 0-1-.1-1.4 0-.5-.1-.9-.2-1.4-.1-.4-.1-.9-.2-1.3l-.3-1.5c-.1-.4-.2-.8-.3-1.1-.2-.5-.3-1-.5-1.6l-.3-.9c-.2-.5-.5-1.1-.7-1.6-.1-.3-.3-.6-.4-.8l-.9-1.5c-.2-.3-.3-.5-.5-.8-.3-.5-.6-.9-1-1.4-.2-.3-.4-.5-.6-.8-.3-.4-.7-.8-1-1.2-.2-.3-.5-.6-.7-.8-.3-.4-.7-.7-1.1-1-.3-.3-.6-.6-.9-.8-.4-.3-.7-.6-1.1-.9-.3-.3-.7-.5-1-.8-.4-.3-.8-.5-1.2-.8-.4-.2-.7-.5-1.1-.7-.4-.2-.9-.5-1.3-.7-.4-.2-.7-.4-1.1-.5l-1.5-.6c-.3-.1-.6-.2-1-.4-.6-.2-1.2-.3-1.8-.5-.3-.1-.6-.2-.9-.2-.6-.1-1.2-.2-1.9-.3-.3 0-.5-.1-.8-.1h-.2c-.2 0-.5 0-.7-.1-.7-.1-1.3-.1-2-.1H27.6C12.4 0 0 12.4 0 27.6c0 15.3 12.4 27.6 27.6 27.6h39.5l-48.7 84.1c-7.6 13.2-3 30.1 10.2 37.7 13.2 7.6 30.1 3 37.7-10.2L139 41.6c0-.1 0-.1.1-.2z"/></svg>

From 1b1aff91fd535c377ee66c58e0d8aa34c60bfccc Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Mon, 7 Feb 2022 09:21:40 +0100
Subject: [PATCH 67/83] [TASK] Require extension manager

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 491b3af..6f735a3 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
     "ext-json": "*",
     "typo3/cms-core": "^10 || ^11",
     "typo3/cms-backend": "^10 || ^11",
-    "typo3/cms-extbase": "^10 || ^11"
+    "typo3/cms-extbase": "^10 || ^11",
+    "typo3/cms-extensionmanager": "^10 || ^11"
   },
   "require-dev": {
     "typo3/minimal": "^11",

From ba1a4456b2cf29ee820a7755553c26d6a7d7181c Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Mon, 7 Feb 2022 09:41:20 +0100
Subject: [PATCH 68/83] [TASK] Simplify extension import code

---
 Classes/Service/Import/ExtensionImport.php | 29 ++++++++--------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/Classes/Service/Import/ExtensionImport.php b/Classes/Service/Import/ExtensionImport.php
index 3444ffe..501db1d 100644
--- a/Classes/Service/Import/ExtensionImport.php
+++ b/Classes/Service/Import/ExtensionImport.php
@@ -12,11 +12,9 @@
 use InvalidArgumentException;
 use T3Monitor\T3monitoring\Service\DataIntegrity;
 use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Extbase\Mvc\Request;
-use TYPO3\CMS\Extensionmanager\Controller\UpdateFromTerController;
+use TYPO3\CMS\Extensionmanager\Remote\RemoteRegistry;
 
 /**
  * Class ExtensionImport
@@ -135,22 +133,17 @@ protected function addCoreDependenciesToFields(array &$fields)
      */
     protected function updateExtensionList(): bool
     {
-        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() == 10) {
-            return GeneralUtility::makeInstance('TYPO3\CMS\Extensionmanager\Utility\Repository\Helper')->updateExtList();
-        } else {
-            /** @var Request $request */
-            $request = GeneralUtility::makeInstance(Request::class);
-            /** @var UpdateFromTerController $controller */
-            $controller = GeneralUtility::makeInstance(UpdateFromTerController::class);
-            $jsonResponse = $controller->processRequest(
-                $request
-                    ->withControllerActionName('updateExtensionListFromTer')
-                    ->withArgument('forceUpdateCheck', true)
-            );
-            $result = json_decode($jsonResponse->getBody(), true);
-
-            return $result['updated'];
+        $updated = false;
+
+        $remoteRegistry = GeneralUtility::makeInstance(RemoteRegistry::class);
+        foreach ($remoteRegistry->getListableRemotes() as $remote) {
+            $remoteUpdate = $remote->getAvailablePackages();
+            if ($remoteUpdate) {
+                $updated = true;
+            }
         }
+
+        return $updated;
     }
 
     /**

From b7dd0b66b1676b5a5947c45ffbaa1773728574f1 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <lehmann@networkteam.com>
Date: Fri, 10 Jun 2022 12:25:40 +0200
Subject: [PATCH 69/83] [TASK] Resolve undefined key warnings

---
 Classes/Domain/TypeConverter/ClientFilterDemandConverter.php | 2 +-
 Classes/ViewHelpers/Format/DependenciesViewHelper.php        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
index 3b1b33d..4dc8588 100644
--- a/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
+++ b/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
@@ -77,6 +77,6 @@ public function canConvertFrom($source, string $targetType): bool
     protected function isAllowed()
     {
         $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
-        return isset($vars) && is_array($vars['filter']);
+        return isset($vars['filter']) && is_array($vars['filter']);
     }
 }
diff --git a/Classes/ViewHelpers/Format/DependenciesViewHelper.php b/Classes/ViewHelpers/Format/DependenciesViewHelper.php
index 042a81d..c71ee06 100644
--- a/Classes/ViewHelpers/Format/DependenciesViewHelper.php
+++ b/Classes/ViewHelpers/Format/DependenciesViewHelper.php
@@ -44,6 +44,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
         $output = [];
         foreach ($dependencies as $type => $list) {
             $output[] = '<tr><th colspan="2">' . htmlspecialchars(ucfirst($type)) . '</th></tr>';
+            $output[$type] = '';
             foreach ($list as $item => $version) {
                 $output[$type] .= sprintf('<tr><td>%s</td><td>%s</td></tr>', htmlspecialchars($item), htmlspecialchars($version));
             }

From 00c97a87c38a2f4ebc68c1d7669428c7fd8c6c6e Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <lehmann@networkteam.com>
Date: Fri, 10 Jun 2022 18:59:08 +0200
Subject: [PATCH 70/83] [TASK] Resolve undefined key warnings

---
 Classes/Service/Import/ClientImport.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 9f5151f..4f1c6d5 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -119,8 +119,8 @@ protected function importSingleClient(array $row)
                 'error_message' => '',
                 'php_version' => $json['core']['phpVersion'],
                 'mysql_version' => $json['core']['mysqlClientVersion'],
-                'disk_total_space' => $json['core']['diskTotalSpace'] ?: 0,
-                'disk_free_space' => $json['core']['diskFreeSpace'] ?: 0,
+                'disk_total_space' => $json['core']['diskTotalSpace'] ?? 0,
+                'disk_free_space' => $json['core']['diskFreeSpace'] ?? 0,
                 'core' => $this->getUsedCore($json['core']['typo3Version']),
                 'extensions' => $this->handleExtensionRelations($row['uid'], (array)$json['extensions']),
                 'error_count' => 0
@@ -150,7 +150,7 @@ protected function importSingleClient(array $row)
     protected function addExtraData(array $json, array &$update, $field)
     {
         $dbField = 'extra_' . $field;
-        if (isset($json['extra']) && is_array($json['extra'][$field])) {
+        if (is_array($json['extra'][$field] ?? false)) {
             $update[$dbField] = json_encode($json['extra'][$field]);
         } else {
             $update[$dbField] = '';

From 2ff22833d1fbe71e7db80d4abb06b01ed99a8f16 Mon Sep 17 00:00:00 2001
From: Marco Kuprat <78789123+cnmarco@users.noreply.github.com>
Date: Thu, 23 Jun 2022 13:54:03 +0200
Subject: [PATCH 71/83] [BUGFIX] #210 and #211 (#212)

* Fix updating extension list and resetting state "is_latest" for extensions

* Minor code cleanup
---
 Classes/Service/DataIntegrity.php          | 7 +++++++
 Classes/Service/Import/ExtensionImport.php | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index 2ac6856..614d2a7 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -154,6 +154,13 @@ protected function getLatestExtensionVersion()
                 ->execute();
         }
 
+        // set is_latest = 0 for extension versions that are not last_major_release
+        $queryBuilder = $connection->createQueryBuilder();
+        $queryBuilder->update($table)
+            ->set('is_latest', 0)
+            ->where('version != last_major_release')
+            ->execute();
+
         $queryBuilder = $connection->createQueryBuilder();
         $queryBuilder->update($table)
             ->set('is_latest', 1)
diff --git a/Classes/Service/Import/ExtensionImport.php b/Classes/Service/Import/ExtensionImport.php
index 501db1d..2a4827d 100644
--- a/Classes/Service/Import/ExtensionImport.php
+++ b/Classes/Service/Import/ExtensionImport.php
@@ -32,7 +32,9 @@ class ExtensionImport extends BaseImport
      */
     public function run()
     {
-        $updateRequired = $this->updateExtensionList();
+        // $updateRequired = $this->updateExtensionList();
+        // always set $updateRequired = true, as $this->updateExtensionList() never returns true
+        $updateRequired = true;
         if ($updateRequired) {
             $this->insertExtensionsInCustomTable();
         }
@@ -137,6 +139,8 @@ protected function updateExtensionList(): bool
 
         $remoteRegistry = GeneralUtility::makeInstance(RemoteRegistry::class);
         foreach ($remoteRegistry->getListableRemotes() as $remote) {
+            // TYPO3 11.5.12: at least TYPO3\CMS\Extensionmanager\Remote\TerExtensionRemote::getAvailablePackages()
+            // returns void, so $updated will never become TRUE here...
             $remoteUpdate = $remote->getAvailablePackages();
             if ($remoteUpdate) {
                 $updated = true;

From 24ee46bc84ce6830ee8ace7732ee1535538eb039 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <lehmann@networkteam.com>
Date: Wed, 29 Jun 2022 10:19:34 +0200
Subject: [PATCH 72/83] [TASK] Resolve undefined key warning

---
 Classes/Service/Import/ClientImport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 4f1c6d5..423013f 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -308,7 +308,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                 $client,
                 $relationId,
                 ($data['title']) ?: 'extension has no title',
-                array_search($data['state'], Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
+                array_search($data['state'] ?? null, Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
                 $data['isLoaded'],
             ];
 

From 9dc041806068b44b0b0cb96ec0bd3908b5fc8eac Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <lehmann@networkteam.com>
Date: Sat, 2 Jul 2022 13:21:17 +0200
Subject: [PATCH 73/83] [TASK] Resolve undefined key warning

---
 Classes/Service/Import/ClientImport.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 423013f..e35f2a9 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -272,6 +272,9 @@ protected function handleExtensionRelations($client, array $extensions = [])
                 }
             }
 
+            $state = array_search($data['state'] ?? null, Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true));
+            $title = empty($data['title']) ? 'extension has no title' : $data['title'];
+
             if ($found) {
                 $relationId = $found['uid'];
             } else {
@@ -285,10 +288,10 @@ protected function handleExtensionRelations($client, array $extensions = [])
                     'version_integer' => VersionNumberUtility::convertVersionNumberToInteger($data['version']),
                     'major_version' => (int)$versionSplit[0],
                     'minor_version' => (int)$versionSplit[1],
-                    'title' => (string)$data['title'],
-                    'description' => (string)$data['description'],
-                    'author_name' => (string)$data['author'],
-                    'state' => array_search($data['state'], Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
+                    'title' => $title,
+                    'description' => $data['description'] ?? '',
+                    'author_name' => $data['author'] ?? '',
+                    'state' => $state,
                     'category' => (int)array_search($data['category'], Extension::$defaultCategories),
                     'is_official' => 0,
                     'tstamp' => $GLOBALS['EXEC_TIME'],
@@ -307,8 +310,8 @@ protected function handleExtensionRelations($client, array $extensions = [])
             $relationsToBeAdded[] = [
                 $client,
                 $relationId,
-                ($data['title']) ?: 'extension has no title',
-                array_search($data['state'] ?? null, Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true)),
+                $title,
+                $state,
                 $data['isLoaded'],
             ];
 

From 06660f608255dfd80e89367a256b030f63977af1 Mon Sep 17 00:00:00 2001
From: Tobias Schmidt <79580110+tbsschmdt@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:33:06 +0200
Subject: [PATCH 74/83] [BUGFIX] Fix text formatting in client detail view
 (#214)

Text for extra dangers, extra warnings and extra info is sometimes not just plain text but HTML. Therefore it needs to be rendered as HTML.
---
 Resources/Private/Templates/Client/Show.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index a47dec5..841b821 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -229,10 +229,10 @@ <h1>
 			<f:for each="{data}" as="value" key="key">
 				<tr class="{cssClass}">
 					<th style="width: 20%;">{key}</th>
-					<td>{value}</td>
+					<td>{value -> f:format.html()}</td>
 				</tr>
 			</f:for>
 		</table>
 	</div>
 </f:section>
-</html>
\ No newline at end of file
+</html>

From 485836e3a7e39ba3c388fe26f9ddd3e1e738c85d Mon Sep 17 00:00:00 2001
From: BeerOnTheBeach <58625187+BeerOnTheBeach@users.noreply.github.com>
Date: Thu, 1 Sep 2022 12:55:14 +0200
Subject: [PATCH 75/83] [TASK] Fix undefiened array-key in import (#213)

Co-authored-by: Gero <g.proebster@die-lobby.de>
---
 Classes/Service/Import/ClientImport.php    | 3 ++-
 Classes/Service/Import/ExtensionImport.php | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index e35f2a9..39c621a 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -274,6 +274,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
 
             $state = array_search($data['state'] ?? null, Extension::$defaultStates, true) ?: key(array_slice(Extension::$defaultStates, -1, 1, true));
             $title = empty($data['title']) ? 'extension has no title' : $data['title'];
+            $category = empty($data['category']) ? false : $data['category'];
 
             if ($found) {
                 $relationId = $found['uid'];
@@ -292,7 +293,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                     'description' => $data['description'] ?? '',
                     'author_name' => $data['author'] ?? '',
                     'state' => $state,
-                    'category' => (int)array_search($data['category'], Extension::$defaultCategories),
+                    'category' => (int)array_search($category, Extension::$defaultCategories),
                     'is_official' => 0,
                     'tstamp' => $GLOBALS['EXEC_TIME'],
                     'update_comment' => '',
diff --git a/Classes/Service/Import/ExtensionImport.php b/Classes/Service/Import/ExtensionImport.php
index 2a4827d..2b7b6c5 100644
--- a/Classes/Service/Import/ExtensionImport.php
+++ b/Classes/Service/Import/ExtensionImport.php
@@ -120,8 +120,14 @@ protected function addCoreDependenciesToFields(array &$fields)
         if (!$fields['serialized_dependencies']) {
             return;
         }
+
         $dependencies = unserialize($fields['serialized_dependencies']);
-        if (!is_array($dependencies) || !is_array($dependencies['depends']) || !isset($dependencies['depends']['typo3'])) {
+        $depends = null;
+        if (array_key_exists('depends', $dependencies)) {
+            $depends = $dependencies['depends'];
+        }
+
+        if (!is_array($dependencies) || !is_array($depends) || !isset($dependencies['depends']['typo3'])) {
             return;
         }
 

From 5fcbad3f3351aa10be7bd0fd71e7c50c70eb69ca Mon Sep 17 00:00:00 2001
From: Tobias Schmidt <79580110+tbsschmdt@users.noreply.github.com>
Date: Thu, 1 Sep 2022 12:55:53 +0200
Subject: [PATCH 76/83] [BUGFIX] Fix display of database version (#215)

---
 .../Format/MysqlVersionViewHelper.php         | 38 -------------------
 Resources/Private/Language/de.locallang.xlf   |  2 +-
 Resources/Private/Language/locallang.xlf      |  2 +-
 Resources/Private/Language/locallang_db.xlf   |  2 +-
 Resources/Private/Language/nl.locallang.xlf   |  2 +-
 Resources/Private/Templates/Client/Show.html  |  4 +-
 6 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 Classes/ViewHelpers/Format/MysqlVersionViewHelper.php

diff --git a/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php b/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php
deleted file mode 100644
index e4671b3..0000000
--- a/Classes/ViewHelpers/Format/MysqlVersionViewHelper.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace T3Monitor\T3monitoring\ViewHelpers\Format;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-
-/**
- * Class MysqlVersionViewHelper
- */
-class MysqlVersionViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
-        $this->registerArgument('version', 'string', 'state', false, '');
-    }
-
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
-        $version = $arguments['version'] ?: $renderChildrenClosure();
-        $versionString = str_pad($version, 5, '0', STR_PAD_LEFT);
-        $parts = [
-            $versionString[0],
-            substr($versionString, 1, 2),
-            substr($versionString, 3, 5)
-        ];
-
-        return (int)$parts[0] . '.' . (int)$parts[1] . '.' . (int)$parts[2];
-    }
-}
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index e518b02..e3c51ac 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -29,7 +29,7 @@
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
 				<source>Mysql Version</source>
-				<target>Mysql Version</target>
+				<target>Datenbank Version</target>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
 				<source>Disk Total Space</source>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 09b06c2..78fad96 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -53,7 +53,7 @@
 				<source>Php Version</source>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Mysql Version</source>
+				<source>Database Version</source>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
 				<source>Disk Total Space</source>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 7d2e143..7093009 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -31,7 +31,7 @@
 				<source>Php Version</source>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Mysql Version</source>
+				<source>Database Version</source>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
 				<source>Insecure Core</source>
diff --git a/Resources/Private/Language/nl.locallang.xlf b/Resources/Private/Language/nl.locallang.xlf
index a3f4126..98f3454 100644
--- a/Resources/Private/Language/nl.locallang.xlf
+++ b/Resources/Private/Language/nl.locallang.xlf
@@ -29,7 +29,7 @@
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
 				<source>Mysql Version</source>
-				<target>MySQL versie</target>
+				<target>Databank versie</target>
 			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
 				<source>Disk Total Space</source>
diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 841b821..1d531d4 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -67,8 +67,8 @@ <h1>
 						</tr>
 					</f:if>
 					<tr>
-						<th><i class="fa fa-database fa-fw"></i> Mysql Version</th>
-						<td>{client.mysqlVersion -> monitor:format.mysqlVersion()}</td>
+						<th><i class="fa fa-database fa-fw"></i> {f:translate(key:'tx_t3monitoring_domain_model_client.mysql_version')}</th>
+						<td>{client.mysqlVersion}</td>
 					</tr>
 					<tr>
 						<th><i class="fa fa-code fa-fw"></i> PHP Version</th>

From bc61ab0b41858c3547f5c8e3a514903a4f39e993 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georgringer@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:16:04 +0200
Subject: [PATCH 77/83] Update ClientImport.php

---
 Classes/Service/Import/ClientImport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 39c621a..6a37d2a 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -299,7 +299,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
                     'update_comment' => '',
                 ];
 
-                if ($data['constraints'] !== null) {
+                if ($data['constraints'] ?? null) {
                     $insert['serialized_dependencies'] = $this->serializeDependencies($data['constraints']);
                 }
 

From ecf51ade7baa88a1dff0ea92208e66d146257403 Mon Sep 17 00:00:00 2001
From: lwinterhalder <l.winterhalder@outlook.de>
Date: Thu, 22 Dec 2022 14:34:17 +0100
Subject: [PATCH 78/83] Add event for client data import (#217)

---
 Classes/Event/ImportClientDataEvent.php | 39 +++++++++++++++++++++++++
 Classes/Service/Import/BaseImport.php   |  6 ++++
 Classes/Service/Import/ClientImport.php |  6 ++++
 3 files changed, 51 insertions(+)
 create mode 100644 Classes/Event/ImportClientDataEvent.php

diff --git a/Classes/Event/ImportClientDataEvent.php b/Classes/Event/ImportClientDataEvent.php
new file mode 100644
index 0000000..83a65e0
--- /dev/null
+++ b/Classes/Event/ImportClientDataEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace T3Monitor\T3monitoring\Event;
+
+final class ImportClientDataEvent
+{
+    private array $json;
+    private array $row;
+    private array $update;
+
+    public function __construct(array $json, array $row, array $update)
+    {
+        $this->json = $json;
+        $this->row = $row;
+        $this->update = $update;
+    }
+
+    public function getJson(): array
+    {
+        return $this->json;
+    }
+
+    public function getRow(): array
+    {
+        return $this->row;
+    }
+
+    public function getUpdate(): array
+    {
+        return $this->update;
+    }
+
+    public function setUpdate(array $update): void
+    {
+        $this->update = $update;
+    }
+}
diff --git a/Classes/Service/Import/BaseImport.php b/Classes/Service/Import/BaseImport.php
index c78db4c..f192dce 100644
--- a/Classes/Service/Import/BaseImport.php
+++ b/Classes/Service/Import/BaseImport.php
@@ -8,7 +8,9 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\EventDispatcher\EventDispatcherInterface;
 use T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration;
+use TYPO3\CMS\Core\EventDispatcher\EventDispatcher;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -23,6 +25,8 @@ class BaseImport
     /** @var Registry */
     protected $registry;
 
+    protected EventDispatcherInterface $eventDispatcher;
+
     /**
      * Constructor
      */
@@ -30,6 +34,8 @@ public function __construct()
     {
         $this->emConfiguration = GeneralUtility::makeInstance(EmMonitoringConfiguration::class);
         $this->registry = GeneralUtility::makeInstance(Registry::class);
+        $this->eventDispatcher = GeneralUtility::makeInstance(EventDispatcherInterface::class);
+
     }
 
     /**
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 6a37d2a..4284bfa 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -11,6 +11,7 @@
 
 use Exception;
 use T3Monitor\T3monitoring\Domain\Model\Extension;
+use T3Monitor\T3monitoring\Event\ImportClientDataEvent;
 use T3Monitor\T3monitoring\Notification\EmailNotification;
 use T3Monitor\T3monitoring\Service\DataIntegrity;
 use TYPO3\CMS\Core\Database\Connection;
@@ -126,6 +127,11 @@ protected function importSingleClient(array $row)
                 'error_count' => 0
             ];
 
+            $event = $this->eventDispatcher->dispatch(
+                new ImportClientDataEvent($json, $row, $update)
+            );
+            $update = $event->getUpdate();
+
             $this->addExtraData($json, $update, 'info');
             $this->addExtraData($json, $update, 'warning');
             $this->addExtraData($json, $update, 'danger');

From 17808c28027d9cfc84147e128836e6678922793d Mon Sep 17 00:00:00 2001
From: mueller-sebastian <sebastian.mueller@elementare-teilchen.de>
Date: Tue, 14 Feb 2023 10:29:59 +0100
Subject: [PATCH 79/83] Add comment possibility to t3monitoring client (#219)

* Add comment possibility to t3monitoring client

* Make comment field less high
---
 Classes/Domain/Model/Client.php               | 26 +++++++++++++++++++
 .../tx_t3monitoring_domain_model_client.php   | 13 ++++++++--
 Resources/Private/Language/locallang.xlf      |  3 +++
 Resources/Private/Templates/Client/Show.html  |  4 +++
 ext_tables.sql                                |  1 +
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index 687d53c..04e50fe 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -30,6 +30,11 @@ class Client extends AbstractEntity
      */
     protected $domain = '';
 
+    /**
+     * @var string
+     */
+    protected $comment = '';
+
     /**
      * @var string
      */
@@ -224,6 +229,27 @@ public function setDomain($domain)
         $this->domain = $domain;
     }
 
+    /**
+     * Returns the comment
+     *
+     * @return string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * Sets the comment
+     *
+     * @param string $comment
+     * @return void
+     */
+    public function setComment($comment)
+    {
+        $this->comment = $comment;
+    }
+
     /**
      * @return string
      */
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index e3d6960..2d13b5b 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -10,13 +10,13 @@
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
-        'searchFields' => 'title,domain,secret,email,php_version,mysql_version,disk_total_space,disk_free_space,insecure_core,outdated_core,insecure_extensions,outdated_extensions,error_message,extensions,core,sla,tag',
+        'searchFields' => 'title,domain,comment,secret,email,php_version,mysql_version,disk_total_space,disk_free_space,insecure_core,outdated_core,insecure_extensions,outdated_extensions,error_message,extensions,core,sla,tag',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg'
     ],
     'types' => [
         1 => [
             'showitem' => '
-        --div--;General,--palette--;;paletteTitle, --palette--;;paletteDomain,email,sla,tag,
+        --div--;General,--palette--;;paletteTitle, --palette--;;paletteDomain,email,sla,tag,comment,
         --div--;Readonly information,last_successful_import,error_message,--palette--;;paletteCore, --palette--;;paletteExtensions, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,
         --div--;Extra,extra_info,extra_warning,extra_danger,
         --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
@@ -58,6 +58,15 @@
                 'placeholder' => 'http://yourdomain.com/'
             ],
         ],
+        'comment' => [
+            'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.comment',
+            'config' => [
+                'type' => 'text',
+                'cols' => 40,
+                'rows' => 10,
+                'eval' => 'trim'
+            ],
+        ],
         'secret' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.secret',
             'config' => [
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 78fad96..7927971 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -12,6 +12,9 @@
 			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
 				<source>Domain</source>
 			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_client.comment">
+				<source>Comment</source>
+			</trans-unit>
 			<trans-unit id="tx_t3monitoring_domain_model_client.status">
 				<source>Status</source>
 			</trans-unit>
diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 1d531d4..76a8f32 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -82,6 +82,10 @@ <h1>
 						<th><i class="fa fa-hdd-o fa-fw"></i> {f:translate(key:'tx_t3monitoring_domain_model_client.disk_free_space')}</th>
 						<td>{client.diskFreeSpace -> f:format.bytes(decimals: 1)}</td>
 					</tr>
+					<tr>
+						<th><i class="fa fa-comment-o fa-fw"></i> {f:translate(key:'tx_t3monitoring_domain_model_client.comment')}</th>
+						<td>{client.comment -> f:format.nl2br()}</td>
+					</tr>
 				</table>
 			</div>
 		</div>
diff --git a/ext_tables.sql b/ext_tables.sql
index fb6b69c..601edcd 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -8,6 +8,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 
 	title varchar(255) DEFAULT '' NOT NULL,
 	domain varchar(255) DEFAULT '' NOT NULL,
+	comment text NOT NULL,
 	basic_auth_username varchar(255) DEFAULT '' NOT NULL,
 	basic_auth_password varchar(255) DEFAULT '' NOT NULL,
 	host_header varchar(255) DEFAULT '' NOT NULL,

From c8a84383362b0aadea1cf5cf3a1a65a0f190e517 Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Tue, 2 May 2023 10:32:39 +0200
Subject: [PATCH 80/83] [BUGFIX] Handle missing extension version number (#220)

---
 Classes/Service/Import/ClientImport.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 4284bfa..5a9a01d 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -254,10 +254,12 @@ protected function handleExtensionRelations($client, array $extensions = [])
 
         $whereClause = [];
         foreach ($extensions as $key => $data) {
-            $whereClause[] = $queryBuilder->expr()->andX(
+            if (!empty($data['version'])) {
+                $whereClause[] = $queryBuilder->expr()->andX(
                     $queryBuilder->expr()->eq('version', $queryBuilder->createNamedParameter($data['version'])),
                     $queryBuilder->expr()->eq('name', $queryBuilder->createNamedParameter($key))
                 );
+            }
         }
 
         $existingExtensions = $queryBuilder
@@ -271,8 +273,9 @@ protected function handleExtensionRelations($client, array $extensions = [])
         foreach ($extensions as $key => $data) {
             // search if exists
             $found = null;
+            $version = $data['version'] ?? '';
             foreach ($existingExtensions as $existingExtension) {
-                if ($existingExtension['name'] === $key && $existingExtension['version'] === $data['version']) {
+                if ($existingExtension['name'] === $key && $existingExtension['version'] === $version) {
                     $found = $existingExtension;
                     break;
                 }
@@ -285,16 +288,16 @@ protected function handleExtensionRelations($client, array $extensions = [])
             if ($found) {
                 $relationId = $found['uid'];
             } else {
-                $versionSplit = explode('.', $data['version'], 3);
+                $versionSplit = explode('.', $version, 3);
 
                 $insert = [
                     'crdate' => $GLOBALS['EXEC_TIME'],
                     'pid' => $this->emConfiguration->getPid(),
                     'name' => $key,
-                    'version' => (string)$data['version'],
-                    'version_integer' => VersionNumberUtility::convertVersionNumberToInteger($data['version']),
-                    'major_version' => (int)$versionSplit[0],
-                    'minor_version' => (int)$versionSplit[1],
+                    'version' => (string)$version,
+                    'version_integer' => VersionNumberUtility::convertVersionNumberToInteger($version),
+                    'major_version' => (int)($versionSplit[0] ?? 0),
+                    'minor_version' => (int)($versionSplit[1] ?? 0),
                     'title' => $title,
                     'description' => $data['description'] ?? '',
                     'author_name' => $data['author'] ?? '',

From d0d9d3bdc3d5e048d0fa2933b90d518102c97b6a Mon Sep 17 00:00:00 2001
From: nlehmkuhl <info@nielslehmkuhl.de>
Date: Thu, 6 Jul 2023 09:20:47 +0200
Subject: [PATCH 81/83] [BUGFIX] fix determination of used core versions (#222)

- use inner join to include only versions found in clients
- remove unrestricted setting is_used=1 for all rows
---
 Classes/Service/DataIntegrity.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index 614d2a7..1bf4703 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -216,7 +216,7 @@ protected function usedCore()
         $rows = $queryBuilder
             ->select('tx_t3monitoring_domain_model_core.uid')
             ->from($table)
-            ->leftJoin(
+            ->innerJoin(
                 'tx_t3monitoring_domain_model_core',
                 'tx_t3monitoring_domain_model_client',
                 'tx_t3monitoring_domain_model_client',
@@ -235,7 +235,6 @@ protected function usedCore()
             ->set('is_used', 0)
             ->execute();
         if (!empty($coreRows)) {
-            $qb->set('is_used', 1)->execute();
             foreach ($coreRows as $id => $row) {
                 $qb->where('uid = ' . $id);
                 $qb->set('is_used', 1)->execute();

From d01e124ef07e99ce3182838f674638b438fa9d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20H=C3=B6rmann-Engl?=
 <hoermannklaus@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:13:50 +0200
Subject: [PATCH 82/83] [DOC] Added documentation for email notifications
 (#193)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [DOC] Add documentation for notifications

* DOC: fix t3monitoring occurences

Replaced t3monitor with t3monitoring

---------

Co-authored-by: Klaus Hörmann-Engl <kho@world-direct.at>
---
 README.rst | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.rst b/README.rst
index f4e1c15..1c59ca1 100644
--- a/README.rst
+++ b/README.rst
@@ -89,3 +89,29 @@ Especially the import of extensions can take a while, therefore you can use diff
 - ``./typo3/cli_dispatch.phpsh extbase monitoring:importCore`` to fetch latest core versions
 - ``./typo3/cli_dispatch.phpsh extbase monitoring:importExtensions`` to fetch the extensions
 - ``./typo3/cli_dispatch.phpsh extbase monitoring:importClients`` to fetch the client data
+
+Notifications
+-------------
+t3monitoring contains various notifications.
+
+Failed to fetch client info
+"""""""""""""""""""""""""""
+This notification sends an email, if a clients information (provided by the extension "t3monitoring_client") cannot be accessed/fetched. You may configure the email recipient in the "Extension Configuration" of the t3monitoring extension using the setting "records.emailForFailedClient".
+
+The notification is send by the Symfony Console Command **"monitoring:importClients"** and consists of a single email which contains a list of all failing clients. The frequency of the notification email depends on your scheduled task for importing the clients.
+
+The "Extension Configuration" also contains a option "records.emailAllowedAmountOfFailures". This value provides the ability to only send the notification email, if a client fails multiple times in a row.
+
+Client report
+"""""""""""""
+Another possible notification is the "Client report". It is represented by the Symfony Console Command **"reporting:client"**. It generates an email for each client and uses the clients email property ("email") as recipient address. If there is no email set, its not possible to send a notfication.
+
+If t3monitoring identifies security problems, an outdated core or additional error messages the notification is sent. If the client does not break with these regulations, no email is sent.
+
+The frequency is again defined by the according scheduled task.
+
+Admin report
+""""""""""""
+Last but not least, the "Admin report" (Symfony Console Command: **reporting:admin**) generates a single email with all problematic clients and sends it. The recipients email address needs to be configured as argument of the Symfony Console Command (respective the scheduled task).
+
+The frequency of the sent notification is also defined by the occurence of the scheduled task.

From f613b95fe5fd42cc0188aff3a1ccd23c8d291b58 Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Sun, 4 Aug 2024 08:49:32 +0200
Subject: [PATCH 83/83] [TASK] Core v12 support (#225)

* [TASK] Add .editorconfig

* [TASK] Migrate ext_tables.php for v12

* [TASK] Cleanup ext_tables.sql

* [TASK] Cleanup ext_localconf.php

* [TASK] Require TYPO3 v11 and allow v12

* [TASK] .gitignore

* [DOC] readme

* [TEST] travis PHP versions

* [TASK] Reformat composer.json

* [TASK] Update locallang files

* [TASK] Update templates

* [TASK] Cleanup TCA and TS

* [TEST] Migrate tests

* [TASK] Migrate viewhelpers

* [TASK] Support core v12 only

* [TASK] PHP code cleanup

* [TASK] PHP code cleanup controller/commands

* [TASK] Declare branch alias

* [TASK] Migrate ImportCoreCommand

* [BUGFIX] DI

* [TASK] Migrate TCA

* [TASK] Migrate TCA cruser_id

* [TASK] Migrate TCA items

* [BUGFIX] Explicit settings instead of dynamic properties

* [BUGFIX] BE routes with correct name

* [BUGFIX] Correct BE module registration

* [BUGFIX] Adjust TS for module

* [BUGFIX] Restore position for BE module

* [TASK] Migrate module templates

* [TASK] Set default values for ExtensionFilterDemand

* [BUGFIX] Controller registration and view config

* [BUGFIX] Fluid adjustments

* [TASK] Remove ext_tables.php

* [TASK] Move type converter registration to DI

* [BUGFIX] Disallow v11 in emconf

* [BUGFIX] Fix type converter registration
---
 .editorconfig                                 |  64 ++
 .gitignore                                    |   4 +-
 .phpstorm.meta.php                            | 151 +++
 .travis.yml                                   |   7 +-
 Classes/Command/ImportAllCommand.php          |  25 +-
 Classes/Command/ImportClientsCommand.php      |  25 +-
 Classes/Command/ImportCoreCommand.php         |  24 +-
 Classes/Command/ImportExtensionsCommand.php   |  21 +-
 Classes/Command/ReportAdminCommand.php        |  27 +-
 Classes/Command/ReportClientCommand.php       |  23 +-
 Classes/Controller/BaseController.php         | 149 ++-
 Classes/Controller/ClientController.php       |  37 +-
 Classes/Controller/CoreController.php         |  20 +-
 Classes/Controller/ExtensionController.php    |  43 +-
 Classes/Controller/SlaController.php          |  38 +-
 Classes/Controller/StatisticController.php    |  74 +-
 Classes/Controller/TagController.php          |  36 +-
 Classes/Domain/Model/Client.php               | 633 +++----------
 Classes/Domain/Model/Core.php                 | 323 +------
 .../Domain/Model/Dto/ClientFilterDemand.php   | 203 +---
 Classes/Domain/Model/Dto/CoreFilterDemand.php |  20 +-
 .../Model/Dto/EmMonitoringConfiguration.php   |  72 +-
 .../Model/Dto/ExtensionFilterDemand.php       |  34 +-
 Classes/Domain/Model/Extension.php            | 509 ++--------
 Classes/Domain/Model/Sla.php                  |  51 +-
 Classes/Domain/Model/Tag.php                  |  51 +-
 Classes/Domain/Repository/BaseRepository.php  |  33 +-
 .../Domain/Repository/ClientRepository.php    |  61 +-
 Classes/Domain/Repository/CoreRepository.php  |  54 +-
 .../Domain/Repository/ExtensionRepository.php |  53 +-
 Classes/Domain/Repository/SlaRepository.php   |  12 +-
 .../Domain/Repository/StatisticRepository.php |  17 +-
 Classes/Domain/Repository/TagRepository.php   |  12 +-
 .../ClientFilterDemandConverter.php           |  26 +-
 .../ClientFilterDemandConverterV9.php         |  87 --
 Classes/Event/ImportClientDataEvent.php       |  15 +-
 Classes/Hooks/DataHandlerHook.php             |  56 +-
 Classes/Notification/EmailNotification.php    |  32 +-
 Classes/Service/BulletinImport.php            |  29 +-
 Classes/Service/DataIntegrity.php             | 107 ++-
 Classes/Service/Import/BaseImport.php         |  29 +-
 Classes/Service/Import/ClientImport.php       | 114 +--
 Classes/Service/Import/CoreImport.php         |  59 +-
 Classes/Service/Import/ExtensionImport.php    |  48 +-
 .../AdditionalExtensionDataViewHelper.php     |  15 +-
 .../AvailableUpdatesViewHelper.php            |  15 +-
 Classes/ViewHelpers/EditRecordViewHelper.php  |  15 +-
 .../Format/DateTimeAgeViewHelper.php          |   6 +-
 .../Format/DependenciesViewHelper.php         |   9 +-
 .../Format/ExtensionCategoryViewHelper.php    |   7 +-
 .../Format/ExtensionStateViewHelper.php       |   7 +-
 Configuration/Backend/Modules.php             |  20 +
 Configuration/Services.yaml                   |  10 +
 .../tx_t3monitoring_domain_model_client.php   |  42 +-
 .../TCA/tx_t3monitoring_domain_model_core.php |  19 +-
 ...tx_t3monitoring_domain_model_extension.php |  22 +-
 .../TCA/tx_t3monitoring_domain_model_sla.php  |   7 +-
 .../TCA/tx_t3monitoring_domain_model_tag.php  |   9 +-
 Configuration/TypoScript/setup.typoscript     |  20 +-
 .../images}/t3monitoring-client.png           | Bin
 .../images}/t3monitoring-extensions.png       | Bin
 .../images}/t3monitoring-search.png           | Bin
 .../images}/t3monitoring_index.png            | Bin
 README.rst                                    |  62 +-
 Resources/Private/Language/de.locallang.xlf   | 870 +++++++++---------
 Resources/Private/Language/locallang.xlf      | 671 +++++++-------
 Resources/Private/Language/locallang_db.xlf   | 246 ++---
 .../Private/Language/locallang_t3monitor.xlf  |  18 +-
 Resources/Private/Language/nl.locallang.xlf   | 854 +++++++++--------
 Resources/Private/Layouts/Simple.html         |   7 -
 Resources/Private/Templates/Client/Show.html  |   6 +-
 Resources/Private/Templates/Core/List.html    |   8 +-
 .../Private/Templates/Extension/List.html     |   6 +-
 .../Private/Templates/Extension/Show.html     |   7 +-
 .../Templates/Notification/AdminEmail.txt     |   4 +-
 Resources/Private/Templates/Sla/List.html     |   6 +-
 Resources/Private/Templates/Sla/Show.html     |   6 +-
 .../Templates/Statistic/Administration.html   |   7 +-
 .../Private/Templates/Statistic/Index.html    |   9 +-
 Resources/Private/Templates/Tag/List.html     |   6 +-
 Tests/Unit/Command/ReportAdminCommandTest.php |  23 +-
 Tests/Unit/Domain/Model/ClientTest.php        |  89 +-
 .../Domain/Model/Dto/CoreFilterDemandTest.php |  17 +-
 .../Model/Dto/ExtensionFilterDemandTest.php   |  29 +-
 .../Service/Import/ClientImportTest.php       |  24 +-
 .../Notification/EmailNotificationTest.php    |  25 +-
 composer.json                                 |  92 +-
 ext_emconf.php                                |   7 +-
 ext_localconf.php                             |  13 +-
 ext_tables.php                                |  32 -
 ext_tables.sql                                |  91 +-
 91 files changed, 2650 insertions(+), 4316 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .phpstorm.meta.php
 delete mode 100644 Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
 create mode 100644 Configuration/Backend/Modules.php
 rename {Resources/Public/Screenshots => Documentation/images}/t3monitoring-client.png (100%)
 rename {Resources/Public/Screenshots => Documentation/images}/t3monitoring-extensions.png (100%)
 rename {Resources/Public/Screenshots => Documentation/images}/t3monitoring-search.png (100%)
 rename {Resources/Public/Screenshots => Documentation/images}/t3monitoring_index.png (100%)
 delete mode 100755 Resources/Private/Layouts/Simple.html
 delete mode 100644 ext_tables.php

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..72bdfe1
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,64 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# TS/JS-Files
+[*.{ts,js,mjs}]
+indent_size = 2
+
+# JSON-Files
+[*.json]
+indent_style = tab
+
+# ReST-Files
+[*.{rst,rst.txt}]
+indent_size = 4
+max_line_length = 80
+
+# Markdown-Files
+[*.md]
+max_line_length = 80
+
+# YAML-Files
+[*.{yaml,yml}]
+indent_size = 2
+
+# NEON-Files
+[*.neon]
+indent_size = 2
+indent_style = tab
+
+# stylelint
+[.stylelintrc]
+indent_size = 2
+
+# package.json
+[package.json]
+indent_size = 2
+
+# TypoScript
+[*.{typoscript,tsconfig}]
+indent_size = 2
+
+# XLF-Files
+[*.xlf]
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab
diff --git a/.gitignore b/.gitignore
index 9f1ddc3..1c22e5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .DS_Store
-.Build
\ No newline at end of file
+/.Build
+/composer.lock
+/docker-compose.yaml
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
new file mode 100644
index 0000000..0ae6298
--- /dev/null
+++ b/.phpstorm.meta.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Extend PhpStorms code completion capabilities by providing a meta file
+ *
+ * @link https://www.jetbrains.com/help/phpstorm/ide-advanced-metadata.html
+ */
+
+namespace PHPSTORM_META {
+    expectedArguments(
+        \TYPO3\CMS\Core\Context\Context::getAspect(),
+        0,
+        'date',
+        'visibility',
+        'backend.user',
+        'frontend.user',
+        'workspace',
+        'language',
+        'frontend.preview',
+    );
+    override(\TYPO3\CMS\Core\Context\Context::getAspect(), map([
+        'date' => \TYPO3\CMS\Core\Context\DateTimeAspect::class,
+        'visibility' => \TYPO3\CMS\Core\Context\VisibilityAspect::class,
+        'backend.user' => \TYPO3\CMS\Core\Context\UserAspect::class,
+        'frontend.user' => \TYPO3\CMS\Core\Context\UserAspect::class,
+        'workspace' => \TYPO3\CMS\Core\Context\WorkspaceAspect::class,
+        'language' => \TYPO3\CMS\Core\Context\LanguageAspect::class,
+        'frontend.preview' => \TYPO3\CMS\Frontend\Context\PreviewAspect::class,
+    ]));
+    expectedArguments(
+        \TYPO3\CMS\Core\Context\DateTimeAspect::get(),
+        0,
+        'timestamp',
+        'iso',
+        'timezone',
+        'full',
+        'accessTime'
+    );
+    expectedArguments(
+        \TYPO3\CMS\Core\Context\VisibilityAspect::get(),
+        0,
+        'includeHiddenPages',
+        'includeHiddenContent',
+        'includeDeletedRecords'
+    );
+    expectedArguments(
+        \TYPO3\CMS\Core\Context\UserAspect::get(),
+        0,
+        'id',
+        'username',
+        'isLoggedIn',
+        'isAdmin',
+        'groupIds',
+        'groupNames'
+    );
+    expectedArguments(
+        \TYPO3\CMS\Core\Context\WorkspaceAspect::get(),
+        0,
+        'id',
+        'isLive',
+        'isOffline'
+    );
+    expectedArguments(
+        \TYPO3\CMS\Core\Context\LanguageAspect::get(),
+        0,
+        'id',
+        'contentId',
+        'fallbackChain',
+        'overlayType',
+        'legacyLanguageMode',
+        'legacyOverlayType'
+    );
+    expectedArguments(
+        \TYPO3\CMS\Frontend\Context\PreviewAspect::get(),
+        0,
+        'isPreview'
+    );
+
+    expectedArguments(
+        \Psr\Http\Message\ServerRequestInterface::getAttribute(),
+        0,
+        'frontend.user',
+        'normalizedParams',
+        'site',
+        'language',
+        'routing',
+        'module',
+        'moduleData',
+        'frontend.controller',
+        'frontend.typoscript',
+        'frontend.cache.instruction',
+        'frontend.page.information',
+    );
+    override(\Psr\Http\Message\ServerRequestInterface::getAttribute(), map([
+        'frontend.user' => \TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication::class,
+        'normalizedParams' => \TYPO3\CMS\Core\Http\NormalizedParams::class,
+        'site' => \TYPO3\CMS\Core\Site\Entity\SiteInterface::class,
+        'language' => \TYPO3\CMS\Core\Site\Entity\SiteLanguage::class,
+        'routing' => '\TYPO3\CMS\Core\Routing\SiteRouteResult|\TYPO3\CMS\Core\Routing\PageArguments',
+        'module' => \TYPO3\CMS\Backend\Module\ModuleInterface::class,
+        'moduleData' => \TYPO3\CMS\Backend\Module\ModuleData::class,
+        'frontend.controller' => \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class,
+        'frontend.typoscript' => \TYPO3\CMS\Core\TypoScript\FrontendTypoScript::class,
+        'frontend.cache.instruction' => \TYPO3\CMS\Frontend\Cache\CacheInstruction::class,
+        'frontend.page.information' => \TYPO3\CMS\Frontend\Page\PageInformation::class,
+    ]));
+
+    expectedArguments(
+        \TYPO3\CMS\Core\Http\ServerRequest::getAttribute(),
+        0,
+        'frontend.user',
+        'normalizedParams',
+        'site',
+        'language',
+        'routing',
+        'module',
+        'moduleData'
+    );
+    override(\TYPO3\CMS\Core\Http\ServerRequest::getAttribute(), map([
+        'frontend.user' => \TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication::class,
+        'normalizedParams' => \TYPO3\CMS\Core\Http\NormalizedParams::class,
+        'site' => \TYPO3\CMS\Core\Site\Entity\SiteInterface::class,
+        'language' => \TYPO3\CMS\Core\Site\Entity\SiteLanguage::class,
+        'routing' => '\TYPO3\CMS\Core\Routing\SiteRouteResult|\TYPO3\CMS\Core\Routing\PageArguments',
+        'module' => \TYPO3\CMS\Backend\Module\ModuleInterface::class,
+        'moduleData' => \TYPO3\CMS\Backend\Module\ModuleData::class,
+    ]));
+
+    override(\TYPO3\CMS\Core\Routing\SiteMatcher::matchRequest(), type(
+            \TYPO3\CMS\Core\Routing\SiteRouteResult::class,
+            \TYPO3\CMS\Core\Routing\RouteResultInterface::class,
+        )
+    );
+
+    override(\TYPO3\CMS\Core\Routing\PageRouter::matchRequest(), type(
+        \TYPO3\CMS\Core\Routing\PageArguments::class,
+        \TYPO3\CMS\Core\Routing\RouteResultInterface::class,
+    ));
+
+    override(\Psr\Container\ContainerInterface::get(0), map([
+        '' => '@',
+    ]));
+
+    override(\Psr\EventDispatcher\EventDispatcherInterface::dispatch(0), map([
+        '' => '@',
+    ]));
+
+    override(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(0), map([
+        '' => '@'
+    ]));
+}
diff --git a/.travis.yml b/.travis.yml
index 6338c04..45731c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 7.2
-  - 7.3
-  - 7.4
+  - 8.2
+  - 8.3
 
 sudo: false
 
@@ -22,7 +21,7 @@ before_install:
   - composer --version
 
 before_script:
-  - export TYPO3_PATH_WEB=$PWD/.Build/Web
+  - export TYPO3_PATH_WEB=$PWD/.Build/web
   - composer install
 
 script:
diff --git a/Classes/Command/ImportAllCommand.php b/Classes/Command/ImportAllCommand.php
index 3cecbdf..1795af4 100644
--- a/Classes/Command/ImportAllCommand.php
+++ b/Classes/Command/ImportAllCommand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Command;
 
 /*
@@ -16,30 +19,14 @@
 use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Monitoring command controller
- */
 class ImportAllCommand extends Command
 {
-
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Import all: core, extensions, clients');
     }
 
-    /**
-     * Executes the command for adding the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @throws \Doctrine\DBAL\ConnectionException
-     * @throws \TYPO3\CMS\Extbase\Object\Exception
-     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         GeneralUtility::makeInstance(CoreImport::class)->run();
         GeneralUtility::makeInstance(ExtensionImport::class)->run();
@@ -50,6 +37,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($result as $label => $count) {
             $output->writeln(sprintf('%s: %s', $label, $count));
         }
-        return 0;
+        return Command::SUCCESS;
     }
 }
diff --git a/Classes/Command/ImportClientsCommand.php b/Classes/Command/ImportClientsCommand.php
index caf03f7..04813c5 100644
--- a/Classes/Command/ImportClientsCommand.php
+++ b/Classes/Command/ImportClientsCommand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Command;
 
 /*
@@ -14,30 +17,14 @@
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Monitoring command controller
- */
 class ImportClientsCommand extends Command
 {
-
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Import clients');
     }
 
-    /**
-     * Executes the command for adding the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @throws \Doctrine\DBAL\ConnectionException
-     * @throws \TYPO3\CMS\Extbase\Object\Exception
-     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $import = GeneralUtility::makeInstance(ClientImport::class);
         $import->run();
@@ -46,6 +33,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($result as $label => $count) {
             $output->writeln(sprintf('%s: %s', $label, $count));
         }
-        return 0;
+        return Command::SUCCESS;
     }
 }
diff --git a/Classes/Command/ImportCoreCommand.php b/Classes/Command/ImportCoreCommand.php
index 4e0c7aa..7b0a9cf 100644
--- a/Classes/Command/ImportCoreCommand.php
+++ b/Classes/Command/ImportCoreCommand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Command;
 
 /*
@@ -14,31 +17,16 @@
 use T3Monitor\T3monitoring\Service\Import\CoreImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Monitoring command controller
- */
 class ImportCoreCommand extends Command
 {
-
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Import core');
     }
 
-    /**
-     * Executes the command for adding the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @throws \Doctrine\DBAL\ConnectionException
-     * @throws \TYPO3\CMS\Extbase\Object\Exception
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         GeneralUtility::makeInstance(CoreImport::class)->run();
-        return 0;
+        return Command::SUCCESS;
     }
 }
diff --git a/Classes/Command/ImportExtensionsCommand.php b/Classes/Command/ImportExtensionsCommand.php
index c1bdbc8..e9a23ac 100644
--- a/Classes/Command/ImportExtensionsCommand.php
+++ b/Classes/Command/ImportExtensionsCommand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Command;
 
 /*
@@ -14,30 +17,16 @@
 use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Monitoring command controller
- */
 class ImportExtensionsCommand extends Command
 {
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
     protected function configure()
     {
         $this->setDescription('Import extensions');
     }
 
-    /**
-     * Executes the command for adding the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @throws \TYPO3\CMS\Extbase\Object\Exception
-     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         GeneralUtility::makeInstance(ExtensionImport::class)->run();
-        return 0;
+        return Command::SUCCESS;
     }
 }
diff --git a/Classes/Command/ReportAdminCommand.php b/Classes/Command/ReportAdminCommand.php
index 975b3d0..5f407dd 100644
--- a/Classes/Command/ReportAdminCommand.php
+++ b/Classes/Command/ReportAdminCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Command;
 
 /*
@@ -21,42 +23,29 @@
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Report command controller
- */
 class ReportAdminCommand extends Command
 {
     /** @var Client[] */
-    protected $clients = [];
+    protected array $clients = [];
 
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this->addArgument('email', InputArgument::OPTIONAL, 'Email address to send report to', '');
         $this->setDescription('Generate collective report for all insecure clients (core or extensions)');
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         parent::initialize($input, $output);
 
         $this->clients = GeneralUtility::makeInstance(ClientRepository::class)->getAllForReport();
     }
 
-    /**
-     * Executes the command for adding the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @throws \TYPO3\CMS\Extbase\Object\Exception
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (count($this->clients) === 0) {
             $output->writeln($this->getLabel('noInsecureClients'));
-            return 0;
+            return Command::SUCCESS;
         }
 
         $email = $input->getArgument('email');
@@ -96,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $style = new SymfonyStyle($input, $output);
             $style->table($header, $collectedClientData);
         }
-        return 0;
+        return Command::SUCCESS;
     }
 
     protected function getLabel(string $key): string
diff --git a/Classes/Command/ReportClientCommand.php b/Classes/Command/ReportClientCommand.php
index 9aad1a6..eb80a8d 100644
--- a/Classes/Command/ReportClientCommand.php
+++ b/Classes/Command/ReportClientCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Command;
 
 /*
@@ -17,36 +19,23 @@
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Report command controller
- */
 class ReportClientCommand extends Command
 {
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Report clients');
     }
 
-    /**
-     * Executes the command for adding the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @throws \TYPO3\CMS\Extbase\Object\Exception
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $clients = GeneralUtility::makeInstance(ClientRepository::class)->getAllForReport(true);
         if (count($clients) === 0) {
             $output->writeln($this->getLabel('noInsecureClients'));
-            return 0;
+            return Command::SUCCESS;
         }
 
         GeneralUtility::makeInstance(EmailNotification::class)->sendClientEmail($clients);
-        return 0;
+        return Command::SUCCESS;
     }
 
     protected function getLabel(string $key): string
diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
index 34a3ccc..e0a7def 100644
--- a/Classes/Controller/BaseController.php
+++ b/Classes/Controller/BaseController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -9,13 +11,15 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
 use T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand;
 use T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration;
 use T3Monitor\T3monitoring\Domain\Repository\ClientRepository;
 use T3Monitor\T3monitoring\Domain\Repository\CoreRepository;
 use T3Monitor\T3monitoring\Domain\Repository\StatisticRepository;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
-use TYPO3\CMS\Backend\View\BackendTemplateView;
+use TYPO3\CMS\Backend\Template\ModuleTemplate;
+use TYPO3\CMS\Backend\Template\ModuleTemplateFactory;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Localization\LanguageService;
@@ -24,55 +28,26 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
-use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3Fluid\Fluid\View\ViewInterface;
 
-/**
- * Class BaseController
- */
 class BaseController extends ActionController
 {
-
-    /** @var BackendTemplateView */
+    /** @var ModuleTemplate */
     protected $view;
 
-    /** @var StatisticRepository */
-    protected $statisticRepository;
-
-    /** @var ClientRepository */
-    protected $clientRepository;
-
-    /** @var CoreRepository */
-    protected $coreRepository;
-
-    /** @var ClientFilterDemand */
-    protected $filterDemand;
-
-    /** @var BackendTemplateView */
-    protected $defaultViewObjectName = BackendTemplateView::class;
-
-    /** @var IconFactory */
-    protected $iconFactory;
-
-    /** @var Registry */
-    protected $registry;
-
-    /** @var EmMonitoringConfiguration */
-    protected $emConfiguration;
-
-    /**
-     * Initialize action
-     */
-    public function initializeAction()
+    public function __construct(
+        private readonly ModuleTemplateFactory $moduleTemplateFactory,
+        protected StatisticRepository $statisticRepository,
+        protected ClientRepository $clientRepository,
+        protected CoreRepository $coreRepository,
+        protected IconFactory $iconFactory,
+        protected Registry $registry,
+        protected EmMonitoringConfiguration $emConfiguration
+    ) {}
+
+    public function initializeAction(): void
     {
-        $this->statisticRepository = GeneralUtility::makeInstance(StatisticRepository::class);
-        $this->filterDemand = GeneralUtility::makeInstance(ClientFilterDemand::class);
-        $this->clientRepository = GeneralUtility::makeInstance(ClientRepository::class);
-        $this->coreRepository = GeneralUtility::makeInstance(CoreRepository::class);
-        $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $this->registry = GeneralUtility::makeInstance(Registry::class);
-        $this->emConfiguration = GeneralUtility::makeInstance(EmMonitoringConfiguration::class);
-
         parent::initializeAction();
 
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
@@ -83,46 +58,35 @@ public function initializeAction()
             'paths' => [
                 'datatables' => $fullJsPath . '/jquery.dataTables.min',
                 'datatablesBootstrap' => $fullJsPath . '/dataTables.bootstrap.min',
-            ]
+            ],
         ]);
+
+        $pageRenderer->loadRequireJsModule('TYPO3/CMS/T3monitoring/Main');
+        $pageRenderer->addCssFile('EXT:t3monitoring/Resources/Public/Css/t3monitoring.css');
     }
 
-    /**
-     * Set up the doc header properly here
-     *
-     * @param ViewInterface $view
-     * @throws \InvalidArgumentException
-     */
     protected function initializeView(ViewInterface $view)
     {
-        /** @var BackendTemplateView $view */
-        parent::initializeView($view);
-        $view->getModuleTemplate()->getDocHeaderComponent()->setMetaInformation([]);
+        $this->view = $this->moduleTemplateFactory->create($this->request);
+        $this->view->getDocHeaderComponent()->setMetaInformation([]);
+        $this->view->setFlashMessageQueue($this->getFlashMessageQueue());
+
         $view->assignMultiple([
             'emConfiguration' => $this->emConfiguration,
             'formats' => [
                 'date' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'],
                 'time' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'],
                 'dateAndTime' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'],
-            ]
+            ],
         ]);
 
-        /** @var PageRenderer $pageRenderer */
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->loadRequireJsModule('TYPO3/CMS/T3monitoring/Main');
-        $pageRenderer->addCssFile('EXT:t3monitoring/Resources/Public/Css/t3monitoring.css');
-
         $this->createMenu();
         $this->getButtons();
     }
 
-    /**
-     * Create menu
-     * @throws \InvalidArgumentException
-     */
-    protected function createMenu()
+    protected function createMenu(): void
     {
-        $menu = $this->view->getModuleTemplate()->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
+        $menu = $this->view->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
         $menu->setIdentifier('t3monitoring');
 
         $actions = [
@@ -135,14 +99,11 @@ protected function createMenu()
         ];
 
         foreach ($actions as $action) {
-            switch ($action['controller']) {
-                case 'Statistic':
-                    $isActive = $this->request->getControllerName() === $action['controller']
-                        && $this->request->getControllerActionName() === $action['action'];
-                    break;
-                default:
-                    $isActive = $this->request->getControllerName() === $action['controller'];
-            }
+            $isActive = match ($action['controller']) {
+                'Statistic' => $this->request->getControllerName() === $action['controller']
+                    && $this->request->getControllerActionName() === $action['action'],
+                default => $this->request->getControllerName() === $action['controller'],
+            };
 
             $item = $menu->makeMenuItem()
                 ->setTitle($action['label'])
@@ -151,16 +112,15 @@ protected function createMenu()
             $menu->addMenuItem($item);
         }
 
-        $this->view->getModuleTemplate()->getDocHeaderComponent()->getMenuRegistry()->addMenu($menu);
+        $this->view->getDocHeaderComponent()->getMenuRegistry()->addMenu($menu);
     }
 
     /**
      * Create the panel of buttons for submitting the form or otherwise perform operations.
-     * @throws \InvalidArgumentException
      */
-    protected function getButtons()
+    protected function getButtons(): void
     {
-        $buttonBar = $this->view->getModuleTemplate()->getDocHeaderComponent()->getButtonBar();
+        $buttonBar = $this->view->getDocHeaderComponent()->getButtonBar();
 
         // Home
         if (($this->request->getControllerName() !== 'Statistic'
@@ -176,9 +136,13 @@ protected function getButtons()
 
         $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
 
+        $queryParams = array_merge(
+            $this->request->getQueryParams()['tx_t3monitoring_tools_t3monitoringt3monitor'] ?? [],
+            $this->request->getParsedBody()['tx_t3monitoring_tools_t3monitoringt3monitor'] ?? []
+        );
         // Buttons for new records
-        $returnUrl = rawurlencode($uriBuilder->buildUriFromRoute('tools_T3monitoringT3monitor', [
-            'tx_t3monitoring_tools_t3monitoringt3monitor' => GeneralUtility::_GPmerged('tx_t3monitoring_tools_t3monitoringt3monitor')
+        $returnUrl = rawurlencode((string)$uriBuilder->buildUriFromRoute('t3monitoring', [
+            'tx_t3monitoring_tools_t3monitoringt3monitor' => $queryParams,
         ]));
         $pid = $this->emConfiguration->getPid();
 
@@ -216,18 +180,11 @@ protected function getButtons()
         }
     }
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getLabel($key): string
+    protected function getLabel(string $key): string
     {
         return $this->getLanguageService()->sL('LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:' . $key);
     }
 
-    /**
-     * @return UriBuilder
-     */
     protected function getUriBuilder(): UriBuilder
     {
         $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
@@ -236,21 +193,21 @@ protected function getUriBuilder(): UriBuilder
         return $uriBuilder;
     }
 
-    /**
-     * @return ClientFilterDemand
-     */
     protected function getClientFilterDemand(): ClientFilterDemand
     {
-        return GeneralUtility::makeInstance(ClientFilterDemand::class);
+        return new ClientFilterDemand();
     }
 
-    /**
-     * Returns the LanguageService
-     *
-     * @return LanguageService
-     */
     protected function getLanguageService(): LanguageService
     {
         return $GLOBALS['LANG'];
     }
+
+    protected function htmlResponse(?string $html = null): ResponseInterface
+    {
+        if ($html !== null) {
+            return parent::htmlResponse($html);
+        }
+        return $this->view->renderResponse($this->request->getControllerActionName());
+    }
 }
diff --git a/Classes/Controller/ClientController.php b/Classes/Controller/ClientController.php
index de8a0c7..be1f3f8 100644
--- a/Classes/Controller/ClientController.php
+++ b/Classes/Controller/ClientController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -9,52 +11,55 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
 use T3Monitor\T3monitoring\Domain\Model\Client;
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
+use TYPO3\CMS\Backend\Attribute\AsController;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * ClientController
- */
+#[AsController]
 class ClientController extends BaseController
 {
 
     /**
      * Show client
      *
-     * @param Client $client
+     * @param Client|null $client
+     * @return ResponseInterface
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation $client
-     * @return void
      */
-    public function showAction(Client $client = null)
+    public function showAction(?Client $client = null): ResponseInterface
     {
         if ($client === null) {
             // @todo flash message
-            $this->redirect('index', 'Statistic');
+            return $this->redirect('index', 'Statistic');
         }
 
         $this->view->assignMultiple([
             'client' => $client,
         ]);
+
+        return $this->htmlResponse();
     }
 
     /**
      * Fetch client
      *
-     * @param Client $client
+     * @param Client|null $client
+     * @return ResponseInterface
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation $client
      */
-    public function fetchAction(Client $client = null)
+    public function fetchAction(?Client $client = null): ResponseInterface
     {
         if ($client === null) {
             // @todo flash message
-            $this->redirect('index', 'Statistic');
-        } else {
-            /** @var ClientImport $import */
-            $import = GeneralUtility::makeInstance(ClientImport::class);
-            $import->run($client->getUid());
-            $this->addFlashMessage($this->getLabel('fetchClient.success'));
-            $this->redirect('show', null, null, ['client' => $client]);
+            return $this->redirect('index', 'Statistic');
         }
+
+        /** @var ClientImport $import */
+        $import = GeneralUtility::makeInstance(ClientImport::class);
+        $import->run($client->getUid());
+        $this->addFlashMessage($this->getLabel('fetchClient.success'));
+        return $this->redirect('show', null, null, ['client' => $client]);
     }
 }
diff --git a/Classes/Controller/CoreController.php b/Classes/Controller/CoreController.php
index e1bf87c..4b19ab3 100644
--- a/Classes/Controller/CoreController.php
+++ b/Classes/Controller/CoreController.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -8,23 +11,18 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
 use T3Monitor\T3monitoring\Domain\Model\Dto\CoreFilterDemand;
 use T3Monitor\T3monitoring\Domain\Repository\CoreRepository;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Backend\Attribute\AsController;
 
-/**
- * CoreController
- */
+#[AsController]
 class CoreController extends BaseController
 {
-
-    /**
-     * @param CoreFilterDemand|null $filter
-     */
-    public function listAction(CoreFilterDemand $filter = null)
+    public function listAction(?CoreFilterDemand $filter = null): ResponseInterface
     {
         if ($filter === null) {
-            $filter = GeneralUtility::makeInstance(CoreFilterDemand::class);
+            $filter = new CoreFilterDemand();
             $filter->setUsage(CoreRepository::USED_ONLY);
         }
 
@@ -32,5 +30,7 @@ public function listAction(CoreFilterDemand $filter = null)
             'filter' => $filter,
             'cores' => $this->coreRepository->findByDemand($filter)
         ]);
+
+        return $this->htmlResponse();
     }
 }
diff --git a/Classes/Controller/ExtensionController.php b/Classes/Controller/ExtensionController.php
index ec4235c..a669dc6 100644
--- a/Classes/Controller/ExtensionController.php
+++ b/Classes/Controller/ExtensionController.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -8,57 +11,45 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
 use T3Monitor\T3monitoring\Domain\Model\Dto\ExtensionFilterDemand;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use T3Monitor\T3monitoring\Domain\Repository\ExtensionRepository;
+use TYPO3\CMS\Backend\Attribute\AsController;
 
-/**
- * ExtensionController
- */
+#[AsController]
 class ExtensionController extends BaseController
 {
+    protected ExtensionRepository $extensionRepository;
 
-    /**
-     * @var \T3Monitor\T3monitoring\Domain\Repository\ExtensionRepository
-     */
-    protected $extensionRepository = null;
-
-    /**
-     * @param \T3Monitor\T3monitoring\Domain\Repository\ExtensionRepository $extensionRepository
-     */
-    public function injectExtensionRepository(\T3Monitor\T3monitoring\Domain\Repository\ExtensionRepository $extensionRepository)
+    public function injectExtensionRepository(ExtensionRepository $extensionRepository): void
     {
         $this->extensionRepository = $extensionRepository;
     }
 
-    /**
-     * @param ExtensionFilterDemand $filter
-     */
-    public function listAction(ExtensionFilterDemand $filter = null)
+    public function listAction(?ExtensionFilterDemand $filter = null): ResponseInterface
     {
         if ($filter === null) {
-            $filter = GeneralUtility::makeInstance(ExtensionFilterDemand::class);
+            $filter = new ExtensionFilterDemand();
         }
 
         $this->view->assignMultiple([
             'filter' => $filter,
-            'extensions' => $this->extensionRepository->findByDemand($filter)
+            'extensions' => $this->extensionRepository->findByDemand($filter),
         ]);
+
+        return $this->htmlResponse();
     }
 
-    /**
-     * action show
-     *
-     * @param string $extension
-     */
-    public function showAction($extension = '')
+    public function showAction(string $extension = ''): ResponseInterface
     {
         if (empty($extension)) {
-            $this->redirect('list');
+            return $this->redirect('list');
         }
         $versions = $this->extensionRepository->findAllVersionsByName($extension);
         $this->view->assignMultiple([
              'versions' => $versions,
             'latest' => $versions->getFirst(),
         ]);
+        return $this->htmlResponse();
     }
 }
diff --git a/Classes/Controller/SlaController.php b/Classes/Controller/SlaController.php
index 571bd34..7c2c9d8 100644
--- a/Classes/Controller/SlaController.php
+++ b/Classes/Controller/SlaController.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -8,45 +11,32 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
 use T3Monitor\T3monitoring\Domain\Model\Sla;
+use T3Monitor\T3monitoring\Domain\Repository\SlaRepository;
+use TYPO3\CMS\Backend\Attribute\AsController;
 
-/**
- * SlaController
- */
+#[AsController]
 class SlaController extends BaseController
 {
+    protected SlaRepository $slaRepository;
 
-    /**
-     * @var \T3Monitor\T3monitoring\Domain\Repository\SlaRepository
-     */
-    protected $slaRepository = null;
-
-    /**
-     * @param \T3Monitor\T3monitoring\Domain\Repository\SlaRepository $slaRepository
-     */
-    public function injectSlaRepository(\T3Monitor\T3monitoring\Domain\Repository\SlaRepository $slaRepository)
+    public function injectSlaRepository(SlaRepository $slaRepository): void
     {
         $this->slaRepository = $slaRepository;
     }
 
-    /**
-     * action list
-     */
-    public function listAction()
+    public function listAction(): ResponseInterface
     {
         $slas = $this->slaRepository->findAll();
         $this->view->assign('slas', $slas);
+        return $this->htmlResponse();
     }
 
-    /**
-     * action show
-     *
-     * @param Sla $sla
-     */
-    public function showAction(Sla $sla = null)
+    public function showAction(?Sla $sla = null): ResponseInterface
     {
         if ($sla === null) {
-            $this->redirect('index', 'Statistic');
+            return $this->redirect('index', 'Statistic');
         }
 
         $demand = $this->getClientFilterDemand();
@@ -55,5 +45,7 @@ public function showAction(Sla $sla = null)
             'sla' => $sla,
             'clients' => $this->clientRepository->findByDemand($demand)
         ]);
+
+        return $this->htmlResponse();
     }
 }
diff --git a/Classes/Controller/StatisticController.php b/Classes/Controller/StatisticController.php
index e1f6e1e..60fa0d3 100644
--- a/Classes/Controller/StatisticController.php
+++ b/Classes/Controller/StatisticController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -9,56 +11,38 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
+use T3Monitor\T3monitoring\Domain\Model\Core;
 use T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand;
-use T3Monitor\T3monitoring\Domain\Repository\ClientRepository;
-use T3Monitor\T3monitoring\Domain\Repository\CoreRepository;
 use T3Monitor\T3monitoring\Domain\Repository\SlaRepository;
-use T3Monitor\T3monitoring\Domain\Repository\StatisticRepository;
 use T3Monitor\T3monitoring\Domain\Repository\TagRepository;
 use T3Monitor\T3monitoring\Service\BulletinImport;
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
 use T3Monitor\T3monitoring\Service\Import\CoreImport;
 use T3Monitor\T3monitoring\Service\Import\ExtensionImport;
+use TYPO3\CMS\Backend\Attribute\AsController;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
-/**
- * Class StatisticController
- */
+#[AsController]
 class StatisticController extends BaseController
 {
+    const RSS_URL = 'https://typo3.org/?type=101';
 
-    /**
-     * @var \T3Monitor\T3monitoring\Domain\Repository\SlaRepository
-     */
-    protected $slaRepository = null;
+    protected SlaRepository $slaRepository;
+    protected TagRepository $tagRepository;
 
-    /**
-     * @var \T3Monitor\T3monitoring\Domain\Repository\TagRepository
-     */
-    protected $tagRepository = null;
+    public function injectSlaRepository(SlaRepository $slaRepository): void
+    {
+        $this->slaRepository = $slaRepository;
+    }
 
-    /**
-     * Initialize action
-     */
-    public function initializeAction()
+    public function injectTagRepository(TagRepository $tagRepository): void
     {
-        $this->statisticRepository = GeneralUtility::makeInstance(StatisticRepository::class);
-        $this->filterDemand = GeneralUtility::makeInstance(ClientFilterDemand::class);
-        $this->clientRepository = GeneralUtility::makeInstance(ClientRepository::class);
-        $this->coreRepository = GeneralUtility::makeInstance(CoreRepository::class);
-        $this->slaRepository = GeneralUtility::makeInstance(SlaRepository::class);
-        $this->tagRepository = GeneralUtility::makeInstance(TagRepository::class);
-
-        parent::initializeAction();
+        $this->tagRepository = $tagRepository;
     }
 
-    /**
-     * Index action
-     *
-     * @param ClientFilterDemand|null $filter
-     */
-    public function indexAction(ClientFilterDemand $filter = null)
+    public function indexAction(?ClientFilterDemand $filter = null): ResponseInterface
     {
         if (null === $filter) {
             $filter = $this->getClientFilterDemand();
@@ -79,7 +63,7 @@ public function indexAction(ClientFilterDemand $filter = null)
         $feedItems = null;
         if ($this->emConfiguration->getLoadBulletins()) {
             /** @var BulletinImport $bulletinImport */
-            $bulletinImport = GeneralUtility::makeInstance(BulletinImport::class, 'https://typo3.org/?type=101', 5);
+            $bulletinImport = GeneralUtility::makeInstance(BulletinImport::class, self::RSS_URL, 5);
             $feedItems = $bulletinImport->start();
         }
 
@@ -107,14 +91,11 @@ public function indexAction(ClientFilterDemand $filter = null)
                 'extension' => $this->registry->get('t3monitoring', 'importExtension'),
             ],
         ]);
+
+        return $this->htmlResponse();
     }
 
-    /**
-     * Administrator action
-     *
-     * @param string $import
-     */
-    public function administrationAction($import = '')
+    public function administrationAction(string $import = ''): ResponseInterface
     {
         $success = $error = false;
 
@@ -140,21 +121,18 @@ public function administrationAction($import = '')
 
         $this->view->assignMultiple([
             'success' => $success,
-            'error' => $error
+            'error' => $error,
         ]);
+
+        return $this->htmlResponse();
     }
 
-    /**
-     * Get all core versions
-     *
-     * @return array
-     */
-    protected function getAllCoreVersions()
+    protected function getAllCoreVersions(): array
     {
         $result = $used = [];
-        $versions = $this->coreRepository->findAllCoreVersions(CoreRepository::USED_ONLY);
+        $versions = $this->coreRepository->findAllCoreVersions();
         foreach ($versions as $version) {
-            /** @var \T3Monitor\T3monitoring\Domain\Model\Core $version */
+            /** @var Core $version */
             $info = VersionNumberUtility::convertVersionStringToArray($version->getVersion());
             $branchVersion = $info['version_main'] . '.' . $info['version_sub'];
             if (!isset($used[$branchVersion])) {
diff --git a/Classes/Controller/TagController.php b/Classes/Controller/TagController.php
index 15dff5e..79a09ae 100644
--- a/Classes/Controller/TagController.php
+++ b/Classes/Controller/TagController.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Controller;
 
 /*
@@ -8,46 +11,32 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use Psr\Http\Message\ResponseInterface;
 use T3Monitor\T3monitoring\Domain\Model\Tag;
 use T3Monitor\T3monitoring\Domain\Repository\TagRepository;
+use TYPO3\CMS\Backend\Attribute\AsController;
 
-/**
- * TagController
- */
+#[AsController]
 class TagController extends BaseController
 {
+    protected TagRepository $tagRepository;
 
-    /**
-     * @var TagRepository
-     */
-    protected $tagRepository = null;
-
-    /**
-     * @param TagRepository $tagRepository
-     */
-    public function injectTagRepository(TagRepository $tagRepository)
+    public function injectTagRepository(TagRepository $tagRepository): void
     {
         $this->tagRepository = $tagRepository;
     }
 
-    /**
-     * action list
-     */
-    public function listAction()
+    public function listAction(): ResponseInterface
     {
         $tags = $this->tagRepository->findAll();
         $this->view->assign('tags', $tags);
+        return $this->htmlResponse();
     }
 
-    /**
-     * action show
-     *
-     * @param Tag $tag
-     */
-    public function showAction(Tag $tag = null)
+    public function showAction(?Tag $tag = null): ResponseInterface
     {
         if ($tag === null) {
-            $this->redirect('index', 'Statistic');
+            return $this->redirect('index', 'Statistic');
         }
 
         $demand = $this->getClientFilterDemand();
@@ -56,5 +45,6 @@ public function showAction(Tag $tag = null)
             'tag' => $tag,
             'clients' => $this->clientRepository->findByDemand($demand)
         ]);
+        return $this->htmlResponse();
     }
 }
diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
index 04e50fe..1ba0060 100644
--- a/Classes/Domain/Model/Client.php
+++ b/Classes/Domain/Model/Client.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model;
 
 /*
@@ -8,166 +11,60 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use DateTime;
+use TYPO3\CMS\Extbase\Annotation\ORM\Lazy;
+use TYPO3\CMS\Extbase\Annotation\Validate;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-/**
- * Client
- */
 class Client extends AbstractEntity
 {
+    #[Validate(['validator' => 'NotEmpty'])]
+    protected string $title = '';
+
+    #[Validate(['validator' => 'NotEmpty'])]
+    protected string $domain = '';
+    protected string $comment = '';
+    protected string $hostHeader = '';
+    protected bool $ignoreCertErrors = false;
+    protected bool $excludeFromImport = false;
+    protected string $forceIpResolve = '';
+    protected string $basicAuthUsername = '';
+    protected string $basicAuthPassword = '';
+
+    #[Validate(['validator' => 'NotEmpty'])]
+    protected string $secret = '';
+    protected string $email = '';
+    protected string $phpVersion = '';
+    protected string $mysqlVersion = '';
+    protected int $diskTotalSpace = 0;
+    protected int $diskFreeSpace = 0;
+    protected bool $insecureCore = false;
+    protected bool $outdatedCore = false;
+    protected int $insecureExtensions = 0;
+    protected int $outdatedExtensions = 0;
+    protected string $errorMessage = '';
+    protected string $extraInfo = '';
+    protected string $extraWarning = '';
+    protected string $extraDanger = '';
+    protected ?DateTime $lastSuccessfulImport = null;
+
+    /**
+     * @var LazyLoadingProxy|ObjectStorage<Extension>
+     */
+    #[Lazy]
+    protected ObjectStorage|LazyLoadingProxy $extensions;
+
+    #[Lazy]
+    protected Core|LazyLoadingProxy|null $core = null;
+
+    #[Lazy]
+    protected Sla|LazyLoadingProxy|null $sla = null;
+
+    #[Lazy]
+    protected Tag|LazyLoadingProxy|null $tag = null;
 
-    /**
-     * @var string
-     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
-     */
-    protected $title = '';
-
-    /**
-     * @var string
-     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
-     */
-    protected $domain = '';
-
-    /**
-     * @var string
-     */
-    protected $comment = '';
-
-    /**
-     * @var string
-     */
-    protected $hostHeader = '';
-
-    /**
-     * @var bool
-     */
-    protected $ignoreCertErrors = false;
-
-    /**
-     * @var bool
-     */
-    protected $excludeFromImport = false;
-
-    /**
-     * @var string
-     */
-    protected $forceIpResolve = '';
-
-    /**
-     * @var string
-     */
-    protected $basicAuthUsername = '';
-
-    /**
-     * @var string
-     */
-    protected $basicAuthPassword = '';
-
-    /**
-     * @var string
-     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
-     */
-    protected $secret = '';
-
-    /**
-     * @var string
-     */
-    protected $email = '';
-
-    /**
-     * @var string
-     */
-    protected $phpVersion = '';
-
-    /**
-     * @var string
-     */
-    protected $mysqlVersion = '';
-
-    /**
-     * @var int
-     */
-    protected $diskTotalSpace = 0;
-
-    /**
-     * @var int
-     */
-    protected $diskFreeSpace = 0;
-
-    /**
-     * @var bool
-     */
-    protected $insecureCore = false;
-
-    /**
-     * @var bool
-     */
-    protected $outdatedCore = false;
-
-    /**
-     * @var int
-     */
-    protected $insecureExtensions = 0;
-
-    /**
-     * @var int
-     */
-    protected $outdatedExtensions = 0;
-
-    /**
-     * @var string
-     */
-    protected $errorMessage = '';
-
-    /**
-     * @var string
-     */
-    protected $extraInfo = '';
-
-    /**
-     * @var string
-     */
-    protected $extraWarning = '';
-
-    /**
-     * @var string
-     */
-    protected $extraDanger = '';
-
-    /**
-     * @var \DateTime
-     */
-    protected $lastSuccessfulImport = null;
-
-    /**
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Extension>
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
-     */
-    protected $extensions = null;
-
-    /**
-     * @var \T3Monitor\T3monitoring\Domain\Model\Core
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
-     */
-    protected $core = null;
-
-    /**
-     * @var \T3Monitor\T3monitoring\Domain\Model\Sla
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
-     */
-    protected $sla = null;
-
-    /**
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Tag>
-     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
-     */
-    protected $tag = null;
-
-    /**
-     * __construct
-     */
     public function __construct()
     {
         // Do not remove the next line: It would break the functionality
@@ -182,523 +79,267 @@ public function __construct()
      *
      * @return void
      */
-    protected function initStorageObjects()
+    protected function initStorageObjects(): void
     {
         $this->extensions = new ObjectStorage();
     }
 
-    /**
-     * Returns the title
-     *
-     * @return string
-     */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * Sets the title
-     *
-     * @param string $title
-     * @return void
-     */
-    public function setTitle($title)
+    public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * Returns the domain
-     *
-     * @return string
-     */
-    public function getDomain()
+    public function getDomain(): string
     {
         return $this->domain;
     }
 
-    /**
-     * Sets the domain
-     *
-     * @param string $domain
-     * @return void
-     */
-    public function setDomain($domain)
+    public function setDomain(string $domain): void
     {
         $this->domain = $domain;
     }
 
-    /**
-     * Returns the comment
-     *
-     * @return string
-     */
-    public function getComment()
+    public function getComment(): string
     {
         return $this->comment;
     }
 
-    /**
-     * Sets the comment
-     *
-     * @param string $comment
-     * @return void
-     */
-    public function setComment($comment)
+    public function setComment(string $comment): void
     {
         $this->comment = $comment;
     }
 
-    /**
-     * @return string
-     */
-    public function getBasicAuthUsername()
+    public function getBasicAuthUsername(): string
     {
         return $this->basicAuthUsername;
     }
 
-    /**
-     * @param string $basicAuthUsername
-     */
-    public function setBasicAuthUsername($basicAuthUsername)
+    public function setBasicAuthUsername(string $basicAuthUsername): void
     {
         $this->basicAuthUsername = $basicAuthUsername;
     }
 
-    /**
-     * @return string
-     */
-    public function getBasicAuthPassword()
+    public function getBasicAuthPassword(): string
     {
         return $this->basicAuthPassword;
     }
 
-    /**
-     * @param string $basicAuthPassword
-     */
-    public function setBasicAuthPassword($basicAuthPassword)
+    public function setBasicAuthPassword(string $basicAuthPassword): void
     {
         $this->basicAuthPassword = $basicAuthPassword;
     }
 
-    /**
-     * @return string
-     */
-    public function getHostHeader()
+    public function getHostHeader(): string
     {
         return $this->hostHeader;
     }
 
-    /**
-     * @param string $hostHeader
-     */
-    public function setHostHeader(string $hostHeader)
+    public function setHostHeader(string $hostHeader): void
     {
         $this->hostHeader = $hostHeader;
     }
 
-    /**
-     * @return bool
-     */
-    public function isIgnoreCertErrors()
+    public function isIgnoreCertErrors(): bool
     {
         return $this->ignoreCertErrors;
     }
 
-    /**
-     * @param bool $ignoreCertErrors
-     */
-    public function setIgnoreCertErrors(bool $ignoreCertErrors)
+    public function setIgnoreCertErrors(bool $ignoreCertErrors): void
     {
         $this->ignoreCertErrors = $ignoreCertErrors;
     }
 
-    /**
-     * @return bool
-     */
-    public function isExcludeFromImport()
+    public function isExcludeFromImport(): bool
     {
         return $this->excludeFromImport;
     }
 
-    /**
-     * @param bool $ignoreCertErrors
-     */
-    public function setExcludeFromImport(bool $excludeFromImport)
+    public function setExcludeFromImport(bool $excludeFromImport): void
     {
         $this->excludeFromImport = $excludeFromImport;
     }
 
-    /**
-     * @return string
-     */
-    public function getForceIpResolve()
+    public function getForceIpResolve(): string
     {
         return $this->forceIpResolve;
     }
 
-    /**
-     * @param string $forceIpResolve
-     */
-    public function setForceIpResolve(string $forceIpResolve)
+    public function setForceIpResolve(string $forceIpResolve): void
     {
         $this->forceIpResolve = $forceIpResolve;
     }
 
-    /**
-     * Returns the secret
-     *
-     * @return string
-     */
-    public function getSecret()
+    public function getSecret(): string
     {
         return $this->secret;
     }
 
-    /**
-     * Sets the secret
-     *
-     * @param string $secret
-     * @return void
-     */
-    public function setSecret($secret)
+    public function setSecret(string $secret): void
     {
         $this->secret = $secret;
     }
 
-    /**
-     * Returns the email
-     *
-     * @return string
-     */
-    public function getEmail()
+    public function getEmail(): string
     {
         return $this->email;
     }
 
-    /**
-     * Sets the email
-     *
-     * @param string $email
-     * @return void
-     */
-    public function setEmail($email)
+    public function setEmail(string $email): void
     {
         $this->email = $email;
     }
 
-    /**
-     * Returns the phpVersion
-     *
-     * @return string
-     */
-    public function getPhpVersion()
+    public function getPhpVersion(): string
     {
         return $this->phpVersion;
     }
 
-    /**
-     * Sets the phpVersion
-     *
-     * @param string $phpVersion
-     * @return void
-     */
-    public function setPhpVersion($phpVersion)
+    public function setPhpVersion(string $phpVersion): void
     {
         $this->phpVersion = $phpVersion;
     }
 
-    /**
-     * Returns the mysqlVersion
-     *
-     * @return string
-     */
-    public function getMysqlVersion()
+    public function getMysqlVersion(): string
     {
         return $this->mysqlVersion;
     }
 
-    /**
-     * Sets the mysqlVersion
-     *
-     * @param string $mysqlVersion
-     * @return void
-     */
-    public function setMysqlVersion($mysqlVersion)
+    public function setMysqlVersion(string $mysqlVersion): void
     {
         $this->mysqlVersion = $mysqlVersion;
     }
 
-    /**
-     * Returns the diskFreeSpace
-     *
-     * @return int
-     */
-    public function getDiskFreeSpace()
+    public function getDiskFreeSpace(): int
     {
         return $this->diskFreeSpace;
     }
 
-    /**
-     * Sets the diskFreeSpace
-     *
-     * @param int $diskFreeSpace
-     * @return void
-     */
-    public function setDiskFreeSpace($diskFreeSpace)
+    public function setDiskFreeSpace(int $diskFreeSpace): void
     {
         $this->diskFreeSpace = $diskFreeSpace;
     }
 
-    /**
-     * Returns the diskTotalSpace
-     *
-     * @return int
-     */
-    public function getDiskTotalSpace()
+    public function getDiskTotalSpace(): int
     {
         return $this->diskTotalSpace;
     }
 
-    /**
-     * Sets the diskTotalSpace
-     *
-     * @param int $diskTotalSpace
-     * @return void
-     */
-    public function setDiskTotalSpace($diskTotalSpace)
+    public function setDiskTotalSpace(int $diskTotalSpace): void
     {
         $this->diskTotalSpace = $diskTotalSpace;
     }
 
-    /**
-     * Returns the insecureCore
-     *
-     * @return bool
-     */
-    public function getInsecureCore()
+    public function getInsecureCore(): bool
     {
         return $this->insecureCore;
     }
 
-    /**
-     * Sets the insecureCore
-     *
-     * @param bool $insecureCore
-     * @return void
-     */
-    public function setInsecureCore($insecureCore)
+    public function setInsecureCore(bool $insecureCore): void
     {
         $this->insecureCore = $insecureCore;
     }
 
-    /**
-     * Returns the boolean state of insecureCore
-     *
-     * @return bool
-     */
-    public function isInsecureCore()
+    public function isInsecureCore(): bool
     {
         return $this->insecureCore;
     }
 
-    /**
-     * Returns the outdatedCore
-     *
-     * @return bool
-     */
-    public function getOutdatedCore()
+    public function getOutdatedCore(): bool
     {
         return $this->outdatedCore;
     }
 
-    /**
-     * Sets the outdatedCore
-     *
-     * @param bool $outdatedCore
-     * @return void
-     */
-    public function setOutdatedCore($outdatedCore)
+    public function setOutdatedCore(bool $outdatedCore): void
     {
         $this->outdatedCore = $outdatedCore;
     }
 
-    /**
-     * Returns the boolean state of outdatedCore
-     *
-     * @return bool
-     */
-    public function isOutdatedCore()
+    public function isOutdatedCore(): bool
     {
         return $this->outdatedCore;
     }
 
-    /**
-     * Returns the insecureExtensions
-     *
-     * @return int
-     */
-    public function getInsecureExtensions()
+    public function getInsecureExtensions(): int
     {
         return $this->insecureExtensions;
     }
 
-    /**
-     * Sets the insecureExtensions
-     *
-     * @param int $insecureExtensions
-     * @return void
-     */
-    public function setInsecureExtensions($insecureExtensions)
+    public function setInsecureExtensions(int $insecureExtensions): void
     {
         $this->insecureExtensions = $insecureExtensions;
     }
 
-    /**
-     * Returns the outdatedExtensions
-     *
-     * @return int
-     */
-    public function getOutdatedExtensions()
+    public function getOutdatedExtensions(): int
     {
         return $this->outdatedExtensions;
     }
 
-    /**
-     * Sets the outdatedExtensions
-     *
-     * @param int $outdatedExtensions
-     * @return void
-     */
-    public function setOutdatedExtensions($outdatedExtensions)
+    public function setOutdatedExtensions(int $outdatedExtensions): void
     {
         $this->outdatedExtensions = $outdatedExtensions;
     }
 
-    /**
-     * Returns the errorMessage
-     *
-     * @return string
-     */
-    public function getErrorMessage()
+    public function getErrorMessage(): string
     {
         return $this->errorMessage;
     }
 
-    /**
-     * Sets the errorMessage
-     *
-     * @param string $errorMessage
-     * @return void
-     */
-    public function setErrorMessage($errorMessage)
+    public function setErrorMessage(string $errorMessage): void
     {
         $this->errorMessage = $errorMessage;
     }
 
-    /**
-     * Returns the extraInfo
-     *
-     * @return string
-     */
-    public function getExtraInfo()
+    public function getExtraInfo(): string
     {
         return $this->extraInfo;
     }
 
-    /**
-     * Sets the extraInfo
-     *
-     * @param string $extraInfo
-     * @return void
-     */
-    public function setExtraInfo($extraInfo)
+    public function setExtraInfo(string $extraInfo): void
     {
         $this->extraInfo = $extraInfo;
     }
 
-    /**
-     * Returns the extraWarning
-     *
-     * @return string
-     */
-    public function getExtraWarning()
+    public function getExtraWarning(): string
     {
         return $this->extraWarning;
     }
 
-    /**
-     * Sets the extraWarning
-     *
-     * @param string $extraWarning
-     * @return void
-     */
-    public function setExtraWarning($extraWarning)
+    public function setExtraWarning(string $extraWarning): void
     {
         $this->extraWarning = $extraWarning;
     }
 
-    /**
-     * Returns the extraDanger
-     *
-     * @return string
-     */
-    public function getExtraDanger()
+    public function getExtraDanger(): string
     {
         return $this->extraDanger;
     }
 
-    /**
-     * Sets the extraDanger
-     *
-     * @param string $extraDanger
-     * @return void
-     */
-    public function setExtraDanger($extraDanger)
+    public function setExtraDanger(string $extraDanger): void
     {
         $this->extraDanger = $extraDanger;
     }
 
-    /**
-     * Returns the lastSuccessfulImport
-     *
-     * @return \DateTime
-     */
-    public function getLastSuccessfulImport()
+    public function getLastSuccessfulImport(): ?DateTime
     {
         return $this->lastSuccessfulImport;
     }
 
-    /**
-     * Sets the lastSuccessfulImport
-     *
-     * @param \DateTime $lastSuccessfulImport
-     * @return void
-     */
-    public function setLastSuccessfulImport(\DateTime $lastSuccessfulImport)
+    public function setLastSuccessfulImport(DateTime $lastSuccessfulImport): void
     {
         $this->lastSuccessfulImport = $lastSuccessfulImport;
     }
 
-    /**
-     * Adds a Extension
-     *
-     * @param \T3Monitor\T3monitoring\Domain\Model\Extension $extension
-     * @return void
-     */
-    public function addExtension(Extension $extension)
+    public function addExtension(Extension $extension): void
     {
         $this->extensions->attach($extension);
     }
 
-    /**
-     * Removes a Extension
-     *
-     * @param \T3Monitor\T3monitoring\Domain\Model\Extension $extensionToRemove The Extension to be removed
-     * @return void
-     */
-    public function removeExtension(Extension $extensionToRemove)
+    public function removeExtension(Extension $extensionToRemove): void
     {
         $this->extensions->detach($extensionToRemove);
     }
@@ -706,9 +347,9 @@ public function removeExtension(Extension $extensionToRemove)
     /**
      * Returns the extensions
      *
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Extension>
+     * @return ObjectStorage<Extension>
      */
-    public function getExtensions()
+    public function getExtensions(): ObjectStorage
     {
         return $this->extensions instanceof LazyLoadingProxy ? $this->extensions->_loadRealInstance() : $this->extensions;
     }
@@ -716,81 +357,45 @@ public function getExtensions()
     /**
      * Sets the extensions
      *
-     * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3Monitor\T3monitoring\Domain\Model\Extension> $extensions
+     * @param ObjectStorage<Extension> $extensions
      * @return void
      */
-    public function setExtensions(ObjectStorage $extensions)
+    public function setExtensions(ObjectStorage $extensions): void
     {
         $this->extensions = $extensions;
     }
 
-    /**
-     * Returns the core
-     *
-     * @return \T3Monitor\T3monitoring\Domain\Model\Core
-     */
-    public function getCore()
+    public function getCore(): ?Core
     {
         return $this->core instanceof LazyLoadingProxy ? $this->core->_loadRealInstance() : $this->core;
     }
 
-    /**
-     * Sets the core
-     *
-     * @param \T3Monitor\T3monitoring\Domain\Model\Core $core
-     * @return void
-     */
-    public function setCore(Core $core)
+    public function setCore(Core $core): void
     {
         $this->core = $core;
     }
 
-    /**
-     * Returns the sla
-     *
-     * @return \T3Monitor\T3monitoring\Domain\Model\Sla
-     */
-    public function getSla()
+    public function getSla(): ?Sla
     {
         return $this->sla instanceof LazyLoadingProxy ? $this->sla->_loadRealInstance() : $this->sla;
     }
 
-    /**
-     * Sets the sla
-     *
-     * @param \T3Monitor\T3monitoring\Domain\Model\Sla $sla
-     * @return void
-     */
-    public function setSla(Sla $sla)
+    public function setSla(Sla $sla): void
     {
         $this->sla = $sla;
     }
 
-    /**
-     * Returns the tag
-     *
-     * @return \T3Monitor\T3monitoring\Domain\Model\Tag
-     */
-    public function getTag()
+    public function getTag(): ?Tag
     {
         return $this->tag instanceof LazyLoadingProxy ? $this->tag->_loadRealInstance() : $this->tag;
     }
 
-    /**
-     * Sets the tag
-     *
-     * @param \T3Monitor\T3monitoring\Domain\Model\Tag $tag
-     * @return void
-     */
-    public function setTag(Tag $tag)
+    public function setTag(Tag $tag): void
     {
         $this->tag = $tag;
     }
 
-    /**
-     * @return array
-     */
-    public function getExtraInfoAsArray()
+    public function getExtraInfoAsArray(): array
     {
         if (!empty($this->extraInfo)) {
             return json_decode($this->extraInfo, true);
@@ -798,10 +403,7 @@ public function getExtraInfoAsArray()
         return [];
     }
 
-    /**
-     * @return array
-     */
-    public function getExtraWarningAsArray()
+    public function getExtraWarningAsArray(): array
     {
         if (!empty($this->extraWarning)) {
             return json_decode($this->extraWarning, true);
@@ -809,10 +411,7 @@ public function getExtraWarningAsArray()
         return [];
     }
 
-    /**
-     * @return array
-     */
-    public function getExtraDangerAsArray()
+    public function getExtraDangerAsArray(): array
     {
         if (!empty($this->extraDanger)) {
             return json_decode($this->extraDanger, true);
diff --git a/Classes/Domain/Model/Core.php b/Classes/Domain/Model/Core.php
index d940656..2cc0f7a 100644
--- a/Classes/Domain/Model/Core.php
+++ b/Classes/Domain/Model/Core.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model;
 
 /*
@@ -8,408 +10,181 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use DateTime;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Core
- */
 class Core extends AbstractEntity
 {
-
-    /**
-     * @var string
-     */
-    protected $version = '';
-
-    /**
-     * @var bool
-     */
-    protected $insecure = false;
-
-    /**
-     * @var string
-     */
-    protected $nextSecureVersion = '';
-
-    /**
-     * @var int
-     */
-    protected $type = 0;
-
-    /**
-     * @var \DateTime
-     */
-    protected $releaseDate = null;
-
-    /**
-     * @var string
-     */
-    protected $latest = '';
-
-    /**
-     * @var string
-     */
-    protected $stable = '';
-
-    /**
-     * @var bool
-     */
-    protected $isStable = false;
-
-    /**
-     * @var bool
-     */
-    protected $isActive = false;
-
-    /**
-     * @var bool
-     */
-    protected $isLatest = false;
-
-    /**
-     * @var int
-     */
-    protected $versionInteger = 0;
-
-    /**
-     * @var bool
-     */
-    protected $isUsed = false;
-
-    /**
-     * @var bool
-     */
-    protected $isOfficial = false;
-
-    /**
-     * Returns the version
-     *
-     * @return string
-     */
-    public function getVersion()
+    protected string $version = '';
+    protected bool $insecure = false;
+    protected string $nextSecureVersion = '';
+    protected int $type = 0;
+    protected ?DateTime $releaseDate = null;
+    protected string $latest = '';
+    protected string $stable = '';
+    protected bool $isStable = false;
+    protected bool $isActive = false;
+    protected bool $isLatest = false;
+    protected int $versionInteger = 0;
+    protected bool $isUsed = false;
+    protected bool $isOfficial = false;
+
+    public function getVersion(): string
     {
         return $this->version;
     }
 
-    /**
-     * Sets the version
-     *
-     * @param string $version
-     * @return void
-     */
-    public function setVersion($version)
+    public function setVersion(string $version): void
     {
         $this->version = $version;
     }
 
-    /**
-     * Returns the insecure
-     *
-     * @return bool
-     */
-    public function getInsecure()
+    public function getInsecure(): bool
     {
         return $this->insecure;
     }
 
-    /**
-     * Sets the insecure
-     *
-     * @param bool $insecure
-     * @return void
-     */
-    public function setInsecure($insecure)
+    public function setInsecure(bool $insecure): void
     {
         $this->insecure = $insecure;
     }
 
-    /**
-     * Returns the boolean state of insecure
-     *
-     * @return bool
-     */
-    public function isInsecure()
+    public function isInsecure(): bool
     {
         return $this->insecure;
     }
 
-    /**
-     * Returns the nextSecureVersion
-     *
-     * @return string
-     */
-    public function getNextSecureVersion()
+    public function getNextSecureVersion(): string
     {
         return $this->nextSecureVersion;
     }
 
-    /**
-     * Sets the nextSecureVersion
-     *
-     * @param string $nextSecureVersion
-     * @return void
-     */
-    public function setNextSecureVersion($nextSecureVersion)
+    public function setNextSecureVersion(string $nextSecureVersion): void
     {
         $this->nextSecureVersion = $nextSecureVersion;
     }
 
-    /**
-     * Returns the type
-     *
-     * @return int
-     */
-    public function getType()
+    public function getType(): int
     {
         return $this->type;
     }
 
-    /**
-     * Sets the type
-     *
-     * @param int $type
-     * @return void
-     */
-    public function setType($type)
+    public function setType(int $type): void
     {
         $this->type = $type;
     }
 
-    /**
-     * Returns the releaseDate
-     *
-     * @return \DateTime
-     */
-    public function getReleaseDate()
+    public function getReleaseDate(): ?DateTime
     {
         return $this->releaseDate;
     }
 
-    /**
-     * Sets the releaseDate
-     *
-     * @param \DateTime $releaseDate
-     * @return void
-     */
-    public function setReleaseDate(\DateTime $releaseDate)
+    public function setReleaseDate(DateTime $releaseDate): void
     {
         $this->releaseDate = $releaseDate;
     }
 
-    /**
-     * Returns the latest
-     *
-     * @return string
-     */
-    public function getLatest()
+    public function getLatest(): string
     {
         return $this->latest;
     }
 
-    /**
-     * Sets the latest
-     *
-     * @param string $latest
-     * @return void
-     */
-    public function setLatest($latest)
+    public function setLatest(string $latest): void
     {
         $this->latest = $latest;
     }
 
-    /**
-     * Returns the stable
-     *
-     * @return string
-     */
-    public function getStable()
+    public function getStable(): string
     {
         return $this->stable;
     }
 
-    /**
-     * Sets the stable
-     *
-     * @param string $stable
-     * @return void
-     */
-    public function setStable($stable)
+    public function setStable(string $stable): void
     {
         $this->stable = $stable;
     }
 
-    /**
-     * Returns the isStable
-     *
-     * @return bool
-     */
-    public function getIsStable()
+    public function getIsStable(): bool
     {
         return $this->isStable;
     }
 
-    /**
-     * Sets the isStable
-     *
-     * @param bool $isStable
-     * @return void
-     */
-    public function setIsStable($isStable)
+    public function setIsStable(bool $isStable): void
     {
         $this->isStable = $isStable;
     }
 
-    /**
-     * Returns the boolean state of isStable
-     *
-     * @return bool
-     */
-    public function isIsStable()
+    public function isIsStable(): bool
     {
         return $this->isStable;
     }
 
-    /**
-     * Returns the isActive
-     *
-     * @return bool
-     */
-    public function getIsActive()
+    public function getIsActive(): bool
     {
         return $this->isActive;
     }
 
-    /**
-     * Sets the isActive
-     *
-     * @param bool $isActive
-     * @return void
-     */
-    public function setIsActive($isActive)
+    public function setIsActive(bool $isActive): void
     {
         $this->isActive = $isActive;
     }
 
-    /**
-     * Returns the boolean state of isActive
-     *
-     * @return bool
-     */
-    public function isIsActive()
+    public function isIsActive(): bool
     {
         return $this->isActive;
     }
 
-    /**
-     * Returns the isLatest
-     *
-     * @return bool
-     */
-    public function getIsLatest()
+    public function getIsLatest(): bool
     {
         return $this->isLatest;
     }
 
-    /**
-     * Sets the isLatest
-     *
-     * @param bool $isLatest
-     * @return void
-     */
-    public function setIsLatest($isLatest)
+    public function setIsLatest(bool $isLatest): void
     {
         $this->isLatest = $isLatest;
     }
 
-    /**
-     * Returns the boolean state of isLatest
-     *
-     * @return bool
-     */
-    public function isIsLatest()
+    public function isIsLatest(): bool
     {
         return $this->isLatest;
     }
 
-    /**
-     * Returns the versionInteger
-     *
-     * @return int
-     */
-    public function getVersionInteger()
+    public function getVersionInteger(): int
     {
         return $this->versionInteger;
     }
 
-    /**
-     * Sets the versionInteger
-     *
-     * @param int $versionInteger
-     * @return void
-     */
-    public function setVersionInteger($versionInteger)
+    public function setVersionInteger(int $versionInteger): void
     {
         $this->versionInteger = $versionInteger;
     }
 
-    /**
-     * Returns the isUsed
-     *
-     * @return bool
-     */
-    public function getIsUsed()
+    public function getIsUsed(): bool
     {
         return $this->isUsed;
     }
 
-    /**
-     * Sets the isUsed
-     *
-     * @param bool $isUsed
-     * @return void
-     */
-    public function setIsUsed($isUsed)
+    public function setIsUsed(bool $isUsed): void
     {
         $this->isUsed = $isUsed;
     }
 
-    /**
-     * Returns the boolean state of isUsed
-     *
-     * @return bool
-     */
-    public function isIsUsed()
+    public function isIsUsed(): bool
     {
         return $this->isUsed;
     }
 
-    /**
-     * Returns the isOfficial
-     *
-     * @return bool
-     */
-    public function getIsOfficial()
+    public function getIsOfficial(): bool
     {
         return $this->isOfficial;
     }
 
-    /**
-     * Sets the isOfficial
-     *
-     * @param bool $isOfficial
-     * @return void
-     */
-    public function setIsOfficial($isOfficial)
+    public function setIsOfficial(bool $isOfficial): void
     {
         $this->isOfficial = $isOfficial;
     }
 
-    /**
-     * Returns the boolean state of isOfficial
-     *
-     * @return bool
-     */
-    public function isIsOfficial()
+    public function isIsOfficial(): bool
     {
         return $this->isOfficial;
     }
diff --git a/Classes/Domain/Model/Dto/ClientFilterDemand.php b/Classes/Domain/Model/Dto/ClientFilterDemand.php
index 2885784..11b0c5d 100644
--- a/Classes/Domain/Model/Dto/ClientFilterDemand.php
+++ b/Classes/Domain/Model/Dto/ClientFilterDemand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model\Dto;
 
 /*
@@ -10,280 +13,160 @@
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Class ClientFilterDemand
- */
 class ClientFilterDemand extends AbstractEntity
 {
-
-    /** @var string */
-    protected $version;
-
-    /** @var int */
-    protected $sla;
-
-    /** @var int */
-    protected $tag;
-
-    /** @var string */
-    protected $searchWord;
-
-    /** @var bool */
-    protected $withErrorMessage;
-
-    /** @var bool */
-    protected $withInsecureExtensions;
-
-    /** @var bool */
-    protected $withInsecureCore;
-
-    /** @var bool */
-    protected $withOutdatedCore;
-
-    /** @var bool */
-    protected $withOutdatedExtensions;
-
-    /** @var bool */
-    protected $withExtraInfo;
-
-    /** @var bool */
-    protected $withExtraWarning;
-
-    /** @var bool */
-    protected $withExtraDanger;
-
-    /** @var bool */
-    protected $withEmailAddress;
-
-    /**
-     * @return string
-     */
-    public function getVersion()
+    protected string $version = '';
+    protected int $sla = 0;
+    protected int $tag = 0;
+    protected string $searchWord = '';
+    protected bool $withErrorMessage = false;
+    protected bool $withInsecureExtensions = false;
+    protected bool $withInsecureCore = false;
+    protected bool $withOutdatedCore = false;
+    protected bool $withOutdatedExtensions = false;
+    protected bool $withExtraInfo = false;
+    protected bool $withExtraWarning = false;
+    protected bool $withExtraDanger = false;
+    protected bool $withEmailAddress = false;
+
+    public function getVersion(): string
     {
         return $this->version;
     }
 
-    /**
-     * @param string $version
-     * @return $this
-     */
-    public function setVersion($version)
+    public function setVersion(string $version): static
     {
         $this->version = $version;
         return $this;
     }
 
-    /**
-     * @return int
-     */
-    public function getSla()
+    public function getSla(): int
     {
         return $this->sla;
     }
 
-    /**
-     * @param int $sla
-     * @return $this
-     */
-    public function setSla($sla)
+    public function setSla(int $sla): static
     {
         $this->sla = $sla;
         return $this;
     }
 
-    /**
-     * @return int
-     */
-    public function getTag()
+    public function getTag(): int
     {
         return $this->tag;
     }
 
-    /**
-     * @param int $tag
-     * @return $this
-     */
-    public function setTag($tag)
+    public function setTag(int $tag): static
     {
         $this->tag = $tag;
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getSearchWord()
+    public function getSearchWord(): string
     {
         return $this->searchWord;
     }
 
-    /**
-     * @param string $searchWord
-     * @return $this
-     */
-    public function setSearchWord($searchWord)
+    public function setSearchWord(string $searchWord): static
     {
         $this->searchWord = $searchWord;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithErrorMessage()
+    public function isWithErrorMessage(): bool
     {
         return $this->withErrorMessage;
     }
 
-    /**
-     * @param bool $withErrorMessage
-     * @return $this
-     */
-    public function setWithErrorMessage($withErrorMessage)
+    public function setWithErrorMessage(bool $withErrorMessage): static
     {
         $this->withErrorMessage = $withErrorMessage;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithInsecureExtensions()
+    public function isWithInsecureExtensions(): bool
     {
         return $this->withInsecureExtensions;
     }
 
-    /**
-     * @param bool $withInsecureExtensions
-     * @return $this
-     */
-    public function setWithInsecureExtensions($withInsecureExtensions)
+    public function setWithInsecureExtensions(bool $withInsecureExtensions): static
     {
         $this->withInsecureExtensions = $withInsecureExtensions;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithInsecureCore()
+    public function isWithInsecureCore(): bool
     {
         return $this->withInsecureCore;
     }
 
-    /**
-     * @param bool $withInsecureCore
-     * @return $this
-     */
-    public function setWithInsecureCore($withInsecureCore)
+    public function setWithInsecureCore(bool $withInsecureCore): static
     {
         $this->withInsecureCore = $withInsecureCore;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithOutdatedCore()
+    public function isWithOutdatedCore(): bool
     {
         return $this->withOutdatedCore;
     }
 
-    /**
-     * @param bool $withOutdatedCore
-     * @return $this
-     */
-    public function setWithOutdatedCore($withOutdatedCore)
+    public function setWithOutdatedCore(bool $withOutdatedCore): static
     {
         $this->withOutdatedCore = $withOutdatedCore;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithOutdatedExtensions()
+    public function isWithOutdatedExtensions(): bool
     {
         return $this->withOutdatedExtensions;
     }
 
-    /**
-     * @param bool $withOutdatedExtensions
-     * @return $this
-     */
-    public function setWithOutdatedExtensions($withOutdatedExtensions)
+    public function setWithOutdatedExtensions(bool $withOutdatedExtensions): static
     {
         $this->withOutdatedExtensions = $withOutdatedExtensions;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithExtraInfo()
+    public function isWithExtraInfo(): bool
     {
         return $this->withExtraInfo;
     }
 
-    /**
-     * @param bool $withExtraInfo
-     * @return $this
-     */
-    public function setWithExtraInfo($withExtraInfo)
+    public function setWithExtraInfo(bool $withExtraInfo): static
     {
         $this->withExtraInfo = $withExtraInfo;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithExtraWarning()
+    public function isWithExtraWarning(): bool
     {
         return $this->withExtraWarning;
     }
 
-    /**
-     * @param bool $withExtraWarning
-     * @return $this
-     */
-    public function setWithExtraWarning($withExtraWarning)
+    public function setWithExtraWarning(bool $withExtraWarning): static
     {
         $this->withExtraWarning = $withExtraWarning;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithExtraDanger()
+    public function isWithExtraDanger(): bool
     {
         return $this->withExtraDanger;
     }
 
-    /**
-     * @param bool $withExtraDanger
-     * @return $this
-     */
-    public function setWithExtraDanger($withExtraDanger)
+    public function setWithExtraDanger(bool $withExtraDanger): static
     {
         $this->withExtraDanger = $withExtraDanger;
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isWithEmailAddress()
+    public function isWithEmailAddress(): bool
     {
         return $this->withEmailAddress;
     }
 
-    /**
-     * @param bool $withEmailAddress
-     * @return $this
-     */
-    public function setWithEmailAddress($withEmailAddress)
+    public function setWithEmailAddress(bool $withEmailAddress): static
     {
         $this->withEmailAddress = $withEmailAddress;
         return $this;
diff --git a/Classes/Domain/Model/Dto/CoreFilterDemand.php b/Classes/Domain/Model/Dto/CoreFilterDemand.php
index ff67416..686e655 100644
--- a/Classes/Domain/Model/Dto/CoreFilterDemand.php
+++ b/Classes/Domain/Model/Dto/CoreFilterDemand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model\Dto;
 
 /*
@@ -10,27 +13,16 @@
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Class CoreFilterDemand
- */
 class CoreFilterDemand extends AbstractEntity
 {
+    protected int $usage = 0;
 
-    /** @var int */
-    protected $usage;
-
-    /**
-     * @return int
-     */
-    public function getUsage()
+    public function getUsage(): int
     {
         return $this->usage;
     }
 
-    /**
-     * @param int $usage
-     */
-    public function setUsage($usage)
+    public function setUsage(int $usage): void
     {
         $this->usage = $usage;
     }
diff --git a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
index a13ee83..dac8e08 100644
--- a/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
+++ b/Classes/Domain/Model/Dto/EmMonitoringConfiguration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model\Dto;
 
 /*
@@ -13,94 +15,58 @@
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Extension configuration
- */
 class EmMonitoringConfiguration implements SingletonInterface
 {
-
-    /** @var int */
-    protected $pid = 0;
-
-    /** @var bool */
-    protected $loadBulletins = true;
-
-    /** @var bool */
-    protected $useGoogleCharts = true;
-
-    /** @var bool */
-    protected $presentationMode = false;
-
-    /** @var string */
-    protected $ipHint = '';
-
-    /** @var string */
-    protected $emailForFailedClient = '';
-
-    /** @var int */
-    protected $emailAllowedAmountOfFailures = 0;
+    protected int $pid = 0;
+    protected bool $loadBulletins = true;
+    protected bool $useGoogleCharts = true;
+    protected bool $presentationMode = false;
+    protected string $ipHint = '';
+    protected string $emailForFailedClient = '';
+    protected int $emailAllowedAmountOfFailures = 0;
 
     public function __construct()
     {
         $settings = (array)GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('t3monitoring');
-        foreach ($settings as $key => $value) {
-            if (property_exists(__CLASS__, $key)) {
-                $this->$key = $value;
-            }
-        }
+        $this->pid = (int)$settings['pid'];
+        $this->loadBulletins = (bool)$settings['loadBulletins'];
+        $this->emailForFailedClient = $settings['emailForFailedClient'];
+        $this->emailAllowedAmountOfFailures = (int)$settings['emailAllowedAmountOfFailures'];
+        $this->useGoogleCharts = (bool)$settings['useGoogleCharts'];
+        $this->presentationMode = (bool)$settings['presentationMode'];
+        $this->ipHint = $settings['ipHint'];
     }
 
-    /**
-     * @return int
-     */
     public function getPid(): int
     {
-        return (int)$this->pid;
+        return $this->pid;
     }
 
-    /**
-     * @return bool
-     */
     public function getLoadBulletins(): bool
     {
-        return (bool)$this->loadBulletins;
+        return $this->loadBulletins;
     }
 
-    /**
-     * @return bool
-     */
     public function getUseGoogleCharts(): bool
     {
-        return (bool)$this->useGoogleCharts;
+        return $this->useGoogleCharts;
     }
 
-    /**
-     * @return bool
-     */
     public function isPresentationMode(): bool
     {
         return $this->presentationMode;
     }
 
-    /**
-     * @return string
-     */
     public function getIpHint(): string
     {
         return $this->ipHint;
     }
 
-    /**
-     * @return string
-     */
     public function getEmailForFailedClient(): string
     {
         return $this->emailForFailedClient;
     }
 
-    /**
-     * @return int
-     */
     public function getEmailAllowedAmountOfFailures(): int
     {
         return $this->emailAllowedAmountOfFailures;
diff --git a/Classes/Domain/Model/Dto/ExtensionFilterDemand.php b/Classes/Domain/Model/Dto/ExtensionFilterDemand.php
index 43be506..11f7ec2 100644
--- a/Classes/Domain/Model/Dto/ExtensionFilterDemand.php
+++ b/Classes/Domain/Model/Dto/ExtensionFilterDemand.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model\Dto;
 
 /*
@@ -10,46 +13,27 @@
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Class ExtensionFilterDemand
- */
 class ExtensionFilterDemand extends AbstractEntity
 {
+    protected string $name = '';
+    protected bool $exactSearch = false;
 
-    /** @var string */
-    protected $name;
-
-    /** @var bool */
-    protected $exactSearch;
-
-    /**
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @param string $name
-     */
-    public function setName($name)
+    public function setName(string $name): void
     {
         $this->name = $name;
     }
 
-    /**
-     * @return bool
-     */
-    public function isExactSearch()
+    public function isExactSearch(): bool
     {
         return $this->exactSearch;
     }
 
-    /**
-     * @param bool $exactSearch
-     */
-    public function setExactSearch($exactSearch)
+    public function setExactSearch(bool $exactSearch): void
     {
         $this->exactSearch = $exactSearch;
     }
diff --git a/Classes/Domain/Model/Extension.php b/Classes/Domain/Model/Extension.php
index 100fc8f..a1cec40 100644
--- a/Classes/Domain/Model/Extension.php
+++ b/Classes/Domain/Model/Extension.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model;
 
 /*
@@ -8,20 +11,13 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use DateTime;
+use TYPO3\CMS\Extbase\Annotation\Validate;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Extension
- */
 class Extension extends AbstractEntity
 {
-
-    /**
-     * Contains default states.
-     *
-     * @var array
-     */
-    public static $defaultStates = [
+    public static array $defaultStates = [
         0 => 'alpha',
         1 => 'beta',
         2 => 'stable',
@@ -32,12 +28,7 @@ class Extension extends AbstractEntity
         999 => 'n/a'
     ];
 
-    /**
-     * Contains default categories.
-     *
-     * @var array
-     */
-    public static $defaultCategories = [
+    public static array $defaultCategories = [
         0 => 'be',
         1 => 'module',
         2 => 'fe',
@@ -50,611 +41,271 @@ class Extension extends AbstractEntity
         10 => 'distribution'
     ];
 
-    /**
-     * @var string
-     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
-     */
-    protected $name = '';
-
-    /**
-     * @var string
-     */
-    protected $version = '';
-
-    /**
-     * @var bool
-     */
-    protected $insecure = false;
-
-    /**
-     * @var string
-     */
-    protected $nextSecureVersion = '';
-
-    /**
-     * @var string
-     */
-    protected $title = '';
-
-    /**
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * @var \DateTime
-     */
-    protected $lastUpdated = null;
-
-    /**
-     * @var string
-     */
-    protected $authorName = '';
-
-    /**
-     * @var string
-     */
-    protected $updateComment = '';
-
-    /**
-     * @var int
-     */
-    protected $state = 0;
-
-    /**
-     * @var int
-     */
-    protected $category = 0;
-
-    /**
-     * @var int
-     */
-    protected $versionInteger = 0;
-
-    /**
-     * @var bool
-     */
-    protected $isUsed = false;
-
-    /**
-     * @var bool
-     */
-    protected $isOfficial = false;
-
-    /**
-     * @var bool
-     */
-    protected $isModified = false;
-
-    /**
-     * @var bool
-     */
-    protected $isLatest = false;
-
-    /**
-     * @var string
-     */
-    protected $lastBugfixRelease = '';
-
-    /**
-     * @var string
-     */
-    protected $lastMinorRelease = '';
-
-    /**
-     * @var string
-     */
-    protected $lastMajorRelease = '';
-
-    /**
-     * @var string
-     */
-    protected $serializedDependencies = '';
-
-    /** @var int */
-    protected $typo3MinVersion = 0;
-
-    /** @var int */
-    protected $typo3MaxVersion = 0;
-
-    /**
-     * Returns the name
-     *
-     * @return string
-     */
-    public function getName()
+    #[Validate(['validator' => 'NotEmpty'])]
+    protected string $name = '';
+    protected string $version = '';
+    protected bool $insecure = false;
+    protected string $nextSecureVersion = '';
+    protected string $title = '';
+    protected string $description = '';
+    protected ?DateTime $lastUpdated = null;
+    protected string $authorName = '';
+    protected string $updateComment = '';
+    protected int $state = 0;
+    protected int $category = 0;
+    protected int $versionInteger = 0;
+    protected bool $isUsed = false;
+    protected bool $isOfficial = false;
+    protected bool $isModified = false;
+    protected bool $isLatest = false;
+    protected string $lastBugfixRelease = '';
+    protected string $lastMinorRelease = '';
+    protected string $lastMajorRelease = '';
+    protected string $serializedDependencies = '';
+    protected int $typo3MinVersion = 0;
+    protected int $typo3MaxVersion = 0;
+
+    public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * Sets the name
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name)
+    public function setName(string $name): void
     {
         $this->name = $name;
     }
 
-    /**
-     * Returns the version
-     *
-     * @return string
-     */
-    public function getVersion()
+    public function getVersion(): string
     {
         return $this->version;
     }
 
-    /**
-     * Sets the version
-     *
-     * @param string $version
-     * @return void
-     */
-    public function setVersion($version)
+    public function setVersion(string $version): void
     {
         $this->version = $version;
     }
 
-    /**
-     * Returns the insecure
-     *
-     * @return bool
-     */
-    public function getInsecure()
+    public function getInsecure(): bool
     {
         return $this->insecure;
     }
 
-    /**
-     * Sets the insecure
-     *
-     * @param bool $insecure
-     * @return void
-     */
-    public function setInsecure($insecure)
+    public function setInsecure(bool $insecure): void
     {
         $this->insecure = $insecure;
     }
 
-    /**
-     * Returns the boolean state of insecure
-     *
-     * @return bool
-     */
-    public function isInsecure()
+    public function isInsecure(): bool
     {
         return $this->insecure;
     }
 
-    /**
-     * Returns the nextSecureVersion
-     *
-     * @return string
-     */
-    public function getNextSecureVersion()
+    public function getNextSecureVersion(): string
     {
         return $this->nextSecureVersion;
     }
 
-    /**
-     * Sets the nextSecureVersion
-     *
-     * @param string $nextSecureVersion
-     * @return void
-     */
-    public function setNextSecureVersion($nextSecureVersion)
+    public function setNextSecureVersion(string $nextSecureVersion): void
     {
         $this->nextSecureVersion = $nextSecureVersion;
     }
 
-    /**
-     * Returns the title
-     *
-     * @return string
-     */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * Sets the title
-     *
-     * @param string $title
-     * @return void
-     */
-    public function setTitle($title)
+    public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * Returns the description
-     *
-     * @return string
-     */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * Sets the description
-     *
-     * @param string $description
-     * @return void
-     */
-    public function setDescription($description)
+    public function setDescription(string $description): void
     {
         $this->description = $description;
     }
 
-    /**
-     * Returns the lastUpdated
-     *
-     * @return \DateTime
-     */
-    public function getLastUpdated()
+    public function getLastUpdated(): ?DateTime
     {
         return $this->lastUpdated;
     }
 
-    /**
-     * Sets the lastUpdated
-     *
-     * @param \DateTime $lastUpdated
-     * @return void
-     */
-    public function setLastUpdated(\DateTime $lastUpdated)
+    public function setLastUpdated(DateTime $lastUpdated): void
     {
         $this->lastUpdated = $lastUpdated;
     }
 
-    /**
-     * Returns the authorName
-     *
-     * @return string
-     */
-    public function getAuthorName()
+    public function getAuthorName(): string
     {
         return $this->authorName;
     }
 
-    /**
-     * Sets the authorName
-     *
-     * @param string $authorName
-     * @return void
-     */
-    public function setAuthorName($authorName)
+    public function setAuthorName(string $authorName): void
     {
         $this->authorName = $authorName;
     }
 
-    /**
-     * Returns the updateComment
-     *
-     * @return string
-     */
-    public function getUpdateComment()
+    public function getUpdateComment(): string
     {
         return $this->updateComment;
     }
 
-    /**
-     * Sets the updateComment
-     *
-     * @param string $updateComment
-     * @return void
-     */
-    public function setUpdateComment($updateComment)
+    public function setUpdateComment(string $updateComment): void
     {
         $this->updateComment = $updateComment;
     }
 
-    /**
-     * Returns the state
-     *
-     * @return int
-     */
-    public function getState()
+    public function getState(): int
     {
         return $this->state;
     }
 
-    /**
-     * Sets the state
-     *
-     * @param int $state
-     * @return void
-     */
-    public function setState($state)
+    public function setState(int $state): void
     {
         $this->state = $state;
     }
 
-    /**
-     * Returns the category
-     *
-     * @return int
-     */
-    public function getCategory()
+    public function getCategory(): int
     {
         return $this->category;
     }
 
-    /**
-     * Sets the category
-     *
-     * @param int $category
-     * @return void
-     */
-    public function setCategory($category)
+    public function setCategory(int $category): void
     {
         $this->category = $category;
     }
 
-    /**
-     * Returns the versionInteger
-     *
-     * @return int
-     */
-    public function getVersionInteger()
+    public function getVersionInteger(): int
     {
         return $this->versionInteger;
     }
 
-    /**
-     * Sets the versionInteger
-     *
-     * @param int $versionInteger
-     * @return void
-     */
-    public function setVersionInteger($versionInteger)
+    public function setVersionInteger(int $versionInteger): void
     {
         $this->versionInteger = $versionInteger;
     }
 
-    /**
-     * Returns the isUsed
-     *
-     * @return bool
-     */
-    public function getIsUsed()
+    public function getIsUsed(): bool
     {
         return $this->isUsed;
     }
 
-    /**
-     * Sets the isUsed
-     *
-     * @param bool $isUsed
-     * @return void
-     */
-    public function setIsUsed($isUsed)
+    public function setIsUsed(bool $isUsed): void
     {
         $this->isUsed = $isUsed;
     }
 
-    /**
-     * Returns the boolean state of isUsed
-     *
-     * @return bool
-     */
-    public function isIsUsed()
+    public function isIsUsed(): bool
     {
         return $this->isUsed;
     }
 
-    /**
-     * Returns the isOfficial
-     *
-     * @return bool
-     */
-    public function getIsOfficial()
+    public function getIsOfficial(): bool
     {
         return $this->isOfficial;
     }
 
-    /**
-     * Sets the isOfficial
-     *
-     * @param bool $isOfficial
-     * @return void
-     */
-    public function setIsOfficial($isOfficial)
+    public function setIsOfficial(bool $isOfficial): void
     {
         $this->isOfficial = $isOfficial;
     }
 
-    /**
-     * Returns the boolean state of isOfficial
-     *
-     * @return bool
-     */
-    public function isIsOfficial()
+    public function isIsOfficial(): bool
     {
         return $this->isOfficial;
     }
 
-    /**
-     * Returns the isModified
-     *
-     * @return bool
-     */
-    public function getIsModified()
+    public function getIsModified(): bool
     {
         return $this->isModified;
     }
 
-    /**
-     * Sets the isModified
-     *
-     * @param bool $isModified
-     * @return void
-     */
-    public function setIsModified($isModified)
+    public function setIsModified(bool $isModified): void
     {
         $this->isModified = $isModified;
     }
 
-    /**
-     * Returns the boolean state of isModified
-     *
-     * @return bool
-     */
-    public function isIsModified()
+    public function isIsModified(): bool
     {
         return $this->isModified;
     }
 
-    /**
-     * Returns the isLatest
-     *
-     * @return bool
-     */
-    public function getIsLatest()
+    public function getIsLatest(): bool
     {
         return $this->isLatest;
     }
 
-    /**
-     * Sets the isLatest
-     *
-     * @param bool $isLatest
-     * @return void
-     */
-    public function setIsLatest($isLatest)
+    public function setIsLatest(bool $isLatest): void
     {
         $this->isLatest = $isLatest;
     }
 
-    /**
-     * Returns the boolean state of isLatest
-     *
-     * @return bool
-     */
-    public function isIsLatest()
+    public function isIsLatest(): bool
     {
         return $this->isLatest;
     }
 
-    /**
-     * Returns the lastBugfixRelease
-     *
-     * @return string
-     */
-    public function getLastBugfixRelease()
+    public function getLastBugfixRelease(): string
     {
         return $this->lastBugfixRelease;
     }
 
-    /**
-     * Sets the lastBugfixRelease
-     *
-     * @param string $lastBugfixRelease
-     * @return void
-     */
-    public function setLastBugfixRelease($lastBugfixRelease)
+    public function setLastBugfixRelease(string $lastBugfixRelease): void
     {
         $this->lastBugfixRelease = $lastBugfixRelease;
     }
 
-    /**
-     * Returns the lastMinorRelease
-     *
-     * @return string
-     */
-    public function getLastMinorRelease()
+    public function getLastMinorRelease(): string
     {
         return $this->lastMinorRelease;
     }
 
-    /**
-     * Sets the lastMinorRelease
-     *
-     * @param string $lastMinorRelease
-     * @return void
-     */
-    public function setLastMinorRelease($lastMinorRelease)
+    public function setLastMinorRelease(string $lastMinorRelease): void
     {
         $this->lastMinorRelease = $lastMinorRelease;
     }
 
-    /**
-     * Returns the lastMajorRelease
-     *
-     * @return string
-     */
-    public function getLastMajorRelease()
+    public function getLastMajorRelease(): string
     {
         return $this->lastMajorRelease;
     }
 
-    /**
-     * Sets the lastMajorRelease
-     *
-     * @param string $lastMajorRelease
-     * @return void
-     */
-    public function setLastMajorRelease($lastMajorRelease)
+    public function setLastMajorRelease(string $lastMajorRelease): void
     {
         $this->lastMajorRelease = $lastMajorRelease;
     }
 
-    /**
-     * Returns the serializedDependencies
-     *
-     * @return string
-     */
-    public function getSerializedDependencies()
+    public function getSerializedDependencies(): string
     {
         return $this->serializedDependencies;
     }
 
-    /**
-     * Sets the serializedDependencies
-     *
-     * @param string $serializedDependencies
-     * @return void
-     */
-    public function setSerializedDependencies($serializedDependencies)
+    public function setSerializedDependencies(string $serializedDependencies): void
     {
         $this->serializedDependencies = $serializedDependencies;
     }
 
-    /**
-     * @return int
-     */
-    public function getTypo3MinVersion()
+    public function getTypo3MinVersion(): int
     {
         return $this->typo3MinVersion;
     }
 
-    /**
-     * @param int $typo3MinVersion
-     */
-    public function setTypo3MinVersion($typo3MinVersion)
+    public function setTypo3MinVersion(int $typo3MinVersion): void
     {
         $this->typo3MinVersion = $typo3MinVersion;
     }
 
-    /**
-     * @return int
-     */
-    public function getTypo3MaxVersion()
+    public function getTypo3MaxVersion(): int
     {
         return $this->typo3MaxVersion;
     }
 
-    /**
-     * @param int $typo3MaxVersion
-     */
-    public function setTypo3MaxVersion($typo3MaxVersion)
+    public function setTypo3MaxVersion(int $typo3MaxVersion): void
     {
         $this->typo3MaxVersion = $typo3MaxVersion;
     }
diff --git a/Classes/Domain/Model/Sla.php b/Classes/Domain/Model/Sla.php
index cc415d8..9821413 100644
--- a/Classes/Domain/Model/Sla.php
+++ b/Classes/Domain/Model/Sla.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model;
 
 /*
@@ -8,63 +11,31 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Extbase\Annotation\Validate;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Sla
- */
 class Sla extends AbstractEntity
 {
+    #[Validate(['validator' => 'NotEmpty'])]
+    protected string $title = '';
+    protected string $description = '';
 
-    /**
-     * @var string
-     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
-     */
-    protected $title = '';
-
-    /**
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * Returns the title
-     *
-     * @return string
-     */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * Sets the title
-     *
-     * @param string $title
-     * @return void
-     */
-    public function setTitle($title)
+    public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * Returns the description
-     *
-     * @return string
-     */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * Sets the description
-     *
-     * @param string $description
-     * @return void
-     */
-    public function setDescription($description)
+    public function setDescription(string $description): void
     {
         $this->description = $description;
     }
diff --git a/Classes/Domain/Model/Tag.php b/Classes/Domain/Model/Tag.php
index b31b1c5..f27decb 100644
--- a/Classes/Domain/Model/Tag.php
+++ b/Classes/Domain/Model/Tag.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Model;
 
 /*
@@ -8,63 +11,31 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Extbase\Annotation\Validate;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
-/**
- * Tag
- */
 class Tag extends AbstractEntity
 {
+    #[Validate(['validator' => 'NotEmpty'])]
+    protected string $title = '';
+    protected string $description = '';
 
-    /**
-     * @var string
-     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
-     */
-    protected $title = '';
-
-    /**
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * Returns the title
-     *
-     * @return string
-     */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * Sets the title
-     *
-     * @param string $title
-     * @return void
-     */
-    public function setTitle($title)
+    public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * Returns the description
-     *
-     * @return string
-     */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * Sets the description
-     *
-     * @param string $description
-     * @return void
-     */
-    public function setDescription($description)
+    public function setDescription(string $description): void
     {
         $this->description = $description;
     }
diff --git a/Classes/Domain/Repository/BaseRepository.php b/Classes/Domain/Repository/BaseRepository.php
index b73a4b1..a3c13d5 100644
--- a/Classes/Domain/Repository/BaseRepository.php
+++ b/Classes/Domain/Repository/BaseRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -8,49 +11,25 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Core\Database\Connection;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 
-/**
- * Base repository
- */
 class BaseRepository extends Repository
 {
-    /**
-     * @return Connection
-     * @throws \Doctrine\DBAL\DBALException
-     */
-    protected function getDatabaseConnection() : Connection
-    {
-        return GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionByName(ConnectionPool::DEFAULT_CONNECTION_NAME);
-    }
-
-    /**
-     * @return QueryResultInterface
-     */
-    public function findAll()
+    public function findAll(): QueryResultInterface
     {
         $query = $this->getQuery();
         return $query->execute();
     }
 
-    /**
-     * @return int
-     */
-    public function countAll()
+    public function countAll(): int
     {
         $query = $this->getQuery();
         return $query->execute()->count();
     }
 
-    /**
-     * @return QueryInterface
-     */
-    protected function getQuery()
+    protected function getQuery(): QueryInterface
     {
         $query = $this->createQuery();
         $query->getQuerySettings()->setRespectStoragePage(false);
diff --git a/Classes/Domain/Repository/ClientRepository.php b/Classes/Domain/Repository/ClientRepository.php
index 1b65d51..7621851 100644
--- a/Classes/Domain/Repository/ClientRepository.php
+++ b/Classes/Domain/Repository/ClientRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -8,51 +11,39 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use T3Monitor\T3monitoring\Domain\Model\Client;
 use T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
-/**
- * The repository for Clients
- */
 class ClientRepository extends BaseRepository
 {
-
-    /** @var array */
-    protected $searchFields = ['title', 'domain'];
+    protected array $searchFields = ['title', 'domain'];
 
     /** @var array */
     protected $defaultOrderings = ['title' => QueryInterface::ORDER_ASCENDING];
 
-    /**
-     * @param ClientFilterDemand $demand
-     * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
-     */
-    public function findByDemand(ClientFilterDemand $demand)
+    public function findByDemand(ClientFilterDemand $demand): QueryResultInterface|array
     {
         $query = $this->getQuery();
         $constraints = $this->getConstraints($demand, $query);
 
         if (!empty($constraints)) {
             $query->matching(
-                $query->logicalAnd($constraints)
+                $query->logicalAnd(...$constraints)
             );
         }
 
         return $query->execute();
     }
 
-    /**
-     * @param ClientFilterDemand $demand
-     * @return int
-     */
-    public function countByDemand(ClientFilterDemand $demand)
+    public function countByDemand(ClientFilterDemand $demand): int
     {
         $query = $this->getQuery();
         $constraints = $this->getConstraints($demand, $query);
         if (!empty($constraints)) {
             $query->matching(
-                $query->logicalAnd($constraints)
+                $query->logicalAnd(...$constraints)
             );
         }
         return $query->execute()->count();
@@ -60,19 +51,17 @@ public function countByDemand(ClientFilterDemand $demand)
 
     /**
      * @param bool $emailAddressRequired
-     * @return \T3Monitor\T3monitoring\Domain\Model\Client[]
+     * @return Client[]
      */
-    public function getAllForReport($emailAddressRequired = false)
+    public function getAllForReport(bool $emailAddressRequired = false): array
     {
         $query = $this->getQuery();
-        $demand = $this->getFilterDemand();
+        $demand = new ClientFilterDemand();
         $demand->setWithInsecureCore(true);
         $demand->setWithInsecureExtensions(true);
         $demand->setWithExtraDanger(true);
 
-        $constraints[] = $query->logicalOr(
-            $this->getConstraints($demand, $query)
-        );
+        $constraints[] = $query->logicalOr(...$this->getConstraints($demand, $query));
 
         if ($emailAddressRequired) {
             $constraints[] = $query->logicalNot(
@@ -81,17 +70,13 @@ public function getAllForReport($emailAddressRequired = false)
         }
 
         $query->matching(
-            $query->logicalAnd($constraints)
+            $query->logicalAnd(...$constraints)
         );
 
         return $query->execute();
     }
 
-    /**
-     * @param ClientFilterDemand $demand
-     * @param QueryInterface $query
-     */
-    protected function getConstraints(ClientFilterDemand $demand, QueryInterface $query)
+    protected function getConstraints(ClientFilterDemand $demand, QueryInterface $query): array
     {
         $constraints = [];
 
@@ -112,7 +97,7 @@ protected function getConstraints(ClientFilterDemand $demand, QueryInterface $qu
                 $searchConstraints[] = $query->like($field, '%' . $demand->getSearchWord() . '%');
             }
             if (count($searchConstraints)) {
-                $constraints[] = $query->logicalOr($searchConstraints);
+                $constraints[] = $query->logicalOr(...$searchConstraints);
             }
         }
 
@@ -148,10 +133,10 @@ protected function getConstraints(ClientFilterDemand $demand, QueryInterface $qu
 
         // outdated core
         if ($demand->isWithOutdatedCore()) {
-            $constraints[] = $query->logicalOr([
+            $constraints[] = $query->logicalOr(
                 $query->equals('core.isLatest', 0),
                 $query->equals('core.isActive', 0)
-            ]);
+            );
         }
 
         // extra info
@@ -171,12 +156,4 @@ protected function getConstraints(ClientFilterDemand $demand, QueryInterface $qu
 
         return $constraints;
     }
-
-    /**
-     * @return ClientFilterDemand
-     */
-    protected function getFilterDemand()
-    {
-        return GeneralUtility::makeInstance(ClientFilterDemand::class);
-    }
 }
diff --git a/Classes/Domain/Repository/CoreRepository.php b/Classes/Domain/Repository/CoreRepository.php
index 40685c9..20c9cf7 100644
--- a/Classes/Domain/Repository/CoreRepository.php
+++ b/Classes/Domain/Repository/CoreRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -8,72 +11,47 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use T3Monitor\T3monitoring\Domain\Model\Core;
 use T3Monitor\T3monitoring\Domain\Model\Dto\CoreFilterDemand;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
-/**
- * The repository for Cores
- */
 class CoreRepository extends BaseRepository
 {
     const USED_ALL = 0;
     const USED_ONLY = 1;
 
-    /**
-     * Initialize object
-     */
-    public function initializeObject()
+    public function initializeObject(): void
     {
         $this->setDefaultOrderings(['versionInteger' => QueryInterface::ORDER_DESCENDING]);
     }
 
-    /**
-     * @param CoreFilterDemand $demand
-     * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
-     */
-    public function findByDemand(CoreFilterDemand $demand)
+    public function findByDemand(CoreFilterDemand $demand): QueryResultInterface|array
     {
         $query = $this->getQuery();
-
-        $constraints = [];
-
-        // used
-        $constraints[] = $query->equals('isUsed', $demand->getUsage());
-
-        if (!empty($constraints)) {
-            $query->matching(
-                $query->logicalAnd($constraints)
-            );
-        }
+        $query->matching(
+            $query->equals('isUsed', $demand->getUsage())
+        );
 
         return $query->execute();
     }
 
-    /**
-     * @param int $mode
-     * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
-     */
-    public function findAllCoreVersions($mode = self::USED_ONLY)
+    public function findAllCoreVersions(int $mode = self::USED_ONLY): QueryResultInterface|array
     {
         $query = $this->getQuery();
         if ($mode > 0) {
-            $query->matching($query->logicalAnd(
+            $query->matching(
                 $query->equals('isUsed', ($mode === self::USED_ONLY ? 1 : 0))
-            ));
+            );
         }
         return $query->execute();
     }
 
-    /**
-     * @param string $version
-     * @return \T3Monitor\T3monitoring\Domain\Model\Core
-     */
-    public function findByVersionAsInteger($version)
+    public function findByVersionAsInteger(string $version): Core
     {
         $query = $this->getQuery();
         return $query->matching(
-            $query->logicalAnd(
-                $query->equals('versionInteger', $version)
-            ))->execute()->getFirst();
+            $query->equals('versionInteger', $version)
+        )->execute()->getFirst();
     }
 }
diff --git a/Classes/Domain/Repository/ExtensionRepository.php b/Classes/Domain/Repository/ExtensionRepository.php
index 782b772..6f607c8 100644
--- a/Classes/Domain/Repository/ExtensionRepository.php
+++ b/Classes/Domain/Repository/ExtensionRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -11,45 +13,30 @@
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\ExtensionFilterDemand;
 use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
-/**
- * The repository for Extensions
- */
 class ExtensionRepository extends BaseRepository
 {
-
-    /**
-     * Initialize object
-     */
-    public function initializeObject()
+    public function initializeObject(): void
     {
         $this->setDefaultOrderings(['name' => QueryInterface::ORDER_ASCENDING]);
     }
 
-    /**
-     * @param string $name
-     * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
-     */
-    public function findAllVersionsByName($name)
+    public function findAllVersionsByName(string $name): QueryResultInterface|array
     {
         $query = $this->getQuery();
         $query->setOrderings(['versionInteger' => QueryInterface::ORDER_DESCENDING]);
         $query->matching(
-            $query->logicalAnd($query->equals('name', $name))
+            $query->equals('name', $name)
         );
 
         return $query->execute();
     }
 
-    /**
-     * @param ExtensionFilterDemand $demand
-     * @return array
-     */
-    public function findByDemand(ExtensionFilterDemand $demand)
+    public function findByDemand(ExtensionFilterDemand $demand): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_t3monitoring_domain_model_extension');
         $expressionBuilder = $queryBuilder->expr();
@@ -64,10 +51,10 @@ public function findByDemand(ExtensionFilterDemand $demand)
             ->orderBy('ext.name', 'ASC')
             ->orderBy('ext.version_integer', 'DESC')
             ->orderBy('client.title', 'ASC');
-        $this->extendWhereClause($demand, $queryBuilder, $expressionBuilder);
+        $this->extendWhereClause($demand, $queryBuilder);
 
         $result = [];
-        foreach ($queryBuilder->execute()->fetchAll() as $row) {
+        while ($row = $queryBuilder->executeQuery()->fetchAssociative()) {
             $result[$row['name']][$row['version']]['insecure'] = $row['insecure'];
             $result[$row['name']][$row['version']]['clients'][] = $row;
         }
@@ -75,19 +62,17 @@ public function findByDemand(ExtensionFilterDemand $demand)
         return $result;
     }
 
-    /**
-     * @param ExtensionFilterDemand $demand
-     * @param QueryBuilder          $queryBuilder
-     * @param ExpressionBuilder     $expressionBuilder
-     */
-    protected function extendWhereClause(ExtensionFilterDemand $demand, QueryBuilder &$queryBuilder, ExpressionBuilder $expressionBuilder)
+    protected function extendWhereClause(ExtensionFilterDemand $demand, QueryBuilder $qb): void
     {
-        if ($demand->getName()) {
-            if ($demand->isExactSearch()) {
-                $queryBuilder->andWhere($expressionBuilder->eq('ext.name', $queryBuilder->createNamedParameter($demand->getName())));
-            } else {
-                $queryBuilder->andWhere($expressionBuilder->like('ext.name', $queryBuilder->createNamedParameter('%' . $demand->getName() . '%')));
-            }
+        if (!$demand->getName()) {
+            return;
+        }
+        if ($demand->isExactSearch()) {
+            $condition = $qb->expr()->eq('ext.name', $qb->createNamedParameter($demand->getName()));
+        } else {
+            $condition = $qb->expr()->like('ext.name',
+                $qb->createNamedParameter('%' . $qb->escapeLikeWildcards($demand->getName()) . '%'));
         }
+        $qb->andWhere($condition);
     }
 }
diff --git a/Classes/Domain/Repository/SlaRepository.php b/Classes/Domain/Repository/SlaRepository.php
index 6dfcb43..bbe62f0 100644
--- a/Classes/Domain/Repository/SlaRepository.php
+++ b/Classes/Domain/Repository/SlaRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -10,16 +13,9 @@
 
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-/**
- * The repository for Slas
- */
 class SlaRepository extends BaseRepository
 {
-
-    /**
-     * Initialize object
-     */
-    public function initializeObject()
+    public function initializeObject(): void
     {
         $this->setDefaultOrderings(['sorting' => QueryInterface::ORDER_ASCENDING]);
     }
diff --git a/Classes/Domain/Repository/StatisticRepository.php b/Classes/Domain/Repository/StatisticRepository.php
index d7cf730..fee1eab 100644
--- a/Classes/Domain/Repository/StatisticRepository.php
+++ b/Classes/Domain/Repository/StatisticRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -9,18 +11,12 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * The repository for statistics
- */
 class StatisticRepository extends BaseRepository
 {
-
-    /**
-     * @return array
-     */
     public function getUsedCoreVersionCount(): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -32,7 +28,7 @@ public function getUsedCoreVersionCount(): array
             ,tx_t3monitoring_domain_model_core.is_stable,tx_t3monitoring_domain_model_core.is_active,tx_t3monitoring_domain_model_core.is_latest')
             ->from('tx_t3monitoring_domain_model_core')
             ->where(
-                $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
+                $queryBuilder->expr()->eq('hidden', $queryBuilder->createNamedParameter(0, Connection::PARAM_INT))
             )
             ->leftJoin(
                 'tx_t3monitoring_domain_model_core',
@@ -42,12 +38,9 @@ public function getUsedCoreVersionCount(): array
             )
             ->orderBy('tx_t3monitoring_domain_model_core.version_integer')
             ->groupBy('tx_t3monitoring_domain_model_core.version', 'version_integer', 'insecure', 'is_stable', 'is_latest', 'is_active')
-            ->execute()->fetchAll();
+            ->executeQuery()->fetchAllAssociative();
     }
 
-    /**
-     * @return string
-     */
     public function getUsedCoreVersionCountJson(): string
     {
         $data = $this->getUsedCoreVersionCount();
diff --git a/Classes/Domain/Repository/TagRepository.php b/Classes/Domain/Repository/TagRepository.php
index 1b043e5..9c38a76 100644
--- a/Classes/Domain/Repository/TagRepository.php
+++ b/Classes/Domain/Repository/TagRepository.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\Repository;
 
 /*
@@ -10,16 +13,9 @@
 
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-/**
- * The repository for Tags
- */
 class TagRepository extends BaseRepository
 {
-
-    /**
-     * Initialize object
-     */
-    public function initializeObject()
+    public function initializeObject(): void
     {
         $this->setDefaultOrderings(['sorting' => QueryInterface::ORDER_ASCENDING]);
     }
diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
index 4dc8588..d27b442 100644
--- a/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
+++ b/Classes/Domain/TypeConverter/ClientFilterDemandConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Domain\TypeConverter;
 
 /*
@@ -10,13 +12,11 @@
  */
 
 use T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand;
+use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface;
 use TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter;
 
-/**
- * Class ClientFilterDemandConverter
- */
 class ClientFilterDemandConverter extends AbstractTypeConverter
 {
     /**
@@ -40,7 +40,7 @@ class ClientFilterDemandConverter extends AbstractTypeConverter
      * @param mixed $source
      * @param string $targetType
      * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
+     * @param PropertyMappingConfigurationInterface|null $configuration
      * @return float|\TYPO3\CMS\Extbase\Error\Error
      * @api
      */
@@ -50,11 +50,10 @@ public function convertFrom(
         array $convertedChildProperties = [],
         PropertyMappingConfigurationInterface $configuration = null
     ) {
-        if (!$this->isAllowed()) {
+        $properties = $this->getProperties();
+        if (!$properties) {
             return null;
         }
-        $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
-        $properties = $vars['filter'];
 
         $object = GeneralUtility::makeInstance($this->targetType);
         foreach ($properties as $key => $value) {
@@ -68,15 +67,14 @@ public function convertFrom(
 
     public function canConvertFrom($source, string $targetType): bool
     {
-        return $this->isAllowed();
+        return $this->getProperties() !== [];
     }
 
-    /**
-     * @return bool
-     */
-    protected function isAllowed()
+    protected function getProperties(): array
     {
-        $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
-        return isset($vars['filter']) && is_array($vars['filter']);
+        /** @var ServerRequest $request */
+        $request = $GLOBALS['TYPO3_REQUEST'];
+        $vars = $request->getQueryParams()['tx_t3monitoring_tools_t3monitoringt3monitor'] ?? [];
+        return is_array($vars['filter'] ?? false) ? $vars['filter'] : [];
     }
 }
diff --git a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php b/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
deleted file mode 100644
index 7a3e61e..0000000
--- a/Classes/Domain/TypeConverter/ClientFilterDemandConverterV9.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace T3Monitor\T3monitoring\Domain\TypeConverter;
-
-/*
- * This file is part of the t3monitoring extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-use T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface;
-use TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter;
-
-/**
- * Class ClientFilterDemandConverter
- */
-class ClientFilterDemandConverterV9 extends AbstractTypeConverter
-{
-    /**
-     * @var array<string>
-     */
-    protected $sourceTypes = ['array', 'string'];
-
-    /**
-     * @var string
-     */
-    protected $targetType = ClientFilterDemand::class;
-
-    /**
-     * @var int
-     */
-    protected $priority = 10;
-
-    /**
-     * Actually convert from $source to $targetType, by doing a typecast.
-     *
-     * @param mixed $source
-     * @param string $targetType
-     * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
-     * @return float|\TYPO3\CMS\Extbase\Error\Error
-     * @api
-     */
-    public function convertFrom(
-        $source,
-        $targetType,
-        array $convertedChildProperties = [],
-        PropertyMappingConfigurationInterface $configuration = null
-    ) {
-        if (!$this->isAllowed()) {
-            return null;
-        }
-        $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
-        $properties = $vars['filter'];
-
-        $object = GeneralUtility::makeInstance($this->targetType);
-        foreach ($properties as $key => $value) {
-            if (property_exists($object, $key)) {
-                $setter = 'set' . ucfirst($key);
-                $object->$setter($value);
-            }
-        }
-        return $object;
-    }
-
-    /**
-     * @param mixed $source
-     * @param string $targetType
-     * @return bool
-     */
-    public function canConvertFrom($source, $targetType): bool
-    {
-        return $this->isAllowed();
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isAllowed()
-    {
-        $vars = GeneralUtility::_GET('tx_t3monitoring_tools_t3monitoringt3monitor');
-        return isset($vars) && is_array($vars['filter']);
-    }
-}
diff --git a/Classes/Event/ImportClientDataEvent.php b/Classes/Event/ImportClientDataEvent.php
index 83a65e0..bfe047e 100644
--- a/Classes/Event/ImportClientDataEvent.php
+++ b/Classes/Event/ImportClientDataEvent.php
@@ -6,16 +6,11 @@
 
 final class ImportClientDataEvent
 {
-    private array $json;
-    private array $row;
-    private array $update;
-
-    public function __construct(array $json, array $row, array $update)
-    {
-        $this->json = $json;
-        $this->row = $row;
-        $this->update = $update;
-    }
+    public function __construct(
+        private readonly array $json,
+        private readonly array $row,
+        private array $update
+    ) {}
 
     public function getJson(): array
     {
diff --git a/Classes/Hooks/DataHandlerHook.php b/Classes/Hooks/DataHandlerHook.php
index 69e8063..49f54ce 100644
--- a/Classes/Hooks/DataHandlerHook.php
+++ b/Classes/Hooks/DataHandlerHook.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Hooks;
 
 /*
@@ -11,37 +14,28 @@
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Class DataHandlerHook
- */
 class DataHandlerHook
 {
-
-    /**
-     * @param string $status
-     * @param string $table
-     * @param string $recordUid
-     * @param array $fields
-     * @param DataHandler $parentObject
-     * @throws \InvalidArgumentException
-     */
     public function processDatamap_afterDatabaseOperations(
-        $status,
-        $table,
-        $recordUid,
+        string $status,
+        string $table,
+        string|int $recordUid,
         array $fields,
         DataHandler $parentObject
-    ) {
+    ): void {
         if ($table === 'tx_t3monitoring_domain_model_client') {
             if (is_string($recordUid) && str_starts_with($recordUid, 'NEW')) {
                 $recordUid = $parentObject->substNEWwithIDs[$recordUid];
             }
 
-            $clientRow = BackendUtility::getRecord($table, (int)$recordUid);
+            $recordUid = (int)$recordUid;
+            $clientRow = BackendUtility::getRecord($table, $recordUid);
             if ($clientRow && $clientRow['exclude_from_import'] !== 1) {
                 $this->checkDomain($clientRow['domain']);
                 $this->importClient($recordUid);
@@ -53,50 +47,36 @@ public function processDatamap_afterDatabaseOperations(
      * @todo implement
      * @param string $domain
      */
-    protected function checkDomain($domain)
+    protected function checkDomain(string $domain): void
     {
         return;
         $message = sprintf(
             $this->getLanguageService()->sL('LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:client.domainNotPingAble'),
             $domain
         );
-        $this->addFlashMessage($message, FlashMessage::WARNING);
+        $this->addFlashMessage($message, AbstractMessage::WARNING);
     }
 
-    /**
-     * @param int $recordUid
-     */
-    protected function importClient($recordUid)
+    protected function importClient(int $recordUid): void
     {
         /** @var ClientImport $clientImport */
         $clientImport = GeneralUtility::makeInstance(ClientImport::class);
         $clientImport->run($recordUid);
     }
 
-    /**
-     * @param string $message
-     * @param int $severity
-     * @throws \InvalidArgumentException
-     */
-    protected function addFlashMessage($message, $severity = FlashMessage::INFO)
+    protected function addFlashMessage(string $message, int $severity = AbstractMessage::INFO): void
     {
-        /** @var FlashMessage $flashMessage */
         $flashMessage = GeneralUtility::makeInstance(
             FlashMessage::class,
             $message,
             '',
-            $severity);
-        /** @var $flashMessageService FlashMessageService */
+            $severity
+        );
         $flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
         $flashMessageService->getMessageQueueByIdentifier()->addMessage($flashMessage);
     }
 
-    /**
-     * Returns LanguageService
-     *
-     * @return \TYPO3\CMS\Core\Localization\LanguageService
-     */
-    protected function getLanguageService()
+    protected function getLanguageService(): LanguageService
     {
         return $GLOBALS['LANG'];
     }
diff --git a/Classes/Notification/EmailNotification.php b/Classes/Notification/EmailNotification.php
index 47097c0..c5ad589 100644
--- a/Classes/Notification/EmailNotification.php
+++ b/Classes/Notification/EmailNotification.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Notification;
 
 /*
@@ -17,9 +20,6 @@
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use UnexpectedValueException;
 
-/**
- * Class EmailNotification
- */
 class EmailNotification implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
@@ -29,11 +29,11 @@ class EmailNotification implements LoggerAwareInterface
 
     /**
      * @param string $email
-     * @param \T3Monitor\T3monitoring\Domain\Model\Client[] $clients
+     * @param Client[] $clients
      * @param string $subject
      * @throws UnexpectedValueException
      */
-    public function sendAdminEmail($email, $clients, $subject = 'Monitoring Report')
+    public function sendAdminEmail(string $email, array $clients, string $subject = 'Monitoring Report'): void
     {
         if (!GeneralUtility::validEmail($email)) {
             throw new UnexpectedValueException('The email address is not valid');
@@ -52,13 +52,12 @@ public function sendAdminEmail($email, $clients, $subject = 'Monitoring Report')
     }
 
     /**
-     * @param \T3Monitor\T3monitoring\Domain\Model\Client[] $clients
+     * @param Client[] $clients
      * @param string $subject
      */
-    public function sendClientEmail($clients, $subject = 'Monitoring Report')
+    public function sendClientEmail(array $clients, string $subject = 'Monitoring Report'): void
     {
         foreach ($clients as $client) {
-            /** @var Client $client */
             if (!GeneralUtility::validEmail($client->getEmail())) {
                 continue;
             }
@@ -70,7 +69,7 @@ public function sendClientEmail($clients, $subject = 'Monitoring Report')
         }
     }
 
-    public function sendClientFailedEmail(array $clients, string $emailAddress, $subject = 'Monitoring Client Connection Failure')
+    public function sendClientFailedEmail(array $clients, string $emailAddress, $subject = 'Monitoring Client Connection Failure'): void
     {
         if (empty($emailAddress)) {
             return;
@@ -86,14 +85,7 @@ public function sendClientFailedEmail(array $clients, string $emailAddress, $sub
         $this->sendMail($emailAddress, $subject, $template);
     }
 
-    /**
-     * @param string $to
-     * @param string $subject
-     * @param string $plainContent
-     * @param string $htmlContent
-     * @return int
-     */
-    protected function sendMail(string $to, string $subject, string $plainContent, string $htmlContent = '')
+    protected function sendMail(string $to, string $subject, string $plainContent, string $htmlContent = ''): bool
     {
         /** @var MailMessage $mailMessage */
         $mailMessage = GeneralUtility::makeInstance(MailMessage::class);
@@ -117,7 +109,7 @@ protected function sendMail(string $to, string $subject, string $plainContent, s
      * @param string $format
      * @return string
      */
-    protected function getFluidTemplate(array $arguments, $file, $format = 'html')
+    protected function getFluidTemplate(array $arguments, string $file, string $format = 'html'): string
     {
         /** @var StandaloneView $renderer */
         $renderer = GeneralUtility::makeInstance(StandaloneView::class);
@@ -136,7 +128,7 @@ protected function getFluidTemplate(array $arguments, $file, $format = 'html')
      *
      * @return string
      */
-    protected function getSenderEmailName()
+    protected function getSenderEmailName(): string
     {
         return !empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'])
             ? $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName']
@@ -150,7 +142,7 @@ protected function getSenderEmailName()
      *
      * @return string
      */
-    protected function getSenderEmailAddress()
+    protected function getSenderEmailAddress(): string
     {
         return !empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])
             ? $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress']
diff --git a/Classes/Service/BulletinImport.php b/Classes/Service/BulletinImport.php
index 428f953..d5d218b 100644
--- a/Classes/Service/BulletinImport.php
+++ b/Classes/Service/BulletinImport.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Service;
 
 /*
@@ -11,31 +14,11 @@
 use TYPO3\CMS\Core\Http\RequestFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Class BulletinImport
- */
 class BulletinImport
 {
-    /** @var string */
-    protected $url;
-
-    /** @var int */
-    protected $limit;
-
-    /**
-     * @param string $url
-     * @param int $limit
-     */
-    public function __construct($url, $limit = 10)
-    {
-        $this->url = $url;
-        $this->limit = $limit;
-    }
+    public function __construct(protected string $url, protected int $limit = 10) {}
 
-    /**
-     * @return array
-     */
-    public function start()
+    public function start(): array
     {
         $feed = [];
         try {
@@ -56,7 +39,7 @@ public function start()
                     ];
                 }
             }
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             // do nothing
         }
 
diff --git a/Classes/Service/DataIntegrity.php b/Classes/Service/DataIntegrity.php
index 1bf4703..ecf8fac 100644
--- a/Classes/Service/DataIntegrity.php
+++ b/Classes/Service/DataIntegrity.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace T3Monitor\T3monitoring\Service;
 
@@ -9,19 +10,17 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Class DataIntegrity
- */
 class DataIntegrity
 {
 
     /**
      * Invoke after core import
      */
-    public function invokeAfterCoreImport()
+    public function invokeAfterCoreImport(): void
     {
         $this->usedCore();
     }
@@ -29,7 +28,7 @@ public function invokeAfterCoreImport()
     /**
      * Invoke after client import
      */
-    public function invokeAfterClientImport()
+    public function invokeAfterClientImport(): void
     {
         $this->usedCore();
         $this->usedExtensions();
@@ -38,7 +37,7 @@ public function invokeAfterClientImport()
     /**
      * Invoke after extension import
      */
-    public function invokeAfterExtensionImport()
+    public function invokeAfterExtensionImport(): void
     {
         $this->getLatestExtensionVersion();
         $this->getNextSecureExtensionVersion();
@@ -48,7 +47,7 @@ public function invokeAfterExtensionImport()
     /**
      * Get latest extension version
      */
-    protected function getLatestExtensionVersion()
+    protected function getLatestExtensionVersion(): void
     {
         $table = 'tx_t3monitoring_domain_model_extension';
 
@@ -61,28 +60,28 @@ protected function getLatestExtensionVersion()
             ->select('name', 'major_version', 'minor_version')
             ->from($table)
             ->where(
-                $eb->eq('insecure', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                $eb->gt('version_integer', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                $eb->eq('is_official', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT))
+                $eb->eq('insecure', $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)),
+                $eb->gt('version_integer', $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)),
+                $eb->eq('is_official', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT))
             )
             ->groupBy('name', 'major_version', 'minor_version')
-            ->execute();
+            ->executeQuery();
 
         $queryBuilder2 = $connection->createQueryBuilder();
         $eb2 = $queryBuilder2->expr();
-        while ($row = $res->fetch()) {
+        while ($row = $res->fetchAssociative()) {
             $highestBugFixRelease = $queryBuilder2
                 ->select('version')
                 ->from($table)
                 ->where(
                     $eb2->eq('name', $queryBuilder2->createNamedParameter($row['name'])),
-                    $eb2->eq('major_version', $queryBuilder2->createNamedParameter($row['major_version'], \PDO::PARAM_INT)),
-                    $eb2->eq('minor_version', $queryBuilder2->createNamedParameter($row['minor_version'], \PDO::PARAM_INT))
+                    $eb2->eq('major_version', $queryBuilder2->createNamedParameter($row['major_version'], Connection::PARAM_INT)),
+                    $eb2->eq('minor_version', $queryBuilder2->createNamedParameter($row['minor_version'], Connection::PARAM_INT))
                 )
                 ->orderBy('version_integer', 'desc')
                 ->setMaxResults(1)
-                ->execute()
-                ->fetch();
+                ->executeQuery()
+                ->fetchAssociative();
 
             if (is_array($highestBugFixRelease)) {
                 $connection = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -104,26 +103,26 @@ protected function getLatestExtensionVersion()
             ->select('name', 'major_version')
             ->from($table)
             ->where(
-                $queryBuilder->expr()->eq('insecure', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                $queryBuilder->expr()->gt('version_integer', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-                $queryBuilder->expr()->eq('is_official', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT))
+                $queryBuilder->expr()->eq('insecure', $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)),
+                $queryBuilder->expr()->gt('version_integer', $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)),
+                $queryBuilder->expr()->eq('is_official', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT))
             )
             ->groupBy('name', 'major_version')
-            ->execute();
+            ->executeQuery();
 
         $queryBuilder2 = $connection->createQueryBuilder();
-        while ($row = $res->fetch()) {
+        while ($row = $res->fetchAssociative()) {
             $highestBugFixRelease = $queryBuilder2
                 ->select('version')
                 ->from($table)
                 ->where(
                     $queryBuilder->expr()->eq('name', $queryBuilder2->createNamedParameter($row['name'])),
-                    $queryBuilder->expr()->eq('major_version', $queryBuilder2->createNamedParameter($row['major_version'], \PDO::PARAM_INT))
+                    $queryBuilder->expr()->eq('major_version', $queryBuilder2->createNamedParameter($row['major_version'], Connection::PARAM_INT))
                 )
                 ->orderBy('version_integer', 'desc')
                 ->setMaxResults(1)
-                ->execute()
-                ->fetch();
+                ->executeQuery()
+                ->fetchAssociative();
 
             if (is_array($highestBugFixRelease)) {
                 $connection->update(
@@ -144,14 +143,14 @@ protected function getLatestExtensionVersion()
             ->leftJoin('a', $table, 'b', 'a.name = b.name AND a.version_integer < b.version_integer')
             ->where($queryBuilder->expr()->isNull('b.name'))
             ->orderBy('a.uid')
-            ->execute();
+            ->executeQuery();
 
         $queryBuilder = $connection->createQueryBuilder();
-        while ($row = $queryResult->fetch()) {
+        while ($row = $queryResult->fetchAssociative()) {
             $queryBuilder->update($table)
                 ->set('last_major_release', $row['version'])
                 ->where($queryBuilder->expr()->eq('name', $queryBuilder->createNamedParameter($row['name'])))
-                ->execute();
+                ->executeStatement();
         }
 
         // set is_latest = 0 for extension versions that are not last_major_release
@@ -159,19 +158,19 @@ protected function getLatestExtensionVersion()
         $queryBuilder->update($table)
             ->set('is_latest', 0)
             ->where('version != last_major_release')
-            ->execute();
+            ->executeStatement();
 
         $queryBuilder = $connection->createQueryBuilder();
         $queryBuilder->update($table)
             ->set('is_latest', 1)
             ->where('version=last_major_release')
-            ->execute();
+            ->executeStatement();
     }
 
     /**
      * Get next secure extension version
      */
-    protected function getNextSecureExtensionVersion()
+    protected function getNextSecureExtensionVersion(): void
     {
         $table = 'tx_t3monitoring_domain_model_extension';
 
@@ -179,9 +178,9 @@ protected function getNextSecureExtensionVersion()
         $insecureExtensions = $queryBuilder
             ->select('uid', 'name', 'version_integer')
             ->from($table)
-            ->where($queryBuilder->expr()->eq('insecure', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT)))
-            ->execute()
-            ->fetchAll();
+            ->where($queryBuilder->expr()->eq('insecure', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)))
+            ->executeQuery()
+            ->fetchAllAssociative();
 
         foreach ($insecureExtensions as $row) {
             $queryBuilder2 = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -190,13 +189,13 @@ protected function getNextSecureExtensionVersion()
                 ->select('uid', 'version')
                 ->from($table)
                 ->where(
-                    $queryBuilder->expr()->eq('insecure', $queryBuilder2->createNamedParameter(0, \PDO::PARAM_INT)),
+                    $queryBuilder->expr()->eq('insecure', $queryBuilder2->createNamedParameter(0, Connection::PARAM_INT)),
                     $queryBuilder->expr()->eq('name', $queryBuilder2->createNamedParameter($row['name'])),
-                    $queryBuilder->expr()->gt('version_integer', $queryBuilder2->createNamedParameter($row['version_integer'], \PDO::PARAM_INT))
+                    $queryBuilder->expr()->gt('version_integer', $queryBuilder2->createNamedParameter($row['version_integer'], Connection::PARAM_INT))
                 )
                 ->setMaxResults(1)
-                ->execute()
-                ->fetch();
+                ->executeQuery()
+                ->fetchAssociative();
 
             if (is_array($nextSecureVersion)) {
                 $connection = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -209,7 +208,7 @@ protected function getNextSecureExtensionVersion()
     /**
      * Used core
      */
-    protected function usedCore()
+    protected function usedCore(): void
     {
         $table = 'tx_t3monitoring_domain_model_core';
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
@@ -222,8 +221,8 @@ protected function usedCore()
                 'tx_t3monitoring_domain_model_client',
                 $queryBuilder->expr()->eq('tx_t3monitoring_domain_model_core.uid', $queryBuilder->quoteIdentifier('tx_t3monitoring_domain_model_client.core'))
             )
-            ->execute()
-            ->fetchAll();
+            ->executeQuery()
+            ->fetchAllAssociative();
         $coreRows = [];
         foreach ($rows as $row) {
             $coreRows[$row['uid']] = $row;
@@ -233,11 +232,11 @@ protected function usedCore()
         $qb = $connection->createQueryBuilder();
         $qb->update($table)
             ->set('is_used', 0)
-            ->execute();
+            ->executeStatement();
         if (!empty($coreRows)) {
             foreach ($coreRows as $id => $row) {
                 $qb->where('uid = ' . $id);
-                $qb->set('is_used', 1)->execute();
+                $qb->set('is_used', 1)->executeStatement();
             }
         }
     }
@@ -245,7 +244,7 @@ protected function usedCore()
     /**
      * Used extensions
      */
-    protected function usedExtensions()
+    protected function usedExtensions(): void
     {
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_t3monitoring_domain_model_client');
@@ -253,8 +252,8 @@ protected function usedExtensions()
         $clients = $queryBuilder
             ->select('uid')
             ->from('tx_t3monitoring_domain_model_client')
-            ->execute()
-            ->fetchAll();
+            ->executeQuery()
+            ->fetchAllAssociative();
 
         foreach ($clients as $client) {
             $queryBuilder = $connection->createQueryBuilder();
@@ -268,10 +267,10 @@ protected function usedExtensions()
                     $queryBuilder->expr()->eq('tx_t3monitoring_client_extension_mm.uid_foreign', $queryBuilder->quoteIdentifier('tx_t3monitoring_domain_model_extension.uid'))
                 )
                 ->where(
-                    $queryBuilder->expr()->eq('is_official', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->eq('insecure', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT)),
-                    $queryBuilder->expr()->eq('tx_t3monitoring_client_extension_mm.uid_local', $queryBuilder->createNamedParameter($client['uid'], \PDO::PARAM_INT))
-                )->execute()->fetchColumn(0);
+                    $queryBuilder->expr()->eq('is_official', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)),
+                    $queryBuilder->expr()->eq('insecure', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)),
+                    $queryBuilder->expr()->eq('tx_t3monitoring_client_extension_mm.uid_local', $queryBuilder->createNamedParameter($client['uid'], Connection::PARAM_INT))
+                )->executeQuery()->fetchFirstColumn();
 
             // count outdated extensions
             $queryBuilder2 = $connection->createQueryBuilder();
@@ -285,11 +284,11 @@ protected function usedExtensions()
                     $queryBuilder2->expr()->eq('tx_t3monitoring_client_extension_mm.uid_foreign', $queryBuilder2->quoteIdentifier('tx_t3monitoring_domain_model_extension.uid'))
                 )
                 ->where(
-                    $queryBuilder2->expr()->eq('is_official', $queryBuilder2->createNamedParameter(1, \PDO::PARAM_INT)),
-                    $queryBuilder2->expr()->eq('insecure', $queryBuilder2->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder2->expr()->eq('is_latest', $queryBuilder2->createNamedParameter(0, \PDO::PARAM_INT)),
-                    $queryBuilder2->expr()->eq('tx_t3monitoring_client_extension_mm.uid_local', $queryBuilder2->createNamedParameter($client['uid'], \PDO::PARAM_INT))
-                )->execute()->fetchColumn(0);
+                    $queryBuilder2->expr()->eq('is_official', $queryBuilder2->createNamedParameter(1, Connection::PARAM_INT)),
+                    $queryBuilder2->expr()->eq('insecure', $queryBuilder2->createNamedParameter(0, Connection::PARAM_INT)),
+                    $queryBuilder2->expr()->eq('is_latest', $queryBuilder2->createNamedParameter(0, Connection::PARAM_INT)),
+                    $queryBuilder2->expr()->eq('tx_t3monitoring_client_extension_mm.uid_local', $queryBuilder2->createNamedParameter($client['uid'], Connection::PARAM_INT))
+                )->executeQuery()->fetchFirstColumn();
 
             // update client
             $connection->update(
diff --git a/Classes/Service/Import/BaseImport.php b/Classes/Service/Import/BaseImport.php
index f192dce..160a0c4 100644
--- a/Classes/Service/Import/BaseImport.php
+++ b/Classes/Service/Import/BaseImport.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Service\Import;
 
 /*
@@ -10,40 +13,26 @@
 
 use Psr\EventDispatcher\EventDispatcherInterface;
 use T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration;
-use TYPO3\CMS\Core\EventDispatcher\EventDispatcher;
+use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-/**
- * Class BaseImport
- */
 class BaseImport
 {
-    /** @var EmMonitoringConfiguration */
-    protected $emConfiguration;
-
-    /** @var Registry */
-    protected $registry;
-
+    protected EmMonitoringConfiguration $emConfiguration;
+    protected Registry $registry;
     protected EventDispatcherInterface $eventDispatcher;
 
-    /**
-     * Constructor
-     */
     public function __construct()
     {
         $this->emConfiguration = GeneralUtility::makeInstance(EmMonitoringConfiguration::class);
         $this->registry = GeneralUtility::makeInstance(Registry::class);
         $this->eventDispatcher = GeneralUtility::makeInstance(EventDispatcherInterface::class);
-
     }
 
-    /**
-     * @param string $action
-     * @throws \InvalidArgumentException
-     */
-    protected function setImportTime($action)
+    protected function setImportTime(string $action): void
     {
-        $this->registry->set('t3monitoring', 'import' . ucfirst($action), $GLOBALS['EXEC_TIME']);
+        $now = GeneralUtility::makeInstance(Context::class)->getAspect('date')->get('timestamp');
+        $this->registry->set('t3monitoring', 'import' . ucfirst($action), $now);
     }
 }
diff --git a/Classes/Service/Import/ClientImport.php b/Classes/Service/Import/ClientImport.php
index 5a9a01d..184c5cb 100644
--- a/Classes/Service/Import/ClientImport.php
+++ b/Classes/Service/Import/ClientImport.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Service\Import;
 
 /*
@@ -10,6 +12,7 @@
  */
 
 use Exception;
+use RuntimeException;
 use T3Monitor\T3monitoring\Domain\Model\Extension;
 use T3Monitor\T3monitoring\Event\ImportClientDataEvent;
 use T3Monitor\T3monitoring\Notification\EmailNotification;
@@ -21,28 +24,15 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
-/**
- * Class ClientImport
- */
 class ClientImport extends BaseImport
 {
     const TABLE = 'tx_t3monitoring_domain_model_client';
 
-    /** @var array */
-    protected $coreVersions = [];
-
-    /** @var array */
-    protected $responseCount = ['error' => 0, 'success' => 0];
-
-    /** @var array */
-    protected $failedClients = [];
+    protected array $coreVersions = [];
+    protected array $responseCount = ['error' => 0, 'success' => 0];
+    protected array $failedClients = [];
+    protected EmailNotification $emailNotification;
 
-    /** @var  EmailNotification */
-    protected $emailNotification;
-
-    /**
-     * Constructor
-     */
     public function __construct()
     {
         $this->coreVersions = $this->getAllCoreVersions();
@@ -50,12 +40,7 @@ public function __construct()
         parent::__construct();
     }
 
-    /**
-     * @param int $clientId
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
-    public function run(int $clientId = 0)
+    public function run(int $clientId = 0): void
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable(self::TABLE);
@@ -64,15 +49,15 @@ public function run(int $clientId = 0)
             ->from(self::TABLE);
         if ($clientId > 0) {
             $query->where(
-                $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($clientId, \PDO::PARAM_INT))
+                $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($clientId, Connection::PARAM_INT))
             );
         } else {
             $query->where(
-                $queryBuilder->expr()->eq('exclude_from_import', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
+                $queryBuilder->expr()->eq('exclude_from_import', $queryBuilder->createNamedParameter(0, Connection::PARAM_INT))
             );
         }
 
-        $clientRows = $query->execute()->fetchAll();
+        $clientRows = $query->executeQuery()->fetchAllAssociative();
 
         foreach ($clientRows as $client) {
             $this->importSingleClient($client);
@@ -90,28 +75,21 @@ public function run(int $clientId = 0)
         $this->setImportTime('client');
     }
 
-    /**
-     * @return array
-     */
-    public function getResponseCount()
+    public function getResponseCount(): array
     {
         return $this->responseCount;
     }
 
-    /**
-     * @param array $row
-     * @throws \RuntimeException
-     */
-    protected function importSingleClient(array $row)
+    protected function importSingleClient(array $row): void
     {
         try {
             $response = $this->requestClientData($row);
             if (empty($response)) {
-                throw new \RuntimeException('Empty response from client ' . $row['title']);
+                throw new RuntimeException('Empty response from client ' . $row['title']);
             }
             $json = json_decode($response, true);
             if (!is_array($json)) {
-                throw new \RuntimeException('Invalid response from client ' . $row['title']);
+                throw new RuntimeException('Invalid response from client ' . $row['title']);
             }
 
             $update = [
@@ -153,7 +131,7 @@ protected function importSingleClient(array $row)
      * @param array $update
      * @param string $field
      */
-    protected function addExtraData(array $json, array &$update, $field)
+    protected function addExtraData(array $json, array &$update, string $field): void
     {
         $dbField = 'extra_' . $field;
         if (is_array($json['extra'][$field] ?? false)) {
@@ -163,11 +141,7 @@ protected function addExtraData(array $json, array &$update, $field)
         }
     }
 
-    /**
-     * @param array $client
-     * @param Exception $error
-     */
-    protected function handleError(array $client, Exception $error)
+    protected function handleError(array $client, Exception $error): void
     {
         $this->responseCount['error']++;
         $this->failedClients[] = $client;
@@ -185,13 +159,6 @@ protected function handleError(array $client, Exception $error)
         );
     }
 
-    /**
-     * @param array $row
-     *
-     * @return mixed
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
     protected function requestClientData(array $row)
     {
         $domain = $this->unifyDomain($row['domain']);
@@ -207,7 +174,7 @@ protected function requestClientData(array $row)
         $additionalOptions = [
             'headers' => $headers,
             'allow_redirects' => true,
-            'verify' => (bool)!$row['ignore_cert_errors'],
+            'verify' => !$row['ignore_cert_errors'],
         ];
         if (!empty($row['basic_auth_username']) && !empty($row['basic_auth_password'])) {
             $additionalOptions['auth'] = [ $row['basic_auth_username'], $row['basic_auth_password'] ];
@@ -217,7 +184,7 @@ protected function requestClientData(array $row)
         }
         $response = $requestFactory->request($url, 'GET', $additionalOptions);
         if (!empty($response->getReasonPhrase()) && $response->getReasonPhrase() !== 'OK') {
-            throw new \RuntimeException($response->getReasonPhrase());
+            throw new RuntimeException($response->getReasonPhrase());
         }
         if (in_array($response->getStatusCode(), [ 200, 301, 302 ], true)) {
             $response = $response->getBody()->getContents();
@@ -226,12 +193,7 @@ protected function requestClientData(array $row)
         return $response;
     }
 
-    /**
-     * @param string $domain
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function unifyDomain($domain)
+    protected function unifyDomain(string $domain): string
     {
         $domain = rtrim($domain, '/');
         if (!str_starts_with($domain, 'http://') && !str_starts_with($domain, 'https://')) {
@@ -241,12 +203,7 @@ protected function unifyDomain($domain)
         return $domain;
     }
 
-    /**
-     * @param int $client client uid
-     * @param array $extensions list of extensions
-     * @return int count of used extensions
-     */
-    protected function handleExtensionRelations($client, array $extensions = [])
+    protected function handleExtensionRelations(int $client, array $extensions = []): int
     {
         $table = 'tx_t3monitoring_domain_model_extension';
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -255,7 +212,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
         $whereClause = [];
         foreach ($extensions as $key => $data) {
             if (!empty($data['version'])) {
-                $whereClause[] = $queryBuilder->expr()->andX(
+                $whereClause[] = $queryBuilder->expr()->and(
                     $queryBuilder->expr()->eq('version', $queryBuilder->createNamedParameter($data['version'])),
                     $queryBuilder->expr()->eq('name', $queryBuilder->createNamedParameter($key))
                 );
@@ -265,9 +222,9 @@ protected function handleExtensionRelations($client, array $extensions = [])
         $existingExtensions = $queryBuilder
             ->select('uid', 'version', 'name')
             ->from($table)
-            ->where($queryBuilder->expr()->orX(...$whereClause))
-            ->execute()
-            ->fetchAll();
+            ->where($queryBuilder->expr()->or(...$whereClause))
+            ->executeQuery()
+            ->fetchAllAssociative();
 
         $relationsToBeAdded = [];
         foreach ($extensions as $key => $data) {
@@ -327,7 +284,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
 
             $mmTable = 'tx_t3monitoring_client_extension_mm';
             $mmConnection = $this->getConnectionTableFor($mmTable);
-            $mmConnection->delete($mmTable, ['uid_local' => (int)$client]);
+            $mmConnection->delete($mmTable, ['uid_local' => $client]);
             $mmConnection = $this->getConnectionTableFor($mmTable);
             $mmConnection->bulkInsert($mmTable, $relationsToBeAdded, $fields);
         }
@@ -335,11 +292,7 @@ protected function handleExtensionRelations($client, array $extensions = [])
         return count($extensions);
     }
 
-    /**
-     * @param array $constraints
-     * @return string|null
-     */
-    protected function serializeDependencies(array $constraints)
+    protected function serializeDependencies(array $constraints): ?string
     {
         foreach ($constraints as $key => $constraint) {
             if (!is_array($constraint) || $constraint === []) {
@@ -349,10 +302,6 @@ protected function serializeDependencies(array $constraints)
         return $constraints !== [] ? serialize($constraints) : null;
     }
 
-    /**
-     * @param string $version
-     * @return int
-     */
     protected function getUsedCore(string $version): int
     {
         if (isset($this->coreVersions[$version])) {
@@ -371,15 +320,12 @@ protected function getUsedCore(string $version): int
         ];
 
         $connection->insert('tx_t3monitoring_domain_model_core', $insert);
-        $newId = $connection->lastInsertId('tx_t3monitoring_domain_model_core');
+        $newId = (int)$connection->lastInsertId('tx_t3monitoring_domain_model_core');
         $this->coreVersions[$version] = ['uid' => $newId, 'version' => $version];
 
         return $newId;
     }
 
-    /**
-     * @return array
-     */
     protected function getAllCoreVersions(): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -387,8 +333,8 @@ protected function getAllCoreVersions(): array
         $rows = $queryBuilder
             ->select('uid', 'version')
             ->from('tx_t3monitoring_domain_model_core')
-            ->execute()
-            ->fetchAll();
+            ->executeQuery()
+            ->fetchAllAssociative();
         $finalRows = [];
         foreach ($rows as $row) {
             $finalRows[$row['version']] = $row;
diff --git a/Classes/Service/Import/CoreImport.php b/Classes/Service/Import/CoreImport.php
index ac0c94d..19ccca7 100644
--- a/Classes/Service/Import/CoreImport.php
+++ b/Classes/Service/Import/CoreImport.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Service\Import;
 
 /*
@@ -15,9 +17,6 @@
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use UnexpectedValueException;
 
-/**
- * Class CoreImport
- */
 class CoreImport extends BaseImport
 {
     const TYPE_REGULAR = 0;
@@ -28,13 +27,7 @@ class CoreImport extends BaseImport
     const URL = 'https://get.typo3.org/json';
     const MINIMAL_TYPO3_VERSION = '4.5.0';
 
-    /**
-     * Run core import
-     *
-     * @throws \Doctrine\DBAL\ConnectionException
-     * @throws \Exception
-     */
-    public function run()
+    public function run(): void
     {
         $table = 'tx_t3monitoring_domain_model_core';
         $data = $this->getSimplifiedData();
@@ -43,8 +36,8 @@ public function run()
         $rows = $queryBuilder
             ->select('uid', 'version')
             ->from($table)
-            ->execute()
-            ->fetchAll();
+            ->executeQuery()
+            ->fetchAllAssociative();
         $previousCoreVersions = [];
         foreach ($rows as $row) {
             $previousCoreVersions[$row['version']] = $row;
@@ -79,7 +72,7 @@ public function run()
                 }
             }
             $connection->commit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $connection->rollBack();
             throw $e;
         }
@@ -139,7 +132,7 @@ protected function getSimplifiedData(): array
      *
      * @param array $releases
      */
-    protected function addInsecureFlag(array &$releases)
+    protected function addInsecureFlag(array &$releases): void
     {
         // mark all as insecure which are not maintained
         foreach ($releases as &$release) {
@@ -148,6 +141,7 @@ protected function addInsecureFlag(array &$releases)
                 $release['next_secure_version'] = ''; // @todo: next major?
             }
         }
+        unset($release);
 
         $listOfInsecureAndActiveVersions = [];
         foreach ($releases as $version => $release) {
@@ -169,40 +163,21 @@ protected function addInsecureFlag(array &$releases)
         }
     }
 
-    /**
-     * @param string $date
-     * @return string
-     */
-    protected function getReleaseDate($date): string
+    protected function getReleaseDate(string $date): string
     {
         $converted = new \DateTime($date);
         return $converted->format('Y-m-d H:i:s');
     }
 
-    /**
-     * @param string $type
-     * @return int
-     * @throws UnexpectedValueException
-     */
-    protected function getType($type): int
+    protected function getType(string $type): int
     {
-        switch ($type) {
-            case 'regular':
-                $id = self::TYPE_REGULAR;
-                break;
-            case 'release':
-                $id = self::TYPE_RELEASE;
-                break;
-            case 'security':
-                $id = self::TYPE_SECURITY;
-                break;
-            case 'development':
-                $id = self::TYPE_DEVELOPMENT;
-                break;
-            default:
-                throw new UnexpectedValueException(sprintf('Not known type "%s" found', $type));
-        }
-        return $id;
+        return match ($type) {
+            'regular' => self::TYPE_REGULAR,
+            'release' => self::TYPE_RELEASE,
+            'security' => self::TYPE_SECURITY,
+            'development' => self::TYPE_DEVELOPMENT,
+            default => throw new UnexpectedValueException(sprintf('Not known type "%s" found', $type)),
+        };
     }
 
     /**
diff --git a/Classes/Service/Import/ExtensionImport.php b/Classes/Service/Import/ExtensionImport.php
index 2b7b6c5..c6ca71f 100644
--- a/Classes/Service/Import/ExtensionImport.php
+++ b/Classes/Service/Import/ExtensionImport.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Service\Import;
 
 /*
@@ -16,9 +18,6 @@
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extensionmanager\Remote\RemoteRegistry;
 
-/**
- * Class ExtensionImport
- */
 class ExtensionImport extends BaseImport
 {
 
@@ -30,23 +29,16 @@ class ExtensionImport extends BaseImport
      *
      * @throws InvalidArgumentException
      */
-    public function run()
+    public function run(): void
     {
-        // $updateRequired = $this->updateExtensionList();
-        // always set $updateRequired = true, as $this->updateExtensionList() never returns true
-        $updateRequired = true;
-        if ($updateRequired) {
-            $this->insertExtensionsInCustomTable();
-        }
+        $this->updateExtensionList();
+        $this->insertExtensionsInCustomTable();
         $dataIntegrity = GeneralUtility::makeInstance(DataIntegrity::class);
         $dataIntegrity->invokeAfterExtensionImport();
         $this->setImportTime('extension');
     }
 
-    /**
-     * Insert Extension in custom table
-     */
-    protected function insertExtensionsInCustomTable()
+    protected function insertExtensionsInCustomTable(): void
     {
         $table = 'tx_t3monitoring_domain_model_extension';
         $queryBuilderCoreExtensions = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -56,11 +48,11 @@ protected function insertExtensionsInCustomTable()
             ->from('tx_extensionmanager_domain_model_extension')
             ->where(
                 $queryBuilderCoreExtensions->expr()->gt('last_updated', $queryBuilderCoreExtensions->createNamedParameter(strtotime(self::MIN_DATE)))
-            )->execute();
+            )->executeQuery();
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($table);
-        while ($row = $res->fetch()) {
+        while ($row = $res->fetchAssociative()) {
             $versionSplit = explode('.', $row['version'], 3);
 
             $fields = [
@@ -91,7 +83,7 @@ protected function insertExtensionsInCustomTable()
                 ->where(
                     $queryBuilder->expr()->eq('version', $queryBuilder->createNamedParameter($row['version'])),
                     $queryBuilder->expr()->eq('name', $queryBuilder->createNamedParameter($row['extension_key']))
-                )->execute()->fetch();
+                )->executeQuery()->fetchAssociative();
 
             $connection = GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getConnectionForTable($table);
@@ -113,7 +105,7 @@ protected function insertExtensionsInCustomTable()
         }
     }
 
-    protected function addCoreDependenciesToFields(array &$fields)
+    protected function addCoreDependenciesToFields(array &$fields): void
     {
         $fields['typo3_min_version'] = 0;
         $fields['typo3_max_version'] = 0;
@@ -136,24 +128,12 @@ protected function addCoreDependenciesToFields(array &$fields)
         $fields['typo3_max_version'] = VersionNumberUtility::convertVersionNumberToInteger($split[1]);
     }
 
-    /**
-     * @return bool TRUE if the extension list was successfully update, FALSE if no update necessary
-     */
-    protected function updateExtensionList(): bool
+    protected function updateExtensionList(): void
     {
-        $updated = false;
-
         $remoteRegistry = GeneralUtility::makeInstance(RemoteRegistry::class);
         foreach ($remoteRegistry->getListableRemotes() as $remote) {
-            // TYPO3 11.5.12: at least TYPO3\CMS\Extensionmanager\Remote\TerExtensionRemote::getAvailablePackages()
-            // returns void, so $updated will never become TRUE here...
-            $remoteUpdate = $remote->getAvailablePackages();
-            if ($remoteUpdate) {
-                $updated = true;
-            }
+            $remote->getAvailablePackages();
         }
-
-        return $updated;
     }
 
     /**
@@ -166,10 +146,10 @@ protected function updateExtensionList(): bool
      * @param string $version A string with a version range.
      * @return array
      */
-    protected static function splitVersionRange($version)
+    protected static function splitVersionRange(string $version): array
     {
         $versionRange = [];
-        if (strpos($version, '-') !== false) {
+        if (str_contains($version, '-')) {
             $versionRange = explode('-', $version, 2);
         } else {
             $versionRange[0] = $version;
diff --git a/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php b/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php
index 89c8497..e0dbd18 100644
--- a/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php
+++ b/Classes/ViewHelpers/AdditionalExtensionDataViewHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\ViewHelpers;
 
 /*
@@ -9,20 +11,17 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-/**
- * Class AdditionalExtensionDataViewHelper
- */
 class AdditionalExtensionDataViewHelper extends AbstractViewHelper
 {
-    /** @var bool */
     protected $escapeOutput = false;
 
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('client', 'int', 'Client', true);
@@ -38,11 +37,11 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
             ->select('is_loaded', 'state', 'title')
             ->from('tx_t3monitoring_client_extension_mm')
             ->where(
-                $queryBuilderCoreExtensions->expr()->eq('uid_local', $queryBuilderCoreExtensions->createNamedParameter($arguments['client'], \PDO::PARAM_INT)),
-                $queryBuilderCoreExtensions->expr()->eq('uid_foreign', $queryBuilderCoreExtensions->createNamedParameter($arguments['extension'], \PDO::PARAM_INT))
+                $queryBuilderCoreExtensions->expr()->eq('uid_local', $queryBuilderCoreExtensions->createNamedParameter($arguments['client'], Connection::PARAM_INT)),
+                $queryBuilderCoreExtensions->expr()->eq('uid_foreign', $queryBuilderCoreExtensions->createNamedParameter($arguments['extension'], Connection::PARAM_INT))
             )
             ->setMaxResults(1)
-            ->execute()->fetch();
+            ->executeQuery()->fetchAssociative();
 
         $renderingContext->getVariableProvider()->add($arguments['as'], $result);
         $output = $renderChildrenClosure();
diff --git a/Classes/ViewHelpers/AvailableUpdatesViewHelper.php b/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
index dfdb9ba..9ca19d3 100644
--- a/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
+++ b/Classes/ViewHelpers/AvailableUpdatesViewHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\ViewHelpers;
 
 /*
@@ -16,15 +18,11 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-/**
- * Class AvailableUpdatesViewHelper
- */
 class AvailableUpdatesViewHelper extends AbstractViewHelper
 {
-    /** @var bool */
     protected $escapeOutput = false;
 
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('extension', Extension::class, 'Extension', true);
@@ -82,11 +80,6 @@ protected static function getCompatibility(int $extMin, int $extMax, Core $core)
         return 0;
     }
 
-    /**
-     * @param string $name
-     * @param string $version
-     * @return array
-     */
     protected static function getExtDetails(string $name, string $version): array
     {
         $table = 'tx_t3monitoring_domain_model_extension';
@@ -101,7 +94,7 @@ protected static function getExtDetails(string $name, string $version): array
                 $queryBuilderCoreExtensions->expr()->eq('version', $queryBuilderCoreExtensions->createNamedParameter($version))
             )
             ->setMaxResults(1)
-            ->execute()->fetch();
+            ->executeQuery()->fetchAssociative();
 
         if ($row) {
             return $row;
diff --git a/Classes/ViewHelpers/EditRecordViewHelper.php b/Classes/ViewHelpers/EditRecordViewHelper.php
index feb44b1..d180638 100644
--- a/Classes/ViewHelpers/EditRecordViewHelper.php
+++ b/Classes/ViewHelpers/EditRecordViewHelper.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace T3Monitor\T3monitoring\ViewHelpers;
 
@@ -10,6 +11,7 @@
  */
 
 use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -19,7 +21,7 @@
  */
 class EditRecordViewHelper extends AbstractViewHelper
 {
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('parameters', 'string', 'parameters', true);
@@ -31,8 +33,15 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
 
         $parameters = GeneralUtility::explodeUrl2Array($arguments['parameters']);
 
-        $parameters['returnUrl'] = (string)$uriBuilder->buildUriFromRoute('tools_T3monitoringT3monitor', [
-            'tx_t3monitoring_tools_t3monitoringt3monitor' => GeneralUtility::_GPmerged('tx_t3monitoring_tools_t3monitoringt3monitor')
+        /** @var ServerRequest $request */
+        $request = $GLOBALS['TYPO3_REQUEST'];
+        $queryParams = array_merge(
+            $request->getQueryParams()['tx_t3monitoring_tools_t3monitoringt3monitor'] ?? [],
+            $request->getParsedBody()['tx_t3monitoring_tools_t3monitoringt3monitor'] ?? []
+        );
+
+        $parameters['returnUrl'] = (string)$uriBuilder->buildUriFromRoute('t3monitoring', [
+            'tx_t3monitoring_tools_t3monitoringt3monitor' => $queryParams
         ]);
 
         return $uriBuilder->buildUriFromRoute('record_edit', $parameters);
diff --git a/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php b/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php
index 7b74fa6..1abf926 100644
--- a/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php
+++ b/Classes/ViewHelpers/Format/DateTimeAgeViewHelper.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace T3Monitor\T3monitoring\ViewHelpers\Format;
 
@@ -13,12 +14,9 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-/**
- * Class DateTimeAgeViewHelper
- */
 class DateTimeAgeViewHelper extends AbstractViewHelper
 {
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('date', \DateTime::class, 'date', true);
diff --git a/Classes/ViewHelpers/Format/DependenciesViewHelper.php b/Classes/ViewHelpers/Format/DependenciesViewHelper.php
index c71ee06..4a19eae 100644
--- a/Classes/ViewHelpers/Format/DependenciesViewHelper.php
+++ b/Classes/ViewHelpers/Format/DependenciesViewHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\ViewHelpers\Format;
 
 /*
@@ -12,9 +14,6 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-/**
- * Class DependenciesViewHelper
- */
 class DependenciesViewHelper extends AbstractViewHelper
 {
     /** @var bool */
@@ -23,13 +22,13 @@ class DependenciesViewHelper extends AbstractViewHelper
     /** @var bool */
     protected $escapeChildren = false;
 
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('dependencies', 'string', 'dependencies');
     }
 
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext): string
     {
         $dependencies = $arguments['dependencies'] ?: $renderChildrenClosure();
 
diff --git a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
index 9a7fc3c..9e08d96 100644
--- a/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
+++ b/Classes/ViewHelpers/Format/ExtensionCategoryViewHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\ViewHelpers\Format;
 
 /*
@@ -13,12 +15,9 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-/**
- * Class ExtensionCategoryViewHelper
- */
 class ExtensionCategoryViewHelper extends AbstractViewHelper
 {
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('category', 'int', 'category', false, 0);
diff --git a/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php b/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php
index deda291..0e119a8 100644
--- a/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php
+++ b/Classes/ViewHelpers/Format/ExtensionStateViewHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\ViewHelpers\Format;
 
 /*
@@ -13,12 +15,9 @@
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-/**
- * Class ExtensionStateViewHelper
- */
 class ExtensionStateViewHelper extends AbstractViewHelper
 {
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         parent::initializeArguments();
         $this->registerArgument('state', 'int', 'state', false, 0);
diff --git a/Configuration/Backend/Modules.php b/Configuration/Backend/Modules.php
new file mode 100644
index 0000000..830f353
--- /dev/null
+++ b/Configuration/Backend/Modules.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    't3monitoring' => [
+        'parent' => 'tools',
+        'position' => ['top'],
+        'access' => 'user,group',
+        'icon' => 'EXT:t3monitoring/Resources/Public/Icons/module.svg',
+        'labels' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_t3monitor.xlf',
+        'extensionName' => 't3monitoring',
+        'controllerActions' => [
+            \T3Monitor\T3monitoring\Controller\StatisticController::class => ['index', 'administration'],
+            \T3Monitor\T3monitoring\Controller\CoreController::class => ['list'],
+            \T3Monitor\T3monitoring\Controller\ClientController::class => ['show', 'fetch'],
+            \T3Monitor\T3monitoring\Controller\ExtensionController::class => ['list', 'show'],
+            \T3Monitor\T3monitoring\Controller\SlaController::class => ['list', 'show'],
+            \T3Monitor\T3monitoring\Controller\TagController::class => ['list', 'show'],
+        ],
+    ],
+];
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 966074c..4d6a910 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -8,6 +8,16 @@ services:
     resource: '../Classes/*'
     exclude: '../Classes/Domain/Model/*'
 
+  T3Monitor\T3monitoring\Domain\Model\Dto\EmMonitoringConfiguration:
+    public: true
+
+  T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverter:
+    tags:
+      - name: extbase.type_converter
+        priority: 10
+        target: T3Monitor\T3monitoring\Domain\Model\Dto\ClientFilterDemand
+        sources: array,string
+
   T3Monitor\T3monitoring\Command\ImportCoreCommand:
     tags:
       - name: 'console.command'
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_client.php b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
index 2d13b5b..5d4227f 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_client.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_client.php
@@ -5,11 +5,13 @@
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
-        'cruser_id' => 'cruser_id',
         'delete' => 'deleted',
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
+        'security' => [
+            'ignorePageTypeRestriction' => true,
+        ],
         'searchFields' => 'title,domain,comment,secret,email,php_version,mysql_version,disk_total_space,disk_free_space,insecure_core,outdated_core,insecure_extensions,outdated_extensions,error_message,extensions,core,sla,tag',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_client.svg'
     ],
@@ -45,8 +47,9 @@
             'config' => [
                 'type' => 'input',
                 'size' => 30,
-                'eval' => 'trim,required',
-                'max' => 255
+                'eval' => 'trim',
+                'required' => true,
+                'max' => 255,
             ],
         ],
         'domain' => [
@@ -54,7 +57,8 @@
             'config' => [
                 'type' => 'input',
                 'size' => 50,
-                'eval' => 'trim,required',
+                'eval' => 'trim',
+                'required' => true,
                 'placeholder' => 'http://yourdomain.com/'
             ],
         ],
@@ -72,7 +76,8 @@
             'config' => [
                 'type' => 'input',
                 'size' => 50,
-                'eval' => 'trim,required',
+                'eval' => 'trim',
+                'required' => true,
                 'min' => 5,
                 'max' => 255
             ],
@@ -90,7 +95,7 @@
             'config' => [
                 'type' => 'input',
                 'size' => 30,
-                'eval' => 'trim,password'
+                'eval' => 'trim'
             ],
         ],
         'host_header' => [
@@ -120,9 +125,9 @@
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['', ''],
-                    ['IPv4', 'v4'],
-                    ['IPv6', 'v6'],
+                    ['label' => '', 'value' => ''],
+                    ['label' => 'IPv4', 'value' => 'v4'],
+                    ['label' => 'IPv6', 'value' => 'v6'],
                 ],
                 'default' => '',
             ],
@@ -145,7 +150,7 @@
                 'minitems' => 0,
                 'default' => 0,
                 'items' => [
-                    ['', 0]
+                    ['label' => '', 'value' => 0]
                 ]
             ],
         ],
@@ -182,18 +187,16 @@
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.disk_total_space',
             'config' => [
                 'readOnly' => true,
-                'type' => 'input',
+                'type' => 'number',
                 'size' => 5,
-                'eval' => 'int'
             ],
         ],
         'disk_free_space' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.disk_free_space',
             'config' => [
                 'readOnly' => true,
-                'type' => 'input',
+                'type' => 'number',
                 'size' => 5,
-                'eval' => 'int'
             ],
         ],
         'insecure_core' => [
@@ -216,18 +219,16 @@
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.insecure_extensions',
             'config' => [
                 'readOnly' => true,
-                'type' => 'input',
+                'type' => 'number',
                 'size' => 4,
-                'eval' => 'int'
             ],
         ],
         'outdated_extensions' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.outdated_extensions',
             'config' => [
                 'readOnly' => true,
-                'type' => 'input',
+                'type' => 'number',
                 'size' => 4,
-                'eval' => 'int'
             ],
         ],
         'error_message' => [
@@ -274,9 +275,7 @@
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.last_successful_import',
             'config' => [
                 'readOnly' => true,
-                'type' => 'input',
-                'renderType' => 'inputDateTime',
-                'eval' => 'datetime',
+                'type' => 'datetime',
                 'default' => 0,
                 'size' => 10,
             ],
@@ -286,7 +285,6 @@
             'config' => [
                 'readOnly' => true,
                 'type' => 'group',
-                'internal_type' => 'db',
                 'allowed' => 'tx_t3monitoring_domain_model_extension',
                 'foreign_table' => 'tx_t3monitoring_domain_model_extension',
                 'foreign_table_where' => 'ORDER BY tx_t3monitoring_domain_model_extension.name',
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_core.php b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
index 8ee8410..3757665 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_core.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_core.php
@@ -5,8 +5,8 @@
         'label' => 'version',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
-        'cruser_id' => 'cruser_id',
-        'enablecolumns' => [
+        'security' => [
+            'ignorePageTypeRestriction' => true,
         ],
         'searchFields' => 'version,insecure,next_secure_version,type,release_date,latest,stable,is_stable,is_active,is_latest,version_integer,is_used,is_official,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_core.svg'
@@ -50,10 +50,10 @@
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.0', 0],
-                    ['LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.1', 1],
-                    ['LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.2', 2],
-                    ['LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.4', 4],
+                    ['label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.0', 'value' => 0],
+                    ['label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.1', 'value' => 1],
+                    ['label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.2', 'value' => 2],
+                    ['label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.type.4', 'value' => 4],
                 ],
                 'default' => 0,
             ],
@@ -62,9 +62,7 @@
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.release_date',
             'config' => [
                 'dbType' => 'datetime',
-                'type' => 'input',
-                'renderType' => 'inputDateTime',
-                'eval' => 'datetime',
+                'type' => 'datetime',
             ],
         ],
         'latest' => [
@@ -107,9 +105,8 @@
         'version_integer' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_core.version_integer',
             'config' => [
-                'type' => 'input',
+                'type' => 'number',
                 'size' => 4,
-                'eval' => 'int'
             ],
         ],
         'is_used' => [
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
index 8afd80f..85326cb 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_extension.php
@@ -8,24 +8,23 @@
         'hideTable' => true,
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
-        'cruser_id' => 'cruser_id',
-        'enablecolumns' => [],
+        'security' => [
+            'ignorePageTypeRestriction' => true,
+        ],
         'searchFields' => 'name,version,insecure,next_secure_version,title,description,last_updated,author_name,update_comment,state,category,version_integer,is_used,is_official,is_modified,is_latest,last_bugfix_release,last_minor_release,last_major_release,serialized_dependencies,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_extension.svg'
     ],
     'types' => [
         1 => ['showitem' => 'name, version, insecure, next_secure_version, title, description, last_updated, author_name, update_comment, state, category, version_integer, is_used, is_official, is_modified, is_latest,last_bugfix_release, last_minor_release, last_major_release, typo3_min_version,typo3_max_version,serialized_dependencies'],
     ],
-    'palettes' => [
-        1 => ['showitem' => ''],
-    ],
     'columns' => [
         'name' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.name',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
-                'eval' => 'trim,required'
+                'eval' => 'trim',
+                'required' => true,
             ],
         ],
         'version' => [
@@ -71,10 +70,8 @@
         'last_updated' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.last_updated',
             'config' => [
-                'type' => 'input',
+                'type' => 'datetime',
                 'dbType' => 'datetime',
-                'renderType' => 'inputDateTime',
-                'eval' => 'datetime',
             ],
         ],
         'author_name' => [
@@ -100,7 +97,7 @@
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['-- Label --', 0],
+                    ['label' => '-- Label --', 'value' => 0],
                 ],
             ],
         ],
@@ -110,16 +107,15 @@
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'items' => [
-                    ['-- Label --', 0],
+                    ['label' => '-- Label --', 'value' => 0],
                 ],
             ],
         ],
         'version_integer' => [
             'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_extension.version_integer',
             'config' => [
-                'type' => 'input',
+                'type' => 'number',
                 'size' => 4,
-                'eval' => 'int'
             ],
         ],
         'is_used' => [
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
index 1508240..72f5484 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_sla.php
@@ -5,12 +5,14 @@
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
-        'cruser_id' => 'cruser_id',
         'sortby' => 'sorting',
         'delete' => 'deleted',
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
+        'security' => [
+            'ignorePageTypeRestriction' => true,
+        ],
         'searchFields' => 'title,description,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_sla.svg'
     ],
@@ -33,7 +35,8 @@
             'config' => [
                 'type' => 'input',
                 'size' => 30,
-                'eval' => 'trim,required'
+                'eval' => 'trim',
+                'required' => true,
             ],
         ],
         'description' => [
diff --git a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
index 070b319..8d603b6 100644
--- a/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
+++ b/Configuration/TCA/tx_t3monitoring_domain_model_tag.php
@@ -5,17 +5,19 @@
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
-        'cruser_id' => 'cruser_id',
         'sortby' => 'sorting',
         'delete' => 'deleted',
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
+        'security' => [
+            'ignorePageTypeRestriction' => true,
+        ],
         'searchFields' => 'title,description,',
         'iconfile' => 'EXT:t3monitoring/Resources/Public/Icons/tx_t3monitoring_domain_model_tag.svg'
     ],
     'types' => [
-        1 => ['showitem' => 'title, description, 
+        1 => ['showitem' => 'title, description,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                 hidden,
             --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,'],
@@ -34,7 +36,8 @@
                 'type' => 'input',
                 'size' => 30,
                 'max' => 255,
-                'eval' => 'trim,required'
+                'eval' => 'trim',
+                'required' => true,
             ],
         ],
         'description' => [
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index 1acecf0..5fbfea9 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -1,12 +1,9 @@
 
 plugin.tx_t3monitoring_t3monitor {
   view {
-    templateRootPaths.0 = EXT:t3monitoring/Resources/Private/Templates/
-    templateRootPaths.1 = {$plugin.tx_t3monitoring_t3monitor.view.templateRootPath}
-    partialRootPaths.0 = EXT:t3monitoring/Resources/Private/Partials/
-    partialRootPaths.1 = {$plugin.tx_t3monitoring_t3monitor.view.partialRootPath}
-    layoutRootPaths.0 = EXT:t3monitoring/Resources/Private/Layouts/
-    layoutRootPaths.1 = {$plugin.tx_t3monitoring_t3monitor.view.layoutRootPath}
+    templateRootPaths.10 = {$plugin.tx_t3monitoring_t3monitor.view.templateRootPath}
+    partialRootPaths.10 = {$plugin.tx_t3monitoring_t3monitor.view.partialRootPath}
+    layoutRootPaths.10 = {$plugin.tx_t3monitoring_t3monitor.view.layoutRootPath}
   }
   persistence {
     storagePid = {$plugin.tx_t3monitoring_t3monitor.persistence.storagePid}
@@ -14,16 +11,13 @@ plugin.tx_t3monitoring_t3monitor {
 }
 
 # Module configuration
-module.tx_t3monitoring_tools_t3monitoringt3monitor {
+module.tx_t3monitoring_t3monitoring {
   persistence {
     storagePid = {$module.tx_t3monitoring_t3monitor.persistence.storagePid}
   }
   view {
-    templateRootPaths.0 = EXT:t3monitoring/Resources/Private/Backend/Templates/
-    templateRootPaths.1 = {$module.tx_t3monitoring_t3monitor.view.templateRootPath}
-    partialRootPaths.0 = EXT:t3monitoring/Resources/Private/Backend/Partials/
-    partialRootPaths.1 = {$module.tx_t3monitoring_t3monitor.view.partialRootPath}
-    layoutRootPaths.0 = EXT:t3monitoring/Resources/Private/Backend/Layouts/
-    layoutRootPaths.1 = {$module.tx_t3monitoring_t3monitor.view.layoutRootPath}
+    templateRootPaths.10 = {$module.tx_t3monitoring_t3monitor.view.templateRootPath}
+    partialRootPaths.10 = {$module.tx_t3monitoring_t3monitor.view.partialRootPath}
+    layoutRootPaths.10 = {$module.tx_t3monitoring_t3monitor.view.layoutRootPath}
   }
 }
diff --git a/Resources/Public/Screenshots/t3monitoring-client.png b/Documentation/images/t3monitoring-client.png
similarity index 100%
rename from Resources/Public/Screenshots/t3monitoring-client.png
rename to Documentation/images/t3monitoring-client.png
diff --git a/Resources/Public/Screenshots/t3monitoring-extensions.png b/Documentation/images/t3monitoring-extensions.png
similarity index 100%
rename from Resources/Public/Screenshots/t3monitoring-extensions.png
rename to Documentation/images/t3monitoring-extensions.png
diff --git a/Resources/Public/Screenshots/t3monitoring-search.png b/Documentation/images/t3monitoring-search.png
similarity index 100%
rename from Resources/Public/Screenshots/t3monitoring-search.png
rename to Documentation/images/t3monitoring-search.png
diff --git a/Resources/Public/Screenshots/t3monitoring_index.png b/Documentation/images/t3monitoring_index.png
similarity index 100%
rename from Resources/Public/Screenshots/t3monitoring_index.png
rename to Documentation/images/t3monitoring_index.png
diff --git a/README.rst b/README.rst
index 1c59ca1..31ecb40 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,6 @@
 TYPO3 CMS Extension "t3monitoring"
 ==================================
+
 .. image:: https://travis-ci.org/georgringer/t3monitoring.svg?branch=master
     :target: https://travis-ci.org/georgringer/t3monitoring
 
@@ -11,18 +12,18 @@ This extensions provides the possibility to monitor all of your TYPO3 installati
 
 **Requirements**
 
-- At least TYPO3 CMS 8 LTS (monitoring works also for 6.2 installations)
+- At least TYPO3 CMS 11 LTS (monitoring works also for 6.2 installations)
 - The host must have access to every client to be able to fetch the data
 
-Important: This extension is still beta and things might change!
-
 **Pricing**
-This extension is completly free to use! However maintaining an extension takes an enormous amount of time. Therefore I am using a concept which is based on your trust!
+
+This extension is completely free to use! However maintaining an extension takes an enormous amount of time.
+Therefore I am using a concept which is based on your trust!
 If you use this extension to monitor your clients, please consider to pay (once):
 
-- €150 for less than 20 clients
-- €350 for less than 100 clients
-- €500 for more than 100 clients
+- € 150 for less than 20 clients
+- € 350 for less than 100 clients
+- € 500 for more than 100 clients
 
 Please contact me via email (mail@ringer.it) or slack for questions and to receive an invoice!
 
@@ -31,26 +32,27 @@ Screenshots
 
 **Overview**
 
-.. figure:: Resources/Public/Screenshots/t3monitoring_index.png
+.. figure:: Documentation/images/t3monitoring_index.png
 		:alt: Overview including most important information
 
 **Search result**
 
-.. figure:: Resources/Public/Screenshots/t3monitoring-search.png
+.. figure:: Documentation/images/t3monitoring-search.png
 		:alt: Search result
 
 **Single view of a client**
 
-.. figure:: Resources/Public/Screenshots/t3monitoring-client.png
+.. figure:: Documentation/images/t3monitoring-client.png
 		:alt: Client
 
 **List of all used extensions**
 
-.. figure:: Resources/Public/Screenshots/t3monitoring-extensions.png
+.. figure:: Documentation/images/t3monitoring-extensions.png
 		:alt: Extensions
 
 How to start
 ------------
+
 Before you can actually monitor any installation, you need to install the extension *t3monitoring_client* on every installation (called "client").
 This extension provides the data which will be fetched by the master installation. You can find this extension on github (https://github.com/georgringer/t3monitoring_client) or later in the TER.
 
@@ -58,6 +60,7 @@ This extension provides the data which will be fetched by the master installatio
 
 Create the clients
 """"""""""""""""""
+
 Create a record "**Client**" on any sys folder and fill out at least the following required fields:
 
 - Title
@@ -75,43 +78,56 @@ Create an optional record "**SLA**" to group your clients. Examples could be:
 
 Import the data
 """""""""""""""
-To be able to deliver proper results, this extensions requires information about all core versions and all extensions. This information is provided by typo3.org.
+
+To be able to deliver proper results, this extensions requires information about all core versions and all extensions.
+This information is provided by get.typo3.org.
 
 To import the data, use the command line: ::
 
-	./typo3/cli_dispatch.phpsh extbase monitoring:importAll
+	vendor/bin/typo3 monitoring:importAll
 
 
 You can add this call also as task in the scheduler extension.
 
 Especially the import of extensions can take a while, therefore you can use different calls for all required imports:
 
-- ``./typo3/cli_dispatch.phpsh extbase monitoring:importCore`` to fetch latest core versions
-- ``./typo3/cli_dispatch.phpsh extbase monitoring:importExtensions`` to fetch the extensions
-- ``./typo3/cli_dispatch.phpsh extbase monitoring:importClients`` to fetch the client data
+- ``vendor/bin/typo3 monitoring:importCore`` to fetch latest core versions
+- ``vendor/bin/typo3 monitoring:importExtensions`` to fetch the extensions
+- ``vendor/bin/typo3 monitoring:importClients`` to fetch the client data
 
 Notifications
 -------------
+
 t3monitoring contains various notifications.
 
 Failed to fetch client info
 """""""""""""""""""""""""""
-This notification sends an email, if a clients information (provided by the extension "t3monitoring_client") cannot be accessed/fetched. You may configure the email recipient in the "Extension Configuration" of the t3monitoring extension using the setting "records.emailForFailedClient".
 
-The notification is send by the Symfony Console Command **"monitoring:importClients"** and consists of a single email which contains a list of all failing clients. The frequency of the notification email depends on your scheduled task for importing the clients.
+This notification sends an email, if a clients information (provided by the extension "t3monitoring_client") cannot be accessed/fetched.
+You may configure the email recipient in the "Extension Configuration" of the t3monitoring extension using the setting "records.emailForFailedClient".
+
+The notification is send by the Symfony Console Command **"monitoring:importClients"** and consists of a single email which contains a list of all failing clients.
+The frequency of the notification email depends on your scheduled task for importing the clients.
 
-The "Extension Configuration" also contains a option "records.emailAllowedAmountOfFailures". This value provides the ability to only send the notification email, if a client fails multiple times in a row.
+The "Extension Configuration" also contains a option "records.emailAllowedAmountOfFailures".
+This value provides the ability to only send the notification email, if a client fails multiple times in a row.
 
 Client report
 """""""""""""
-Another possible notification is the "Client report". It is represented by the Symfony Console Command **"reporting:client"**. It generates an email for each client and uses the clients email property ("email") as recipient address. If there is no email set, its not possible to send a notfication.
 
-If t3monitoring identifies security problems, an outdated core or additional error messages the notification is sent. If the client does not break with these regulations, no email is sent.
+Another possible notification is the "Client report". It is represented by the Symfony Console Command **"reporting:client"**.
+It generates an email for each client and uses the clients email property ("email") as recipient address.
+If there is no email set, its not possible to send a notification.
+
+If t3monitoring identifies security problems, an outdated core or additional error messages the notification is sent.
+If the client does not break with these regulations, no email is sent.
 
 The frequency is again defined by the according scheduled task.
 
 Admin report
 """"""""""""
-Last but not least, the "Admin report" (Symfony Console Command: **reporting:admin**) generates a single email with all problematic clients and sends it. The recipients email address needs to be configured as argument of the Symfony Console Command (respective the scheduled task).
 
-The frequency of the sent notification is also defined by the occurence of the scheduled task.
+Last but not least, the "Admin report" (Symfony Console Command: **reporting:admin**) generates a single email with all problematic clients and sends it.
+The recipients email address needs to be configured as argument of the Symfony Console Command (respective the scheduled task).
+
+The frequency of the sent notification is also defined by the occurrence of the scheduled task.
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index e3c51ac..448bfa9 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -1,591 +1,583 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-05-20T17:08:29Z" product-name="t3monitoring">
-		<header/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" target-language="de" original="messages" datatype="plaintext" product-name="t3monitoring" date="2024-08-02T14:46:11+02:00">
+		<header></header>
 		<body>
-			<trans-unit id="tx_t3monitoring_domain_model_client">
-				<source>Client</source>
-				<target>Client</target>
+			<trans-unit id="administration" resname="administration">
+				<source>Administration</source>
+				<target>Administration</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="administration.import.description" resname="administration.import.description">
+				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
+				<target>Beachten sie, dass der Import etwas dauern kann. Bei einem Timeout die Kommandozeile benutzen!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
-				<source>Domain</source>
-				<target>Domain</target>
+			<trans-unit id="administration.import.headline" resname="administration.import.headline">
+				<source>Start an import</source>
+				<target>Import starten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
-				<source>Secret</source>
-				<target>Secret</target>
+			<trans-unit id="administration.import.success" resname="administration.import.success">
+				<source>The import was successful!</source>
+				<target>Der Import war erfolgreich!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.email">
-				<source>Email</source>
-				<target>E-Mail</target>
+			<trans-unit id="administration.ipHint" resname="administration.ipHint">
+				<source>&#xA;&#x9;&#x9;&#x9;&#x9;Set the allowed IP(s) for the client to &lt;code&gt;%s&lt;/code&gt;.&#xA;&#x9;&#x9;&#x9;&#x9;</source>
+				<target>&#xA;&#x9;&#x9;&#x9;&#x9;Die erlaubten IP(s) für den Client auf &lt;code&gt;%s&lt;/code&gt; setzen.&#xA;&#x9;&#x9;&#x9;&#x9;</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.php_version">
-				<source>Php Version</source>
-				<target>Php Version</target>
+			<trans-unit id="administration.sponsors.description" resname="administration.sponsors.description">
+				<source>This extension has been sponsored by</source>
+				<target>Diese Extension wurde gesponsert von</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Mysql Version</source>
-				<target>Datenbank Version</target>
+			<trans-unit id="administration.sponsors.headline" resname="administration.sponsors.headline">
+				<source>Sponsors</source>
+				<target>Sponsoren</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
-				<source>Disk Total Space</source>
-				<target>Disk Total Space</target>
+			<trans-unit id="available.extensions" resname="available.extensions">
+				<source>Available extensions</source>
+				<target>Vorhandene Extensions</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space">
-				<source>Disk Free Space</source>
-				<target>Disk Free Space</target>
+			<trans-unit id="bulletins.all" resname="bulletins.all">
+				<source>All bulletins</source>
+				<target>Alle Bulletins</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
-				<source>Insecure Core</source>
-				<target>Unsicherer Core</target>
+			<trans-unit id="bulletins.disabled" resname="bulletins.disabled">
+				<source>Loading the bulletins is disabled.</source>
+				<target>Das Laden der Bulletins ist deaktiviert.</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core">
-				<source>Outdated Core</source>
-				<target>Veralteter Core</target>
+			<trans-unit id="bulletins.errorFetch" resname="bulletins.errorFetch">
+				<source>Sorry, the bulletins could not be fetched!</source>
+				<target>Die Bulletins konnten leider nicht geladen werden!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions">
-				<source>Insecure Extensions</source>
-				<target>Unsichere Extensions</target>
+			<trans-unit id="bulletins.headline" resname="bulletins.headline">
+				<source>Latest security bulletins</source>
+				<target>Neueste Security Bulletins</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
-				<source>Outdated Extensions</source>
-				<target>Veraltete Extensions</target>
+			<trans-unit id="client.domainNotPingAble" resname="client.domainNotPingAble">
+				<source>The domain &#34;%s&#34; could not not be contacted (maybe invalid or not reachable)!</source>
+				<target>Die Domain &#34;%s&#34; konnte nicht erreicht werden (ungültig oder nicht erreichbar)!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
-				<source>Error Message</source>
-				<target>Fehlermeldung</target>
+			<trans-unit id="client.extra" resname="client.extra">
+				<source>Extra</source>
+				<target>Extras</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info">
-				<source>Extra Info</source>
-				<target>Zusätzliche Infos</target>
+			<trans-unit id="client.extra.danger" resname="client.extra.danger">
+				<source>Additional error messages</source>
+				<target>Zusätzliche Fehlermeldungen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning">
-				<source>Extra Warning</source>
+			<trans-unit id="client.extra.warning" resname="client.extra.warning">
+				<source>Additional warnings</source>
 				<target>Zusätzliche Warnungen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger">
-				<source>Extra Danger</source>
-				<target>Zusätzliche Gefahren</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import">
-				<source>Last Successful Import</source>
-				<target>Letzter erfolgreicher Import</target>
+			<trans-unit id="client.facts" resname="client.facts">
+				<source>Facts</source>
+				<target>Fakten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extensions">
-				<source>Extensions</source>
-				<target>Extension</target>
+			<trans-unit id="client.noSuccessfulImport" resname="client.noSuccessfulImport">
+				<source>No successful import until now!</source>
+				<target>Bisher kein erfolgreicher Import!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.core">
-				<source>Core</source>
-				<target>Core</target>
+			<trans-unit id="clients.listAll" resname="clients.listAll">
+				<source>List all</source>
+				<target>Alle anzeigen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.sla">
-				<source>Sla</source>
-				<target>Sla</target>
+			<trans-unit id="clients.notFound" resname="clients.notFound">
+				<source>No clients found</source>
+				<target>Keine Clients gefunden</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension">
-				<source>Extension</source>
-				<target>Extension</target>
+			<trans-unit id="clients.notReachable" resname="clients.notReachable">
+				<source>Not reachable</source>
+				<target>Nicht erreichbar</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.name">
-				<source>Name</source>
-				<target>Name</target>
+			<trans-unit id="clients.numberOfExtensions" resname="clients.numberOfExtensions">
+				<source>Number of extensions</source>
+				<target>Anzahl Extensions</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version">
-				<source>Version</source>
-				<target>Version</target>
+			<trans-unit id="clients.total" resname="clients.total">
+				<source>Clients (%s)</source>
+				<target>Clients (%s)</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure">
-				<source>Insecure</source>
-				<target>Unsicher</target>
+			<trans-unit id="core.totalUsed" resname="core.totalUsed">
+				<source>Used core versions (%s)</source>
+				<target>Verwendete Core-Versionen (%s)</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version">
-				<source>Next Secure Version</source>
-				<target>Nächste sichere Version</target>
+			<trans-unit id="coreFilter.usage" resname="coreFilter.usage">
+				<source>Usage</source>
+				<target>Verwendung</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="coreFilter.usage.0" resname="coreFilter.usage.0">
+				<source>All</source>
+				<target>Alle</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.description">
-				<source>Description</source>
-				<target>Beschreibung</target>
+			<trans-unit id="coreFilter.usage.1" resname="coreFilter.usage.1">
+				<source>Used</source>
+				<target>verwendet</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated">
-				<source>Last Updated</source>
-				<target>Letztes Update</target>
+			<trans-unit id="coreVersions" resname="coreVersions">
+				<source>Core Versions</source>
+				<target>Core-Versionen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name">
-				<source>Author Name</source>
-				<target>Name des Autors</target>
+			<trans-unit id="coreVersions.header" resname="coreVersions.header">
+				<source>Core versions</source>
+				<target>Core-Versionen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment">
-				<source>Update Comment</source>
-				<target>Updatebeschreibung</target>
+			<trans-unit id="count" resname="count">
+				<source>Count</source>
+				<target>Anzahl</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.state">
-				<source>State</source>
-				<target>Status</target>
+			<trans-unit id="createNew.client" resname="createNew.client">
+				<source>Create new client</source>
+				<target>Neuen Client anlegen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.category">
-				<source>Category</source>
-				<target>Kategorie</target>
+			<trans-unit id="edit.client" resname="edit.client">
+				<source>Edit client</source>
+				<target>Client bearbeiten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer">
-				<source>Version Integer</source>
-				<target>Version Integer</target>
+			<trans-unit id="extension.by" resname="extension.by">
+				<source>by %s</source>
+				<target>von %s</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used">
-				<source>Is Used</source>
-				<target>Verwendet</target>
+			<trans-unit id="extension.notFound" resname="extension.notFound">
+				<source>No extensions found</source>
+				<target>Keine Extensions gefunden</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official">
-				<source>Is Official</source>
-				<target>Offiziell</target>
+			<trans-unit id="extension.total" resname="extension.total">
+				<source>Extensions (%s)</source>
+				<target>Extensions (%s)</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified">
-				<source>Is Modified</source>
-				<target>Verändert</target>
+			<trans-unit id="extensionFilter.exactSearch" resname="extensionFilter.exactSearch">
+				<source>Exact search</source>
+				<target>Exakte Suche</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest">
-				<source>Is Latest</source>
-				<target>Aktuell</target>
+			<trans-unit id="extensionFilter.name" resname="extensionFilter.name">
+				<source>Name</source>
+				<target>Name</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release">
-				<source>Last Bugfix Release</source>
-				<target>Letztes Bugfix-Release</target>
+			<trans-unit id="extensionList" resname="extensionList">
+				<source>Extension List</source>
+				<target>Liste der Extensions</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release">
-				<source>Last Minor Release</source>
-				<target>Letztes Minor-Release</target>
+			<trans-unit id="fetchClient.link" resname="fetchClient.link">
+				<source>Fetch single client</source>
+				<target>Einzelnen Client abrufen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release">
-				<source>Last Major Release</source>
-				<target>Letztes Major-Release</target>
+			<trans-unit id="fetchClient.success" resname="fetchClient.success">
+				<source>The data of the client has been successfully fetched!</source>
+				<target>Die Daten des Clients wurden erfolgreich abgerufen!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
-				<source>Serialized Dependencies</source>
-				<target>Serialisierte Abhängigkeiten</target>
+			<trans-unit id="filter.connectionErrors" resname="filter.connectionErrors">
+				<source>Connection errors</source>
+				<target>Verbindungsfehler</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core">
+			<trans-unit id="filter.fieldset.core" resname="filter.fieldset.core">
 				<source>Core</source>
 				<target>Core</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version">
-				<source>Version</source>
-				<target>Version</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.insecure">
-				<source>Insecure</source>
-				<target>Unsicher</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version">
-				<source>Next Secure Version</source>
-				<target>Nächste sichere Version</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type">
-				<source>Type</source>
-				<target>Typ</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.release_date">
-				<source>Release Date</source>
-				<target>Veröffentlichungsdatum</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.latest">
-				<source>Latest</source>
-				<target>Letzter</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.stable">
-				<source>Stable</source>
-				<target>Stabiler</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable">
-				<source>Is Stable</source>
-				<target>Stabil</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_active">
-				<source>Is Active</source>
-				<target>Aktiv</target>
+			<trans-unit id="filter.fieldset.extensions" resname="filter.fieldset.extensions">
+				<source>Extensions</source>
+				<target>Extensions</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest">
-				<source>Is Latest</source>
-				<target>Letzter</target>
+			<trans-unit id="filter.fieldset.misc" resname="filter.fieldset.misc">
+				<source>Misc</source>
+				<target>Diverses</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer">
-				<source>Version Integer</source>
-				<target>Version Integer</target>
+			<trans-unit id="filter.withExtraDanger" resname="filter.withExtraDanger">
+				<source>Additional errors</source>
+				<target>Zusätzliche Fehler</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_used">
-				<source>Is Used</source>
-				<target>Benutzt</target>
+			<trans-unit id="filter.withExtraWarning" resname="filter.withExtraWarning">
+				<source>Additional warnings</source>
+				<target>Zusätzliche Warnungen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_official">
-				<source>Is Official</source>
-				<target>Offiziell</target>
+			<trans-unit id="found.in.ter" resname="found.in.ter">
+				<source>Found in TER</source>
+				<target>Im TER gefunden</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla">
-				<source>Sla</source>
-				<target>Sla</target>
+			<trans-unit id="home" resname="home">
+				<source>Home</source>
+				<target>Home</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag">
-				<source>Tag</source>
-				<target>Tag</target>
+			<trans-unit id="lastImport.client" resname="lastImport.client">
+				<source>Import clients</source>
+				<target>Clients importiert</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="lastImport.core" resname="lastImport.core">
+				<source>Import core</source>
+				<target>Core importiert</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.description">
-				<source>Description</source>
-				<target>Beschreibung</target>
+			<trans-unit id="lastImport.extension" resname="lastImport.extension">
+				<source>Import extensions</source>
+				<target>Extensions importiert</target>
 			</trans-unit>
-			<trans-unit id="update.available">
-				<source>Update available</source>
-				<target>Update verfügbar</target>
+			<trans-unit id="lastImport.header" resname="lastImport.header">
+				<source>Last imports</source>
+				<target>Letzter Import</target>
 			</trans-unit>
-			<trans-unit id="secure">
-				<source>Secure</source>
-				<target>Sicher</target>
+			<trans-unit id="lastImport.none" resname="lastImport.none">
+				<source>No import yet!</source>
+				<target>Bisher kein Import!</target>
 			</trans-unit>
-			<trans-unit id="loaded">
+			<trans-unit id="loaded" resname="loaded">
 				<source>Loaded</source>
 				<target>Geladen</target>
 			</trans-unit>
-			<trans-unit id="found.in.ter">
-				<source>Found in TER</source>
-				<target>Im TER gefunden</target>
-			</trans-unit>
-			<trans-unit id="next.secure.version">
+			<trans-unit id="next.secure.version" resname="next.secure.version">
 				<source>Next secure version:</source>
 				<target>Nächste sichere Version:</target>
 			</trans-unit>
-			<trans-unit id="no.official.update">
-				<source>No official update available</source>
-				<target>Kein offizielles Update verfügbar</target>
-			</trans-unit>
-			<trans-unit id="yes">
-				<source>yes</source>
-				<target>ja</target>
-			</trans-unit>
-			<trans-unit id="no">
+			<trans-unit id="no" resname="no">
 				<source>no</source>
 				<target>nein</target>
 			</trans-unit>
-			<trans-unit id="unknown">
-				<source>unknown</source>
-				<target>unbekannt</target>
-			</trans-unit>
-			<trans-unit id="no.cores.imported">
+			<trans-unit id="no.cores.imported" resname="no.cores.imported">
 				<source>No cores yet imported</source>
 				<target>Noch keine Core-Versionen importiert</target>
 			</trans-unit>
-			<trans-unit id="no.versions.available">
+			<trans-unit id="no.official.update" resname="no.official.update">
+				<source>No official update available</source>
+				<target>Kein offizielles Update verfügbar</target>
+			</trans-unit>
+			<trans-unit id="no.versions.available" resname="no.versions.available">
 				<source>No versions available</source>
 				<target>Keine Versionen verfügbar</target>
 			</trans-unit>
-			<trans-unit id="view.administration">
-				<source>Administration</source>
-				<target>Administration</target>
+			<trans-unit id="noClients.description" resname="noClients.description">
+				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
+				<target>Schön, dass Sie t3monitoring ausprobieren wollen! Um zu beginnen, erstellen Sie einen Client mit dem + Icon oben!</target>
 			</trans-unit>
-			<trans-unit id="view.usedExtensions">
-				<source>Used extensions</source>
-				<target>Verwendete Extensions</target>
+			<trans-unit id="noClients.title" resname="noClients.title">
+				<source>No clients created!</source>
+				<target>Keine Clients angelegt!</target>
 			</trans-unit>
-			<trans-unit id="view.core">
-				<source>Used core versions</source>
-				<target>Verwendete Core-Versionen</target>
+			<trans-unit id="noInsecureClients" resname="noInsecureClients">
+				<source>No insecure clients found!</source>
+				<target>Keine unsicheren Clients gefunden!</target>
 			</trans-unit>
-			<trans-unit id="administration.import.headline">
-				<source>Start an import</source>
-				<target>Import starten</target>
+			<trans-unit id="presentationMode.client.domain" resname="presentationMode.client.domain">
+				<source>http://*********.***</source>
+				<target>http://*********.***</target>
 			</trans-unit>
-			<trans-unit id="administration.import.success">
-				<source>The import was successful!</source>
-				<target>Der Import war erfolgreich!</target>
+			<trans-unit id="presentationMode.client.title" resname="presentationMode.client.title">
+				<source>Client with uid %s</source>
+				<target>Client mit der uid %s</target>
 			</trans-unit>
-			<trans-unit id="administration.import.description">
-				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
-				<target>Beachten sie, dass der Import etwas dauern kann. Bei einem Timeout die Kommandozeile benutzen!</target>
+			<trans-unit id="search" resname="search">
+				<source>Search</source>
+				<target>Suche</target>
 			</trans-unit>
-			<trans-unit id="createNew.client">
-				<source>Create new client</source>
-				<target>Neuen Client anlegen</target>
+			<trans-unit id="search.introHelp" resname="search.introHelp">
+				<source>Use the search on the left to filter the clients for specific properties.</source>
+				<target>Die Suche auf der linken Seite benutzen um die Clients nach spezifischen Eigenschaften zu filtern.</target>
 			</trans-unit>
-			<trans-unit id="edit.client">
-				<source>Edit client</source>
-				<target>Client bearbeiten</target>
+			<trans-unit id="secure" resname="secure">
+				<source>Secure</source>
+				<target>Sicher</target>
 			</trans-unit>
-			<trans-unit id="home">
-				<source>Home</source>
-				<target>Home</target>
+			<trans-unit id="sla" resname="sla">
+				<source>SLA</source>
+				<target>SLA</target>
 			</trans-unit>
-			<trans-unit id="extensionList">
-				<source>Extension List</source>
-				<target>Liste der Extensions</target>
+			<trans-unit id="sla.clients" resname="sla.clients">
+				<source>List all clients with this SLA</source>
+				<target>Alle Clients mit dieser SLA anzeigen</target>
 			</trans-unit>
-			<trans-unit id="coreVersions">
-				<source>Core Versions</source>
-				<target>Core-Versionen</target>
+			<trans-unit id="sla.header" resname="sla.header">
+				<source>Service level agreements</source>
+				<target>Service Level Agreements</target>
 			</trans-unit>
-			<trans-unit id="sla">
-				<source>SLA</source>
-				<target>SLA</target>
+			<trans-unit id="sla.noClients" resname="sla.noClients">
+				<source>This SLA is not used by any client!</source>
+				<target>Diese SLA wir von keinem Client benutzt!</target>
 			</trans-unit>
-			<trans-unit id="administration">
-				<source>Administration</source>
-				<target>Administration</target>
+			<trans-unit id="sla.notFound" resname="sla.notFound">
+				<source>No Tag records found!</source>
+				<target>Keine Tag Einträge gefunden!</target>
 			</trans-unit>
-			<trans-unit id="available.extensions">
-				<source>Available extensions</source>
-				<target>Vorhandene Extensions</target>
+			<trans-unit id="sla.total" resname="sla.total">
+				<source>SLA (%s)</source>
+				<target>SLA (%s)</target>
 			</trans-unit>
-			<trans-unit id="count">
-				<source>Count</source>
-				<target>Anzahl</target>
+			<trans-unit id="tag.clients" resname="tag.clients">
+				<source>List all clients with this tag</source>
+				<target>Alle Clients mit diesem Tag anzeigen</target>
 			</trans-unit>
-			<trans-unit id="search">
-				<source>Search</source>
-				<target>Suche</target>
+			<trans-unit id="tag.header" resname="tag.header">
+				<source>Tags</source>
+				<target>Tags</target>
 			</trans-unit>
-			<trans-unit id="search.introHelp">
-				<source>Use the search on the left to filter the clients for specific properties.</source>
-				<target>Die Suche auf der linken Seite benutzen um die Clients nach spezifischen Eigenschaften zu filtern.</target>
+			<trans-unit id="tag.noClients" resname="tag.noClients">
+				<source>This Tag is not used by any client!</source>
+				<target>Diese Tag wir von keinem Client benutzt!</target>
 			</trans-unit>
-			<trans-unit id="bulletins.headline">
-				<source>Latest security bulletins</source>
-				<target>Neueste Security Bulletins</target>
+			<trans-unit id="tag.total" resname="tag.total">
+				<source>Tags (%s)</source>
+				<target>Tags (%s)</target>
 			</trans-unit>
-			<trans-unit id="bulletins.errorFetch">
-				<source>Sorry, the bulletins could not be fetched!</source>
-				<target>Die Bulletins konnten leider nicht geladen werden!</target>
+			<trans-unit id="total" resname="total">
+				<source>total</source>
+				<target>insgesamt</target>
 			</trans-unit>
-			<trans-unit id="bulletins.disabled">
-				<source>Loading the bulletins is disabled.</source>
-				<target>Das Laden der Bulletins ist deaktiviert.</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client" resname="tx_t3monitoring_domain_model_client">
+				<source>Client</source>
+				<target>Client</target>
 			</trans-unit>
-			<trans-unit id="bulletins.all">
-				<source>All bulletins</source>
-				<target>Alle Bulletins</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.core" resname="tx_t3monitoring_domain_model_client.core">
+				<source>Core</source>
+				<target>Core</target>
 			</trans-unit>
-			<trans-unit id="clients.total">
-				<source>Clients (%s)</source>
-				<target>Clients (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space" resname="tx_t3monitoring_domain_model_client.disk_free_space">
+				<source>Disk Free Space</source>
+				<target>Disk Free Space</target>
 			</trans-unit>
-			<trans-unit id="clients.listAll">
-				<source>List all</source>
-				<target>Alle anzeigen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space" resname="tx_t3monitoring_domain_model_client.disk_total_space">
+				<source>Disk Total Space</source>
+				<target>Disk Total Space</target>
 			</trans-unit>
-			<trans-unit id="clients.notFound">
-				<source>No clients found</source>
-				<target>Keine Clients gefunden</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.domain" resname="tx_t3monitoring_domain_model_client.domain">
+				<source>Domain</source>
+				<target>Domain</target>
 			</trans-unit>
-			<trans-unit id="coreVersions.header">
-				<source>Core versions</source>
-				<target>Core-Versionen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.email" resname="tx_t3monitoring_domain_model_client.email">
+				<source>Email</source>
+				<target>E-Mail</target>
 			</trans-unit>
-			<trans-unit id="sla.header">
-				<source>Service level agreements</source>
-				<target>Service Level Agreements</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.error_message" resname="tx_t3monitoring_domain_model_client.error_message">
+				<source>Error Message</source>
+				<target>Fehlermeldung</target>
 			</trans-unit>
-			<trans-unit id="tag.header">
-				<source>Tags</source>
-				<target>Tags</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extensions" resname="tx_t3monitoring_domain_model_client.extensions">
+				<source>Extensions</source>
+				<target>Extension</target>
 			</trans-unit>
-			<trans-unit id="total">
-				<source>total</source>
-				<target>insgesamt</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger" resname="tx_t3monitoring_domain_model_client.extra_danger">
+				<source>Extra Danger</source>
+				<target>Zusätzliche Gefahren</target>
 			</trans-unit>
-			<trans-unit id="core.totalUsed">
-				<source>Used core versions (%s)</source>
-				<target>Verwendete Core-Versionen (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info" resname="tx_t3monitoring_domain_model_client.extra_info">
+				<source>Extra Info</source>
+				<target>Zusätzliche Infos</target>
 			</trans-unit>
-			<trans-unit id="clients.notReachable">
-				<source>Not reachable</source>
-				<target>Nicht erreichbar</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning" resname="tx_t3monitoring_domain_model_client.extra_warning">
+				<source>Extra Warning</source>
+				<target>Zusätzliche Warnungen</target>
 			</trans-unit>
-			<trans-unit id="clients.numberOfExtensions">
-				<source>Number of extensions</source>
-				<target>Anzahl Extensions</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core" resname="tx_t3monitoring_domain_model_client.insecure_core">
+				<source>Insecure Core</source>
+				<target>Unsicherer Core</target>
 			</trans-unit>
-			<trans-unit id="client.facts">
-				<source>Facts</source>
-				<target>Fakten</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions" resname="tx_t3monitoring_domain_model_client.insecure_extensions">
+				<source>Insecure Extensions</source>
+				<target>Unsichere Extensions</target>
 			</trans-unit>
-			<trans-unit id="client.noSuccessfulImport">
-				<source>No successful import until now!</source>
-				<target>Bisher kein erfolgreicher Import!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import" resname="tx_t3monitoring_domain_model_client.last_successful_import">
+				<source>Last Successful Import</source>
+				<target>Letzter erfolgreicher Import</target>
 			</trans-unit>
-			<trans-unit id="client.extra">
-				<source>Extra</source>
-				<target>Extras</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version" resname="tx_t3monitoring_domain_model_client.mysql_version">
+				<source>Database Version</source>
+				<target>Datenbank Version</target>
 			</trans-unit>
-			<trans-unit id="client.extra.warning">
-				<source>Additional warnings</source>
-				<target>Zusätzliche Warnungen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core" resname="tx_t3monitoring_domain_model_client.outdated_core">
+				<source>Outdated Core</source>
+				<target>Veralteter Core</target>
 			</trans-unit>
-			<trans-unit id="client.extra.danger">
-				<source>Additional error messages</source>
-				<target>Zusätzliche Fehlermeldungen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions" resname="tx_t3monitoring_domain_model_client.outdated_extensions">
+				<source>Outdated Extensions</source>
+				<target>Veraltete Extensions</target>
 			</trans-unit>
-			<trans-unit id="filter.connectionErrors">
-				<source>Connection errors</source>
-				<target>Verbindungsfehler</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.php_version" resname="tx_t3monitoring_domain_model_client.php_version">
+				<source>Php Version</source>
+				<target>Php Version</target>
 			</trans-unit>
-			<trans-unit id="client.domainNotPingAble">
-				<source>The domain "%s" could not not be contacted (maybe invalid or not reachable)!</source>
-				<target>Die Domain "%s" konnte nicht erreicht werden (ungültig oder nicht erreichbar)!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.secret" resname="tx_t3monitoring_domain_model_client.secret">
+				<source>Secret</source>
+				<target>Secret</target>
 			</trans-unit>
-			<trans-unit id="filter.withExtraWarning">
-				<source>Additional warnings</source>
-				<target>Zusätzliche Warnungen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.sla" resname="tx_t3monitoring_domain_model_client.sla">
+				<source>Sla</source>
+				<target>Sla</target>
 			</trans-unit>
-			<trans-unit id="filter.withExtraDanger">
-				<source>Additional errors</source>
-				<target>Zusätzliche Fehler</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.title" resname="tx_t3monitoring_domain_model_client.title">
+				<source>Title</source>
+				<target>Titel</target>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.core">
+			<trans-unit id="tx_t3monitoring_domain_model_core" resname="tx_t3monitoring_domain_model_core">
 				<source>Core</source>
 				<target>Core</target>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.extensions">
-				<source>Extensions</source>
-				<target>Extensions</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.insecure" resname="tx_t3monitoring_domain_model_core.insecure">
+				<source>Insecure</source>
+				<target>Unsicher</target>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.misc">
-				<source>Misc</source>
-				<target>Diverses</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_active" resname="tx_t3monitoring_domain_model_core.is_active">
+				<source>Is Active</source>
+				<target>Aktiv</target>
 			</trans-unit>
-			<trans-unit id="lastImport.header">
-				<source>Last imports</source>
-				<target>Letzter Import</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest" resname="tx_t3monitoring_domain_model_core.is_latest">
+				<source>Is Latest</source>
+				<target>Letzter</target>
 			</trans-unit>
-			<trans-unit id="lastImport.client">
-				<source>Import clients</source>
-				<target>Clients importiert</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_official" resname="tx_t3monitoring_domain_model_core.is_official">
+				<source>Is Official</source>
+				<target>Offiziell</target>
 			</trans-unit>
-			<trans-unit id="lastImport.core">
-				<source>Import core</source>
-				<target>Core importiert</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable" resname="tx_t3monitoring_domain_model_core.is_stable">
+				<source>Is Stable</source>
+				<target>Stabil</target>
 			</trans-unit>
-			<trans-unit id="lastImport.extension">
-				<source>Import extensions</source>
-				<target>Extensions importiert</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_used" resname="tx_t3monitoring_domain_model_core.is_used">
+				<source>Is Used</source>
+				<target>Benutzt</target>
 			</trans-unit>
-			<trans-unit id="lastImport.none">
-				<source>No import yet!</source>
-				<target>Bisher kein Import!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.latest" resname="tx_t3monitoring_domain_model_core.latest">
+				<source>Latest</source>
+				<target>Letzter</target>
 			</trans-unit>
-			<trans-unit id="sla.total">
-				<source>SLA (%s)</source>
-				<target>SLA (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version" resname="tx_t3monitoring_domain_model_core.next_secure_version">
+				<source>Next Secure Version</source>
+				<target>Nächste sichere Version</target>
 			</trans-unit>
-			<trans-unit id="sla.notFound">
-				<source>No SLA records found!</source>
-				<target>Keine SLA Einträge gefunden!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.release_date" resname="tx_t3monitoring_domain_model_core.release_date">
+				<source>Release Date</source>
+				<target>Veröffentlichungsdatum</target>
 			</trans-unit>
-			<trans-unit id="sla.clients">
-				<source>List all clients with this SLA</source>
-				<target>Alle Clients mit dieser SLA anzeigen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.stable" resname="tx_t3monitoring_domain_model_core.stable">
+				<source>Stable</source>
+				<target>Stabiler</target>
 			</trans-unit>
-			<trans-unit id="sla.noClients">
-				<source>This SLA is not used by any client!</source>
-				<target>Diese SLA wir von keinem Client benutzt!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type" resname="tx_t3monitoring_domain_model_core.type">
+				<source>Type</source>
+				<target>Typ</target>
 			</trans-unit>
-			<trans-unit id="tag.total">
-				<source>Tags (%s)</source>
-				<target>Tags (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version" resname="tx_t3monitoring_domain_model_core.version">
+				<source>Version</source>
+				<target>Version</target>
 			</trans-unit>
-			<trans-unit id="sla.notFound">
-				<source>No Tag records found!</source>
-				<target>Keine Tag Einträge gefunden!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer" resname="tx_t3monitoring_domain_model_core.version_integer">
+				<source>Version Integer</source>
+				<target>Version Integer</target>
 			</trans-unit>
-			<trans-unit id="tag.clients">
-				<source>List all clients with this tag</source>
-				<target>Alle Clients mit diesem Tag anzeigen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension" resname="tx_t3monitoring_domain_model_extension">
+				<source>Extension</source>
+				<target>Extension</target>
 			</trans-unit>
-			<trans-unit id="tag.noClients">
-				<source>This Tag is not used by any client!</source>
-				<target>Diese Tag wir von keinem Client benutzt!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name" resname="tx_t3monitoring_domain_model_extension.author_name">
+				<source>Author Name</source>
+				<target>Name des Autors</target>
 			</trans-unit>
-			<trans-unit id="extension.total">
-				<source>Extensions (%s)</source>
-				<target>Extensions (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.category" resname="tx_t3monitoring_domain_model_extension.category">
+				<source>Category</source>
+				<target>Kategorie</target>
 			</trans-unit>
-			<trans-unit id="extension.notFound">
-				<source>No extensions found</source>
-				<target>Keine Extensions gefunden</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.description" resname="tx_t3monitoring_domain_model_extension.description">
+				<source>Description</source>
+				<target>Beschreibung</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure" resname="tx_t3monitoring_domain_model_extension.insecure">
+				<source>Insecure</source>
+				<target>Unsicher</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest" resname="tx_t3monitoring_domain_model_extension.is_latest">
+				<source>Is Latest</source>
+				<target>Aktuell</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified" resname="tx_t3monitoring_domain_model_extension.is_modified">
+				<source>Is Modified</source>
+				<target>Verändert</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official" resname="tx_t3monitoring_domain_model_extension.is_official">
+				<source>Is Official</source>
+				<target>Offiziell</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used" resname="tx_t3monitoring_domain_model_extension.is_used">
+				<source>Is Used</source>
+				<target>Verwendet</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release" resname="tx_t3monitoring_domain_model_extension.last_bugfix_release">
+				<source>Last Bugfix Release</source>
+				<target>Letztes Bugfix-Release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release" resname="tx_t3monitoring_domain_model_extension.last_major_release">
+				<source>Last Major Release</source>
+				<target>Letztes Major-Release</target>
 			</trans-unit>
-			<trans-unit id="extensionFilter.name">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release" resname="tx_t3monitoring_domain_model_extension.last_minor_release">
+				<source>Last Minor Release</source>
+				<target>Letztes Minor-Release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated" resname="tx_t3monitoring_domain_model_extension.last_updated">
+				<source>Last Updated</source>
+				<target>Letztes Update</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.name" resname="tx_t3monitoring_domain_model_extension.name">
 				<source>Name</source>
 				<target>Name</target>
 			</trans-unit>
-			<trans-unit id="extensionFilter.exactSearch">
-				<source>Exact search</source>
-				<target>Exakte Suche</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version" resname="tx_t3monitoring_domain_model_extension.next_secure_version">
+				<source>Next Secure Version</source>
+				<target>Nächste sichere Version</target>
 			</trans-unit>
-			<trans-unit id="extension.by">
-				<source>by %s</source>
-				<target>von %s</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies" resname="tx_t3monitoring_domain_model_extension.serialized_dependencies">
+				<source>Serialized Dependencies</source>
+				<target>Serialisierte Abhängigkeiten</target>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage">
-				<source>Usage</source>
-				<target>Verwendung</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.state" resname="tx_t3monitoring_domain_model_extension.state">
+				<source>State</source>
+				<target>Status</target>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage.1">
-				<source>Used</source>
-				<target>verwendet</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.title" resname="tx_t3monitoring_domain_model_extension.title">
+				<source>Title</source>
+				<target>Titel</target>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage.0">
-				<source>All</source>
-				<target>Alle</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment" resname="tx_t3monitoring_domain_model_extension.update_comment">
+				<source>Update Comment</source>
+				<target>Updatebeschreibung</target>
 			</trans-unit>
-			<trans-unit id="administration.sponsors.headline">
-				<source>Sponsors</source>
-				<target>Sponsoren</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version" resname="tx_t3monitoring_domain_model_extension.version">
+				<source>Version</source>
+				<target>Version</target>
 			</trans-unit>
-			<trans-unit id="administration.sponsors.description">
-				<source>This extension has been sponsored by</source>
-				<target>Diese Extension wurde gesponsert von</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer" resname="tx_t3monitoring_domain_model_extension.version_integer">
+				<source>Version Integer</source>
+				<target>Version Integer</target>
 			</trans-unit>
-			<trans-unit id="administration.ipHint">
-				<source><![CDATA[
-				Set the allowed IP(s) for the client to <code>%s</code>.
-				]]></source>
-				<target><![CDATA[
-				Die erlaubten IP(s) für den Client auf <code>%s</code> setzen.
-				]]></target>
+			<trans-unit id="tx_t3monitoring_domain_model_sla" resname="tx_t3monitoring_domain_model_sla">
+				<source>Sla</source>
+				<target>Sla</target>
 			</trans-unit>
-			<trans-unit id="noClients.title">
-				<source>No clients created!</source>
-				<target>Keine Clients angelegt!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.description" resname="tx_t3monitoring_domain_model_sla.description">
+				<source>Description</source>
+				<target>Beschreibung</target>
 			</trans-unit>
-			<trans-unit id="noClients.description">
-				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
-				<target>Schön, dass Sie t3monitoring ausprobieren wollen! Um zu beginnen, erstellen Sie einen Client mit dem + Icon oben!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.title" resname="tx_t3monitoring_domain_model_sla.title">
+				<source>Title</source>
+				<target>Titel</target>
 			</trans-unit>
-			<trans-unit id="presentationMode.client.title">
-				<source>Client with uid %s</source>
-				<target>Client mit der uid %s</target>
+			<trans-unit id="tx_t3monitoring_domain_model_tag" resname="tx_t3monitoring_domain_model_tag">
+				<source>Tags</source>
+				<target>Tag</target>
 			</trans-unit>
-			<trans-unit id="presentationMode.client.domain">
-				<source>http://*********.***</source>
-				<target>http://*********.***</target>
+			<trans-unit id="unknown" resname="unknown">
+				<source>unknown</source>
+				<target>unbekannt</target>
 			</trans-unit>
-			<trans-unit id="noInsecureClients">
-				<source>No insecure clients found!</source>
-				<target>Keine unsicheren Clients gefunden!</target>
+			<trans-unit id="update.available" resname="update.available">
+				<source>Update available</source>
+				<target>Update verfügbar</target>
 			</trans-unit>
-			<trans-unit id="fetchClient.link">
-				<source>Fetch single client</source>
-				<target>Einzelnen Client abrufen</target>
+			<trans-unit id="view.administration" resname="view.administration">
+				<source>Administration</source>
+				<target>Administration</target>
 			</trans-unit>
-			<trans-unit id="fetchClient.success">
-				<source>The data of the client has been successfully fetched!</source>
-				<target>Die Daten des Clients wurden erfolgreich abgerufen!</target>
+			<trans-unit id="view.core" resname="view.core">
+				<source>Used core versions</source>
+				<target>Verwendete Core-Versionen</target>
+			</trans-unit>
+			<trans-unit id="view.usedExtensions" resname="view.usedExtensions">
+				<source>Used extensions</source>
+				<target>Verwendete Extensions</target>
+			</trans-unit>
+			<trans-unit id="yes" resname="yes">
+				<source>yes</source>
+				<target>ja</target>
 			</trans-unit>
 		</body>
 	</file>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 7927971..f5c06db 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -1,508 +1,499 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2016-04-03T20:21:29Z" product-name="t3monitoring">
-		<header/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" original="messages" datatype="plaintext" product-name="t3monitoring" date="2024-08-02T14:46:11+02:00">
+		<header></header>
 		<body>
-			<trans-unit id="tx_t3monitoring_domain_model_client">
-				<source>Client</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.title">
-				<source>Title</source>
+			<trans-unit id="administration" resname="administration">
+				<source>Administration</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
-				<source>Domain</source>
+			<trans-unit id="administration.import.description" resname="administration.import.description">
+				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.comment">
-				<source>Comment</source>
+			<trans-unit id="administration.import.headline" resname="administration.import.headline">
+				<source>Start an import</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.status">
-				<source>Status</source>
+			<trans-unit id="administration.import.success" resname="administration.import.success">
+				<source>The import was successful!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error">
-				<source>Error</source>
+			<trans-unit id="administration.ipHint" resname="administration.ipHint">
+				<source>&#xA;&#x9;&#x9;&#x9;&#x9;Set the allowed IP(s) for the client to &lt;code&gt;%s&lt;/code&gt;.&#xA;&#x9;&#x9;&#x9;&#x9;</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.ok">
-				<source>OK</source>
+			<trans-unit id="administration.sponsors.description" resname="administration.sponsors.description">
+				<source>This extension has been sponsored by</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.basic_auth_username">
-				<source>BasicAuth username</source>
+			<trans-unit id="administration.sponsors.headline" resname="administration.sponsors.headline">
+				<source>Sponsors</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.basic_auth_password">
-				<source>BasicAuth password</source>
+			<trans-unit id="available.extensions" resname="available.extensions">
+				<source>Available extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.hostHeader">
-				<source>Host Header</source>
-				<context context-type="context">Label for field host header (type input). It's an optional field.</context>
+			<trans-unit id="bulletins.all" resname="bulletins.all">
+				<source>All bulletins</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.ignoreCertErrors">
-				<source>Ignore Certificate Errors</source>
-				<context context-type="context">Label for field Ignore Certificate Errors (type checkbox). It's an optional field.</context>
+			<trans-unit id="bulletins.disabled" resname="bulletins.disabled">
+				<source>Loading the bulletins is disabled.</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.excludeFromImport">
-				<source>Exclude from Import</source>
-				<context context-type="context">Label for field Exclude from Import (type checkbox). It's an optional field.</context>
+			<trans-unit id="bulletins.errorFetch" resname="bulletins.errorFetch">
+				<source>Sorry, the bulletins could not be fetched!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.forceIpResolve">
-				<source>Force IP Resolve</source>
-				<context context-type="context">Label for field Force IP Resolve (type select).</context>
+			<trans-unit id="bulletins.headline" resname="bulletins.headline">
+				<source>Latest security bulletins</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
-				<source>Secret</source>
+			<trans-unit id="client.domainNotPingAble" resname="client.domainNotPingAble">
+				<source>The domain &#34;%s&#34; could not not be contacted (maybe invalid or not reachable)!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.email">
-				<source>Email</source>
+			<trans-unit id="client.extra" resname="client.extra">
+				<source>Extra</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.php_version">
-				<source>Php Version</source>
+			<trans-unit id="client.extra.danger" resname="client.extra.danger">
+				<source>Additional error messages</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Database Version</source>
+			<trans-unit id="client.extra.warning" resname="client.extra.warning">
+				<source>Additional warnings</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
-				<source>Disk Total Space</source>
+			<trans-unit id="client.facts" resname="client.facts">
+				<source>Facts</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space">
-				<source>Disk Free Space</source>
+			<trans-unit id="client.noSuccessfulImport" resname="client.noSuccessfulImport">
+				<source>No successful import until now!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
-				<source>Insecure Core</source>
+			<trans-unit id="clients.listAll" resname="clients.listAll">
+				<source>List all</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core">
-				<source>Outdated Core</source>
+			<trans-unit id="clients.notFound" resname="clients.notFound">
+				<source>No clients found</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions">
-				<source>Insecure Extensions</source>
+			<trans-unit id="clients.notReachable" resname="clients.notReachable">
+				<source>Not reachable</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
-				<source>Outdated Extensions</source>
+			<trans-unit id="clients.numberOfExtensions" resname="clients.numberOfExtensions">
+				<source>Number of extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
-				<source>Error Message</source>
+			<trans-unit id="clients.total" resname="clients.total">
+				<source>Clients (%s)</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info">
-				<source>Extra Info</source>
+			<trans-unit id="core.totalUsed" resname="core.totalUsed">
+				<source>Used core versions (%s)</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning">
-				<source>Extra Warning</source>
+			<trans-unit id="coreFilter.usage" resname="coreFilter.usage">
+				<source>Usage</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger">
-				<source>Extra Danger</source>
+			<trans-unit id="coreFilter.usage.0" resname="coreFilter.usage.0">
+				<source>All</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import">
-				<source>Last Successful Import</source>
+			<trans-unit id="coreFilter.usage.1" resname="coreFilter.usage.1">
+				<source>Used</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extensions">
-				<source>Extensions</source>
+			<trans-unit id="coreVersions" resname="coreVersions">
+				<source>Core Versions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.core">
-				<source>Core</source>
+			<trans-unit id="coreVersions.header" resname="coreVersions.header">
+				<source>Core versions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.sla">
-				<source>Sla</source>
+			<trans-unit id="count" resname="count">
+				<source>Count</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.tag">
-				<source>Tag</source>
+			<trans-unit id="createNew.client" resname="createNew.client">
+				<source>Create new client</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension">
-				<source>Extension</source>
+			<trans-unit id="edit.client" resname="edit.client">
+				<source>Edit client</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.name">
-				<source>Name</source>
+			<trans-unit id="extension.by" resname="extension.by">
+				<source>by %s</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version">
-				<source>Version</source>
+			<trans-unit id="extension.notFound" resname="extension.notFound">
+				<source>No extensions found</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure">
-				<source>Insecure</source>
+			<trans-unit id="extension.total" resname="extension.total">
+				<source>Extensions (%s)</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version">
-				<source>Next Secure Version</source>
+			<trans-unit id="extensionFilter.exactSearch" resname="extensionFilter.exactSearch">
+				<source>Exact search</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.title">
-				<source>Title</source>
+			<trans-unit id="extensionFilter.name" resname="extensionFilter.name">
+				<source>Name</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.description">
-				<source>Description</source>
+			<trans-unit id="extensionList" resname="extensionList">
+				<source>Extension List</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated">
-				<source>Last Updated</source>
+			<trans-unit id="fetchClient.link" resname="fetchClient.link">
+				<source>Fetch single client</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name">
-				<source>Author Name</source>
+			<trans-unit id="fetchClient.success" resname="fetchClient.success">
+				<source>The data of the client has been successfully fetched!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment">
-				<source>Update Comment</source>
+			<trans-unit id="filter.connectionErrors" resname="filter.connectionErrors">
+				<source>Connection errors</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.state">
-				<source>State</source>
+			<trans-unit id="filter.fieldset.core" resname="filter.fieldset.core">
+				<source>Core</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.category">
-				<source>Category</source>
+			<trans-unit id="filter.fieldset.extensions" resname="filter.fieldset.extensions">
+				<source>Extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer">
-				<source>Version Integer</source>
+			<trans-unit id="filter.fieldset.misc" resname="filter.fieldset.misc">
+				<source>Misc</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used">
-				<source>Is Used</source>
+			<trans-unit id="filter.withExtraDanger" resname="filter.withExtraDanger">
+				<source>Additional errors</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official">
-				<source>Is Official</source>
+			<trans-unit id="filter.withExtraWarning" resname="filter.withExtraWarning">
+				<source>Additional warnings</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified">
-				<source>Is Modified</source>
+			<trans-unit id="found.in.ter" resname="found.in.ter">
+				<source>Found in TER</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest">
-				<source>Is Latest</source>
+			<trans-unit id="home" resname="home">
+				<source>Home</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release">
-				<source>Last Bugfix Release</source>
+			<trans-unit id="lastImport.client" resname="lastImport.client">
+				<source>Import clients</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release">
-				<source>Last Minor Release</source>
+			<trans-unit id="lastImport.core" resname="lastImport.core">
+				<source>Import core</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release">
-				<source>Last Major Release</source>
+			<trans-unit id="lastImport.extension" resname="lastImport.extension">
+				<source>Import extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
-				<source>Serialized Dependencies</source>
+			<trans-unit id="lastImport.header" resname="lastImport.header">
+				<source>Last imports</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.typo3_min_version">
-				<source>TYPO3 minimum version</source>
+			<trans-unit id="lastImport.none" resname="lastImport.none">
+				<source>No import yet!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.typo3_max_version">
-				<source>TYPO3 maximum version</source>
+			<trans-unit id="loaded" resname="loaded">
+				<source>Loaded</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core">
-				<source>Core</source>
+			<trans-unit id="next.secure.version" resname="next.secure.version">
+				<source>Next secure version:</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version">
-				<source>Version</source>
+			<trans-unit id="no" resname="no">
+				<source>no</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.insecure">
-				<source>Insecure</source>
+			<trans-unit id="no.cores.imported" resname="no.cores.imported">
+				<source>No cores yet imported</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version">
-				<source>Next Secure Version</source>
+			<trans-unit id="no.official.update" resname="no.official.update">
+				<source>No official update available</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type">
-				<source>Type</source>
+			<trans-unit id="no.versions.available" resname="no.versions.available">
+				<source>No versions available</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type.0">
-				<source>Regular</source>
+			<trans-unit id="noClients.description" resname="noClients.description">
+				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type.1">
-				<source>Release</source>
+			<trans-unit id="noClients.title" resname="noClients.title">
+				<source>No clients created!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type.2">
-				<source>Security</source>
+			<trans-unit id="noInsecureClients" resname="noInsecureClients">
+				<source>No insecure clients found!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type.4">
-				<source>Development</source>
+			<trans-unit id="presentationMode.client.domain" resname="presentationMode.client.domain">
+				<source>http://*********.***</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.release_date">
-				<source>Release Date</source>
+			<trans-unit id="presentationMode.client.title" resname="presentationMode.client.title">
+				<source>Client with uid %s</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.latest">
-				<source>Latest</source>
+			<trans-unit id="search" resname="search">
+				<source>Search</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.stable">
-				<source>Stable</source>
+			<trans-unit id="search.introHelp" resname="search.introHelp">
+				<source>Use the search on the left to filter the clients for specific properties.</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable">
-				<source>Is Stable</source>
+			<trans-unit id="secure" resname="secure">
+				<source>Secure</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_active">
-				<source>Is Active</source>
+			<trans-unit id="sla" resname="sla">
+				<source>SLA</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest">
-				<source>Is Latest</source>
+			<trans-unit id="sla.clients" resname="sla.clients">
+				<source>List all clients with this SLA</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer">
-				<source>Version Integer</source>
+			<trans-unit id="sla.header" resname="sla.header">
+				<source>Service level agreements</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_used">
-				<source>Is Used</source>
+			<trans-unit id="sla.noClients" resname="sla.noClients">
+				<source>This SLA is not used by any client!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_official">
-				<source>Is Official</source>
+			<trans-unit id="sla.notFound" resname="sla.notFound">
+				<source>No Tag records found!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla">
-				<source>Sla</source>
+			<trans-unit id="sla.total" resname="sla.total">
+				<source>SLA (%s)</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.title">
-				<source>Title</source>
+			<trans-unit id="tag" resname="tag">
+				<source>Tag</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.description">
-				<source>Description</source>
+			<trans-unit id="tag.clients" resname="tag.clients">
+				<source>List all clients with this tag</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag">
+			<trans-unit id="tag.header" resname="tag.header">
 				<source>Tags</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag.title">
-				<source>Title</source>
+			<trans-unit id="tag.noClients" resname="tag.noClients">
+				<source>This Tag is not used by any client!</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag.description">
-				<source>Description</source>
+			<trans-unit id="tag.total" resname="tag.total">
+				<source>Tags (%s)</source>
 			</trans-unit>
-			<trans-unit id="update.available">
-				<source>Update available</source>
+			<trans-unit id="total" resname="total">
+				<source>total</source>
 			</trans-unit>
-			<trans-unit id="secure">
-				<source>Secure</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client" resname="tx_t3monitoring_domain_model_client">
+				<source>Client</source>
 			</trans-unit>
-			<trans-unit id="loaded">
-				<source>Loaded</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.basic_auth_password" resname="tx_t3monitoring_domain_model_client.basic_auth_password">
+				<source>BasicAuth password</source>
 			</trans-unit>
-			<trans-unit id="found.in.ter">
-				<source>Found in TER</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.basic_auth_username" resname="tx_t3monitoring_domain_model_client.basic_auth_username">
+				<source>BasicAuth username</source>
 			</trans-unit>
-			<trans-unit id="next.secure.version">
-				<source>Next secure version:</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.comment" resname="tx_t3monitoring_domain_model_client.comment">
+				<source>Comment</source>
 			</trans-unit>
-			<trans-unit id="no.official.update">
-				<source>No official update available</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.core" resname="tx_t3monitoring_domain_model_client.core">
+				<source>Core</source>
 			</trans-unit>
-			<trans-unit id="yes">
-				<source>yes</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space" resname="tx_t3monitoring_domain_model_client.disk_free_space">
+				<source>Disk Free Space</source>
 			</trans-unit>
-			<trans-unit id="no">
-				<source>no</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space" resname="tx_t3monitoring_domain_model_client.disk_total_space">
+				<source>Disk Total Space</source>
 			</trans-unit>
-			<trans-unit id="unknown">
-				<source>unknown</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.domain" resname="tx_t3monitoring_domain_model_client.domain">
+				<source>Domain</source>
 			</trans-unit>
-			<trans-unit id="no.cores.imported">
-				<source>No cores yet imported</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.email" resname="tx_t3monitoring_domain_model_client.email">
+				<source>Email</source>
 			</trans-unit>
-			<trans-unit id="no.versions.available">
-				<source>No versions available</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.error" resname="tx_t3monitoring_domain_model_client.error">
+				<source>Error</source>
 			</trans-unit>
-			<trans-unit id="view.administration">
-				<source>Administration</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.error_message" resname="tx_t3monitoring_domain_model_client.error_message">
+				<source>Error Message</source>
 			</trans-unit>
-			<trans-unit id="view.usedExtensions">
-				<source>Used extensions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.excludeFromImport" resname="tx_t3monitoring_domain_model_client.excludeFromImport">
+				<source>Exclude from Import</source>
 			</trans-unit>
-			<trans-unit id="view.core">
-				<source>Used core versions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extensions" resname="tx_t3monitoring_domain_model_client.extensions">
+				<source>Extensions</source>
 			</trans-unit>
-			<trans-unit id="administration.import.headline">
-				<source>Start an import</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger" resname="tx_t3monitoring_domain_model_client.extra_danger">
+				<source>Extra Danger</source>
 			</trans-unit>
-			<trans-unit id="administration.import.success">
-				<source>The import was successful!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info" resname="tx_t3monitoring_domain_model_client.extra_info">
+				<source>Extra Info</source>
 			</trans-unit>
-			<trans-unit id="administration.import.description">
-				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning" resname="tx_t3monitoring_domain_model_client.extra_warning">
+				<source>Extra Warning</source>
 			</trans-unit>
-			<trans-unit id="createNew.client">
-				<source>Create new client</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.forceIpResolve" resname="tx_t3monitoring_domain_model_client.forceIpResolve">
+				<source>Force IP Resolve</source>
 			</trans-unit>
-			<trans-unit id="edit.client">
-				<source>Edit client</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.hostHeader" resname="tx_t3monitoring_domain_model_client.hostHeader">
+				<source>Host Header</source>
 			</trans-unit>
-			<trans-unit id="home">
-				<source>Home</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.ignoreCertErrors" resname="tx_t3monitoring_domain_model_client.ignoreCertErrors">
+				<source>Ignore Certificate Errors</source>
 			</trans-unit>
-			<trans-unit id="extensionList">
-				<source>Extension List</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core" resname="tx_t3monitoring_domain_model_client.insecure_core">
+				<source>Insecure Core</source>
 			</trans-unit>
-			<trans-unit id="coreVersions">
-				<source>Core Versions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions" resname="tx_t3monitoring_domain_model_client.insecure_extensions">
+				<source>Insecure Extensions</source>
 			</trans-unit>
-			<trans-unit id="sla">
-				<source>SLA</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import" resname="tx_t3monitoring_domain_model_client.last_successful_import">
+				<source>Last Successful Import</source>
 			</trans-unit>
-			<trans-unit id="tag">
-				<source>Tag</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version" resname="tx_t3monitoring_domain_model_client.mysql_version">
+				<source>Database Version</source>
 			</trans-unit>
-			<trans-unit id="administration">
-				<source>Administration</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.ok" resname="tx_t3monitoring_domain_model_client.ok">
+				<source>OK</source>
 			</trans-unit>
-			<trans-unit id="available.extensions">
-				<source>Available extensions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core" resname="tx_t3monitoring_domain_model_client.outdated_core">
+				<source>Outdated Core</source>
 			</trans-unit>
-			<trans-unit id="count">
-				<source>Count</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions" resname="tx_t3monitoring_domain_model_client.outdated_extensions">
+				<source>Outdated Extensions</source>
 			</trans-unit>
-			<trans-unit id="search">
-				<source>Search</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.php_version" resname="tx_t3monitoring_domain_model_client.php_version">
+				<source>Php Version</source>
 			</trans-unit>
-			<trans-unit id="search.introHelp">
-				<source>Use the search on the left to filter the clients for specific properties.</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.secret" resname="tx_t3monitoring_domain_model_client.secret">
+				<source>Secret</source>
 			</trans-unit>
-			<trans-unit id="bulletins.headline">
-				<source>Latest security bulletins</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.sla" resname="tx_t3monitoring_domain_model_client.sla">
+				<source>Sla</source>
 			</trans-unit>
-			<trans-unit id="bulletins.errorFetch">
-				<source>Sorry, the bulletins could not be fetched!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.status" resname="tx_t3monitoring_domain_model_client.status">
+				<source>Status</source>
 			</trans-unit>
-			<trans-unit id="bulletins.disabled">
-				<source>Loading the bulletins is disabled.</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.tag" resname="tx_t3monitoring_domain_model_client.tag">
+				<source>Tag</source>
 			</trans-unit>
-			<trans-unit id="bulletins.all">
-				<source>All bulletins</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.title" resname="tx_t3monitoring_domain_model_client.title">
+				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="clients.total">
-				<source>Clients (%s)</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core" resname="tx_t3monitoring_domain_model_core">
+				<source>Core</source>
 			</trans-unit>
-			<trans-unit id="clients.listAll">
-				<source>List all</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.insecure" resname="tx_t3monitoring_domain_model_core.insecure">
+				<source>Insecure</source>
 			</trans-unit>
-			<trans-unit id="clients.notFound">
-				<source>No clients found</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_active" resname="tx_t3monitoring_domain_model_core.is_active">
+				<source>Is Active</source>
 			</trans-unit>
-			<trans-unit id="coreVersions.header">
-				<source>Core versions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest" resname="tx_t3monitoring_domain_model_core.is_latest">
+				<source>Is Latest</source>
 			</trans-unit>
-			<trans-unit id="sla.header">
-				<source>Service level agreements</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_official" resname="tx_t3monitoring_domain_model_core.is_official">
+				<source>Is Official</source>
 			</trans-unit>
-			<trans-unit id="tag.header">
-				<source>Tags</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable" resname="tx_t3monitoring_domain_model_core.is_stable">
+				<source>Is Stable</source>
 			</trans-unit>
-			<trans-unit id="total">
-				<source>total</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_used" resname="tx_t3monitoring_domain_model_core.is_used">
+				<source>Is Used</source>
 			</trans-unit>
-			<trans-unit id="core.totalUsed">
-				<source>Used core versions (%s)</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.latest" resname="tx_t3monitoring_domain_model_core.latest">
+				<source>Latest</source>
 			</trans-unit>
-			<trans-unit id="clients.notReachable">
-				<source>Not reachable</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version" resname="tx_t3monitoring_domain_model_core.next_secure_version">
+				<source>Next Secure Version</source>
 			</trans-unit>
-			<trans-unit id="clients.numberOfExtensions">
-				<source>Number of extensions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.release_date" resname="tx_t3monitoring_domain_model_core.release_date">
+				<source>Release Date</source>
 			</trans-unit>
-			<trans-unit id="client.facts">
-				<source>Facts</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.stable" resname="tx_t3monitoring_domain_model_core.stable">
+				<source>Stable</source>
 			</trans-unit>
-			<trans-unit id="client.noSuccessfulImport">
-				<source>No successful import until now!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type" resname="tx_t3monitoring_domain_model_core.type">
+				<source>Type</source>
 			</trans-unit>
-			<trans-unit id="client.extra">
-				<source>Extra</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type.0" resname="tx_t3monitoring_domain_model_core.type.0">
+				<source>Regular</source>
 			</trans-unit>
-			<trans-unit id="client.extra.warning">
-				<source>Additional warnings</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type.1" resname="tx_t3monitoring_domain_model_core.type.1">
+				<source>Release</source>
 			</trans-unit>
-			<trans-unit id="client.extra.danger">
-				<source>Additional error messages</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type.2" resname="tx_t3monitoring_domain_model_core.type.2">
+				<source>Security</source>
 			</trans-unit>
-			<trans-unit id="filter.connectionErrors">
-				<source>Connection errors</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type.4" resname="tx_t3monitoring_domain_model_core.type.4">
+				<source>Development</source>
 			</trans-unit>
-			<trans-unit id="client.domainNotPingAble">
-				<source>The domain "%s" could not not be contacted (maybe invalid or not reachable)!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version" resname="tx_t3monitoring_domain_model_core.version">
+				<source>Version</source>
 			</trans-unit>
-			<trans-unit id="filter.withExtraWarning">
-				<source>Additional warnings</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer" resname="tx_t3monitoring_domain_model_core.version_integer">
+				<source>Version Integer</source>
 			</trans-unit>
-			<trans-unit id="filter.withExtraDanger">
-				<source>Additional errors</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension" resname="tx_t3monitoring_domain_model_extension">
+				<source>Extension</source>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.core">
-				<source>Core</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name" resname="tx_t3monitoring_domain_model_extension.author_name">
+				<source>Author Name</source>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.extensions">
-				<source>Extensions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.category" resname="tx_t3monitoring_domain_model_extension.category">
+				<source>Category</source>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.misc">
-				<source>Misc</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.description" resname="tx_t3monitoring_domain_model_extension.description">
+				<source>Description</source>
 			</trans-unit>
-			<trans-unit id="lastImport.header">
-				<source>Last imports</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure" resname="tx_t3monitoring_domain_model_extension.insecure">
+				<source>Insecure</source>
 			</trans-unit>
-			<trans-unit id="lastImport.client">
-				<source>Import clients</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest" resname="tx_t3monitoring_domain_model_extension.is_latest">
+				<source>Is Latest</source>
 			</trans-unit>
-			<trans-unit id="lastImport.core">
-				<source>Import core</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified" resname="tx_t3monitoring_domain_model_extension.is_modified">
+				<source>Is Modified</source>
 			</trans-unit>
-			<trans-unit id="lastImport.extension">
-				<source>Import extensions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official" resname="tx_t3monitoring_domain_model_extension.is_official">
+				<source>Is Official</source>
 			</trans-unit>
-			<trans-unit id="lastImport.none">
-				<source>No import yet!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used" resname="tx_t3monitoring_domain_model_extension.is_used">
+				<source>Is Used</source>
 			</trans-unit>
-			<trans-unit id="sla.total">
-				<source>SLA (%s)</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release" resname="tx_t3monitoring_domain_model_extension.last_bugfix_release">
+				<source>Last Bugfix Release</source>
 			</trans-unit>
-			<trans-unit id="sla.notFound">
-				<source>No SLA records found!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release" resname="tx_t3monitoring_domain_model_extension.last_major_release">
+				<source>Last Major Release</source>
 			</trans-unit>
-			<trans-unit id="sla.clients">
-				<source>List all clients with this SLA</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release" resname="tx_t3monitoring_domain_model_extension.last_minor_release">
+				<source>Last Minor Release</source>
 			</trans-unit>
-			<trans-unit id="sla.noClients">
-				<source>This SLA is not used by any client!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated" resname="tx_t3monitoring_domain_model_extension.last_updated">
+				<source>Last Updated</source>
 			</trans-unit>
-			<trans-unit id="tag.total">
-				<source>Tags (%s)</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.name" resname="tx_t3monitoring_domain_model_extension.name">
+				<source>Name</source>
 			</trans-unit>
-			<trans-unit id="sla.notFound">
-				<source>No Tag records found!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version" resname="tx_t3monitoring_domain_model_extension.next_secure_version">
+				<source>Next Secure Version</source>
 			</trans-unit>
-			<trans-unit id="tag.clients">
-				<source>List all clients with this tag</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies" resname="tx_t3monitoring_domain_model_extension.serialized_dependencies">
+				<source>Serialized Dependencies</source>
 			</trans-unit>
-			<trans-unit id="tag.noClients">
-				<source>This Tag is not used by any client!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.state" resname="tx_t3monitoring_domain_model_extension.state">
+				<source>State</source>
 			</trans-unit>
-			<trans-unit id="extension.total">
-				<source>Extensions (%s)</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.title" resname="tx_t3monitoring_domain_model_extension.title">
+				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="extension.notFound">
-				<source>No extensions found</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.typo3_max_version" resname="tx_t3monitoring_domain_model_extension.typo3_max_version">
+				<source>TYPO3 maximum version</source>
 			</trans-unit>
-			<trans-unit id="extensionFilter.name">
-				<source>Name</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.typo3_min_version" resname="tx_t3monitoring_domain_model_extension.typo3_min_version">
+				<source>TYPO3 minimum version</source>
 			</trans-unit>
-			<trans-unit id="extensionFilter.exactSearch">
-				<source>Exact search</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment" resname="tx_t3monitoring_domain_model_extension.update_comment">
+				<source>Update Comment</source>
 			</trans-unit>
-			<trans-unit id="extension.by">
-				<source>by %s</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version" resname="tx_t3monitoring_domain_model_extension.version">
+				<source>Version</source>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage">
-				<source>Usage</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer" resname="tx_t3monitoring_domain_model_extension.version_integer">
+				<source>Version Integer</source>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage.1">
-				<source>Used</source>
+			<trans-unit id="tx_t3monitoring_domain_model_sla" resname="tx_t3monitoring_domain_model_sla">
+				<source>Sla</source>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage.0">
-				<source>All</source>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.description" resname="tx_t3monitoring_domain_model_sla.description">
+				<source>Description</source>
 			</trans-unit>
-			<trans-unit id="administration.sponsors.headline">
-				<source>Sponsors</source>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.title" resname="tx_t3monitoring_domain_model_sla.title">
+				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="administration.sponsors.description">
-				<source>This extension has been sponsored by</source>
+			<trans-unit id="tx_t3monitoring_domain_model_tag" resname="tx_t3monitoring_domain_model_tag">
+				<source>Tags</source>
 			</trans-unit>
-			<trans-unit id="administration.ipHint">
-				<source><![CDATA[
-				Set the allowed IP(s) for the client to <code>%s</code>.
-				]]></source>
+			<trans-unit id="tx_t3monitoring_domain_model_tag.description" resname="tx_t3monitoring_domain_model_tag.description">
+				<source>Description</source>
 			</trans-unit>
-			<trans-unit id="noClients.title">
-				<source>No clients created!</source>
+			<trans-unit id="tx_t3monitoring_domain_model_tag.title" resname="tx_t3monitoring_domain_model_tag.title">
+				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="noClients.description">
-				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
+			<trans-unit id="unknown" resname="unknown">
+				<source>unknown</source>
 			</trans-unit>
-			<trans-unit id="presentationMode.client.title">
-				<source>Client with uid %s</source>
+			<trans-unit id="update.available" resname="update.available">
+				<source>Update available</source>
 			</trans-unit>
-			<trans-unit id="presentationMode.client.domain">
-				<source>http://*********.***</source>
+			<trans-unit id="view.administration" resname="view.administration">
+				<source>Administration</source>
 			</trans-unit>
-			<trans-unit id="noInsecureClients">
-				<source>No insecure clients found!</source>
+			<trans-unit id="view.core" resname="view.core">
+				<source>Used core versions</source>
 			</trans-unit>
-			<trans-unit id="fetchClient.link">
-				<source>Fetch single client</source>
+			<trans-unit id="view.usedExtensions" resname="view.usedExtensions">
+				<source>Used extensions</source>
 			</trans-unit>
-			<trans-unit id="fetchClient.success">
-				<source>The data of the client has been successfully fetched!</source>
+			<trans-unit id="yes" resname="yes">
+				<source>yes</source>
 			</trans-unit>
 		</body>
 	</file>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 7093009..8d5275d 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -1,197 +1,197 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2016-04-11T12:45:21Z" product-name="t3monitoring">
-		<header/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" original="messages" datatype="plaintext" product-name="t3monitoring" date="2024-08-02T14:46:23+02:00">
+		<header></header>
 		<body>
-			<trans-unit id="tx_t3monitoring_domain_model_client">
+			<trans-unit id="tx_t3monitoring_domain_model_client" resname="tx_t3monitoring_domain_model_client">
 				<source>Client</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.title">
-				<source>Title</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.core" resname="tx_t3monitoring_domain_model_client.core">
+				<source>Core</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
+			<trans-unit id="tx_t3monitoring_domain_model_client.domain" resname="tx_t3monitoring_domain_model_client.domain">
 				<source>Domain</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.status">
-				<source>Status</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.email" resname="tx_t3monitoring_domain_model_client.email">
+				<source>Email</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error">
+			<trans-unit id="tx_t3monitoring_domain_model_client.error" resname="tx_t3monitoring_domain_model_client.error">
 				<source>Error</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.ok">
-				<source>OK</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.error_message" resname="tx_t3monitoring_domain_model_client.error_message">
+				<source>Error Message</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
-				<source>Secret</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extensions" resname="tx_t3monitoring_domain_model_client.extensions">
+				<source>Extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.email">
-				<source>Email</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger" resname="tx_t3monitoring_domain_model_client.extra_danger">
+				<source>Extra Danger</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.php_version">
-				<source>Php Version</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info" resname="tx_t3monitoring_domain_model_client.extra_info">
+				<source>Extra Info</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Database Version</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning" resname="tx_t3monitoring_domain_model_client.extra_warning">
+				<source>Extra Warning</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core" resname="tx_t3monitoring_domain_model_client.insecure_core">
 				<source>Insecure Core</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core">
-				<source>Outdated Core</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions">
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions" resname="tx_t3monitoring_domain_model_client.insecure_extensions">
 				<source>Insecure Extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
-				<source>Outdated Extensions</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
-				<source>Error Message</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import" resname="tx_t3monitoring_domain_model_client.last_successful_import">
+				<source>Last Successful Import</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info">
-				<source>Extra Info</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version" resname="tx_t3monitoring_domain_model_client.mysql_version">
+				<source>Database Version</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning">
-				<source>Extra Warning</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.ok" resname="tx_t3monitoring_domain_model_client.ok">
+				<source>OK</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger">
-				<source>Extra Danger</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core" resname="tx_t3monitoring_domain_model_client.outdated_core">
+				<source>Outdated Core</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import">
-				<source>Last Successful Import</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions" resname="tx_t3monitoring_domain_model_client.outdated_extensions">
+				<source>Outdated Extensions</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extensions">
-				<source>Extensions</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.php_version" resname="tx_t3monitoring_domain_model_client.php_version">
+				<source>Php Version</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.core">
-				<source>Core</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.secret" resname="tx_t3monitoring_domain_model_client.secret">
+				<source>Secret</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.sla">
+			<trans-unit id="tx_t3monitoring_domain_model_client.sla" resname="tx_t3monitoring_domain_model_client.sla">
 				<source>Sla</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension">
-				<source>Extension</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.status" resname="tx_t3monitoring_domain_model_client.status">
+				<source>Status</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.name">
-				<source>Name</source>
+			<trans-unit id="tx_t3monitoring_domain_model_client.title" resname="tx_t3monitoring_domain_model_client.title">
+				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version">
-				<source>Version</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core" resname="tx_t3monitoring_domain_model_core">
+				<source>Core</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure">
+			<trans-unit id="tx_t3monitoring_domain_model_core.insecure" resname="tx_t3monitoring_domain_model_core.insecure">
 				<source>Insecure</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version">
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_active" resname="tx_t3monitoring_domain_model_core.is_active">
+				<source>Is Active</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest" resname="tx_t3monitoring_domain_model_core.is_latest">
+				<source>Is Latest</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_official" resname="tx_t3monitoring_domain_model_core.is_official">
+				<source>Is Official</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable" resname="tx_t3monitoring_domain_model_core.is_stable">
+				<source>Is Stable</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_used" resname="tx_t3monitoring_domain_model_core.is_used">
+				<source>Is Used</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.latest" resname="tx_t3monitoring_domain_model_core.latest">
+				<source>Latest</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version" resname="tx_t3monitoring_domain_model_core.next_secure_version">
 				<source>Next Secure Version</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.title">
-				<source>Title</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.release_date" resname="tx_t3monitoring_domain_model_core.release_date">
+				<source>Release Date</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.description">
-				<source>Description</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.stable" resname="tx_t3monitoring_domain_model_core.stable">
+				<source>Stable</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated">
-				<source>Last Updated</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type" resname="tx_t3monitoring_domain_model_core.type">
+				<source>Type</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name">
-				<source>Author Name</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version" resname="tx_t3monitoring_domain_model_core.version">
+				<source>Version</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment">
-				<source>Update Comment</source>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer" resname="tx_t3monitoring_domain_model_core.version_integer">
+				<source>Version Integer</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.state">
-				<source>State</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension" resname="tx_t3monitoring_domain_model_extension">
+				<source>Extension</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.category">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name" resname="tx_t3monitoring_domain_model_extension.author_name">
+				<source>Author Name</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.category" resname="tx_t3monitoring_domain_model_extension.category">
 				<source>Category</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer">
-				<source>Version Integer</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.description" resname="tx_t3monitoring_domain_model_extension.description">
+				<source>Description</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used">
-				<source>Is Used</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure" resname="tx_t3monitoring_domain_model_extension.insecure">
+				<source>Insecure</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official">
-				<source>Is Official</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest" resname="tx_t3monitoring_domain_model_extension.is_latest">
+				<source>Is Latest</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified" resname="tx_t3monitoring_domain_model_extension.is_modified">
 				<source>Is Modified</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest">
-				<source>Is Latest</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official" resname="tx_t3monitoring_domain_model_extension.is_official">
+				<source>Is Official</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release">
-				<source>Last Bugfix Release</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used" resname="tx_t3monitoring_domain_model_extension.is_used">
+				<source>Is Used</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release">
-				<source>Last Minor Release</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release" resname="tx_t3monitoring_domain_model_extension.last_bugfix_release">
+				<source>Last Bugfix Release</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release" resname="tx_t3monitoring_domain_model_extension.last_major_release">
 				<source>Last Major Release</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
-				<source>Serialized Dependencies</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core">
-				<source>Core</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release" resname="tx_t3monitoring_domain_model_extension.last_minor_release">
+				<source>Last Minor Release</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version">
-				<source>Version</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated" resname="tx_t3monitoring_domain_model_extension.last_updated">
+				<source>Last Updated</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.insecure">
-				<source>Insecure</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.name" resname="tx_t3monitoring_domain_model_extension.name">
+				<source>Name</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version" resname="tx_t3monitoring_domain_model_extension.next_secure_version">
 				<source>Next Secure Version</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type">
-				<source>Type</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.release_date">
-				<source>Release Date</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.latest">
-				<source>Latest</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies" resname="tx_t3monitoring_domain_model_extension.serialized_dependencies">
+				<source>Serialized Dependencies</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.stable">
-				<source>Stable</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.state" resname="tx_t3monitoring_domain_model_extension.state">
+				<source>State</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable">
-				<source>Is Stable</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.title" resname="tx_t3monitoring_domain_model_extension.title">
+				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_active">
-				<source>Is Active</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment" resname="tx_t3monitoring_domain_model_extension.update_comment">
+				<source>Update Comment</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest">
-				<source>Is Latest</source>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version" resname="tx_t3monitoring_domain_model_extension.version">
+				<source>Version</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer" resname="tx_t3monitoring_domain_model_extension.version_integer">
 				<source>Version Integer</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_used">
-				<source>Is Used</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_official">
-				<source>Is Official</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla">
+			<trans-unit id="tx_t3monitoring_domain_model_sla" resname="tx_t3monitoring_domain_model_sla">
 				<source>Sla</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.title">
-				<source>Title</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.description">
+			<trans-unit id="tx_t3monitoring_domain_model_sla.description" resname="tx_t3monitoring_domain_model_sla.description">
 				<source>Description</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag">
-				<source>Tag</source>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag.title">
+			<trans-unit id="tx_t3monitoring_domain_model_sla.title" resname="tx_t3monitoring_domain_model_sla.title">
 				<source>Title</source>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag.description">
+			<trans-unit id="tx_t3monitoring_domain_model_tag" resname="tx_t3monitoring_domain_model_tag">
+				<source>Tag</source>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_tag.description" resname="tx_t3monitoring_domain_model_tag.description">
 				<source>Description</source>
 			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_tag.title" resname="tx_t3monitoring_domain_model_tag.title">
+				<source>Title</source>
+			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/Resources/Private/Language/locallang_t3monitor.xlf b/Resources/Private/Language/locallang_t3monitor.xlf
index 2bfe719..2c5339e 100644
--- a/Resources/Private/Language/locallang_t3monitor.xlf
+++ b/Resources/Private/Language/locallang_t3monitor.xlf
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2016-03-17T20:23:25Z" product-name="t3monitoring">
-		<header/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" original="messages" datatype="plaintext" product-name="t3monitoring" date="2024-08-02T14:46:32+02:00">
+		<header></header>
 		<body>
-			<trans-unit id="mlang_tabs_tab">
-				<source>T3 Monitor</source>
-			</trans-unit>
-			<trans-unit id="mlang_labels_tabdescr">
+			<trans-unit id="mlang_labels_tabdescr" resname="mlang_labels_tabdescr">
 				<source>Monitoring</source>
 			</trans-unit>
+			<trans-unit id="mlang_tabs_tab" resname="mlang_tabs_tab">
+				<source>T3 Monitor</source>
+			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/Resources/Private/Language/nl.locallang.xlf b/Resources/Private/Language/nl.locallang.xlf
index 98f3454..3df2d95 100644
--- a/Resources/Private/Language/nl.locallang.xlf
+++ b/Resources/Private/Language/nl.locallang.xlf
@@ -1,575 +1,571 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="nl" datatype="plaintext" original="messages" date="2016-05-20T20:48:29Z" product-name="t3monitoring">
-		<header/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" target-language="nl" original="messages" datatype="plaintext" product-name="t3monitoring" date="2024-08-02T14:46:11+02:00">
+		<header></header>
 		<body>
-			<trans-unit id="tx_t3monitoring_domain_model_client">
-				<source>Client</source>
-				<target>Klant</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="administration" resname="administration">
+				<source>Administration</source>
+				<target>Administratie</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.domain">
-				<source>Domain</source>
-				<target>Domein</target>
+			<trans-unit id="administration.import.description" resname="administration.import.description">
+				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
+				<target>Wees ervan bewust dat de import een tijdje kan duren. Als er een time-out optreedt de CLI gebruiken!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.secret">
-				<source>Secret</source>
-				<target>Geheim</target>
+			<trans-unit id="administration.import.headline" resname="administration.import.headline">
+				<source>Start an import</source>
+				<target>Import starten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.email">
-				<source>Email</source>
-				<target>E-mail</target>
+			<trans-unit id="administration.import.success" resname="administration.import.success">
+				<source>The import was successful!</source>
+				<target>De import was succesvol!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.php_version">
-				<source>Php Version</source>
-				<target>PHP versie</target>
+			<trans-unit id="administration.ipHint" resname="administration.ipHint">
+				<source>&#xA;&#x9;&#x9;&#x9;&#x9;Set the allowed IP(s) for the client to &lt;code&gt;%s&lt;/code&gt;.&#xA;&#x9;&#x9;&#x9;&#x9;</source>
+				<target>&#xA;&#x9;&#x9;&#x9;&#x9;Zet de toegestane IP(s) voor de klant op &lt;code&gt;%s&lt;/code&gt;.&#xA;&#x9;&#x9;&#x9;&#x9;</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version">
-				<source>Mysql Version</source>
-				<target>Databank versie</target>
+			<trans-unit id="administration.sponsors.description" resname="administration.sponsors.description">
+				<source>This extension has been sponsored by</source>
+				<target>Deze extensie is gesponsord door</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space">
-				<source>Disk Total Space</source>
-				<target>Disk Total Space</target>
+			<trans-unit id="administration.sponsors.headline" resname="administration.sponsors.headline">
+				<source>Sponsors</source>
+				<target>Sponsoren</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space">
-				<source>Disk Free Space</source>
-				<target>Disk Free Space</target>
+			<trans-unit id="available.extensions" resname="available.extensions">
+				<source>Available extensions</source>
+				<target>Beschikbare extensies</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core">
-				<source>Insecure Core</source>
-				<target>Onveilige core</target>
+			<trans-unit id="bulletins.all" resname="bulletins.all">
+				<source>All bulletins</source>
+				<target>Alle bulletins</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core">
-				<source>Outdated Core</source>
-				<target>Verouderde core</target>
+			<trans-unit id="bulletins.disabled" resname="bulletins.disabled">
+				<source>Loading the bulletins is disabled.</source>
+				<target>Het ophalen van bulletins is uitgeschakeld.</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions">
-				<source>Insecure Extensions</source>
-				<target>Onveilige extensies</target>
+			<trans-unit id="bulletins.errorFetch" resname="bulletins.errorFetch">
+				<source>Sorry, the bulletins could not be fetched!</source>
+				<target>Sorry, de bulletins konden niet opgehaald worden!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
-				<source>Outdated Extensions</source>
-				<target>Verouderde extensies</target>
+			<trans-unit id="bulletins.headline" resname="bulletins.headline">
+				<source>Latest security bulletins</source>
+				<target>Laatste security bulletins</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
-				<source>Error Message</source>
-				<target>Foutmelding</target>
+			<trans-unit id="client.domainNotPingAble" resname="client.domainNotPingAble">
+				<source>The domain &#34;%s&#34; could not not be contacted (maybe invalid or not reachable)!</source>
+				<target>Het domein &#34;%s&#34; kon niet bereikt worden (misschien ongeldig of niet bereikbaar)!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info">
-				<source>Extra Info</source>
-				<target>Extra informatie</target>
+			<trans-unit id="client.extra" resname="client.extra">
+				<source>Extra</source>
+				<target>Extras</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning">
-				<source>Extra Warning</source>
-				<target>Extra waarschuwing</target>
+			<trans-unit id="client.extra.danger" resname="client.extra.danger">
+				<source>Additional error messages</source>
+				<target>Additionele foutmeldingen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger">
-				<source>Extra Danger</source>
-				<target>Extra gevaar</target>
+			<trans-unit id="client.extra.warning" resname="client.extra.warning">
+				<source>Additional warnings</source>
+				<target>Additionele waarschuwingen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import">
-				<source>Last Successful Import</source>
-				<target>Laatste succesvolle import</target>
+			<trans-unit id="client.facts" resname="client.facts">
+				<source>Facts</source>
+				<target>Feiten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.extensions">
-				<source>Extensions</source>
-				<target>Extensies</target>
+			<trans-unit id="client.noSuccessfulImport" resname="client.noSuccessfulImport">
+				<source>No successful import until now!</source>
+				<target>Geen succesvolle import tot nu toe!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.core">
-				<source>Core</source>
-				<target>Core</target>
+			<trans-unit id="clients.listAll" resname="clients.listAll">
+				<source>List all</source>
+				<target>Alles bekijken</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_client.sla">
-				<source>Sla</source>
-				<target>Sla</target>
+			<trans-unit id="clients.notFound" resname="clients.notFound">
+				<source>No clients found</source>
+				<target>Geen klanten gevonden</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension">
-				<source>Extension</source>
-				<target>Extensie</target>
+			<trans-unit id="clients.notReachable" resname="clients.notReachable">
+				<source>Not reachable</source>
+				<target>Niet bereikbaar</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.name">
-				<source>Name</source>
-				<target>Naam</target>
+			<trans-unit id="clients.numberOfExtensions" resname="clients.numberOfExtensions">
+				<source>Number of extensions</source>
+				<target>Aantal extensies</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version">
-				<source>Version</source>
-				<target>Versie</target>
+			<trans-unit id="clients.total" resname="clients.total">
+				<source>Clients (%s)</source>
+				<target>Klanten (%s)</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure">
-				<source>Insecure</source>
-				<target>Onveilig</target>
+			<trans-unit id="core.totalUsed" resname="core.totalUsed">
+				<source>Used core versions (%s)</source>
+				<target>Gebruikte Core-versies (%s)</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version">
-				<source>Next Secure Version</source>
-				<target>Eerst volgende veilige versie</target>
+			<trans-unit id="coreFilter.usage" resname="coreFilter.usage">
+				<source>Usage</source>
+				<target>Gebruik</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="coreFilter.usage.0" resname="coreFilter.usage.0">
+				<source>All</source>
+				<target>Alle</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.description">
-				<source>Description</source>
-				<target>Beschrijving</target>
+			<trans-unit id="coreFilter.usage.1" resname="coreFilter.usage.1">
+				<source>Used</source>
+				<target>Gebruikt</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated">
-				<source>Last Updated</source>
-				<target>Laatste update</target>
+			<trans-unit id="coreVersions" resname="coreVersions">
+				<source>Core Versions</source>
+				<target>Core-versies</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name">
-				<source>Author Name</source>
-				<target>Auteur naam</target>
+			<trans-unit id="coreVersions.header" resname="coreVersions.header">
+				<source>Core versions</source>
+				<target>Core-versies</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment">
-				<source>Update Comment</source>
-				<target>Update beschrijving</target>
+			<trans-unit id="count" resname="count">
+				<source>Count</source>
+				<target>Aantal</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.state">
-				<source>State</source>
-				<target>Status</target>
+			<trans-unit id="createNew.client" resname="createNew.client">
+				<source>Create new client</source>
+				<target>Nieuwe klant aanmaken</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.category">
-				<source>Category</source>
-				<target>Categorie</target>
+			<trans-unit id="edit.client" resname="edit.client">
+				<source>Edit client</source>
+				<target>Bewerk klant</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer">
-				<source>Version Integer</source>
-				<target>Versie Integer</target>
+			<trans-unit id="extension.by" resname="extension.by">
+				<source>by %s</source>
+				<target>door %s</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used">
-				<source>Is Used</source>
-				<target>Is gebruikt</target>
+			<trans-unit id="extension.notFound" resname="extension.notFound">
+				<source>No extensions found</source>
+				<target>Geen extensies gevonden</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official">
-				<source>Is Official</source>
-				<target>Is officieel</target>
+			<trans-unit id="extension.total" resname="extension.total">
+				<source>Extensions (%s)</source>
+				<target>Extensies (%s)</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified">
-				<source>Is Modified</source>
-				<target>Verändert</target>
+			<trans-unit id="extensionFilter.exactSearch" resname="extensionFilter.exactSearch">
+				<source>Exact search</source>
+				<target>Exact zoeken</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest">
-				<source>Is Latest</source>
-				<target>Is laatste</target>
+			<trans-unit id="extensionFilter.name" resname="extensionFilter.name">
+				<source>Name</source>
+				<target>Naam</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release">
-				<source>Last Bugfix Release</source>
-				<target>Laatste bugfix release</target>
+			<trans-unit id="extensionList" resname="extensionList">
+				<source>Extension List</source>
+				<target>Lijst van extensies</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release">
-				<source>Last Minor Release</source>
-				<target>Laatste Minor-Release</target>
+			<trans-unit id="fetchClient.link" resname="fetchClient.link">
+				<source>Fetch single client</source>
+				<target>Haal enkele klant op</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release">
-				<source>Last Major Release</source>
-				<target>Laatste Major-Release</target>
+			<trans-unit id="fetchClient.success" resname="fetchClient.success">
+				<source>The data of the client has been successfully fetched!</source>
+				<target>De data voor de klant is succesvol opgehaald!</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies">
-				<source>Serialized Dependencies</source>
-				<target>serialized afhankelijkheden</target>
+			<trans-unit id="filter.connectionErrors" resname="filter.connectionErrors">
+				<source>Connection errors</source>
+				<target>Verbindings foutmeldingen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core">
+			<trans-unit id="filter.fieldset.core" resname="filter.fieldset.core">
 				<source>Core</source>
 				<target>Core</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version">
-				<source>Version</source>
-				<target>Versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.insecure">
-				<source>Insecure</source>
-				<target>Onvelig</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version">
-				<source>Next Secure Version</source>
-				<target>Volgende veilige versie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.type">
-				<source>Type</source>
-				<target>Type</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.release_date">
-				<source>Release Date</source>
-				<target>Datum van publicatie</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.latest">
-				<source>Latest</source>
-				<target>Laatste</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.stable">
-				<source>Stable</source>
-				<target>Stabiel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable">
-				<source>Is Stable</source>
-				<target>Is stabiel</target>
-			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_active">
-				<source>Is Active</source>
-				<target>Actief</target>
+			<trans-unit id="filter.fieldset.extensions" resname="filter.fieldset.extensions">
+				<source>Extensions</source>
+				<target>Extensies</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest">
-				<source>Is Latest</source>
-				<target>Is de nieuwste</target>
+			<trans-unit id="filter.fieldset.misc" resname="filter.fieldset.misc">
+				<source>Misc</source>
+				<target>Diverse</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer">
-				<source>Version Integer</source>
-				<target>Versie Integer</target>
+			<trans-unit id="filter.withExtraDanger" resname="filter.withExtraDanger">
+				<source>Additional errors</source>
+				<target>Additionele foutmeldingen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_used">
-				<source>Is Used</source>
-				<target>Is gebruikt</target>
+			<trans-unit id="filter.withExtraWarning" resname="filter.withExtraWarning">
+				<source>Additional warnings</source>
+				<target>Additionele waarschuwingen</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_core.is_official">
-				<source>Is Official</source>
-				<target>Is officieel</target>
+			<trans-unit id="found.in.ter" resname="found.in.ter">
+				<source>Found in TER</source>
+				<target>In TER gevonden</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla">
-				<source>Sla</source>
-				<target>Sla</target>
+			<trans-unit id="home" resname="home">
+				<source>Home</source>
+				<target>Home</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_tag">
-				<source>Tag</source>
-				<target>Tag</target>
+			<trans-unit id="lastImport.client" resname="lastImport.client">
+				<source>Import clients</source>
+				<target>Importeer klanten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.title">
-				<source>Title</source>
-				<target>Titel</target>
+			<trans-unit id="lastImport.core" resname="lastImport.core">
+				<source>Import core</source>
+				<target>Importeer klanten</target>
 			</trans-unit>
-			<trans-unit id="tx_t3monitoring_domain_model_sla.description">
-				<source>Description</source>
-				<target>Beschrijving</target>
+			<trans-unit id="lastImport.extension" resname="lastImport.extension">
+				<source>Import extensions</source>
+				<target>Importeer extensies</target>
 			</trans-unit>
-			<trans-unit id="update.available">
-				<source>Update available</source>
-				<target>Update beschikbaar</target>
+			<trans-unit id="lastImport.header" resname="lastImport.header">
+				<source>Last imports</source>
+				<target>Laatste import</target>
 			</trans-unit>
-			<trans-unit id="secure">
-				<source>Secure</source>
-				<target>Veilig</target>
+			<trans-unit id="lastImport.none" resname="lastImport.none">
+				<source>No import yet!</source>
+				<target>Nog geen import!</target>
 			</trans-unit>
-			<trans-unit id="loaded">
+			<trans-unit id="loaded" resname="loaded">
 				<source>Loaded</source>
 				<target>Geladen</target>
 			</trans-unit>
-			<trans-unit id="found.in.ter">
-				<source>Found in TER</source>
-				<target>In TER gevonden</target>
-			</trans-unit>
-			<trans-unit id="next.secure.version">
+			<trans-unit id="next.secure.version" resname="next.secure.version">
 				<source>Next secure version:</source>
 				<target>Volgende veilige versie:</target>
 			</trans-unit>
-			<trans-unit id="no.official.update">
-				<source>No official update available</source>
-				<target>Geen officiele versie beschikbaar</target>
-			</trans-unit>
-			<trans-unit id="yes">
-				<source>yes</source>
-				<target>ja</target>
-			</trans-unit>
-			<trans-unit id="no">
+			<trans-unit id="no" resname="no">
 				<source>no</source>
 				<target>nee</target>
 			</trans-unit>
-			<trans-unit id="unknown">
-				<source>unknown</source>
-				<target>onbekend</target>
-			</trans-unit>
-			<trans-unit id="no.cores.imported">
+			<trans-unit id="no.cores.imported" resname="no.cores.imported">
 				<source>No cores yet imported</source>
 				<target>Nog geen core versies geïmporteerd</target>
 			</trans-unit>
-			<trans-unit id="no.versions.available">
+			<trans-unit id="no.official.update" resname="no.official.update">
+				<source>No official update available</source>
+				<target>Geen officiele versie beschikbaar</target>
+			</trans-unit>
+			<trans-unit id="no.versions.available" resname="no.versions.available">
 				<source>No versions available</source>
 				<target>Geen versies beschikbaar</target>
 			</trans-unit>
-			<trans-unit id="view.administration">
-				<source>Administration</source>
-				<target>Administratie</target>
+			<trans-unit id="noClients.description" resname="noClients.description">
+				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
+				<target>Schön, dass Sie t3monitoring ausprobieren wollen! Um zu beginnen, erstellen Sie einen Client mit dem + Icon oben!</target>
 			</trans-unit>
-			<trans-unit id="view.usedExtensions">
-				<source>Used extensions</source>
-				<target>Gebruikte extensies</target>
+			<trans-unit id="noClients.title" resname="noClients.title">
+				<source>No clients created!</source>
+				<target>Geen klanten aangemaakt!</target>
 			</trans-unit>
-			<trans-unit id="view.core">
-				<source>Used core versions</source>
-				<target>Gebruikte Core versies</target>
+			<trans-unit id="noInsecureClients" resname="noInsecureClients">
+				<source>No insecure clients found!</source>
+				<target>Geen onveilige klanten gevonden!</target>
 			</trans-unit>
-			<trans-unit id="administration.import.headline">
-				<source>Start an import</source>
-				<target>Import starten</target>
-			</trans-unit>
-			<trans-unit id="administration.import.success">
-				<source>The import was successful!</source>
-				<target>De import was succesvol!</target>
-			</trans-unit>
-			<trans-unit id="administration.import.description">
-				<source>Be aware that the imports can take a while. If a timeout occurs, use CLI!</source>
-				<target>Wees ervan bewust dat de import een tijdje kan duren. Als er een time-out optreedt de CLI gebruiken!</target>
-			</trans-unit>
-			<trans-unit id="createNew.client">
-				<source>Create new client</source>
-				<target>Nieuwe klant aanmaken</target>
+			<trans-unit id="presentationMode.client.domain" resname="presentationMode.client.domain">
+				<source>http://*********.***</source>
+				<target>http://*********.***</target>
 			</trans-unit>
-			<trans-unit id="edit.client">
-				<source>Edit client</source>
-				<target>Bewerk klant</target>
+			<trans-unit id="presentationMode.client.title" resname="presentationMode.client.title">
+				<source>Client with uid %s</source>
+				<target>Client mit der uid %s</target>
 			</trans-unit>
-			<trans-unit id="home">
-				<source>Home</source>
-				<target>Home</target>
+			<trans-unit id="search" resname="search">
+				<source>Search</source>
+				<target>Zoeken</target>
 			</trans-unit>
-			<trans-unit id="extensionList">
-				<source>Extension List</source>
-				<target>Lijst van extensies</target>
+			<trans-unit id="search.introHelp" resname="search.introHelp">
+				<source>Use the search on the left to filter the clients for specific properties.</source>
+				<target>Gebruik de zoekfunctie aan de linkerkant om de klanten voor specifieke eigenschappen te filteren.</target>
 			</trans-unit>
-			<trans-unit id="coreVersions">
-				<source>Core Versions</source>
-				<target>Core-versies</target>
+			<trans-unit id="secure" resname="secure">
+				<source>Secure</source>
+				<target>Veilig</target>
 			</trans-unit>
-			<trans-unit id="sla">
+			<trans-unit id="sla" resname="sla">
 				<source>SLA</source>
 				<target>SLA</target>
 			</trans-unit>
-			<trans-unit id="administration">
-				<source>Administration</source>
-				<target>Administratie</target>
+			<trans-unit id="sla.clients" resname="sla.clients">
+				<source>List all clients with this SLA</source>
+				<target>Toon alle klanten met deze SLA</target>
 			</trans-unit>
-			<trans-unit id="available.extensions">
-				<source>Available extensions</source>
-				<target>Beschikbare extensies</target>
+			<trans-unit id="sla.header" resname="sla.header">
+				<source>Service level agreements</source>
+				<target>Service Level Agreements</target>
 			</trans-unit>
-			<trans-unit id="count">
-				<source>Count</source>
-				<target>Aantal</target>
+			<trans-unit id="sla.noClients" resname="sla.noClients">
+				<source>This SLA is not used by any client!</source>
+				<target>Deze SLA wordt door geen enkele klant gebruikt!</target>
 			</trans-unit>
-			<trans-unit id="search">
-				<source>Search</source>
-				<target>Zoeken</target>
+			<trans-unit id="sla.notFound" resname="sla.notFound">
+				<source>No Tag records found!</source>
+				<target>Geen SLA records gevonden!</target>
 			</trans-unit>
-			<trans-unit id="search.introHelp">
-				<source>Use the search on the left to filter the clients for specific properties.</source>
-				<target>Gebruik de zoekfunctie aan de linkerkant om de klanten voor specifieke eigenschappen te filteren.</target>
+			<trans-unit id="sla.total" resname="sla.total">
+				<source>SLA (%s)</source>
+				<target>SLA (%s)</target>
 			</trans-unit>
-			<trans-unit id="bulletins.headline">
-				<source>Latest security bulletins</source>
-				<target>Laatste security bulletins</target>
+			<trans-unit id="tag.header" resname="tag.header">
+				<source>Tags</source>
+				<target>Tags</target>
 			</trans-unit>
-			<trans-unit id="bulletins.errorFetch">
-				<source>Sorry, the bulletins could not be fetched!</source>
-				<target>Sorry, de bulletins konden niet opgehaald worden!</target>
+			<trans-unit id="total" resname="total">
+				<source>total</source>
+				<target>totaal</target>
 			</trans-unit>
-			<trans-unit id="bulletins.disabled">
-				<source>Loading the bulletins is disabled.</source>
-				<target>Het ophalen van bulletins is uitgeschakeld.</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client" resname="tx_t3monitoring_domain_model_client">
+				<source>Client</source>
+				<target>Klant</target>
 			</trans-unit>
-			<trans-unit id="bulletins.all">
-				<source>All bulletins</source>
-				<target>Alle bulletins</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.core" resname="tx_t3monitoring_domain_model_client.core">
+				<source>Core</source>
+				<target>Core</target>
 			</trans-unit>
-			<trans-unit id="clients.total">
-				<source>Clients (%s)</source>
-				<target>Klanten (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_free_space" resname="tx_t3monitoring_domain_model_client.disk_free_space">
+				<source>Disk Free Space</source>
+				<target>Disk Free Space</target>
 			</trans-unit>
-			<trans-unit id="clients.listAll">
-				<source>List all</source>
-				<target>Alles bekijken</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.disk_total_space" resname="tx_t3monitoring_domain_model_client.disk_total_space">
+				<source>Disk Total Space</source>
+				<target>Disk Total Space</target>
 			</trans-unit>
-			<trans-unit id="clients.notFound">
-				<source>No clients found</source>
-				<target>Geen klanten gevonden</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.domain" resname="tx_t3monitoring_domain_model_client.domain">
+				<source>Domain</source>
+				<target>Domein</target>
 			</trans-unit>
-			<trans-unit id="coreVersions.header">
-				<source>Core versions</source>
-				<target>Core-versies</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.email" resname="tx_t3monitoring_domain_model_client.email">
+				<source>Email</source>
+				<target>E-mail</target>
 			</trans-unit>
-			<trans-unit id="sla.header">
-				<source>Service level agreements</source>
-				<target>Service Level Agreements</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.error_message" resname="tx_t3monitoring_domain_model_client.error_message">
+				<source>Error Message</source>
+				<target>Foutmelding</target>
 			</trans-unit>
-			<trans-unit id="tag.header">
-				<source>Tags</source>
-				<target>Tags</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extensions" resname="tx_t3monitoring_domain_model_client.extensions">
+				<source>Extensions</source>
+				<target>Extensies</target>
 			</trans-unit>
-			<trans-unit id="total">
-				<source>total</source>
-				<target>totaal</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_danger" resname="tx_t3monitoring_domain_model_client.extra_danger">
+				<source>Extra Danger</source>
+				<target>Extra gevaar</target>
 			</trans-unit>
-			<trans-unit id="core.totalUsed">
-				<source>Used core versions (%s)</source>
-				<target>Gebruikte Core-versies (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_info" resname="tx_t3monitoring_domain_model_client.extra_info">
+				<source>Extra Info</source>
+				<target>Extra informatie</target>
 			</trans-unit>
-			<trans-unit id="clients.notReachable">
-				<source>Not reachable</source>
-				<target>Niet bereikbaar</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.extra_warning" resname="tx_t3monitoring_domain_model_client.extra_warning">
+				<source>Extra Warning</source>
+				<target>Extra waarschuwing</target>
 			</trans-unit>
-			<trans-unit id="clients.numberOfExtensions">
-				<source>Number of extensions</source>
-				<target>Aantal extensies</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_core" resname="tx_t3monitoring_domain_model_client.insecure_core">
+				<source>Insecure Core</source>
+				<target>Onveilige core</target>
 			</trans-unit>
-			<trans-unit id="client.facts">
-				<source>Facts</source>
-				<target>Feiten</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.insecure_extensions" resname="tx_t3monitoring_domain_model_client.insecure_extensions">
+				<source>Insecure Extensions</source>
+				<target>Onveilige extensies</target>
 			</trans-unit>
-			<trans-unit id="client.noSuccessfulImport">
-				<source>No successful import until now!</source>
-				<target>Geen succesvolle import tot nu toe!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.last_successful_import" resname="tx_t3monitoring_domain_model_client.last_successful_import">
+				<source>Last Successful Import</source>
+				<target>Laatste succesvolle import</target>
 			</trans-unit>
-			<trans-unit id="client.extra">
-				<source>Extra</source>
-				<target>Extras</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.mysql_version" resname="tx_t3monitoring_domain_model_client.mysql_version">
+				<source>Database Version</source>
+				<target>Databank versie</target>
 			</trans-unit>
-			<trans-unit id="client.extra.warning">
-				<source>Additional warnings</source>
-				<target>Additionele waarschuwingen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_core" resname="tx_t3monitoring_domain_model_client.outdated_core">
+				<source>Outdated Core</source>
+				<target>Verouderde core</target>
 			</trans-unit>
-			<trans-unit id="client.extra.danger">
-				<source>Additional error messages</source>
-				<target>Additionele foutmeldingen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions" resname="tx_t3monitoring_domain_model_client.outdated_extensions">
+				<source>Outdated Extensions</source>
+				<target>Verouderde extensies</target>
 			</trans-unit>
-			<trans-unit id="filter.connectionErrors">
-				<source>Connection errors</source>
-				<target>Verbindings foutmeldingen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.php_version" resname="tx_t3monitoring_domain_model_client.php_version">
+				<source>Php Version</source>
+				<target>PHP versie</target>
 			</trans-unit>
-			<trans-unit id="client.domainNotPingAble">
-				<source>The domain "%s" could not not be contacted (maybe invalid or not reachable)!</source>
-				<target>Het domein "%s" kon niet bereikt worden (misschien ongeldig of niet bereikbaar)!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.secret" resname="tx_t3monitoring_domain_model_client.secret">
+				<source>Secret</source>
+				<target>Geheim</target>
 			</trans-unit>
-			<trans-unit id="filter.withExtraWarning">
-				<source>Additional warnings</source>
-				<target>Additionele waarschuwingen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.sla" resname="tx_t3monitoring_domain_model_client.sla">
+				<source>Sla</source>
+				<target>Sla</target>
 			</trans-unit>
-			<trans-unit id="filter.withExtraDanger">
-				<source>Additional errors</source>
-				<target>Additionele foutmeldingen</target>
+			<trans-unit id="tx_t3monitoring_domain_model_client.title" resname="tx_t3monitoring_domain_model_client.title">
+				<source>Title</source>
+				<target>Titel</target>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.core">
+			<trans-unit id="tx_t3monitoring_domain_model_core" resname="tx_t3monitoring_domain_model_core">
 				<source>Core</source>
 				<target>Core</target>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.extensions">
-				<source>Extensions</source>
-				<target>Extensies</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.insecure" resname="tx_t3monitoring_domain_model_core.insecure">
+				<source>Insecure</source>
+				<target>Onvelig</target>
 			</trans-unit>
-			<trans-unit id="filter.fieldset.misc">
-				<source>Misc</source>
-				<target>Diverse</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_active" resname="tx_t3monitoring_domain_model_core.is_active">
+				<source>Is Active</source>
+				<target>Actief</target>
 			</trans-unit>
-			<trans-unit id="lastImport.header">
-				<source>Last imports</source>
-				<target>Laatste import</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_latest" resname="tx_t3monitoring_domain_model_core.is_latest">
+				<source>Is Latest</source>
+				<target>Is de nieuwste</target>
 			</trans-unit>
-			<trans-unit id="lastImport.client">
-				<source>Import clients</source>
-				<target>Importeer klanten</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_official" resname="tx_t3monitoring_domain_model_core.is_official">
+				<source>Is Official</source>
+				<target>Is officieel</target>
 			</trans-unit>
-			<trans-unit id="lastImport.core">
-				<source>Import core</source>
-				<target>Importeer klanten</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_stable" resname="tx_t3monitoring_domain_model_core.is_stable">
+				<source>Is Stable</source>
+				<target>Is stabiel</target>
 			</trans-unit>
-			<trans-unit id="lastImport.extension">
-				<source>Import extensions</source>
-				<target>Importeer extensies</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.is_used" resname="tx_t3monitoring_domain_model_core.is_used">
+				<source>Is Used</source>
+				<target>Is gebruikt</target>
 			</trans-unit>
-			<trans-unit id="lastImport.none">
-				<source>No import yet!</source>
-				<target>Nog geen import!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.latest" resname="tx_t3monitoring_domain_model_core.latest">
+				<source>Latest</source>
+				<target>Laatste</target>
 			</trans-unit>
-			<trans-unit id="sla.total">
-				<source>SLA (%s)</source>
-				<target>SLA (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.next_secure_version" resname="tx_t3monitoring_domain_model_core.next_secure_version">
+				<source>Next Secure Version</source>
+				<target>Volgende veilige versie</target>
 			</trans-unit>
-			<trans-unit id="sla.notFound">
-				<source>No SLA records found!</source>
-				<target>Geen SLA records gevonden!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.release_date" resname="tx_t3monitoring_domain_model_core.release_date">
+				<source>Release Date</source>
+				<target>Datum van publicatie</target>
 			</trans-unit>
-			<trans-unit id="sla.clients">
-				<source>List all clients with this SLA</source>
-				<target>Toon alle klanten met deze SLA</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.stable" resname="tx_t3monitoring_domain_model_core.stable">
+				<source>Stable</source>
+				<target>Stabiel</target>
 			</trans-unit>
-			<trans-unit id="sla.noClients">
-				<source>This SLA is not used by any client!</source>
-				<target>Deze SLA wordt door geen enkele klant gebruikt!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.type" resname="tx_t3monitoring_domain_model_core.type">
+				<source>Type</source>
+				<target>Type</target>
 			</trans-unit>
-			<trans-unit id="extension.total">
-				<source>Extensions (%s)</source>
-				<target>Extensies (%s)</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version" resname="tx_t3monitoring_domain_model_core.version">
+				<source>Version</source>
+				<target>Versie</target>
 			</trans-unit>
-			<trans-unit id="extension.notFound">
-				<source>No extensions found</source>
-				<target>Geen extensies gevonden</target>
+			<trans-unit id="tx_t3monitoring_domain_model_core.version_integer" resname="tx_t3monitoring_domain_model_core.version_integer">
+				<source>Version Integer</source>
+				<target>Versie Integer</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension" resname="tx_t3monitoring_domain_model_extension">
+				<source>Extension</source>
+				<target>Extensie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.author_name" resname="tx_t3monitoring_domain_model_extension.author_name">
+				<source>Author Name</source>
+				<target>Auteur naam</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.category" resname="tx_t3monitoring_domain_model_extension.category">
+				<source>Category</source>
+				<target>Categorie</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.description" resname="tx_t3monitoring_domain_model_extension.description">
+				<source>Description</source>
+				<target>Beschrijving</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.insecure" resname="tx_t3monitoring_domain_model_extension.insecure">
+				<source>Insecure</source>
+				<target>Onveilig</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_latest" resname="tx_t3monitoring_domain_model_extension.is_latest">
+				<source>Is Latest</source>
+				<target>Is laatste</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_modified" resname="tx_t3monitoring_domain_model_extension.is_modified">
+				<source>Is Modified</source>
+				<target>Verändert</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_official" resname="tx_t3monitoring_domain_model_extension.is_official">
+				<source>Is Official</source>
+				<target>Is officieel</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.is_used" resname="tx_t3monitoring_domain_model_extension.is_used">
+				<source>Is Used</source>
+				<target>Is gebruikt</target>
 			</trans-unit>
-			<trans-unit id="extensionFilter.name">
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_bugfix_release" resname="tx_t3monitoring_domain_model_extension.last_bugfix_release">
+				<source>Last Bugfix Release</source>
+				<target>Laatste bugfix release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_major_release" resname="tx_t3monitoring_domain_model_extension.last_major_release">
+				<source>Last Major Release</source>
+				<target>Laatste Major-Release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_minor_release" resname="tx_t3monitoring_domain_model_extension.last_minor_release">
+				<source>Last Minor Release</source>
+				<target>Laatste Minor-Release</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.last_updated" resname="tx_t3monitoring_domain_model_extension.last_updated">
+				<source>Last Updated</source>
+				<target>Laatste update</target>
+			</trans-unit>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.name" resname="tx_t3monitoring_domain_model_extension.name">
 				<source>Name</source>
 				<target>Naam</target>
 			</trans-unit>
-			<trans-unit id="extensionFilter.exactSearch">
-				<source>Exact search</source>
-				<target>Exact zoeken</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.next_secure_version" resname="tx_t3monitoring_domain_model_extension.next_secure_version">
+				<source>Next Secure Version</source>
+				<target>Eerst volgende veilige versie</target>
 			</trans-unit>
-			<trans-unit id="extension.by">
-				<source>by %s</source>
-				<target>door %s</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.serialized_dependencies" resname="tx_t3monitoring_domain_model_extension.serialized_dependencies">
+				<source>Serialized Dependencies</source>
+				<target>serialized afhankelijkheden</target>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage">
-				<source>Usage</source>
-				<target>Gebruik</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.state" resname="tx_t3monitoring_domain_model_extension.state">
+				<source>State</source>
+				<target>Status</target>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage.1">
-				<source>Used</source>
-				<target>Gebruikt</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.title" resname="tx_t3monitoring_domain_model_extension.title">
+				<source>Title</source>
+				<target>Titel</target>
 			</trans-unit>
-			<trans-unit id="coreFilter.usage.0">
-				<source>All</source>
-				<target>Alle</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.update_comment" resname="tx_t3monitoring_domain_model_extension.update_comment">
+				<source>Update Comment</source>
+				<target>Update beschrijving</target>
 			</trans-unit>
-			<trans-unit id="administration.sponsors.headline">
-				<source>Sponsors</source>
-				<target>Sponsoren</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version" resname="tx_t3monitoring_domain_model_extension.version">
+				<source>Version</source>
+				<target>Versie</target>
 			</trans-unit>
-			<trans-unit id="administration.sponsors.description">
-				<source>This extension has been sponsored by</source>
-				<target>Deze extensie is gesponsord door</target>
+			<trans-unit id="tx_t3monitoring_domain_model_extension.version_integer" resname="tx_t3monitoring_domain_model_extension.version_integer">
+				<source>Version Integer</source>
+				<target>Versie Integer</target>
 			</trans-unit>
-			<trans-unit id="administration.ipHint">
-				<source><![CDATA[
-				Set the allowed IP(s) for the client to <code>%s</code>.
-				]]></source>
-				<target><![CDATA[
-				Zet de toegestane IP(s) voor de klant op <code>%s</code>.
-				]]></target>
+			<trans-unit id="tx_t3monitoring_domain_model_sla" resname="tx_t3monitoring_domain_model_sla">
+				<source>Sla</source>
+				<target>Sla</target>
 			</trans-unit>
-			<trans-unit id="noClients.title">
-				<source>No clients created!</source>
-				<target>Geen klanten aangemaakt!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.description" resname="tx_t3monitoring_domain_model_sla.description">
+				<source>Description</source>
+				<target>Beschrijving</target>
 			</trans-unit>
-			<trans-unit id="noClients.description">
-				<source>Great that you want to try t3monitoring! To start, create a new client by using the + icon above!</source>
-				<target>Schön, dass Sie t3monitoring ausprobieren wollen! Um zu beginnen, erstellen Sie einen Client mit dem + Icon oben!</target>
+			<trans-unit id="tx_t3monitoring_domain_model_sla.title" resname="tx_t3monitoring_domain_model_sla.title">
+				<source>Title</source>
+				<target>Titel</target>
 			</trans-unit>
-			<trans-unit id="presentationMode.client.title">
-				<source>Client with uid %s</source>
-				<target>Client mit der uid %s</target>
+			<trans-unit id="tx_t3monitoring_domain_model_tag" resname="tx_t3monitoring_domain_model_tag">
+				<source>Tags</source>
+				<target>Tag</target>
 			</trans-unit>
-			<trans-unit id="presentationMode.client.domain">
-				<source>http://*********.***</source>
-				<target>http://*********.***</target>
+			<trans-unit id="unknown" resname="unknown">
+				<source>unknown</source>
+				<target>onbekend</target>
 			</trans-unit>
-			<trans-unit id="noInsecureClients">
-				<source>No insecure clients found!</source>
-				<target>Geen onveilige klanten gevonden!</target>
+			<trans-unit id="update.available" resname="update.available">
+				<source>Update available</source>
+				<target>Update beschikbaar</target>
 			</trans-unit>
-			<trans-unit id="fetchClient.link">
-				<source>Fetch single client</source>
-				<target>Haal enkele klant op</target>
+			<trans-unit id="view.administration" resname="view.administration">
+				<source>Administration</source>
+				<target>Administratie</target>
 			</trans-unit>
-			<trans-unit id="fetchClient.success">
-				<source>The data of the client has been successfully fetched!</source>
-				<target>De data voor de klant is succesvol opgehaald!</target>
+			<trans-unit id="view.core" resname="view.core">
+				<source>Used core versions</source>
+				<target>Gebruikte Core versies</target>
+			</trans-unit>
+			<trans-unit id="view.usedExtensions" resname="view.usedExtensions">
+				<source>Used extensions</source>
+				<target>Gebruikte extensies</target>
+			</trans-unit>
+			<trans-unit id="yes" resname="yes">
+				<source>yes</source>
+				<target>ja</target>
 			</trans-unit>
 		</body>
 	</file>
diff --git a/Resources/Private/Layouts/Simple.html b/Resources/Private/Layouts/Simple.html
deleted file mode 100755
index c647edf..0000000
--- a/Resources/Private/Layouts/Simple.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="t3monitor" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
-	<f:if condition="{emConfiguration.useGoogleCharts}">
-	<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
-	</f:if>
-	<f:flashMessages />
-	<f:render section="content" />
-</div>
diff --git a/Resources/Private/Templates/Client/Show.html b/Resources/Private/Templates/Client/Show.html
index 76a8f32..96b018d 100644
--- a/Resources/Private/Templates/Client/Show.html
+++ b/Resources/Private/Templates/Client/Show.html
@@ -1,8 +1,8 @@
 <html data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers" xmlns:monitor="http://typo3.org/ns/T3Monitor/T3monitoring/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>
 		Client:
 		<f:if condition="{emConfiguration.presentationMode}">
@@ -233,7 +233,7 @@ <h1>
 			<f:for each="{data}" as="value" key="key">
 				<tr class="{cssClass}">
 					<th style="width: 20%;">{key}</th>
-					<td>{value -> f:format.html()}</td>
+					<td>{value -> f:format.raw()}</td>
 				</tr>
 			</f:for>
 		</table>
diff --git a/Resources/Private/Templates/Core/List.html b/Resources/Private/Templates/Core/List.html
index 4975457..fd47bb5 100644
--- a/Resources/Private/Templates/Core/List.html
+++ b/Resources/Private/Templates/Core/List.html
@@ -3,12 +3,12 @@
       xmlns:monitor="http://typo3.org/ns/T3Monitor/T3monitoring/ViewHelpers"
       xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
 
-<f:layout name="Simple"/>
+<f:layout name="Module"/>
 
-<f:section name="content">
+<f:section name="Content">
     <h1>{f:translate(key:'view.core')}</h1>
 
-    <f:form name="filter" object="{filter}" class="form-inline">
+    <f:form action="list" name="filter" object="{filter}" class="form-inline mb-3">
         <div class="form-group">
             <label>{f:translate(key:'coreFilter.usage')}</label>
             <f:form.select property="usage"
@@ -58,4 +58,4 @@ <h1>{f:translate(key:'view.core')}</h1>
         </f:else>
     </f:if>
 </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Extension/List.html b/Resources/Private/Templates/Extension/List.html
index c49cd72..75e4982 100644
--- a/Resources/Private/Templates/Extension/List.html
+++ b/Resources/Private/Templates/Extension/List.html
@@ -2,9 +2,9 @@
 	  xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 	  xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>{f:translate(key:'view.usedExtensions')}</h1>
 
 	<f:form name="filter" object="{filter}" class="form-inline">
@@ -80,4 +80,4 @@ <h1>{f:translate(key:'view.usedExtensions')}</h1>
 		</f:else>
 	</f:if>
 </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Extension/Show.html b/Resources/Private/Templates/Extension/Show.html
index 6fc9c4b..4735e31 100644
--- a/Resources/Private/Templates/Extension/Show.html
+++ b/Resources/Private/Templates/Extension/Show.html
@@ -2,9 +2,9 @@
 	  xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 	  xmlns:monitor="http://typo3.org/ns/T3Monitor/T3monitoring/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>{f:translate(key:'tx_t3monitoring_domain_model_extension')} "{latest.title}" ({latest.name})</h1>
 	<p class="lead">{latest.description -> f:format.nl2br()}
 		<f:if condition="{latest.authorName}">
@@ -46,4 +46,5 @@ <h1>{f:translate(key:'tx_t3monitoring_domain_model_extension')} "{latest.title}"
 			</div>
 		</f:else>
 	</f:if>
-</f:section>
\ No newline at end of file
+</f:section>
+</html>
diff --git a/Resources/Private/Templates/Notification/AdminEmail.txt b/Resources/Private/Templates/Notification/AdminEmail.txt
index 68303c5..638c4d3 100644
--- a/Resources/Private/Templates/Notification/AdminEmail.txt
+++ b/Resources/Private/Templates/Notification/AdminEmail.txt
@@ -1,5 +1,5 @@
 Monitoring report of your clients
-======================================
+=================================
 
 <f:for each="{clients}" as="client">
 {client.title}
@@ -11,4 +11,4 @@ Insecure extensions: <f:for each="{client.extensions}" as="e"><f:if condition="{
 Extra dangers: <f:for each="{client.extraDangerAsArray}" as="value" key="key">
  - {key}: {value}</f:for>
 
-</f:for>
\ No newline at end of file
+</f:for>
diff --git a/Resources/Private/Templates/Sla/List.html b/Resources/Private/Templates/Sla/List.html
index 4bb6b1a..36237c1 100644
--- a/Resources/Private/Templates/Sla/List.html
+++ b/Resources/Private/Templates/Sla/List.html
@@ -1,8 +1,8 @@
 <html data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>{f:translate(key:'sla.header')}</h1>
 	<f:if condition="{slas}">
 		<f:then>
@@ -41,4 +41,4 @@ <h1>{f:translate(key:'sla.header')}</h1>
 		</f:else>
 	</f:if>
 </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Sla/Show.html b/Resources/Private/Templates/Sla/Show.html
index 5172cd4..a1eb506 100644
--- a/Resources/Private/Templates/Sla/Show.html
+++ b/Resources/Private/Templates/Sla/Show.html
@@ -1,8 +1,8 @@
 <html data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>{f:translate(key:'tx_t3monitoring_domain_model_sla')}: {sla.title}</h1>
 
 	<f:if condition="{sla.description}">
@@ -48,4 +48,4 @@ <h2>{f:translate(key:'sla.clients')}</h2>
 		</f:else>
 	</f:if>
 </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Statistic/Administration.html b/Resources/Private/Templates/Statistic/Administration.html
index abfb9b5..d79f6c9 100644
--- a/Resources/Private/Templates/Statistic/Administration.html
+++ b/Resources/Private/Templates/Statistic/Administration.html
@@ -1,8 +1,8 @@
 <html data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>{f:translate(key:'view.administration')}</h1>
 	<f:if condition="{emConfiguration.ipHint}">
 		<div class="alert alert-info">
@@ -13,7 +13,7 @@ <h1>{f:translate(key:'view.administration')}</h1>
 	<h3>{f:translate(key:'administration.import.headline')}</h3>
 	<p>{f:translate(key:'administration.import.description')}</p>
 
-	<div class="btn-toolbar">
+	<div class="btn-toolbar mb-3">
 		<div class="btn-group" role="group">
 			<f:link.action action="administration" arguments="{import:'clients'}" class="btn btn-info">
 				{core:icon(identifier:'actions-system-extension-download', alternativeMarkupIdentifier: 'inline')} {f:translate(key:'tx_t3monitoring_domain_model_client')}
@@ -41,3 +41,4 @@ <h3>{f:translate(key:'administration.import.headline')}</h3>
 	</div>
 
 </f:section>
+</html>
diff --git a/Resources/Private/Templates/Statistic/Index.html b/Resources/Private/Templates/Statistic/Index.html
index 68a5513..f448845 100644
--- a/Resources/Private/Templates/Statistic/Index.html
+++ b/Resources/Private/Templates/Statistic/Index.html
@@ -2,9 +2,13 @@
       xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
       xmlns:monitor="http://typo3.org/ns/T3Monitor/T3monitoring/ViewHelpers">
 
-<f:layout name="Simple"/>
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:if condition="{emConfiguration.useGoogleCharts}">
+    <f:asset.script identifier="googlecharts" src="https://www.gstatic.com/charts/loader.js"  />
+</f:if>
+
+<f:section name="Content">
     <f:if condition="{fullClientCount}">
         <f:then>
             <f:if condition="{showIntro}">
@@ -479,3 +483,4 @@ <h3>{f:translate(key:'lastImport.header')}</h3>
         </f:else>
     </f:if>
 </f:section>
+</html>
diff --git a/Resources/Private/Templates/Tag/List.html b/Resources/Private/Templates/Tag/List.html
index f69b59e..d964fbd 100644
--- a/Resources/Private/Templates/Tag/List.html
+++ b/Resources/Private/Templates/Tag/List.html
@@ -1,8 +1,8 @@
 <html data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
 
-<f:layout name="Simple" />
+<f:layout name="Module" />
 
-<f:section name="content">
+<f:section name="Content">
 	<h1>{f:translate(key:'tag.header')}</h1>
 	<f:if condition="{tags}">
 		<f:then>
@@ -41,4 +41,4 @@ <h1>{f:translate(key:'tag.header')}</h1>
 		</f:else>
 	</f:if>
 </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Tests/Unit/Command/ReportAdminCommandTest.php b/Tests/Unit/Command/ReportAdminCommandTest.php
index 6e4c580..8b7d5f2 100644
--- a/Tests/Unit/Command/ReportAdminCommandTest.php
+++ b/Tests/Unit/Command/ReportAdminCommandTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Tests\Unit\Command;
 
 /*
@@ -8,7 +11,7 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use Prophecy\Prophecy\ObjectProphecy;
+use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use T3Monitor\T3monitoring\Command\ReportAdminCommand;
@@ -22,9 +25,7 @@
  */
 class ReportAdminCommandTest extends UnitTestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function executeWillTriggerEmailNotification()
     {
         $dummyClients = ['123', '456'];
@@ -34,15 +35,13 @@ public function executeWillTriggerEmailNotification()
         $mockedClientImport = $this->getAccessibleMock(ReportAdminCommand::class, ['dummy'], [], '', false);
         $mockedClientImport->_set('clients', $dummyClients);
 
-        /** @var EmailNotification|ObjectProphecy $emailNotification */
-        $emailNotification = $this->prophesize(EmailNotification::class);
-        $emailNotification->sendAdminEmail($emailAddress, $dummyClients)->shouldBeCalled();
-        GeneralUtility::addInstance(EmailNotification::class, $emailNotification->reveal());
+        $emailNotification = $this->createMock(EmailNotification::class);
+        $emailNotification->expects($this->any())->method('sendAdminEmail')->with($emailAddress, $dummyClients);
+        GeneralUtility::addInstance(EmailNotification::class, $emailNotification);
 
-        /** @var InputInterface|ObjectProphecy $input */
-        $input = $this->prophesize(InputInterface::class);
-        $input->getArgument('email')->willReturn($emailAddress);
+        $input = $this->createStub(InputInterface::class);
+        $input->method('getArgument')->willReturn($emailAddress);
 
-        $mockedClientImport->_call('execute', $input->reveal(), $this->prophesize(OutputInterface::class)->reveal());
+        $mockedClientImport->_call('execute', $input, GeneralUtility::makeInstance(OutputInterface::class));
     }
 }
diff --git a/Tests/Unit/Domain/Model/ClientTest.php b/Tests/Unit/Domain/Model/ClientTest.php
index e3aa56b..fc215b2 100644
--- a/Tests/Unit/Domain/Model/ClientTest.php
+++ b/Tests/Unit/Domain/Model/ClientTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Model;
 
 /*
@@ -8,20 +11,14 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\Test;
 use T3Monitor\T3monitoring\Domain\Model\Client;
 use T3Monitor\T3monitoring\Domain\Model\Sla;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-/**
- * Class ClientTest
- */
 class ClientTest extends UnitTestCase
 {
-
-    /**
-     * @var Client
-     */
-    protected $instance;
+    protected Client $instance;
 
     /**
      * Set up
@@ -32,9 +29,7 @@ protected function setUp(): void
         $this->instance = new Client();
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function emailCanBeSet()
     {
         $subject = 'entry@fo.tld';
@@ -42,9 +37,7 @@ public function emailCanBeSet()
         $this->assertEquals($subject, $this->instance->getEmail());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function titleCanBeSet()
     {
         $subject = 'Label';
@@ -52,9 +45,7 @@ public function titleCanBeSet()
         $this->assertEquals($subject, $this->instance->getTitle());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function domainCanBeSet()
     {
         $subject = 'www.typo3.org';
@@ -62,9 +53,7 @@ public function domainCanBeSet()
         $this->assertEquals($subject, $this->instance->getDomain());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function secretCanBeSet()
     {
         $subject = '1234';
@@ -72,9 +61,7 @@ public function secretCanBeSet()
         $this->assertEquals($subject, $this->instance->getSecret());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function phpVersionCanBeSet()
     {
         $subject = '5.2';
@@ -82,9 +69,7 @@ public function phpVersionCanBeSet()
         $this->assertEquals($subject, $this->instance->getPhpVersion());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function mysqlVersionCanBeSet()
     {
         $subject = '5.5';
@@ -92,19 +77,14 @@ public function mysqlVersionCanBeSet()
         $this->assertEquals($subject, $this->instance->getMysqlVersion());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function insecureCoreCanBeSet()
     {
-        $subject = true;
-        $this->instance->setInsecureCore($subject);
-        $this->assertEquals($subject, $this->instance->getInsecureCore());
+        $this->instance->setInsecureCore(true);
+        $this->assertTrue($this->instance->getInsecureCore());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function insecureExtensionsCanBeSet()
     {
         $subject = 123;
@@ -112,19 +92,14 @@ public function insecureExtensionsCanBeSet()
         $this->assertEquals($subject, $this->instance->getInsecureExtensions());
     }
 
-    /**
-     * @test
-     */
-    public function ouddatedCoreCanBeSet()
+    #[Test]
+    public function outdatedCoreCanBeSet()
     {
-        $subject = true;
-        $this->instance->setOutdatedCore($subject);
-        $this->assertEquals($subject, $this->instance->getOutdatedCore());
+        $this->instance->setOutdatedCore(true);
+        $this->assertTrue($this->instance->getOutdatedCore());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function outdatedExtensionsCanBeSet()
     {
         $subject = 456;
@@ -132,9 +107,7 @@ public function outdatedExtensionsCanBeSet()
         $this->assertEquals($subject, $this->instance->getOutdatedExtensions());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function errorMessageCanBeSet()
     {
         $subject = 'error';
@@ -142,9 +115,7 @@ public function errorMessageCanBeSet()
         $this->assertEquals($subject, $this->instance->getErrorMessage());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function extraInfoCanBeSet()
     {
         $subject = 'info';
@@ -152,9 +123,7 @@ public function extraInfoCanBeSet()
         $this->assertEquals($subject, $this->instance->getExtraInfo());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function extraWarningCanBeSet()
     {
         $subject = 'warn';
@@ -162,9 +131,7 @@ public function extraWarningCanBeSet()
         $this->assertEquals($subject, $this->instance->getExtraWarning());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function extraDangerCanBeSet()
     {
         $subject = 'danger';
@@ -172,9 +139,7 @@ public function extraDangerCanBeSet()
         $this->assertEquals($subject, $this->instance->getExtraDanger());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function lastSuccessfulDateCanBeSet()
     {
         $subject = new \DateTime();
@@ -182,9 +147,7 @@ public function lastSuccessfulDateCanBeSet()
         $this->assertEquals($subject, $this->instance->getLastSuccessfulImport());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function slaCanBeSet()
     {
         $subject = new Sla();
diff --git a/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php b/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php
index a8604fa..d22db10 100644
--- a/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php
+++ b/Tests/Unit/Domain/Model/Dto/CoreFilterDemandTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Model\Dto;
 
 /*
@@ -8,19 +11,13 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\Test;
 use T3Monitor\T3monitoring\Domain\Model\Dto\CoreFilterDemand;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-/**
- * Class CoreFilterDemandTest
- */
 class CoreFilterDemandTest extends UnitTestCase
 {
-
-    /**
-     * @var CoreFilterDemand
-     */
-    protected $instance;
+    protected CoreFilterDemand $instance;
 
     /**
      * Set up
@@ -31,9 +28,7 @@ protected function setUp(): void
         $this->instance = new CoreFilterDemand();
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function usageCanBeSet()
     {
         $subject = 123;
diff --git a/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php b/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php
index 0c25d22..4cf9e7c 100644
--- a/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php
+++ b/Tests/Unit/Domain/Model/Dto/ExtensionFilterDemandTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Model\Dto;
 
 /*
@@ -8,32 +11,21 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\Test;
 use T3Monitor\T3monitoring\Domain\Model\Dto\ExtensionFilterDemand;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-/**
- * Class ExtensionFilterDemandTest
- */
 class ExtensionFilterDemandTest extends UnitTestCase
 {
+    protected ExtensionFilterDemand $instance;
 
-    /**
-     * @var ExtensionFilterDemand
-     */
-    protected $instance;
-
-    /**
-     * Set up
-     */
     protected function setUp(): void
     {
         parent::setUp();
         $this->instance = new ExtensionFilterDemand();
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function nameCanBeSet()
     {
         $subject = 'MyExt';
@@ -41,13 +33,10 @@ public function nameCanBeSet()
         $this->assertEquals($subject, $this->instance->getName());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function exactSearchCanBeSet()
     {
-        $subject = true;
-        $this->instance->setExactSearch($subject);
-        $this->assertEquals($subject, $this->instance->isExactSearch());
+        $this->instance->setExactSearch(true);
+        $this->assertTrue($this->instance->isExactSearch());
     }
 }
diff --git a/Tests/Unit/Domain/Service/Import/ClientImportTest.php b/Tests/Unit/Domain/Service/Import/ClientImportTest.php
index d0cabb0..4fc534c 100644
--- a/Tests/Unit/Domain/Service/Import/ClientImportTest.php
+++ b/Tests/Unit/Domain/Service/Import/ClientImportTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Tests\Unit\Domain\Service\Import;
 
 /*
@@ -8,31 +11,22 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use T3Monitor\T3monitoring\Service\Import\ClientImport;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-/**
- * Class ClientImportTest
- */
 class ClientImportTest extends UnitTestCase
 {
-
-    /**
-     * @param string $given
-     * @param string $expected
-     * @dataProvider domainIsCorrectlyUnifiedProvider
-     * @test
-     */
-    public function domainIsCorrectlyUnified($given, $expected)
+    #[Test]
+    #[DataProvider('domainIsCorrectlyUnifiedProvider')]
+    public function domainIsCorrectlyUnified(string $given, string $expected)
     {
         $mockedClientImport = $this->getAccessibleMock(ClientImport::class, ['dummy'], [], '', false);
         $this->assertEquals($expected, $mockedClientImport->_call('unifyDomain', $given));
     }
 
-    /**
-     * @return array
-     */
-    public function domainIsCorrectlyUnifiedProvider()
+    public static function domainIsCorrectlyUnifiedProvider(): array
     {
         return [
             'domainWithProtocolAndEndSlash' => [
diff --git a/Tests/Unit/Notification/EmailNotificationTest.php b/Tests/Unit/Notification/EmailNotificationTest.php
index 85452e1..df2d22a 100644
--- a/Tests/Unit/Notification/EmailNotificationTest.php
+++ b/Tests/Unit/Notification/EmailNotificationTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace T3Monitor\T3monitoring\Tests\Unit\Notification;
 
 /*
@@ -8,6 +11,8 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\Test;
+use T3Monitor\T3monitoring\Domain\Model\Client;
 use T3Monitor\T3monitoring\Notification\EmailNotification;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
@@ -16,21 +21,17 @@
  */
 class EmailNotificationTest extends UnitTestCase
 {
-    protected $resetSingletonInstances = true;
+    protected bool $resetSingletonInstances = true;
 
-    /**
-     * @test
-     */
+    #[Test]
     public function sendAdminEmailThrowsExceptionForInvalidEmailAddress()
     {
         $this->expectException(\UnexpectedValueException::class);
         $notification = new EmailNotification();
-        $notification->sendAdminEmail('invalid', ['client']);
+        $notification->sendAdminEmail('invalid', [new Client()]);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function sendAdminEmailThrowsExceptionForNoClients()
     {
         $this->expectException(\UnexpectedValueException::class);
@@ -38,9 +39,7 @@ public function sendAdminEmailThrowsExceptionForNoClients()
         $notification->sendAdminEmail('john@doe.com', []);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function senderEmailNameIsCorrectlyReturned()
     {
         $notification = $this->getAccessibleMock(EmailNotification::class, ['dummy']);
@@ -52,9 +51,7 @@ public function senderEmailNameIsCorrectlyReturned()
         $this->assertEquals($example, $notification->_call('getSenderEmailName'));
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function senderEmailAddressIsCorrectlyReturned()
     {
         $notification = $this->getAccessibleMock(EmailNotification::class, ['dummy']);
diff --git a/composer.json b/composer.json
index 6f735a3..2c8538e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,48 +1,48 @@
 {
-  "name": "t3monitor/t3monitoring",
-  "type": "typo3-cms-extension",
-  "description": "T3monitoring service",
-  "license": [
-    "GPL-2.0-or-later"
-  ],
-  "require": {
-    "ext-json": "*",
-    "typo3/cms-core": "^10 || ^11",
-    "typo3/cms-backend": "^10 || ^11",
-    "typo3/cms-extbase": "^10 || ^11",
-    "typo3/cms-extensionmanager": "^10 || ^11"
-  },
-  "require-dev": {
-    "typo3/minimal": "^11",
-    "typo3/testing-framework": "*"
-  },
-  "autoload": {
-    "psr-4": {
-      "T3Monitor\\T3monitoring\\": "Classes"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "T3Monitor\\T3monitoring\\Tests\\": "Tests",
-      "TYPO3\\CMS\\Core\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/core/Tests/",
-      "TYPO3\\CMS\\Fluid\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/fluid/Tests/"
-    }
-  },
-  "config": {
-    "vendor-dir": ".Build/vendor",
-    "bin-dir": ".Build/bin"
-  },
-  "scripts": {
-    "post-autoload-dump": [
-      "mkdir -p .Build/Web/typo3conf/ext/",
-      "[ -L .Build/Web/typo3conf/ext/t3monitoring ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/t3monitoring"
-    ]
-  },
-  "extra": {
-    "typo3/cms": {
-      "cms-package-dir": "{$vendor-dir}/typo3/cms",
-      "web-dir": ".Build/Web",
-      "extension-key": "t3monitoring"
-    }
-  }
+	"name": "t3monitor/t3monitoring",
+	"type": "typo3-cms-extension",
+	"description": "T3monitoring service",
+	"license": [
+		"GPL-2.0-or-later"
+	],
+	"require": {
+		"php": "^8.2",
+		"ext-json": "*",
+		"ext-dom": "*",
+		"typo3/cms-core": "^12",
+		"typo3/cms-backend": "^12",
+		"typo3/cms-extbase": "^12",
+		"typo3/cms-extensionmanager": "^12"
+	},
+	"require-dev": {
+		"typo3/minimal": "^12",
+		"typo3/testing-framework": "*"
+	},
+	"autoload": {
+		"psr-4": {
+			"T3Monitor\\T3monitoring\\": "Classes"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"T3Monitor\\T3monitoring\\Tests\\": "Tests"
+		}
+	},
+	"config": {
+		"vendor-dir": ".Build/vendor",
+		"bin-dir": ".Build/bin",
+		"allow-plugins": {
+			"typo3/class-alias-loader": true,
+			"typo3/cms-composer-installers": true
+		}
+	},
+	"extra": {
+		"typo3/cms": {
+			"web-dir": ".Build/web",
+			"extension-key": "t3monitoring"
+		},
+		"branch-alias": {
+			"dev-core-v12": "3.x-dev"
+		}
+	}
 }
diff --git a/ext_emconf.php b/ext_emconf.php
index cd2c3c8..b21c165 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -6,11 +6,12 @@
     'category' => 'be',
     'author' => 'Georg Ringer',
     'author_email' => '',
-    'state' => 'beta',
-    'version' => '2.0.0',
+    'state' => 'stable',
+    'version' => '3.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0-11.5.99',
+            'php' => '8.2.0-8.4.99',
+            'typo3' => '12.4.0-12.4.99',
         ],
         'conflicts' => [],
         'suggests' => [],
diff --git a/ext_localconf.php b/ext_localconf.php
index 118dead..be30ab2 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,13 +1,6 @@
 <?php
-defined('TYPO3_MODE') || die('Access denied.');
 
-call_user_func(
-    function () {
-        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerTypeConverter(
-            \T3Monitor\T3monitoring\Domain\TypeConverter\ClientFilterDemandConverter::class
-        );
+defined('TYPO3') || die('Access denied.');
 
-        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['t3monitoring']
-            = \T3Monitor\T3monitoring\Hooks\DataHandlerHook::class;
-    }
-);
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['t3monitoring']
+    = \T3Monitor\T3monitoring\Hooks\DataHandlerHook::class;
diff --git a/ext_tables.php b/ext_tables.php
deleted file mode 100644
index ca8898f..0000000
--- a/ext_tables.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-defined('TYPO3_MODE') || die('Access denied.');
-
-call_user_func(
-    function () {
-        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-            'T3monitoring',
-            'tools',
-            't3monitor',
-            'top',
-            [
-                \T3Monitor\T3monitoring\Controller\StatisticController::class => 'index,administration',
-                \T3Monitor\T3monitoring\Controller\CoreController::class => 'list',
-                \T3Monitor\T3monitoring\Controller\ClientController::class => 'show,fetch',
-                \T3Monitor\T3monitoring\Controller\ExtensionController::class => 'list, show',
-                \T3Monitor\T3monitoring\Controller\SlaController::class => 'list, show',
-                \T3Monitor\T3monitoring\Controller\TagController::class => 'list, show',
-            ],
-            [
-                'access' => 'user,group',
-                'icon' => 'EXT:t3monitoring/Resources/Public/Icons/module.svg',
-                'labels' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang_t3monitor.xlf',
-            ]
-        );
-
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_client');
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_core');
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_extension');
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_sla');
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_t3monitoring_domain_model_tag');
-    }
-);
diff --git a/ext_tables.sql b/ext_tables.sql
index 601edcd..3d57641 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -1,11 +1,5 @@
-#
-# Table structure for table 'tx_t3monitoring_domain_model_client'
-#
-CREATE TABLE tx_t3monitoring_domain_model_client (
-
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
 
+CREATE TABLE tx_t3monitoring_domain_model_client (
 	title varchar(255) DEFAULT '' NOT NULL,
 	domain varchar(255) DEFAULT '' NOT NULL,
 	comment text NOT NULL,
@@ -34,26 +28,10 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
 	extensions int(11) unsigned DEFAULT '0' NOT NULL,
 	core int(11) unsigned DEFAULT '0',
 	sla int(11) unsigned DEFAULT '0',
-	tag tinytext,
-
-	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
-	crdate int(11) unsigned DEFAULT '0' NOT NULL,
-	cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
-	deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
-	hidden tinyint(4) unsigned DEFAULT '0' NOT NULL,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid)
+	tag tinytext
 );
 
-#
-# Table structure for table 'tx_t3monitoring_domain_model_extension'
-#
 CREATE TABLE tx_t3monitoring_domain_model_extension (
-
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-
 	name varchar(255) DEFAULT '' NOT NULL,
 	version varchar(255) DEFAULT '' NOT NULL,
 	insecure tinyint(1) unsigned DEFAULT '0' NOT NULL,
@@ -79,23 +57,10 @@ CREATE TABLE tx_t3monitoring_domain_model_extension (
 	typo3_max_version int(11) unsigned DEFAULT '0' NOT NULL,
 	serialized_dependencies text,
 
-	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
-	crdate int(11) unsigned DEFAULT '0' NOT NULL,
-	cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid),
 	KEY major (name,major_version)
 );
 
-#
-# Table structure for table 'tx_t3monitoring_domain_model_core'
-#
 CREATE TABLE tx_t3monitoring_domain_model_core (
-
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-
 	version varchar(255) DEFAULT '' NOT NULL,
 	insecure tinyint(1) unsigned DEFAULT '0' NOT NULL,
 	next_secure_version varchar(255) DEFAULT '' NOT NULL,
@@ -108,65 +73,19 @@ CREATE TABLE tx_t3monitoring_domain_model_core (
 	is_latest tinyint(1) unsigned DEFAULT '0' NOT NULL,
 	version_integer int(11) DEFAULT '0' NOT NULL,
 	is_used tinyint(1) unsigned DEFAULT '0' NOT NULL,
-	is_official tinyint(1) unsigned DEFAULT '0' NOT NULL,
-
-	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
-	crdate int(11) unsigned DEFAULT '0' NOT NULL,
-	cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid)
+	is_official tinyint(1) unsigned DEFAULT '0' NOT NULL
 );
 
-#
-# Table structure for table 'tx_t3monitoring_domain_model_sla'
-#
 CREATE TABLE tx_t3monitoring_domain_model_sla (
-
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-
 	title varchar(255) DEFAULT '' NOT NULL,
-	description text NOT NULL,
-
-	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
-	crdate int(11) unsigned DEFAULT '0' NOT NULL,
-	cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
-	deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
-	hidden tinyint(4) unsigned DEFAULT '0' NOT NULL,
-
-	sorting int(11) DEFAULT '0' NOT NULL,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid)
+	description text NOT NULL
 );
 
-#
-# Table structure for table 'tx_t3monitoring_domain_model_tag'
-#
 CREATE TABLE tx_t3monitoring_domain_model_tag (
-
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-
 	title varchar(255) DEFAULT '' NOT NULL,
-	description text NOT NULL,
-
-	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
-	crdate int(11) unsigned DEFAULT '0' NOT NULL,
-	cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
-	deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
-	hidden tinyint(4) unsigned DEFAULT '0' NOT NULL,
-
-	sorting int(11) DEFAULT '0' NOT NULL,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid)
+	description text NOT NULL
 );
 
-#
-# Table structure for table 'tx_t3monitoring_client_extension_mm'
-#
 CREATE TABLE tx_t3monitoring_client_extension_mm (
 	uid_local int(11) unsigned DEFAULT '0' NOT NULL,
 	uid_foreign int(11) unsigned DEFAULT '0' NOT NULL,