diff --git a/CHANGELOG b/CHANGELOG index 9c1a02e8a..af133ff86 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/utils/xmldump.php b/utils/xmldump.php index 7b2d65176..4b4e10da8 100644 --- a/utils/xmldump.php +++ b/utils/xmldump.php @@ -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;