Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

- Remove the system/Logs/ folder

pull/16/head
Jaussoin Timothée 12 years ago
parent
1e42f088f5
commit
899aa4f84d
3 changed files with 1 additions and 517 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      bootstrap.php
  2. 185
      system/Logs/Logger.php
  3. 305
      system/Logs/Logs.php

28
bootstrap.php
View File

@ -1,31 +1,6 @@
<?php
if (!defined('DOCUMENT_ROOT')) die('Access denied');
/**
* First thing, define autoloader
* @param string $className
* @return boolean
*/
/*
function __autoload($className)
{
$className = ltrim($className, '\\');
$fileName = DOCUMENT_ROOT;
$namespace = '';
if ($lastNsPos = strrpos($className, '\\')) {
$namespace = substr($className, 0, $lastNsPos);
$className = substr($className, $lastNsPos + 1);
$fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
}
$fileName .= '/'.str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
if (file_exists($fileName)) {
require_once( $fileName);
return true;
} else {
return false;
}
}
*/
require 'vendor/autoload.php';
/**
@ -33,7 +8,6 @@ require 'vendor/autoload.php';
*/
function systemErrorHandler ( $errno , $errstr , $errfile , $errline , $errcontext=null )
{
//\system\Logs\Logger::addLog( $errstr,$errno,'system',$errfile,$errline);
return false;
}
@ -131,7 +105,7 @@ class Bootstrap {
define('LIB_PATH', DOCUMENT_ROOT . '/lib/');
define('LOCALES_PATH', DOCUMENT_ROOT . '/locales/');
define('CACHE_PATH', DOCUMENT_ROOT . '/cache/');
define('LOG_PATH', DOCUMENT_ROOT . '/log/');
define('LOG_PATH', DOCUMENT_ROOT . '/log/');
define('VIEWS_PATH', DOCUMENT_ROOT . '/app/views/');
define('HELPERS_PATH', DOCUMENT_ROOT . '/app/helpers/');

185
system/Logs/Logger.php
View File

@ -1,185 +0,0 @@
<?php
namespace system\Logs;
if (!defined('DOCUMENT_ROOT')) die('Access denied');
/**
* Class for managing Logs
*/
abstract class Logger
{
/**
* Singleton collection of logs
* @var \system\Logs
*/
static $logs;
static $cssOutputDone=false;
/**
* @var bool Save if warning message is already displayed
*/
static $warningDevelopmentModeDisplayed=false;
/***
* Just an alias of addLog
*/
static function log($message,$level=E_NOTICE,$canal='debug',$file=null,$line=null)
{
return self::addLog($message,$level,$canal,$file,$line);
}
/**
* just an access point to adding a log to the Logs collection
*/
static function addLog($message,$level=E_NOTICE,$canal='debug',$file=null,$line=null)
{
if (!isset(self::$logs)) {
self::$logs = new \system\Logs\Logs();
}
self::$logs->addLog($message,$level,$canal,$file,$line);
}
/**
* just an access point to displayLogs
*/
static function displayLogs()
{
if (!isset(self::$logs)) {
self::$logs = new \system\Logs\Logs();
}
if (DOCTYPE==='text/html') {
self::$logs->displayLogs();
} else {
self::$logs->displayInlineLogs();
}
}
/**
* don't realy know if it is better to set it protected...
* @return array
*/
static function getLogs()
{
if (!isset(self::$logs)) {
self::$logs = new \system\Logs\Logs();
}
return self::$logs->getLogs();
}
/**
* ouput debug css if not already done
*/
static function displayDebugCSS()
{
if (DOCTYPE==='text/html') {
if (!self::$cssOutputDone) {
print '
<style type="text/css">
.carreful h2,
#final_exception h2 {
color: red;
}
.carreful, .debug {
margin: 0 auto;
}
.debug img {
float: right;
margin-top: 5px;
}
#logs {
font-family: monospace;
}
.dev {
padding: 0.5em;
padding-top: 0.2em;
background-color: yellow;
display: block;
clear:both;
color: black;
background-size: 5em 5em;
background-image: linear-gradient(135deg, rgba(0, 0, 0, 0.5) 25%, transparent 25%,
transparent 50%, rgba(0, 0, 0, 0.5) 50%, rgba(0, 0, 0, 0.5) 75%,
transparent 75%, transparent);
background-image: -moz-linear-gradient(135deg, rgba(0, 0, 0, 0.5) 25%, transparent 25%,
transparent 50%, rgba(0, 0, 0, 0.5) 50%, rgba(0, 0, 0, 0.5) 75%,
transparent 75%, transparent);
background-image: -webkit-linear-gradient(135deg, rgba(0, 0, 0, 0.5) 25%, transparent 25%,
transparent 50%, rgba(0, 0, 0, 0.5) 50%, rgba(0, 0, 0, 0.5) 75%,
transparent 75%, transparent);
background-image: -o-linear-gradient(135deg, rgba(0, 0, 0, 0.5) 25%, transparent 25%,
transparent 50%, rgba(0, 0, 0, 0.5) 50%, rgba(0, 0, 0, 0.5) 75%,
transparent 75%, transparent);
pointer-events: none;
}
</style>';
self::$cssOutputDone=true;
}
}
}
/**
* Warning message and display logs
*/
static function displayFooterDebug()
{
if (ENVIRONMENT === 'development' &&
(!self::$warningDevelopmentModeDisplayed ||
count(self::getLogs())
)) {
\system\Logs\Logger::displayDebugCSS();
?>
<div id="debug" class="debug">
<?php
self::displayWarningDevelopmentMessage();
if (count(self::getLogs())) {
?>
<div id="logs">
<?php
self::displayLogs();
self::$logs->defaultSaveLogs();//clear logs
?>
</div>
<?php
}
if (class_exists('ControllerBase') && class_exists('Route') ) {
/**
* @todo FIX THE CALL TO URLIZE
*/
/*
?>
<p>Maybe you can fix some issues with the <a href="<?php echo Route::urlize('admin'); ?>">admin panel</a></p>
<?php*/
}
?>
</div>
<?php
}
}
/**
* display warning develoment mode if not already done
*/
static function displayWarningDevelopmentMessage()
{
if (DOCTYPE==='text/html') {
if (!self::$warningDevelopmentModeDisplayed) {
if (ENVIRONMENT === 'development') {
if (function_exists('t')) {
print '
<div class="dev">
<p>'.t('Development environment.').' - '.t('Change it in the admin panel.').'</p>
</div>';
} else {
print '
<div class="dev">
<p>Be careful you are currently in development environment</p>
</div>';
}
}
self::$warningDevelopmentModeDisplayed = true;
}
}
}
}

