maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more implementing of new Settings class, refs #1325

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-15 12:40:24 +01:00
parent eb33493c79
commit 558108008a
20 changed files with 245 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
lib/classes/logger/class.FileLogger.php
View File

@@ -16,69 +16,65 @@
* @package Logger
*
* @link http://www.nutime.de/
*
*
* Logger - File-Logger-Class
*/
class FileLogger extends AbstractLogger
{
class FileLogger extends AbstractLogger {
/**
* Userinfo
* @var array
*/
private $userinfo = array();
/**
/**
* Logfile
* @var logfile
*/
*/
private $logfile = null;
/**
* Syslogger Objects Array
* @var loggers
*/
static private $loggers = array();
/**
* Class constructor.
*
* @param array userinfo
* @param array settings
*/
protected function __construct($userinfo, $settings)
{
parent::setupLogger($settings);
*/
protected function __construct($userinfo) {
parent::setupLogger();
$this->userinfo = $userinfo;
$this->setLogFile($settings['logger']['logfile']);
$this->setLogFile(Settings::Get('logger.logfile'));
}
/**
* Singleton ftw ;-)
*
*/
static public function getInstanceOf($_usernfo, $_settings)
{
if(!isset(self::$loggers[$_usernfo['loginname']]))
{
self::$loggers[$_usernfo['loginname']] = new FileLogger($_usernfo, $_settings);
static public function getInstanceOf($_usernfo) {
if (!isset(self::$loggers[$_usernfo['loginname']])) {
self::$loggers[$_usernfo['loginname']] = new FileLogger($_usernfo);
}
return self::$loggers[$_usernfo['loginname']];
}
public function logAction($action = USR_ACTION, $type = LOG_NOTICE, $text = null)
{
if(parent::isEnabled())
{
if(parent::getSeverity() <= 1
&& $type == LOG_NOTICE)
{
/**
* logs a given text to all enabled logger-facilities
*
* @param int $action
* @param int $type
* @param string $text
*/
public function logAction($action = USR_ACTION, $type = LOG_NOTICE, $text = null) {
if (parent::isEnabled()) {
if (parent::getSeverity() <= 1
&& $type == LOG_NOTICE
) {
return;
}
@@ -87,22 +83,25 @@ class FileLogger extends AbstractLogger
switch($action)
{
case USR_ACTION:
$_action = 'customer';
$_action = $lng['admin']['customer'];
break;
case RES_ACTION:
$_action = 'reseller';
$_action = $lng['logger']['reseller'];
break;
case ADM_ACTION:
$_action = 'administrator';
$_action = $lng['logger']['admin'];
break;
case CRON_ACTION:
$_action = 'cronjob';
$_action = $lng['logger']['cron'];
break;
case LOGIN_ACTION:
$_action = $lng['logger']['login'];
break;
case LOG_ERROR:
$_action = 'internal';
$_action = $lng['logger']['intern'];
break;
default:
$_action = 'unknown';
$_action = $lng['logger']['unknown'];
break;
}
@@ -131,7 +130,7 @@ class FileLogger extends AbstractLogger
}
if(!isset($this->userinfo['loginname'])
|| $this->userinfo['loginname'] == '')
|| $this->userinfo['loginname'] == '')
{
$name = 'unknown';
}
@@ -147,7 +146,7 @@ class FileLogger extends AbstractLogger
$now = time();
if($text != null
&& $text != '')
&& $text != '')
{
fwrite($fp, date("d.m.Y H:i:s", $now) . " [" . $_type . "] [" . $_action . "-action" . $name . "] " . $text . "\n");
}
@@ -161,7 +160,7 @@ class FileLogger extends AbstractLogger
else
{
if($this->logfile != null
|| $this->logfile != '')
|| $this->logfile != '')
{
throw new Exception("Cannot open logfile '" . $this->logfile . "' for writing!");
}
@@ -172,10 +171,10 @@ class FileLogger extends AbstractLogger
public function setLogFile($filename = null)
{
if($filename != null
&& $filename != ''
&& $filename != "."
&& $filename != ".."
&& !is_dir($filename))
&& $filename != ''
&& $filename != "."
&& $filename != ".."
&& !is_dir($filename))
{
$this->logfile = $filename;
return true;