N°1350 - link audit catecories to domains and evaluate only categories of a given domain via interactive audit

2026-02-12 23:14:18 +01:00 · 2022-08-11 15:50:15 +02:00
parent 4a54b2f8ff
commit 57ab3a0336
12 changed files with 287 additions and 18 deletions
--- a/application/application.inc.php
+++ b/application/application.inc.php
@@ -12,6 +12,7 @@ require_once(APPROOT.'/application/applicationcontext.class.inc.php');
 require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 require_once(APPROOT.'/application/audit.category.class.inc.php');
+require_once(APPROOT.'/application/audit.domain.class.inc.php');
 require_once(APPROOT.'/application/audit.rule.class.inc.php');
 require_once(APPROOT.'/application/query.class.inc.php');
 require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
--- a/application/audit.category.class.inc.php
+++ b/application/audit.category.class.inc.php
@@ -20,7 +20,7 @@
 /**
 * This class manages the audit "categories". Each category defines a set of objects
 * to check and is linked to a set of rules that determine the valid or invalid objects
- * inside the set 
+ * inside the set
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -50,9 +50,10 @@ class AuditCategory extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", array("linked_class"=>"AuditRule", "ext_key_to_me"=>"category_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
 		MetaModel::Init_AddAttribute(new AttributeInteger("ok_error_tolerance", array("allowed_values"=>null, "sql"=>"ok_error_tolerance", "default_value"=>5, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("warning_error_tolerance", array("allowed_values"=>null, "sql"=>"warning_error_tolerance", "default_value"=>25, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("domains_list", array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "category_id", "ext_key_to_remote" => "domain_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));

 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'ok_error_tolerance', 'warning_error_tolerance', 'rules_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'ok_error_tolerance', 'warning_error_tolerance', 'rules_list', 'domains_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
--- a/application/audit.domain.class.inc.php
+++ b/application/audit.domain.class.inc.php
@@ -0,0 +1,99 @@
+<?php
+// Copyright (C) 2010-2021 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop 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
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * This class manages the audit "categories". Each category defines a set of objects
+ * to check and is linked to a set of rules that determine the valid or invalid objects
+ * inside the set
+ *
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * @since 3.1.0
+ */
+class AuditDomain extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditdomain",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeImage("icon", array("is_null_allowed"=>true, "depends_on"=>array(), "display_max_width"=>96, "display_max_height"=>96, "storage_max_width"=>256, "storage_max_height"=>256, "default_image"=>null, "always_load_in_tables"=>false)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("categories_list", array("linked_class" => "lnkAuditCategoryToAuditDomain", "ext_key_to_me" => "domain_id", "ext_key_to_remote" => "category_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'icon', 'categories_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+	}
+
+}
+
+/**
+ * @since 3.1.0
+ */
+class lnkAuditCategoryToAuditDomain extends cmdbAbstractObject
+{
+	/**
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array('category_id', 'domain_id'),
+			"db_table" => "priv_link_audit_category_domain",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"is_link" => true,
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("targetclass" => "AuditCategory", "jointype" => '', "allowed_values" => null, "sql" => "category_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values" => null, "extkey_attcode" => 'category_id', "target_attcode" => "name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("domain_id", array("targetclass" => "AuditDomain", "jointype" => '', "allowed_values" => null, "sql" => "domain_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("domain_name", array("allowed_values" => null, "extkey_attcode" => 'domain_id', "target_attcode" => "name")));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('category_id', 'domain_id'));
+		MetaModel::Init_SetZListItems('list', array('category_id', 'domain_id'));
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'domain_id'));
+	}
+}
+
--- a/core/autoload.php
+++ b/core/autoload.php
@@ -21,6 +21,7 @@ MetaModel::IncludeModule('application/menunode.class.inc.php');
 MetaModel::IncludeModule('application/user.preferences.class.inc.php');
 MetaModel::IncludeModule('application/user.dashboard.class.inc.php');
 MetaModel::IncludeModule('application/audit.rule.class.inc.php');
+MetaModel::IncludeModule('application/audit.domain.class.inc.php');
 MetaModel::IncludeModule('application/query.class.inc.php');
 MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');

--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1592,6 +1592,14 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
+		'audit.enable_selection_landing_page' => [
+			'type'                => 'bool',
+			'description'         => 'If true audit categories must be selected before results are computed (use this setting in case of a lot of audit categories)',
+			'default'             => false,
+			'value'               => false,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 	];

 	public function IsProperty($sPropCode)
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -17,7 +17,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Fehlertoleranz  (OK)',
 	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Erlaubter prozentualer Anteil ungültiger Objekte, bei dem das Ergebnis noch als in Ordnung (grün) dargestellt wird',
 	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Fehlertoleranz (Warnung)',
-	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Erlaubter prozentualer Anteil ungültiger Objekte, bei dem das Ergebnis noch als Warnung (orange) dargestellt wir.',
+	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Erlaubter prozentualer Anteil ungültiger Objekte, bei dem das Ergebnis noch als Warnung (orange) dargestellt wird.',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domänen',
+	'Class:AuditCategory/Attribute:domains_list+' => 'Domänen, die dieser Kategorie zugeordnet sind',
 ));

 //
@@ -48,6 +50,40 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:AuditRule/Attribute:category_name+' => 'Kategoriename für diese Regel',
 ));

+//
+// Class: AuditDomain
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:AuditDomain' => 'Audit-Domäne',
+	'Class:AuditDomain+' => '',
+	'Class:AuditDomain/Attribute:name' => 'Name',
+	'Class:AuditDomain/Attribute:name+' => '',
+	'Class:AuditDomain/Attribute:description' => 'Beschreibung',
+	'Class:AuditDomain/Attribute:description+' => '',
+	'Class:AuditDomain/Attribute:icon' => 'Icon',
+	'Class:AuditDomain/Attribute:icon+' => '',
+	'Class:AuditDomain/Attribute:categories_list' => 'Audit-Kategorien',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Verknüpfte Audit-Kategorien',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Verknüpfung Audit-Kategorie / Audit-Domäne',
+	'Class:lnkAuditCategoryToAuditDomain+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Audit-Kategorie',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Audit-Kategorienname',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Audit-Domäne',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Audit-Domänenname',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => '',
+));
+
 //
 // Class: QueryOQL
 //
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -34,6 +34,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as OK (green)',
 	'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error tolerance (warning)',
 	'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as a warning (orange)',
+	'Class:AuditCategory/Attribute:domains_list' => 'Domains',
+	'Class:AuditCategory/Attribute:domains_list+' => 'List of domains linked to this category',
 ));

 //
@@ -64,6 +66,40 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:AuditRule/Attribute:category_name+' => 'Name of the category for this rule',
 ));

+//
+// Class: AuditDomain
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:AuditDomain' => 'Audit Domain',
+	'Class:AuditDomain+' => '',
+	'Class:AuditDomain/Attribute:name' => 'Name',
+	'Class:AuditDomain/Attribute:name+' => '',
+	'Class:AuditDomain/Attribute:description' => 'Description',
+	'Class:AuditDomain/Attribute:description+' => '',
+	'Class:AuditDomain/Attribute:icon' => 'Icon',
+	'Class:AuditDomain/Attribute:icon+' => '',
+	'Class:AuditDomain/Attribute:categories_list' => 'Categories',
+	'Class:AuditDomain/Attribute:categories_list+' => 'Linked audit categories',
+));
+
+//
+// Class: lnkAuditCategoryToAuditDomain
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkAuditCategoryToAuditDomain' => 'Link AuditCategory / AuditDomain',
+	'Class:lnkAuditCategoryToAuditDomain+' => '',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id' => 'Category',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_id+' => 'Audit Category',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name' => 'Category name',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:category_name+' => 'Audit category name',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id' => 'Domain',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_id+' => 'Audit domain',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name' => 'Domain name',
+	'Class:lnkAuditCategoryToAuditDomain/Attribute:domain_name+' => 'Audit domain name',
+));
+
 //
 // Class: QueryOQL
 //
@@ -722,6 +758,12 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating

 	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
 	'UI:Audit:InteractiveAudit' => 'Interactive Audit',
+	'UI:Audit:InteractiveAudit:Selection' => 'Audit - Domain Selection',
+	'UI:Audit:InteractiveAudit:Selection+' => 'Select a domain to get the result for selected domain',
+	'UI:Audit:InteractiveAudit:Selection:All' => 'All categories',
+	'UI:Audit:InteractiveAudit:AllCategories' => 'Audit result for all categories',
+	'UI:Audit:InteractiveAudit:SelectedCategories' => 'Audit result for %1$s categories / category',
+	'UI:Audit:InteractiveAudit:SelectedDomain' => 'Audit result for domain: %1$s',
 	'UI:Audit:HeaderAuditRule' => 'Audit Rule',
 	'UI:Audit:HeaderNbObjects' => '# Objects',
 	'UI:Audit:HeaderNbErrors' => '# Errors',
--- a/lib/composer/ClassLoader.php
+++ b/lib/composer/ClassLoader.php
@@ -149,7 +149,7 @@ class ClassLoader

    /**
     * @return string[] Array of classname => path
-     * @psalm-var array<string, string>
+     * @psalm-return array<string, string>
     */
    public function getClassMap()
    {
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -88,6 +88,7 @@ return array(
    'AttributeText' => $baseDir . '/core/attributedef.class.inc.php',
    'AttributeURL' => $baseDir . '/core/attributedef.class.inc.php',
    'AuditCategory' => $baseDir . '/application/audit.category.class.inc.php',
+    'AuditDomain' => $baseDir . '/application/audit.domain.class.inc.php',
    'AuditRule' => $baseDir . '/application/audit.rule.class.inc.php',
    'BackgroundTask' => $baseDir . '/core/backgroundtask.class.inc.php',
    'BinaryExpression' => $baseDir . '/core/oql/expression.class.inc.php',
@@ -144,10 +145,6 @@ return array(
    'CAS_Request_Exception' => $vendorDir . '/apereo/phpcas/source/CAS/Request/Exception.php',
    'CAS_Request_MultiRequestInterface' => $vendorDir . '/apereo/phpcas/source/CAS/Request/MultiRequestInterface.php',
    'CAS_Request_RequestInterface' => $vendorDir . '/apereo/phpcas/source/CAS/Request/RequestInterface.php',
-    'CAS_ServiceBaseUrl_AllowedListDiscovery' => $vendorDir . '/apereo/phpcas/source/CAS/ServiceBaseUrl/AllowedListDiscovery.php',
-    'CAS_ServiceBaseUrl_Base' => $vendorDir . '/apereo/phpcas/source/CAS/ServiceBaseUrl/Base.php',
-    'CAS_ServiceBaseUrl_Interface' => $vendorDir . '/apereo/phpcas/source/CAS/ServiceBaseUrl/Interface.php',
-    'CAS_ServiceBaseUrl_Static' => $vendorDir . '/apereo/phpcas/source/CAS/ServiceBaseUrl/Static.php',
    'CAS_Session_PhpSession' => $vendorDir . '/apereo/phpcas/source/CAS/Session/PhpSession.php',
    'CAS_TypeMismatchException' => $vendorDir . '/apereo/phpcas/source/CAS/TypeMismatchException.php',
    'CLILikeWebPage' => $baseDir . '/sources/Application/WebPage/CLILikeWebPage.php',
@@ -2941,6 +2938,7 @@ return array(
    'iTopWizardWebPage' => $baseDir . '/sources/Application/WebPage/iTopWizardWebPage.php',
    'iTopXmlException' => $baseDir . '/application/exceptions/iTopXmlException.php',
    'iWorkingTimeComputer' => $baseDir . '/core/computing.inc.php',
+    'lnkAuditCategoryToAuditDomain' => $baseDir . '/application/audit.domain.class.inc.php',
    'lnkTriggerAction' => $baseDir . '/core/trigger.class.inc.php',
    'ormCaseLog' => $baseDir . '/core/ormcaselog.class.inc.php',
    'ormCustomFieldsValue' => $baseDir . '/core/ormcustomfieldsvalue.class.inc.php',
--- a/lib/composer/autoload_real.php
+++ b/lib/composer/autoload_real.php
@@ -60,11 +60,16 @@ class ComposerAutoloaderInit7f81b4a2a468a061c306af5e447a9a9f
    }
 }

+/**
+ * @param string $fileIdentifier
+ * @param string $file
+ * @return void
+ */
 function composerRequire7f81b4a2a468a061c306af5e447a9a9f($fileIdentifier, $file)
 {
    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+        require $file;
    }
 }
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -453,6 +453,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
        'AttributeText' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php',
        'AttributeURL' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php',
        'AuditCategory' => __DIR__ . '/../..' . '/application/audit.category.class.inc.php',
+        'AuditDomain' => __DIR__ . '/../..' . '/application/audit.domain.class.inc.php',
        'AuditRule' => __DIR__ . '/../..' . '/application/audit.rule.class.inc.php',
        'BackgroundTask' => __DIR__ . '/../..' . '/core/backgroundtask.class.inc.php',
        'BinaryExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
@@ -509,10 +510,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
        'CAS_Request_Exception' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/Request/Exception.php',
        'CAS_Request_MultiRequestInterface' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/Request/MultiRequestInterface.php',
        'CAS_Request_RequestInterface' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/Request/RequestInterface.php',
-        'CAS_ServiceBaseUrl_AllowedListDiscovery' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/ServiceBaseUrl/AllowedListDiscovery.php',
-        'CAS_ServiceBaseUrl_Base' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/ServiceBaseUrl/Base.php',
-        'CAS_ServiceBaseUrl_Interface' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/ServiceBaseUrl/Interface.php',
-        'CAS_ServiceBaseUrl_Static' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/ServiceBaseUrl/Static.php',
        'CAS_Session_PhpSession' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/Session/PhpSession.php',
        'CAS_TypeMismatchException' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/TypeMismatchException.php',
        'CLILikeWebPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/CLILikeWebPage.php',
@@ -3306,6 +3303,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
        'iTopWizardWebPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/iTopWizardWebPage.php',
        'iTopXmlException' => __DIR__ . '/../..' . '/application/exceptions/iTopXmlException.php',
        'iWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php',
+        'lnkAuditCategoryToAuditDomain' => __DIR__ . '/../..' . '/application/audit.domain.class.inc.php',
        'lnkTriggerAction' => __DIR__ . '/../..' . '/core/trigger.class.inc.php',
        'ormCaseLog' => __DIR__ . '/../..' . '/core/ormcaselog.class.inc.php',
        'ormCustomFieldsValue' => __DIR__ . '/../..' . '/core/ormcustomfieldsvalue.class.inc.php',
--- a/pages/audit.php
+++ b/pages/audit.php
@@ -10,6 +10,7 @@ use Combodo\iTop\Application\UI\Base\Component\Dashlet\DashletContainer;
 use Combodo\iTop\Application\UI\Base\Component\Dashlet\DashletFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\Panel;
+use Combodo\iTop\Application\UI\Base\Component\Text\Text;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardRow;
@@ -145,7 +146,9 @@ try
 	require_once(APPROOT.'/application/application.inc.php');

 	require_once(APPROOT.'/application/startup.inc.php');
-	$operation = utils::ReadParam('operation', '');
+
+	$bSelectionAuditRulesByDefault = utils::GetConfig()->Get('audit.enable_selection_landing_page');
+	$operation = utils::ReadParam('operation', $bSelectionAuditRulesByDefault ? 'selection' : 'audit');
 	$oAppContext = new ApplicationContext();
 	
 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
@@ -251,11 +254,89 @@ try
 			$sExportUrl = utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey();
 			$oP->add_ready_script("$('a[href*=\"pages/UI.php?operation=search\"]').attr('href', '".$sExportUrl."')");
 			break;
-		
+
+		case 'selection':
+			$oP->SetBreadCrumbEntry('ui-tool-auditselection', Dict::S('Menu:Audit'), Dict::S('UI:Audit:InteractiveAudit:Selection'), '', 'fas fa-stethoscope', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
+			$oP->AddUiBlock(TitleUIBlockFactory::MakeForPage(Dict::S('UI:Audit:InteractiveAudit:Selection')));
+			$oP->AddUiBlock(new Text(Dict::S('UI:Audit:InteractiveAudit:Selection+')));
+
+			// Header block to select all audit categories
+			$oCategoriesSet = new DBObjectSet(new DBObjectSearch('AuditCategory'));
+			$iCategoryCount = $oCategoriesSet->Count();
+
+			$oDashboardRow = new DashboardRow();
+			$oDashboardRow->AddCSSClass('ibo-audit--dashboard');
+			$oDashboardColumn = new DashboardColumn(false, true);
+			$oDashboardRow->AddDashboardColumn($oDashboardColumn);
+			$oAllCategoriesDashlet = new DashletContainer();
+			$oAllCategoriesDashlet
+				->AddCSSClasses(['ibo-dashlet--is-inline', 'ibo-dashlet-badge'])
+				->AddSubBlock(DashletFactory::MakeForDashletBadge(
+					'../images/icons/icons8-audit.svg',
+					utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=audit",
+					$iCategoryCount,
+					Dict::S('UI:Audit:InteractiveAudit:Selection:All')
+				));
+			$oDashboardColumn->AddUIBlock($oAllCategoriesDashlet);
+			$oP->AddUiBlock($oDashboardRow);
+
+			// Three column layout to display all available audit domains
+			$oDashboardRow = new DashboardRow();
+			$oDashboardRow
+				->AddCSSClass('ibo-audit--dashboard')
+				->AddDashboardColumn(new DashboardColumn(false, true))
+				->AddDashboardColumn(new DashboardColumn(false, true))
+				->AddDashboardColumn(new DashboardColumn(false, true));
+
+			// Fetch all audit domains with at least on linked category
+			$oDomainSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT AuditDomain AS domain JOIN lnkAuditCategoryToAuditDomain AS lnk ON lnk.domain_id = domain.id"));
+			$oDomainSet->SetOrderBy(array('name' => true));
+			$iDomainCnt = 0;
+			/** @var AuditDomain $oAuditDomain */
+			while($oAuditDomain = $oDomainSet->Fetch()) {
+				$sDomainUrl = utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=audit&domain=".$oAuditDomain->GetKey();
+				$sIconUrl = '../images/icons/icons8-puzzle.svg';
+					/** @var \ormDocument $oImage */
+				$oImage = $oAuditDomain->Get('icon');
+				if (!$oImage->IsEmpty()) {
+					$sIconUrl = $oImage->GetDisplayURL(get_class($oAuditDomain), $oAuditDomain->GetKey(), 'icon');
+				}
+				$iCategoryCount = $oAuditDomain->Get('categories_list')->Count();
+				$oDomainBlock = DashletFactory::MakeForDashletBadge($sIconUrl, $sDomainUrl, $iCategoryCount, $oAuditDomain->Get('name'));
+				$oDomainDashlet = new DashletContainer();
+				$oDomainDashlet->AddSubBlock($oDomainBlock)->AddCSSClasses(['ibo-dashlet--is-inline', 'ibo-dashlet-badge']);
+				$oDashboardRow->GetSubBlocks()[$iDomainCnt % 3]->AddUIBlock($oDomainDashlet); // ;
+				$iDomainCnt++;
+			}
+
+			$oP->AddUiBlock($oDashboardRow);
+			break;
+
 		case 'audit':
 		default:
 		$oP->SetBreadCrumbEntry('ui-tool-audit', Dict::S('Menu:Audit'), Dict::S('UI:Audit:InteractiveAudit'), '', 'fas fa-stethoscope', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
 		$oP->AddUiBlock(TitleUIBlockFactory::MakeForPage(Dict::S('UI:Audit:InteractiveAudit')));
+
+		$sDomainKey = utils::ReadParam('domain', '');
+		$sCategories = utils::ReadParam('categories', '', false, utils::ENUM_SANITIZATION_FILTER_STRING);  // May contain commas
+
+		$oCategoriesSet = new DBObjectSet(new DBObjectSearch('AuditCategory'));
+		$sSubTitle = Dict::S('UI:Audit:InteractiveAudit:AllCategories');
+		if(!empty($sCategories))
+		{
+			$oCategoriesSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT AuditCategory WHERE id IN (:categories)", array('categories' => explode(',',$sCategories))));
+			$sSubTitle = Dict::Format('UI:Audit:InteractiveAudit:SelectedCategories', $oCategoriesSet->Count());
+		}
+		elseif (!empty($sDomainKey))
+		{
+			$oAuditDomain = MetaModel::GetObject('AuditDomain', $sDomainKey);
+			$oCategoriesSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT AuditCategory AS c JOIN lnkAuditCategoryToAuditDomain AS lnk ON lnk.category_id = c.id WHERE lnk.domain_id = :domain", array('domain' => $oAuditDomain->GetKey())));
+			$sSubTitle = Dict::Format('UI:Audit:InteractiveAudit:SelectedDomain', $oAuditDomain->GetName());
+		}
+
+		$oP->AddUiBlock(new Text($sSubTitle));
+
+
 		$oTotalBlock = DashletFactory::MakeForDashletBadge('../images/icons/icons8-audit.svg', '#', 0, Dict::S('UI:Audit:Dashboard:ObjectsAudited'));
 		$oErrorBlock = DashletFactory::MakeForDashletBadge('../images/icons/icons8-delete.svg', '#', 0, Dict::S('UI:Audit:Dashboard:ObjectsInError'));
 		$oWorkingBlock = DashletFactory::MakeForDashletBadge('../images/icons/icons8-checkmark.svg', '#', 0, Dict::S('UI:Audit:Dashboard:ObjectsValidated'));
@@ -288,8 +369,7 @@ try

 		$oP->AddUiBlock($oDashboardRow);

-		$oAuditFilter = new DBObjectSearch('AuditCategory');
-		$oCategoriesSet = new DBObjectSet($oAuditFilter);
+
 		
 		$aAuditCategoryPanels = [];
 		/** @var AuditCategory $oAuditCategory */