add log

.github/workflows/action.yml

@@ -1,16 +0,0 @@
-name: Add PRs to Combodo PRs Dashboard
-
-on:
-  pull_request_target:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add PR to Combodo Project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v1.0.2
-        with:
-          project-url: https://github.com/orgs/Combodo/projects/5
-          github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}

application/utils.inc.php

@@ -200,7 +200,13 @@ class utils
 	public static function IsModeCLI()
 	{
 		$sCleanName = strtolower(trim(PHP_SAPI));
-		return ($sCleanName === 'cli');
+		$bRes = $sCleanName === 'cli';
+		IssueLog::Error("IsModeCLI", null, [
+			'sCleanName' => $sCleanName,
+			'bRes' => $bRes,
+		]);
+
+		return $bRes;
 	}
 
 	protected static $bPageMode = null;

approot.inc.php

@@ -14,7 +14,7 @@ define('APPCONF', APPROOT.'conf/');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '2.7.11');
+define('ITOP_CORE_VERSION', '2.7.10');
 
 
 require_once APPROOT.'bootstrap.inc.php';

core/cmdbsource.class.inc.php

@@ -95,7 +95,7 @@ class MySQLHasGoneAwayException extends MySQLException
 	{
 		return array(
 			2006,
-			2013,
+			2013
 		);
 	}
 
@@ -1296,8 +1296,8 @@ class CMDBSource
 	 */
 	public static function IsSameFieldTypes($sItopGeneratedFieldType, $sDbFieldType)
 	{
-		[$sItopFieldDataType, $sItopFieldTypeOptions, $sItopFieldOtherOptions] = static::GetFieldDataTypeAndOptions($sItopGeneratedFieldType);
-		[$sDbFieldDataType, $sDbFieldTypeOptions, $sDbFieldOtherOptions] = static::GetFieldDataTypeAndOptions($sDbFieldType);
+		list($sItopFieldDataType, $sItopFieldTypeOptions, $sItopFieldOtherOptions) = static::GetFieldDataTypeAndOptions($sItopGeneratedFieldType);
+		list($sDbFieldDataType, $sDbFieldTypeOptions, $sDbFieldOtherOptions) = static::GetFieldDataTypeAndOptions($sDbFieldType);
 
 		if (strcasecmp($sItopFieldDataType, $sDbFieldDataType) !== 0)
 		{
@@ -1734,20 +1734,8 @@ class CMDBSource
 		return false;
 	}
 
-    public static function GetClusterNb()
-    {
-        $result = 0;
-        $sSql = "SHOW STATUS LIKE 'wsrep_cluster_size';";
-        $aRows = self::QueryToArray($sSql);
-        if (count($aRows) > 0)
-        {
-            $result = $aRows[0]['Value'];
-        }
-        return intval($result);
-    }
-
-    /**
-     * @return string query to upgrade database charset and collation if needed, null if not
+	/**
+	 * @return string query to upgrade database charset and collation if needed, null if not
 	 * @throws \MySQLException
 	 *
 	 * @since 2.5.0 N°1001 switch to utf8mb4

core/simplegraph.class.inc.php

@@ -537,7 +537,7 @@ EOF
 		}
 		else
 		{
-            throw new Exception('graphviz not found');
+			throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')');
 		}
 		return $sHtml;
 	}
@@ -592,7 +592,7 @@ EOF
 		}
 		else
 		{
-            throw new Exception('graphviz not found');
+			throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')');
 		}
 		return $sHtml;
 	}

css/css-variables.scss

@@ -17,7 +17,7 @@
  */
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.7.11";
+$version: "v2.7.10";
 $approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
 
 // Base colors

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/2.7.11',
+	'authent-cas/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/2.7.11',
+	'authent-external/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/2.7.11',
+	'authent-ldap/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-local/module.authent-local.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/2.7.11',
+	'authent-local/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/2.7.11',
+	'combodo-db-tools/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-attachments/module.itop-attachments.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/2.7.11',
+	'itop-attachments/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-backup/module.itop-backup.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/2.7.11',
+	'itop-backup/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/2.7.11',
+	'itop-bridge-virtualization-storage/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/2.7.11',
+	'itop-change-mgmt-itil/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/2.7.11',
+	'itop-change-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/2.7.11',
+	'itop-config-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config/module.itop-config.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/2.7.11',
+	'itop-config/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-core-update/module.itop-core-update.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-core-update/2.7.11',
+	'itop-core-update/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php

@@ -18,7 +18,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/2.7.11',
+	'itop-datacenter-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php

@@ -25,7 +25,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/2.7.11',
+	'itop-endusers-devices/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-files-information/module.itop-files-information.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-files-information/2.7.11',
+	'itop-files-information/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-full-itil/module.itop-full-itil.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/2.7.11',
+	'itop-full-itil/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/2.7.11',
+	'itop-hub-connector/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/2.7.11',
+	'itop-incident-mgmt-itil/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/2.7.11',
+	'itop-knownerror-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-oauth-client/2.7.11',
+	'itop-oauth-client/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-portal-base/module.itop-portal-base.php

@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/2.7.11', array(
+	'itop-portal-base/2.7.10', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',

datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig

@@ -464,8 +464,8 @@
                         sBody = '{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT'))|escape('js') }}';
 					}
 					var oModalElem = $('#modal-for-alert');
