mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-27 14:14:11 +01:00
Compare commits
2 Commits
develop
...
issue/7426
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4ea5ce0e9 | ||
|
|
ffb0d4c68e |
@@ -200,7 +200,13 @@ class utils
|
|||||||
public static function IsModeCLI()
|
public static function IsModeCLI()
|
||||||
{
|
{
|
||||||
$sCleanName = strtolower(trim(PHP_SAPI));
|
$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;
|
protected static $bPageMode = null;
|
||||||
|
|||||||
@@ -211,13 +211,15 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
|
|||||||
|
|
||||||
if (utils::IsModeCLI())
|
if (utils::IsModeCLI())
|
||||||
{
|
{
|
||||||
$oP = new CLIPage("iTop - Bulk import");
|
$oP = new CLIPage("iTop IsModeCLI - Bulk import");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$oP = new CSVPage("iTop - Bulk import");
|
$oP = new CSVPage("iTop - Bulk import");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
utils::UseParamFile();
|
utils::UseParamFile();
|
||||||
@@ -231,6 +233,10 @@ catch(Exception $e)
|
|||||||
|
|
||||||
if (utils::IsModeCLI())
|
if (utils::IsModeCLI())
|
||||||
{
|
{
|
||||||
|
$sCleanName = strtolower(trim(PHP_SAPI));
|
||||||
|
$bIsCli = ($sCleanName === 'cli');
|
||||||
|
$oP->p("mode CLI bIsCli: $bIsCli sCleanName: $sCleanName");
|
||||||
|
|
||||||
// Next steps:
|
// Next steps:
|
||||||
// specific arguments: 'csvfile'
|
// specific arguments: 'csvfile'
|
||||||
//
|
//
|
||||||
@@ -259,6 +265,10 @@ if (utils::IsModeCLI())
|
|||||||
}
|
}
|
||||||
else
|
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');
|
require_once(APPROOT.'/application/loginwebpage.class.inc.php');
|
||||||
LoginWebPage::ResetSession(true);
|
LoginWebPage::ResetSession(true);
|
||||||
$iRet = LoginWebPage::DoLogin(false, false, LoginWebPage::EXIT_RETURN);
|
$iRet = LoginWebPage::DoLogin(false, false, LoginWebPage::EXIT_RETURN);
|
||||||
|
|||||||
Reference in New Issue
Block a user