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

57
lib/classes/logger/abstract.AbstractLogger.php
View File

@@ -33,68 +33,65 @@ LOG_DEBUG debug-level message
*/
abstract class AbstractLogger
{
/**
* Settings array
* @var settings
*/
private $settings = array();
abstract class AbstractLogger {
/**
* Enable/Disable Logging
* @var logenabled
*/
private $logenabled = false;
/**
* Enable/Disable Cronjob-Logging
* @var logcronjob
*/
private $logcronjob = false;
/**
* Loggin-Severity
* @var severity
*/
private $severity = 1;
// normal
/**
* setup the main logger
*
* @param array settings
*/
protected function setupLogger($settings)
{
$this->settings = $settings;
$this->logenabled = $this->settings['logger']['enabled'];
$this->logcronjob = $this->settings['logger']['log_cron'];
$this->severity = $this->settings['logger']['severity'];
protected function setupLogger() {
$this->logenabled = Settings::Get('logger.enabled');
$this->logcronjob = Settings::Get('logger.log_cron');
$this->severity = Settings::Get('logger.severity');
}
protected function isEnabled()
{
/**
* return whether this logging is enabled
*
* @return bool
*/
protected function isEnabled() {
return $this->logenabled;
}
protected function getSeverity()
{
/**
* return the log severity
*
* @return int
*/
protected function getSeverity() {
return $this->severity;
}
protected function logCron()
{
/**
* whether to log cron-runs or not
*
* @return bool
*/
protected function logCron() {
return $this->logcronjob;
}
/**
* logs a given text
*/
abstract public function logAction();
}
?>
}

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;

64
lib/classes/logger/class.FroxlorLogger.php
View File

@@ -16,24 +16,18 @@
* @package Logger
*
* @link http://www.nutime.de/
*
*
* Logger - Froxlor-Base-Logger-Class
*/
class FroxlorLogger
{
class FroxlorLogger {
/**
* Userinfo
* @var array
*/
private $userinfo = array();
/**
* Settings array
* @var settings
*/
private $settings = array();
/**
* LogTypes Array
* @var logtypes
@@ -50,25 +44,21 @@ class FroxlorLogger
* Class constructor.
*
* @param array userinfo
* @param array settings
*/
protected function __construct($userinfo, $settings) {
protected function __construct($userinfo) {
$this->userinfo = $userinfo;
$this->settings = $settings;
self::$logtypes = array();
if (!isset($this->settings['logger']['logtypes'])
&& (!isset($this->settings['logger']['logtypes']) || $this->settings['logger']['logtypes'] == '')
&& isset($this->settings['logger']['enabled'])
&& $this->settings['logger']['enabled']
if ((Settings::Get('logger.logtypes') == null || Settings::Get('logger.logtypes') == '')
&& (Settings::Get('logger.enabled') !== null && Settings::Get('logger.enabled'))
) {
self::$logtypes[0] = 'syslog';
self::$logtypes[1] = 'mysql';
} else {
if (isset($this->settings['logger']['logtypes'])
&& $this->settings['logger']['logtypes'] != ''
if (Settings::Get('logger.logtypes') !== null
&& Settings::Get('logger.logtypes') != ''
) {
self::$logtypes = explode(',', $this->settings['logger']['logtypes']);
self::$logtypes = explode(',', Settings::Get('logger.logtypes'));
} else {
self::$logtypes = null;
}
@@ -79,8 +69,8 @@ class FroxlorLogger
* Singleton ftw ;-)
*
*/
static public function getInstanceOf($_usernfo, $_settings)
{
static public function getInstanceOf($_usernfo) {
if (!isset($_usernfo)
|| $_usernfo == null
) {
@@ -89,19 +79,26 @@ class FroxlorLogger
}
if (!isset(self::$loggers[$_usernfo['loginname']])) {
self::$loggers[$_usernfo['loginname']] = new FroxlorLogger($_usernfo, $_settings);
self::$loggers[$_usernfo['loginname']] = new FroxlorLogger($_usernfo);
}
return self::$loggers[$_usernfo['loginname']];
}
/**
* 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 (self::$logtypes == null) {
return;
}
if ($this->settings['logger']['log_cron'] == '0'
if (Settings::Get('logger.log_cron') == '0'
&& $action == CRON_ACTION
) {
return;
@@ -112,12 +109,12 @@ class FroxlorLogger
switch ($logger)
{
case 'syslog':
$_log = SysLogger::getInstanceOf($this->userinfo, $this->settings);
$_log = SysLogger::getInstanceOf($this->userinfo);
break;
case 'file':
try
{
$_log = FileLogger::getInstanceOf($this->userinfo, $this->settings);
$_log = FileLogger::getInstanceOf($this->userinfo);
}
catch(Exception $e)
{
@@ -129,7 +126,7 @@ class FroxlorLogger
}
break;
case 'mysql':
$_log = MysqlLogger::getInstanceOf($this->userinfo, $this->settings);
$_log = MysqlLogger::getInstanceOf($this->userinfo);
break;
default:
$_log = null;
@@ -150,6 +147,13 @@ class FroxlorLogger
}
}
/**
* Set whether to log cron-runs
*
* @param bool $_cronlog
*
* @return boolean
*/
public function setCronLog($_cronlog = 0) {
$_cronlog = (int)$_cronlog;
@@ -159,13 +163,7 @@ class FroxlorLogger
) {
$_cronlog = 0;
}
$stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET
`value` = :value
WHERE `settinggroup`='logger' AND `varname`='log_cron'"
);
Database::pexecute($stmt, array('value' => $_cronlog));
Settings::Set('logger.log_cron', $_cronlog);
return true;
}
}

18
lib/classes/logger/class.MysqlLogger.php
View File

@@ -38,25 +38,29 @@ class MysqlLogger extends AbstractLogger {
* 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;
}
/**
* Singleton ftw ;-)
*
*/
static public function getInstanceOf($_usernfo, $_settings) {
static public function getInstanceOf($_usernfo) {
if (!isset(self::$loggers[$_usernfo['loginname']])) {
self::$loggers[$_usernfo['loginname']] = new MysqlLogger($_usernfo, $_settings);
self::$loggers[$_usernfo['loginname']] = new MysqlLogger($_usernfo);
}
return self::$loggers[$_usernfo['loginname']];
}
/**
* 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()) {

82
lib/classes/logger/class.SysLogger.php
View File

@@ -16,61 +16,58 @@
* @package Logger
*
* @link http://www.nutime.de/
*
*
* Logger - SysLog-Logger-Class
*/
class SysLogger extends AbstractLogger
{
class SysLogger extends AbstractLogger {
/**
* Userinfo
* @var array
*/
private $userinfo = array();
/**
* 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;
}
/**
* Singleton ftw ;-)
*
*/
static public function getInstanceOf($_usernfo, $_settings)
{
if(!isset(self::$loggers[$_usernfo['loginname']]))
{
self::$loggers[$_usernfo['loginname']] = new SysLogger($_usernfo, $_settings);
static public function getInstanceOf($_usernfo) {
if (!isset(self::$loggers[$_usernfo['loginname']])) {
self::$loggers[$_usernfo['loginname']] = new SysLogger($_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;
}
@@ -79,28 +76,31 @@ class SysLogger 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;
}
if(!isset($this->userinfo['loginname'])
|| $this->userinfo['loginname'] == '')
{
if (!isset($this->userinfo['loginname'])
|| $this->userinfo['loginname'] == ''
) {
$name = 'unknown';
}
else
@@ -110,13 +110,11 @@ class SysLogger extends AbstractLogger
openlog("Froxlor", LOG_NDELAY, LOG_USER);
if($text != null
&& $text != '')
{
if ($text != null
&& $text != ''
) {
syslog((int)$type, "[" . ucfirst($_action) . " Action" . $name . "] " . $text);
}
else
{
} else {
syslog((int)$type, "[" . ucfirst($_action) . " Action" . $name . "] No text given!!! Check scripts!");
}