-                    oModalElem.find('.modal-content .modal-header .modal-title').text(sTitle);
-                    oModalElem.find('.modal-content .modal-body .alert').addClass('alert-danger').text(sBody);
+                    oModalElem.find('.modal-content .modal-header .modal-title').html(sTitle);
+                    oModalElem.find('.modal-content .modal-body .alert').addClass('alert-danger').html(sBody);
                     oModalElem.modal('show');
 				};
 			{% endblock %}

datamodels/2.x/itop-portal/module.itop-portal.php

@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/2.7.11', array(
+	'itop-portal/2.7.10', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',

datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/2.7.11',
+	'itop-problem-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-profiles-itil/2.7.11',
+	'itop-profiles-itil/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/2.7.11',
+	'itop-request-mgmt-itil/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt/2.7.11',
+	'itop-request-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt-provider/2.7.11',
+	'itop-service-mgmt-provider/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt/2.7.11',
+	'itop-service-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php

@@ -18,7 +18,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-sla-computation/2.7.11',
+	'itop-sla-computation/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php

@@ -25,7 +25,7 @@
  
  SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	 'itop-storage-mgmt/2.7.11',
+	 'itop-storage-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-tickets/module.itop-tickets.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__,
-	'itop-tickets/2.7.11',
+	'itop-tickets/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php

@@ -16,7 +16,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-virtualization-mgmt/2.7.11',
+	'itop-virtualization-mgmt/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-welcome-itil/2.7.11',
+	'itop-welcome-itil/2.7.10',
 	array(
 		// Identification
 		//

datamodels/2.x/version.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <information>
-  <version>2.7.11</version>
+  <version>2.7.10</version>
 </information>

pages/preferences.php

@@ -81,7 +81,7 @@ function DisplayPreferences($oP)
 	$oP->add('<fieldset><legend>'.Dict::S('UI:FavoriteOtherSettings').'</legend>');
 	$oP->add('<form method="post" onsubmit="return ValidateOtherSettings()">');
 
-	$iDefaultPageSize = (int)appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
+	$iDefaultPageSize = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
 	$oP->add('<p>'.Dict::Format('UI:Favorites:Default_X_ItemsPerPage', '<input id="default_page_size" name="default_page_size" type="text" size="3" value="'.$iDefaultPageSize.'"/><span id="v_default_page_size"></span>').'</p>');
 
 	$bShow = utils::IsArchiveMode() || appUserPreferences::GetPref('show_obsolete_data', MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'));

setup/setuputils.class.inc.php

@@ -1230,12 +1230,6 @@ EOF
 				$aResult['checks'][] = new CheckResult(CheckResult::INFO, "MySQL server's max_connections is set to $iMaxConnections.");
 			}
 
-            $iClusters = $oDBSource->GetClusterNb();
-            if ($iClusters > 0) {
-                SetupLog::Warning('Warning - Using Galera will cause malfunctions and data corruptions. Combodo does not support this type of infrastructure.');
-                $aResult['checks'][] = new CheckResult(CheckResult::WARNING, 'Using Galera will cause malfunctions and data corruptions. Combodo does not support this type of infrastructure.');
-            }
-
 			try {
 				$aResult['databases'] = $oDBSource->ListDB();
 			}

tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php

@@ -85,6 +85,23 @@ abstract class ItopTestCase extends TestCase
 		require_once APPROOT . $sFileRelPath;
 	}
 
