gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-29 13:07:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-02-04 11:15:03 +01:00
commit d5cef4fabf
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassExtBase.php
View File

@ -31,9 +31,11 @@
class SeedDMS_ExtBase {
var $settings;
var $dms;
var $logger;
public function __construct($settings, $dms) {
public function __construct($settings, $dms, $logger) {
$this->settings = $settings;
$this->dms = $dms;
$this->logger = $logger;
}
}

4
inc/inc.Extension.php
View File

@ -11,6 +11,8 @@
* @version Release: @package_version@
*/
global $logger;
require "inc.ClassExtensionMgr.php";
require_once "inc.ClassSchedulerTaskBase.php";
require_once "inc.ClassExtBase.php";
@ -44,7 +46,7 @@ foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
if(file_exists($classfile)) {
include($classfile);
$obj = new $extconf['class']['name']($settings, null);
$obj = new $extconf['class']['name']($settings, null, $logger);
if(method_exists($obj, 'init'))
$obj->init();
}

31
webdav/index.php
View File

@ -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);