gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +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 2022-04-07 14:39:21 +02:00
commit b48318d1da
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/inc.ClassCalendar.php
View File

@ -73,7 +73,12 @@ class SeedDMS_Calendar {
"(".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".(int) $from.", ".(int) $to.", ".$this->db->getCurrentTimestamp().", ".$this->user->getID().")"; "(".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".(int) $from.", ".(int) $to.", ".$this->db->getCurrentTimestamp().", ".$this->user->getID().")";
$ret = $this->db->getResult($queryStr); $ret = $this->db->getResult($queryStr);
return $ret; if (!$ret)
return false;
$event = $this->getEvent((int) $this->db->getInsertID('tblEvents'));
return $event;
} /* }}} */ } /* }}} */
public function getEvent($id) { /* {{{ */ public function getEvent($id) { /* {{{ */

21
inc/inc.Utils.php
View File

@ -390,6 +390,27 @@ function utf8_basename($path, $suffix='') { /* {{{ */
return $file; return $file;
} /* }}} */ } /* }}} */
function getLogger($prefix='') { /* {{{ */
global $settings;
if($settings->_logFileEnable) {
if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
else $logname=date("Ym", time());
$logname = $settings->_contentDir."log/".$prefix.$logname.".log";
if(!file_exists($settings->_contentDir.'log'))
@mkdir($settings->_contentDir.'log');
if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log')) {
$logger = Log::factory('file', $logname);
$logger->setMask(Log::MAX(PEAR_LOG_DEBUG));
} else
$logger = null;
} else {
$logger = null;
}
return $logger;
} /* }}} */
/** /**
* Log a message * Log a message
* *

22
webdav/index.php
View File

@ -1,25 +1,11 @@
<?php <?php
include("../inc/inc.Settings.php"); include("../inc/inc.Settings.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());
else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
else $logname=date("Ym", time());
$logname = $settings->_contentDir."log/webdav-".$logname.".log";
if(!file_exists($settings->_contentDir.'log'))
@mkdir($settings->_contentDir.'log');
if(file_exists($settings->_contentDir.'log') && is_dir($settings->_contentDir.'log')) {
$logger = Log::factory('file', $logname);
$logger->setMask(Log::MAX(PEAR_LOG_DEBUG));
} else
$logger = null;
} else {
$logger = null;
}
require_once("../inc/inc.Language.php"); require_once("../inc/inc.Language.php");
require_once("../inc/inc.Utils.php");
$logger = getLogger('webdav-');
require_once("../inc/inc.Init.php"); require_once("../inc/inc.Init.php");
require_once("../inc/inc.Extension.php"); require_once("../inc/inc.Extension.php");
require_once("../inc/inc.DBInit.php"); require_once("../inc/inc.DBInit.php");