create logger before initiating extension, because it is passed to each extension

This commit is contained in:
Uwe Steinmann 2021-02-04 10:41:56 +01:00
parent 15a4d3195b
commit b34d06ca9b

View File

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