From 4dcdd3a0cae5adb4c904d26be650927f3b966732 Mon Sep 17 00:00:00 2001
From: Nuno Miguel Reis <nmsreis@gmail.com>
Date: Mon, 20 Jan 2014 21:55:36 +0000
Subject: [PATCH] added new log function

---
 resources/classes/logging.php | 119 ++++++++++++++++++++++------------
 1 file changed, 76 insertions(+), 43 deletions(-)

diff --git a/resources/classes/logging.php b/resources/classes/logging.php
index 8e8b8cb9a5..2963a7bcc9 100644
--- a/resources/classes/logging.php
+++ b/resources/classes/logging.php
@@ -1,5 +1,5 @@
- <?php
- /**
+<?php
+/**
  * Logging class:
  * - contains lfile, lwrite and lclose public methods
  * - lfile sets path and name of log file
@@ -8,46 +8,79 @@
  * - first call of lwrite method will open log file implicitly
  * - message is written with the following format: [d/M/Y:H:i:s] (script name) message
  */
-class Logging {
-    // declare log file and file pointer as private properties
-    private $log_file, $fp;
-    // set log file (path and name)
-    public function lfile($path) {
-        $this->log_file = $path;
-    }
-    // write message to the log file
-    public function lwrite($message) {
-        // if file pointer doesn't exist, then open log file
-        if (!$this->fp) {
-            $this->lopen();
-        }
-        // define script name
-        $script_name = pathinfo($_SERVER['PHP_SELF'], PATHINFO_FILENAME);
-        // define current time and suppress E_WARNING if using the system TZ settings
-        // (don't forget to set the INI setting date.timezone)
-        $time = @date('[d/M/Y:H:i:s]');
-        // write current time, script name and message to the log file
-        fwrite($this->fp, "$time ($script_name) $message" . PHP_EOL);
-    }
-    // close log file (it's always a good idea to close a file when you're done with it)
-    public function lclose() {
-        fclose($this->fp);
-    }
-    // open log file (private method)
-    private function lopen() {
-        // in case of Windows set default log file
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $log_file_default = 'c:/php/logfile.txt';
-        }
-        // set default log file for Linux and other systems
-        else {
-            $log_file_default = '/tmp/logfile.txt';
-        }
-        // define log file from lfile method or use previously set default
-        $lfile = $this->log_file ? $this->log_file : $log_file_default;
-        // open log file for writing only and place file pointer at the end of the file
-        // (if the file does not exist, try to create it)
-        $this->fp = fopen($lfile, 'a') or exit("Can't open $lfile!");
-    }
+class Logging
+{
+	// declare log file and file pointer as private properties
+	private $log_file, $fp;
+
+	// set log file (path and name)
+
+	public function lfile($path)
+	{
+		$this->log_file = $path;
+	}
+
+	// write message to the log file
+
+	public function lwrite($message)
+	{
+		// if file pointer doesn't exist, then open log file
+		if (!$this->fp) {
+			$this->lopen();
+		}
+		// define script name
+		$script_name = pathinfo($_SERVER['PHP_SELF'], PATHINFO_FILENAME);
+		// define current time and suppress E_WARNING if using the system TZ settings
+		// (don't forget to set the INI setting date.timezone)
+		$time = @date('[d/M/Y:H:i:s]');
+		// write current time, script name and message to the log file
+		fwrite($this->fp, "$time ($script_name) $message" . PHP_EOL);
+	}
+
+	// close log file (it's always a good idea to close a file when you're done with it)
+
+	private function lopen()
+	{
+		// in case of Windows set default log file
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$log_file_default = 'c:/php/logfile.txt';
+		} // set default log file for Linux and other systems
+		else {
+			$log_file_default = '/tmp/logfile.txt';
+		}
+		// define log file from lfile method or use previously set default
+		$lfile = $this->log_file ? $this->log_file : $log_file_default;
+		// open log file for writing only and place file pointer at the end of the file
+		// (if the file does not exist, try to create it)
+		$this->fp = fopen($lfile, 'a') or exit("Can't open $lfile!");
+	}
+
+	// open log file (private method)
+
+	public function lclose()
+	{
+		fclose($this->fp);
+	}
+
+	public function log($level, $msg){
+
+		$log_file = $_SESSION['logging']['log']['logfile'];
+		$log_level = $_SESSION['logging']['log']['loglevel'];
+
+		if ($log_file) {
+			$this->lfile($log_file);
+		}
+		else {
+			$this->lopen();
+		}
+
+		if ($log_level === $level) {
+			$this->lwrite("[".strtoupper($level)."] ".$msg);
+		}
+
+		//close handle
+		$this->lclose();
+	}
 }
+
 ?>