From b34d06ca9b50d2ac87fd71115eb2ec315511aa44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 4 Feb 2021 10:41:56 +0100
Subject: [PATCH] create logger before initiating extension, because it is
 passed to each extension

---
 webdav/index.php | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/webdav/index.php b/webdav/index.php
index f7bdea5ac..0a4c5df9b 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -1,15 +1,7 @@
 <?php
 include("../inc/inc.Settings.php");
-//include("../inc/inc.LogInit.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassNotificationService.php");
-include("../inc/inc.ClassEmailNotify.php");
-include("../inc/inc.ClassController.php");
-include("Log.php");
 
+//include("../inc/inc.LogInit.php");
 // LogInit.php cannot be used, because of the different log file
 if($settings->_logFileEnable) {
 	if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
@@ -19,15 +11,24 @@ if($settings->_logFileEnable) {
 	if(!file_exists($settings->_contentDir.'log'))
 		@mkdir($settings->_contentDir.'log');
 	if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log')) {
-		$log = Log::factory('file', $logname);
-		$log->setMask(Log::MAX(PEAR_LOG_DEBUG));
+		$logger = Log::factory('file', $logname);
+		$logger->setMask(Log::MAX(PEAR_LOG_DEBUG));
 	} else
-		$log = null;
+		$logger = null;
 } else {
-	$log = null;
+	$logger = null;
 }
 
-$notifier = new SeedDMS_NotificationService($log);
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassNotificationService.php");
+include("../inc/inc.ClassEmailNotify.php");
+include("../inc/inc.ClassController.php");
+include("Log.php");
+
+$notifier = new SeedDMS_NotificationService($logger);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
@@ -51,7 +52,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 
 include("webdav.php");
 $server = new HTTP_WebDAV_Server_SeedDMS();
-$server->ServeRequest($dms, $log, $notifier);
+$server->ServeRequest($dms, $logger, $notifier);
 //$files = array();
 //$options = array('path'=>'/Test1/subdir', 'depth'=>1);
 //echo $server->MKCOL(&$options);