305
system/Logs/Logs.php
View File

@ -1,305 +0,0 @@
<?php
namespace system\Logs;
if (!defined('DOCUMENT_ROOT')) die('Access denied');
/**
* this class is a collection for managing logs (in array).
* It's a singleton, on destruct, save all logs
*/
class Logs
{
const LEVEL_TO_STOP = E_ERROR;
/**
* set if a logs is already defined: Singleton, only one "new Logs();"
* @var bool
*/
static protected $defined;
protected $logs = array();
public function __construct()
{
if (self::$defined === true) {
die('standalone');
}
self::$defined = true;
}
/**
* When script die, save all logs not already saved
*/
public function __destruct()
{
$this->defaultSaveLogs();
}
/**
* alias function of addLog (shorter)
*/
public function log($message,$level=E_NOTICE,$canal='debug',$file=null,$line=null)
{
$this->addLog($message,$level,$canal,$file,$line);
}
/**
* adding log array to collection. It's the only access point for this... !!!
* Trow an exception if error level is too critical
* @param sting $message
* @param int $level Define your log level criticity
* @param string $canal tag your log, debug, system, error...
* @param string $file
* @param int $line
*/
public function addLog($message,$level=E_NOTICE,$canal='debug',$file=null,$line=null)
{
$level = (int)$level;
$line = (int)$line;
if (!is_string($message)) {
$message = var_export($message, true);
}
$log = array('message'=>$message,'level'=>$level,'file'=>$file,'line'=>$line,'canal'=>$canal,'date'=> time());
array_push($this->logs, $log);
$this->writeSingleLog($log);
if ($level <= self::LEVEL_TO_STOP) {
$this->criticalEvent($log);
}
}
/**
* just defined what to do when a critical log is sent here
* @param array $log
* @throws Exception
*/
protected function criticalEvent($log) {
$file ='';
$line=0;
if (!headers_sent ($file , $line )) {
if (ENVIRONMENT === 'development') {
header('HTTP/1.1 500 '.$log['message']);
} else {
header('HTTP/1.1 500 Internal Server Error');
}
} else {
$log['message'].= ' - Headers sent on file '.$file.' l.'.$line;
}
if (ENVIRONMENT === 'development') {
if (DOCTYPE!=='text/html') {
$this->displayInlineLogs();
}
ob_end_flush();
throw new \Exception('Fatal Error : '.$this->getDisplayLog($log,true, true),$log['level']);
} else {
ob_end_flush();
throw new \Exception('Fatal Error');
}
}
/**
* getter logs
* @return array
*/
public function getLogs()
{
return $this->logs;
}
/**
* get One log display, in html or in text
* @param array $log
* @param bool $stripTags
* @param type $removeBreak
* @return string
*/
protected function getDisplayLog($log,$stripTags=false,$removeBreak=false)
{
if (!is_array($log)) {
throw new Exception('Error type in getDisplayLog:"'. gettype($log).'"');
}
if ($stripTags) {
$log['message'] = strip_tags($log['message']);
}
if ($removeBreak) {
$log['message'] = str_replace("\n", ' ', $log['message']);
}
$strReturn = '['.date('r',$log['date']).'] ['.$log['canal'].'] ['.self::errorLevel($log['level']).'] '.$log['message'];
if (!is_null($log['file'])) {
$strReturn .= ' on '.$log['file'];
}
if (!is_null($log['line'])) {
$strReturn .= ' l.'.$log['line'];
}
return $strReturn;
}
/**
* Function to display all logs in html
* @return string
*/
public function displayLogs()
{
$logs = $this->getLogs();
$html = '';
if (!empty($logs)) {
$html = '<div class="message logs">';
foreach ($logs as $l) $html .= $this->getDisplayLog($l). '<br />';
$html .= '</div>';
}
print $html;
}
/**
* Function to display all logs inline
* @return string
*/
public function displayInlineLogs()
{
$logs = $this->getLogs();
$text = '';
if (!empty($logs)) {
foreach ($logs as $l) $text .= $this->getDisplayLog($l,true,true). "\n";
}
print $text;
}
/**
* Function to return all logs in text
* @param bool $stripTags
* @return string
*/
public function getInlineLogs($removeBreak=true)
{
$logs = $this->getLogs();
$txt = '';
foreach ($logs as $l) {
$txt .= $this->getDisplayLog($l,true,$removeBreak) . "\n";
}
return $txt;
}
/**
* save and clear logs
* @param string $file
*/
public function saveAndClearLogs($file)
{
if (count($this->logs)) {
try {
$this->saveLogs($file);
} catch (\Exception $e) {
if (ENVIRONMENT === 'development') {
die(\system\Debug::getDump($e, 3, true));
}
syslog(LOG_ERR, $e->getMessage());
die('An error happened');
}
}
}
/**
* Save logs to a file
* @param string $file
* @throws \Exception
*/
protected function saveLogs($file)
{
if (LOG_MANAGEMENT == 'log_folder') {
$f = fopen($file, 'a');
if ($f === false) {
throw new \Exception('Canno\'t open file ' . htmlentities($file));
}
if (false === fwrite($f, $this->getInlineLogs())) {
fclose($f);
throw new \Exception('Canno\'t write to file ' . htmlentities($file));
}
fclose($f);
$this->clearLogs();
} else if (LOG_MANAGEMENT == 'error_log') {
/*foreach ($this->logs as $log) {
error_log($this->getDisplayLog($log,true,true));
}*/
$this->clearLogs();
} else if (LOG_MANAGEMENT == 'syslog') {
/*foreach ($this->logs as $log) {
syslog($log['level'], $this->getDisplayLog($log,true,true));
}*/
$this->clearLogs();
} else {
throw new \Exception('Error configuration: LOG_MANAGEMENT not defined');
}
}
/**
* by default, save to logger.log file
*/
public function defaultSaveLogs()
{
$this->saveAndClearLogs(DOCUMENT_ROOT . '/log/logger.log');
}
/**
* clear logs collection
*/
protected function clearLogs()
{
$this->logs = array();
}
/**
* if log is done by system, don't wait end of execution to write into file
* @param array $log
*/
protected function writeSingleLog($log)
{
if (LOG_MANAGEMENT == 'error_log') {
error_log($this->getDisplayLog($log,true,true));
} else if (LOG_MANAGEMENT == 'syslog') {
if (!syslog($log['level'], $this->getDisplayLog($log,true,true))) {
throw new \Exception('Error, unable to use syslog');
}
}
}
/**
* @param int $intval
* @return string
*/
static function errorLevel($intval)
{
$intval = (int)$intval;
$errorLevels = array(
2047 => 'E_ALL',
1024 => 'E_USER_NOTICE',
512 => 'E_USER_WARNING',
256 => 'E_USER_ERROR',
128 => 'E_COMPILE_WARNING',
64 => 'E_COMPILE_ERROR',
32 => 'E_CORE_WARNING',
16 => 'E_CORE_ERROR',
8 => 'E_NOTICE',
4 => 'E_PARSE',
2 => 'E_WARNING',
1 => 'E_ERROR');
$result = '';
foreach($errorLevels as $number => $name)
{
if (($intval & $number) == $number) {
$result .= ($result != '' ? '&' : '').$name; }
}
if ($result =='') {
return 'E_LVL_'.$intval;
}
return $result;
}
}
Write Preview
Loading…
Cancel
Save