+	/**
+	 * Helper to load a module file. The caller test must be in that module !
+	 * Will browse dir up to find a module.*.php
+	 *
+	 * @param string $sFileRelPath for example 'portal/src/Helper/ApplicationHelper.php'
+	 * @since 2.7.10 3.1.1 3.2.0 N°6709 method creation
+	 */
+	protected function RequireOnceCurrentModuleFile(string $sFileRelPath): void
+	{
+		$aStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+		$sCallerFileFullPath = $aStack[0]['file'];
+		$sCallerDir = dirname($sCallerFileFullPath);
+
+		$sModuleRootPath = static::GetFirstDirUpContainingFile($sCallerDir, 'module.*.php');
+		require_once $sModuleRootPath . $sFileRelPath;
+	}
+
 	/**
 	 * Require once a unit test file (eg. a mock class) from its relative path from the *current* dir.
 	 * This ensure that required files don't crash when unit tests dir is moved in the iTop structure (see N°5608)
@@ -102,6 +119,26 @@ abstract class ItopTestCase extends TestCase
 		require_once $sCallerDirAbsPath . DIRECTORY_SEPARATOR . $sFileRelPath;
 	}
 
+	private static function GetFirstDirUpContainingFile(string $sSearchPath, string $sFileToFindGlobPattern): ?string
+	{
+		for ($iDepth = 0; $iDepth < 8; $iDepth++) {
+			$aGlobFiles = glob($sSearchPath . '/' . $sFileToFindGlobPattern);
+			if (is_array($aGlobFiles) && (count($aGlobFiles) > 0)) {
+				return $sSearchPath . '/';
+			}
+			$iOffsetSep = strrpos($sSearchPath, '/');
+			if ($iOffsetSep === false) {
+				$iOffsetSep = strrpos($sSearchPath, '\\');
+				if ($iOffsetSep === false) {
+					// Do not throw an exception here as PHPUnit will not show it clearly when determing the list of test to perform
+					return 'Could not find the approot file in ' . $sSearchPath;
+				}
+			}
+			$sSearchPath = substr($sSearchPath, 0, $iOffsetSep);
+		}
+		return null;
+	}
+
 	protected function debug($sMsg)
 	{
 		if (DEBUG_UNIT_TEST) {
@@ -116,7 +153,7 @@ abstract class ItopTestCase extends TestCase
 
 	public function GetMicroTime()
 	{
-		[$uSec, $sec] = explode(" ", microtime());
+		list($uSec, $sec) = explode(" ", microtime());
 		return ((float)$uSec + (float)$sec);
 	}
 
@@ -158,7 +195,7 @@ abstract class ItopTestCase extends TestCase
 	/**
 	 * @param string $sObjectClass for example DBObject::class
 	 * @param string $sMethodName
-	 * @param object|null $oObject
+	 * @param object $oObject
 	 * @param array $aArgs
 	 *
 	 * @return mixed method result
@@ -201,7 +238,7 @@ abstract class ItopTestCase extends TestCase
 	 * @throws \ReflectionException
 	 * @since 2.7.8 3.0.3 3.1.0
 	 */
