From c00fcfd941494417ce85d52f1eb2bf4b0e794570 Mon Sep 17 00:00:00 2001
From: shinobu <niehoff.fabian@web.de>
Date: Thu, 27 Oct 2016 16:29:52 +0200
Subject: [PATCH] adds a new .ini entry to enable/disable the logger

---
 application/Bootstrap.php                         | 7 ++++++-
 application/classes/OntoWiki.php                  | 2 +-
 application/config/default.ini                    | 1 +
 application/controllers/ApplicationController.php | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index fac711fd3..a5c3b29f8 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -197,6 +197,10 @@ public function _initConfig()
         $config->libraryUrlBase = $config->staticUrlBase
                                 . $config->libraries->path;
 
+        //check if log.level has a valid integer as value
+        if (!((int)$config->log->level >= 0 && (int)$config->log->level <= 7)) {
+            $config->log->level = 0;
+        }
         // define constants for development/debugging
         if (isset($config->debug) && (boolean)$config->debug) {
             // display errors
@@ -208,6 +212,7 @@ public function _initConfig()
             }
 
             // log everything
+            $config->log->enabled = true;
             $config->log->level = 7;
         }
 
@@ -323,7 +328,7 @@ public function _initLogger()
 
         // initialize logger
         $writer = null;
-        if (is_writable($config->log->path) && ((boolean)$config->log->level !== false)) {
+        if (is_writable($config->log->path) && ((boolean)$config->log->enabled == true)) {
             $levelFilter = new Zend_Log_Filter_Priority((int)$config->log->level, '<=');
 
             $logName = $config->log->path . 'ontowiki';
diff --git a/application/classes/OntoWiki.php b/application/classes/OntoWiki.php
index 18391193c..2c2729662 100644
--- a/application/classes/OntoWiki.php
+++ b/application/classes/OntoWiki.php
@@ -396,7 +396,7 @@ public function getCustomLogger($identifier = self::DEFAULT_LOG_IDENTIFIER)
         }
 
         // initialize logger
-        if (is_writable($config->log->path) && ((boolean)$config->log->level !== false)) {
+        if (is_writable($config->log->path) && ((boolean)$config->log->enabled == true)) {
             $levelFilter = new Zend_Log_Filter_Priority((int)$config->log->level, '<=');
 
             $writer = new Zend_Log_Writer_Stream($config->log->path . $identifier . '.log');
diff --git a/application/config/default.ini b/application/config/default.ini
index eefc628fd..23c8f3154 100644
--- a/application/config/default.ini
+++ b/application/config/default.ini
@@ -244,6 +244,7 @@ service.auth.allowGet = false
 ;   6: Informational - Informational messages
 ;   7: Debug         - Debug messages
 ;
+log.enabled = true
 log.level = 4
 log.path  = "logs"
 
diff --git a/application/controllers/ApplicationController.php b/application/controllers/ApplicationController.php
index c7ed37ac5..786ed1131 100644
--- a/application/controllers/ApplicationController.php
+++ b/application/controllers/ApplicationController.php
@@ -84,7 +84,8 @@ public function aboutAction()
             ),
             'Logging'        => array(
                 'Path'  => rtrim($this->_config->log->path, '/') . $logWritable,
-                'Level' => (bool)$this->_config->log->level ? $this->_config->log->level : 'disabled'
+                'Status' => (bool)$this->_config->log->enabled ? 'enabled' : 'disabled',
+                'Level' => (int)$this->_config->log->level
             )
         );