diff --git a/htdocs/blockedlog/admin/blockedlog_archives.php b/htdocs/blockedlog/admin/blockedlog_archives.php index f963c65c27d..8b98e50698e 100644 --- a/htdocs/blockedlog/admin/blockedlog_archives.php +++ b/htdocs/blockedlog/admin/blockedlog_archives.php @@ -195,7 +195,7 @@ if ($action == 'export' && $user->hasRight('blockedlog', 'read')) { // read is // Refuse and cancel any trigger event if we are running a certified version without forcing https. // This is a security requirement for certification. We do this check before any other to avoid any risk of logging an event that should be blocked because of non respect of certification rules. include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; $isqualified = isALNERunningVersion(1); if ($isqualified && (defined('CERTIF_LNE') && (int) constant('CERTIF_LNE') == 1) && !isHTTPS() && !in_array($action, array('DOC_PREVIEW', 'DOC_DOWNLOAD'))) { diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 55f5d6bfa23..bf1f9347bf7 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -22,7 +22,7 @@ */ include_once DOL_DOCUMENT_ROOT.'/blockedlog/versionmod.inc.php'; -include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; /** @@ -2397,7 +2397,7 @@ class BlockedLog public function canBeEnabled() { include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; $isqualified = isALNEQualifiedVersion(0, 1); diff --git a/htdocs/core/lib/securitycore.lib.php b/htdocs/blockedlog/lib/securitycore.lib.php similarity index 100% rename from htdocs/core/lib/securitycore.lib.php rename to htdocs/blockedlog/lib/securitycore.lib.php diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 6daf2fa03d9..ee14e3596f8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1508,7 +1508,7 @@ function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options */ function dolSetCookie(string $cookiename, string $cookievalue, int $expire = -1) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; global $dolibarr_main_force_https; diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 4d79a6693de..ab0f324001a 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -30,7 +30,7 @@ * because it is used at low code level. */ -include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; /** diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 0315e43a65d..f1bbab6bff8 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -316,7 +316,7 @@ if (empty(DOL_DOCUMENT_ROOT) || !file_exists(DOL_DOCUMENT_ROOT."/core/lib/functi // Included by default (must be before the CSRF check so wa can use the dol_syslog) include_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php'; -include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; //print memory_get_usage(); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index fa8b1da1c90..b3cc8a9eb9a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -87,7 +87,7 @@ require_once 'filefunc.inc.php'; * @var ?string $dolibarr_main_demo */ -include_once DOL_DOCUMENT_ROOT.'/core/lib/securitycore.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/securitycore.lib.php'; // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it. // This is used for example by form of boxes to save personalization of some options.