-	public function GetNonPublicProperty($oObject, string $sProperty)
+	public function GetNonPublicProperty(object $oObject, string $sProperty)
 	{
 		$oProperty = $this->GetProperty(get_class($oObject), $sProperty);
 
@@ -270,7 +307,7 @@ abstract class ItopTestCase extends TestCase
 	 * @throws \ReflectionException
 	 * @since 2.7.8 3.0.3 3.1.0
 	 */
-	public function SetNonPublicProperty($oObject, string $sProperty, $value)
+	public function SetNonPublicProperty(object $oObject, string $sProperty, $value)
 	{
 		$oProperty = $this->GetProperty(get_class($oObject), $sProperty);
 		$oProperty->setValue($oObject, $value);

webservices/import.php

@@ -211,13 +211,15 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
 
 if (utils::IsModeCLI())
 {
-	$oP = new CLIPage("iTop - Bulk import");
+	$oP = new CLIPage("iTop IsModeCLI - Bulk import");
 }
 else
 {
 	$oP = new CSVPage("iTop - Bulk import");
 }
 
+
+
 try
 {
 	utils::UseParamFile();
@@ -231,9 +233,13 @@ catch(Exception $e)
 
 if (utils::IsModeCLI())
 {
+	$sCleanName = strtolower(trim(PHP_SAPI));
+	$bIsCli = ($sCleanName === 'cli');
+	$oP->p("mode CLI bIsCli: $bIsCli sCleanName: $sCleanName");
+
 	// Next steps:
 	//   specific arguments: 'csvfile'
-	//   
+	//
 	$sAuthUser = ReadMandatoryParam($oP, 'auth_user', 'raw_data');
 	$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd', 'raw_data');
 	$sCsvFile = ReadMandatoryParam($oP, 'csvfile', 'raw_data');
@@ -259,6 +265,10 @@ if (utils::IsModeCLI())
 }
 else
 {
+	$sCleanName = strtolower(trim(PHP_SAPI));
+	$bIsCli = ($sCleanName === 'cli');
+	$oP->p("mode WEB bIsCli: $bIsCli sCleanName: $sCleanName");
+
 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
     LoginWebPage::ResetSession(true);
 	$iRet = LoginWebPage::DoLogin(false, false, LoginWebPage::EXIT_RETURN);
@@ -303,7 +313,7 @@ try
 	//
 	// Read parameters
 	//
-	$sClass = ReadMandatoryParam($oP, 'class', 'raw_data'); // do not filter as a valid class, we want to produce the report "wrong class" ourselves 
+	$sClass = ReadMandatoryParam($oP, 'class', 'raw_data'); // do not filter as a valid class, we want to produce the report "wrong class" ourselves
 	$sSep = ReadParam($oP, 'separator', 'raw_data');
 	$sQualifier = ReadParam($oP, 'qualifier', 'raw_data');
 	$sCharSet = ReadParam($oP, 'charset', 'raw_data');
@@ -356,7 +366,7 @@ try
 	{
 		$sDateFormat = null;
 	}
-	
+
 	if ($sCharSet == '')
 	{
 		$sCharSet = MetaModel::GetConfig()->Get('csv_file_default_charset');
@@ -474,7 +484,7 @@ try
 	{
 		$sUTF8Data = iconv($sCharSet, 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
 	}
-	$oCSVParser = new CSVParser($sUTF8Data, $sSep, $sQualifier); 
+	$oCSVParser = new CSVParser($sUTF8Data, $sSep, $sQualifier);
 
 	// Limitation: as the attribute list is in the first line, we can not match external key by a third-party attribute
 	$aRawFieldList = $oCSVParser->ListFields();
@@ -496,7 +506,7 @@ try
 			// Remove any trailing "star" character before the arrow (->)
 			// A star character at the end can be used to indicate a mandatory field
 			$sFieldName = $aMatches[1].'->'.$aMatches[2];
-		}	
+		}
 		if (array_key_exists(strtolower($sFieldName), $aKnownColumnNames))
 		{
 			$aColumns = $aKnownColumnNames[strtolower($sFieldName)];
@@ -518,7 +528,7 @@ try
 			throw new BulkLoadException("Unknown column: '$sSafeName'. Possible columns: ".implode(', ', array_keys($aKnownColumnNames)));
 		}
 	}
-	// Note: at this stage the list of fields is supposed to be made of attcodes (and the symbol '->')	
+	// Note: at this stage the list of fields is supposed to be made of attcodes (and the symbol '->')
 
 	$aAttList = array();
 	$aExtKeys = array();
@@ -753,7 +763,7 @@ try
 		}
 		CMDBObject::SetTrackInfo($sMoreInfo);
 		CMDBObject::SetTrackOrigin('csv-import.php');
-		
+
 		$oMyChange = CMDBObject::GetCurrentChange();
 	}
 
@@ -788,7 +798,7 @@ try
 			break;
 		case 'RowStatus_Issue':
 			$iCountErrors++;
-			break;		
+			break;
 		}
 
 		if ($bWritten)
@@ -867,7 +877,7 @@ try
 				$aDisplayConfig["$iCol"] = array("label"=>$sAttCode, "description"=>$sLabel);
 			}
 		}
-	
+
 		$aResultDisp = array(); // to be displayed
 		foreach($aRes as $iRow => $aRowData)
 		{
@@ -894,11 +904,11 @@ try
 			foreach($aRowData as $key => $value)
 			{
 				$sKey = (string) $key;
-	
+
 				if ($sKey == '__STATUS__') continue;
 				if ($sKey == 'finalclass') continue;
 				if ($sKey == 'id') continue;
-	
+
 				if (is_object($value))
 				{
 					$aRowDisp["$sKey"] = $value->GetDisplayableValue().$value->GetDescription();
@@ -915,15 +925,15 @@ try
 }
 catch(BulkLoadException $e)
 {
-	$oP->add_comment($e->getMessage());		
+	$oP->add_comment($e->getMessage());
 }
 catch(SecurityException $e)
 {
-	$oP->add_comment($e->getMessage());		
+	$oP->add_comment($e->getMessage());
 }
 catch(Exception $e)
 {
-	$oP->add_comment((string)$e);		
+	$oP->add_comment((string)$e);
 }
 
 $oP->output();