composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	setup/setuppage.class.inc.php
This commit is contained in:
Pierre Goiffon
2023-03-06 11:26:33 +01:00
parent 93c0b98eb7 d908827787
commit 976566ec71
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
setup/setuppage.class.inc.php
View File

@@ -75,28 +75,28 @@ class SetupPage extends NiceWebPage
return '';
}
public function info($sText)
public function info($sText, $sTextForLog = null)
{
$this->add("<p class=\"info\">$sText</p>\n");
SetupLog::Info($sText);
SetupLog::Info($sTextForLog ?? $sText);
}
public function ok($sText)
public function ok($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-valid\"><span class=\"message-title\">Success:</span>$sText</div>");
SetupLog::Ok($sText);
SetupLog::Ok($sTextForLog ?? $sText);
}
public function warning($sText)
public function warning($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-warning\"><span class=\"message-title\">Warning:</span>$sText</div>");
SetupLog::Warning($sText);
SetupLog::Warning($sTextForLog ?? $sText);
}
public function error($sText)
public function error($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-error\">$sText</div>");
SetupLog::Error($sText);
SetupLog::Error($sTextForLog ?? $sText);
}
public function form($aData)