From 1b0db22a5b6c4da28995de3644210a782074a9d2 Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Mon, 19 Dec 2022 17:29:14 +0530 Subject: [PATCH] fix app_data folder --- .../libraries/RainLoop/Providers/Domain/DefaultDomain.php | 2 +- app/rainloop/v/1.16.0/include.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php b/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php index d752b88..bf5e38b 100644 --- a/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php +++ b/app/rainloop/v/1.16.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php @@ -60,7 +60,7 @@ class DefaultDomain implements \RainLoop\Providers\Domain\DomainAdminInterface */ private function wildcardDomainsCacheKey() { - return '/WildCard/DomainCache/'.\md5(R_APP_VERSION.APP_PRIVATE_DATA_NAME).'/'; + return '/WildCard/DomainCache/'.\md5(R_APP_VERSION.R_APP_PRIVATE_DATA_NAME).'/'; } /** diff --git a/app/rainloop/v/1.16.0/include.php b/app/rainloop/v/1.16.0/include.php index f5f068f..33bec0c 100644 --- a/app/rainloop/v/1.16.0/include.php +++ b/app/rainloop/v/1.16.0/include.php @@ -34,8 +34,8 @@ define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_'); $sPrivateDataFolderInternalName = @file_exists(R_APP_INDEX_ROOT_PATH.'MULTIPLY') ? APP_SITE : ''; - define('APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? APP_DEFAULT_PRIVATE_DATA_NAME : $sPrivateDataFolderInternalName); - define('APP_MULTIPLY', 0 < strlen($sPrivateDataFolderInternalName) && APP_DEFAULT_PRIVATE_DATA_NAME !== APP_PRIVATE_DATA_NAME); + define('R_APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? APP_DEFAULT_PRIVATE_DATA_NAME : $sPrivateDataFolderInternalName); + define('APP_MULTIPLY', 0 < strlen($sPrivateDataFolderInternalName) && APP_DEFAULT_PRIVATE_DATA_NAME !== R_APP_PRIVATE_DATA_NAME); define('APP_DUMMY', '********'); define('APP_DEV_VERSION', '0.0.0'); @@ -150,8 +150,8 @@ @file_put_contents(R_APP_DATA_FOLDER_PATH.'SALT.php', '<'.'?php //'.$sSalt); } - define('R_APP_SALT', md5($sSalt.APP_PRIVATE_DATA_NAME.$sSalt)); - define('R_APP_PRIVATE_DATA', R_APP_DATA_FOLDER_PATH.'_data_'.($sData ? md5($sData) : '').'/'.APP_PRIVATE_DATA_NAME.'/'); + define('R_APP_SALT', md5($sSalt.R_APP_PRIVATE_DATA_NAME.$sSalt)); + define('R_APP_PRIVATE_DATA', R_APP_DATA_FOLDER_PATH.'_data_'.($sData ? md5($sData) : '').'/'.R_APP_PRIVATE_DATA_NAME.'/'); define('R_APP_PLUGINS_PATH', R_APP_PRIVATE_DATA.'plugins/'); -- GitLab