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

This commit is contained in:
Uwe Steinmann 2026-04-27 08:44:13 +02:00
commit 2aa69a3051
2 changed files with 10 additions and 7 deletions

View File

@ -387,6 +387,7 @@
- check for valid referer uri when logging in
- max. number of files in drop folder list can be configured
- files in drop folder list are sorted by date (descending)
- back port basic authentication from seeddms 6.0.x
--------------------------------------------------------------------------------
Changes in version 5.1.46

View File

@ -102,7 +102,6 @@ $statistic = array(
'folders'=>0,
'roles'=>0,
'users'=>0,
'roles'=>0,
'groups'=>0,
'attributedefinitions'=>0,
'keywordcategories'=>0,
@ -475,12 +474,15 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
}
} /* }}} */
include($myincpath."/inc/inc.Settings.php");
include($myincpath."/inc/inc.Utils.php");
include($myincpath."/inc/inc.Init.php");
include($myincpath."/inc/inc.Extension.php");
include($myincpath."/inc/inc.DBInit.php");
include($myincpath."/inc/inc.ClassAcl.php");
require $myincpath.'/vendor/autoload.php';
require_once($myincpath."/inc/inc.Settings.php");
require_once($myincpath.'/inc/inc.Language.php');
require_once($myincpath."/inc/inc.LogInit.php");
require_once($myincpath."/inc/inc.Utils.php");
require_once($myincpath."/inc/inc.Init.php");
require_once($myincpath."/inc/inc.Extension.php");
require_once($myincpath."/inc/inc.DBInit.php");
require_once($myincpath."/inc/inc.ClassAcl.php");
if(!$folderid) {
$folderid = $settings->_rootFolderID;