composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

N.740 Error when attempting to disable the logs. Took the opportunity to refactor, relying on late static bindings (requires PHP 5.3). The refactoring avoided the fix to be duplicated in three places.

Browse Source 
SVN:trunk[4628]
This commit is contained in:
Romain Quetiez
2017-03-29 08:28:24 +00:00
parent 399662ef99
commit 38c12104b3
1 changed files with 30 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
core/log.class.inc.php
View File

@@ -1,5 +1,5 @@
<?php <?php
// Copyright (C) 2010-2012 Combodo SARL // Copyright (C) 2010-2017 Combodo SARL
// //
// This file is part of iTop. // This file is part of iTop.
// //
@@ -19,7 +19,7 @@
/** /**
* File logging * File logging
* *
* @copyright Copyright (C) 2010-2012 Combodo SARL * @copyright Copyright (C) 2010-2017 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0 * @license http://opensource.org/licenses/AGPL-3.0
*/ */
@@ -69,81 +69,54 @@ class FileLog
} }
} }
class SetupLog abstract class LogAPI
{ {
protected static $m_oFileLog;
public static function Enable($sTargetFile) public static function Enable($sTargetFile)
{ {
self::$m_oFileLog = new FileLog($sTargetFile); static::$m_oFileLog = new FileLog($sTargetFile);
} }
public static function Error($sText) public static function Error($sText)
{ {
self::$m_oFileLog->Error($sText); if (static::$m_oFileLog)
{
static::$m_oFileLog->Error($sText);
}
} }
public static function Warning($sText) public static function Warning($sText)
{ {
self::$m_oFileLog->Warning($sText); if (static::$m_oFileLog)
{
static::$m_oFileLog->Warning($sText);
}
} }
public static function Info($sText) public static function Info($sText)
{ {
self::$m_oFileLog->Info($sText); if (static::$m_oFileLog)
{
static::$m_oFileLog->Info($sText);
}
} }
public static function Ok($sText) public static function Ok($sText)
{ {
self::$m_oFileLog->Ok($sText); if (static::$m_oFileLog)
{
static::$m_oFileLog->Ok($sText);
}
} }
} }
class IssueLog class SetupLog extends LogAPI
{ {
protected static $m_oFileLog; protected static $m_oFileLog = null;
public static function Enable($sTargetFile)
{
self::$m_oFileLog = new FileLog($sTargetFile);
}
public static function Error($sText)
{
self::$m_oFileLog->Error($sText);
}
public static function Warning($sText)
{
self::$m_oFileLog->Warning($sText);
}
public static function Info($sText)
{
self::$m_oFileLog->Info($sText);
}
public static function Ok($sText)
{
self::$m_oFileLog->Ok($sText);
}
} }
class ToolsLog class IssueLog extends LogAPI
{ {
protected static $m_oFileLog; protected static $m_oFileLog = null;
}
public static function Enable($sTargetFile) class ToolsLog extends LogAPI
{ {
self::$m_oFileLog = new FileLog($sTargetFile); protected static $m_oFileLog = null;
} }
public static function Error($sText)
{
self::$m_oFileLog->Error($sText);
}
public static function Warning($sText)
{
self::$m_oFileLog->Warning($sText);
}
public static function Info($sText)
{
self::$m_oFileLog->Info($sText);
}
public static function Ok($sText)
{
self::$m_oFileLog->Ok($sText);
}
}
?>