pass $settings as first parameter of getLogger()

This commit is contained in:
Uwe Steinmann 2025-10-28 15:40:20 +01:00
parent 6db475692a
commit c32fe1be80
4 changed files with 9 additions and 10 deletions

View File

@ -18,8 +18,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
require_once("Log.php");
require_once("inc/inc.Utils.php");
$logger = getLogger('', (int) $settings->_logFileMaxLevel);
$logger = getLogger($settings, '', (int) $settings->_logFileMaxLevel);

View File

@ -493,10 +493,8 @@ function getStreamContext($proxyurl, $proxyuser, $proxypass) { /* {{{ */
return $context;
} /* }}} */
function getLogger($prefix='', $mask=PEAR_LOG_INFO) { /* {{{ */
global $settings;
if($settings->_logFileEnable) {
function getLogger($settings, $prefix='', $mask=PEAR_LOG_INFO) { /* {{{ */
if(!empty($settings->_logFileEnable)) {
if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
else $logname=date("Ym", time());

View File

@ -1,11 +1,13 @@
<?php
include("../inc/inc.Settings.php");
require "vendor/autoload.php";
require_once("Log.php");
require_once("../inc/inc.Language.php");
require_once("../inc/inc.Utils.php");
$logger = getLogger('restapi-', (int) $settings->_logFileRestApiMaxLevel);
$logger = getLogger($settings, 'restapi-', (int) $settings->_logFileRestApiMaxLevel);
require_once("../inc/inc.Init.php");
require_once("../inc/inc.Extension.php");
@ -15,8 +17,6 @@ require_once("../inc/inc.ClassEmailNotify.php");
require_once("../inc/inc.Notification.php");
require_once("../inc/inc.ClassController.php");
require "vendor/autoload.php";
use Psr\Container\ContainerInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;

View File

@ -1,11 +1,13 @@
<?php
include("../inc/inc.Settings.php");
require "vendor/autoload.php";
require_once("Log.php");
require_once("../inc/inc.Language.php");
require_once("../inc/inc.Utils.php");
$logger = getLogger('webdav-');
$logger = getLogger($settings, 'webdav-');
require_once("../inc/inc.Init.php");
require_once("../inc/inc.Extension.php");