From 00e866af578e6db6485be3733ea272eb2b140443 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Sat, 27 Jan 2018 20:10:48 +0100
Subject: [PATCH] Add loglevel and user (or IP) to logging file

---
 htdocs/lib/class.ldapserver.php | 10 +++++-----
 htdocs/lib/class.logger.php     | 35 +++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/htdocs/lib/class.ldapserver.php b/htdocs/lib/class.ldapserver.php
index c82fe2a..004bc7c 100644
--- a/htdocs/lib/class.ldapserver.php
+++ b/htdocs/lib/class.ldapserver.php
@@ -113,10 +113,10 @@ class LdapServer {
 
         if (!@ldap_add($this->conn, LdapDomain::getBaseDN($this, $name), $info)) {
             $error = ldap_error($this->conn);
-            Logger::error('error when adding domain '.$name.' by '.$this->login);
+            Logger::error('error when adding domain '.$name, $this->login);
             throw new Exception("Erreur dans l'ajout du domaine : $error");
         }
-        Logger::info('domain '.$name.' added by '.$this->login);
+        Logger::info('domain '.$name.' added', $this->login);
         //domainnotify($name);
     }
 
@@ -134,12 +134,12 @@ class LdapServer {
             $dn = LdapDomain::getBaseDN($this, $name);
             if (!ldap_delete($this->conn, $dn)) {
                 $error = ldap_error($this->conn);
-                Logger::error('error when delete domain '.$name.' by '.$this->login);
+                Logger::error('error when delete domain '.$name, $this->login);
                 throw new Exception("Erreur dans la suppression du domaine $dn : $error");
             }
-            Logger::info('domain '.$name.' deleted by '.$this->login);
+            Logger::info('domain '.$name.' deleted ', $this->login);
         } else {
-            Logger::error($this->login.' try to delete an unknow domain named '.$name);
+            Logger::error('trying to delete an unknow domain '.$name, $this->login);
             throw new Exception("Ce domaine n'existe pas !");
         }
     }
diff --git a/htdocs/lib/class.logger.php b/htdocs/lib/class.logger.php
index 5ec1b74..5663cf0 100644
--- a/htdocs/lib/class.logger.php
+++ b/htdocs/lib/class.logger.php
@@ -1,11 +1,12 @@
 <?php
 
 class Logger {
-    const CRITICAL = 4;
-    const ERROR = 3;
-    const WARNING = 2;
-    const INFO = 1;
+    const LEVEL = array('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL');
     const DEBUG = 0;
+    const INFO = 1;
+    const WARNING = 2;
+    const ERROR = 3;
+    const CRITICAL = 4;
 
     private static $file,$level;
 
@@ -27,9 +28,13 @@ class Logger {
         }
     }
 
-    private static function write_log($txt, $var) {
-        $date = date("Y-m-d H:i:s");   
-        $log = '['.$date.'] '.$txt.PHP_EOL;
+    private static function write_log($txt, $level, $user, $var) {
+        $date = date("Y-m-d H:i:s");
+        if (empty($user)) {
+            $log = '['.$date.'] '.self::LEVEL[$level].': '.$txt.' ['.$_SERVER['REMOTE_ADDR'].']'.PHP_EOL;
+        } else {
+            $log = '['.$date.'] '.self::LEVEL[$level].': '.$txt.' [by '.$user.']'.PHP_EOL;
+        }
  
         file_put_contents(self::$file, $log, FILE_APPEND | LOCK_EX);
         if (self::$level <= self::DEBUG && !empty($var)) {
@@ -37,27 +42,27 @@ class Logger {
         }
     }
 
-    public static function critical($txt, $var=NULL) {
+    public static function critical($txt, $user=NULL, $var=NULL) {
         if (self::$level <= self::CRITICAL ) {
-            self::write_log($txt, $var);
+            self::write_log($txt, self::CRITICAL, $user, $var);
         } 
     }
 
-    public static function error($txt, $var=NULL) {
+    public static function error($txt, $user=NULL, $var=NULL) {
         if (self::$level <= self::ERROR ) {
-            self::write_log($txt, $var);
+            self::write_log($txt, self::ERROR, $user, $var);
         } 
     }
 
-    public static function warning($txt, $var=NULL) {
+    public static function warning($txt, $user=NULL, $var=NULL) {
         if (self::$level <= self::WARNING) {
-            self::write_log($txt, $var);
+            self::write_log($txt, self::WARNING, $user, $var);
         } 
     }
 
-    public static function info($txt, $var=NULL) {
+    public static function info($txt, $user=NULL, $var=NULL) {
         if (self::$level <= self::INFO) {
-            self::write_log($txt, $var);
+            self::write_log($txt, self::INFO, $user, $var);
         } 
     }
 }