diff --git a/inc/inc.ClassCalendar.php b/inc/inc.ClassCalendar.php index 32af407c1..63face820 100644 --- a/inc/inc.ClassCalendar.php +++ b/inc/inc.ClassCalendar.php @@ -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().")"; $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) { /* {{{ */ diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 5aca70fa4..dac901ce3 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -390,6 +390,27 @@ function utf8_basename($path, $suffix='') { /* {{{ */ 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 * diff --git a/webdav/index.php b/webdav/index.php index 89d89245d..a6be8fa13 100644 --- a/webdav/index.php +++ b/webdav/index.php @@ -1,25 +1,11 @@ _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.Utils.php"); + +$logger = getLogger('webdav-'); + require_once("../inc/inc.Init.php"); require_once("../inc/inc.Extension.php"); require_once("../inc/inc.DBInit.php");