diff --git a/xoops_trust_path/modules/xupdate/include/FtpCommonFileArchive.class.php b/xoops_trust_path/modules/xupdate/include/FtpCommonFileArchive.class.php index 5fe87c2e0..f011114e3 100644 --- a/xoops_trust_path/modules/xupdate/include/FtpCommonFileArchive.class.php +++ b/xoops_trust_path/modules/xupdate/include/FtpCommonFileArchive.class.php @@ -14,9 +14,9 @@ public function __construct() public function _unzipFile() { // local file name - $downloadDirPath = realpath($this->Xupdate->params['temp_path']); + $downloadDirPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath($this->Xupdate->params['temp_path'])); $downloadFilePath = $this->Xupdate->params['temp_path'].'/'.$this->download_file; - $exploredDirPath = realpath($downloadDirPath.'/'.$this->target_key); + $exploredDirPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath($downloadDirPath.'/'.$this->target_key)); if (empty($downloadFilePath)) { $this->_set_error_log('getDownloadFilePath not found error in: '.$this->_getDownloadFilePath()); return false; diff --git a/xoops_trust_path/modules/xupdate/include/ModulesIniDadaSet.class.php b/xoops_trust_path/modules/xupdate/include/ModulesIniDadaSet.class.php index 57c3e6dd9..2e796e6f7 100644 --- a/xoops_trust_path/modules/xupdate/include/ModulesIniDadaSet.class.php +++ b/xoops_trust_path/modules/xupdate/include/ModulesIniDadaSet.class.php @@ -124,7 +124,7 @@ private function _processCache($cacheCheckMd5, $checkonly) if (($checkonly && $cacheCheckStr === 'running') || (!$checkonly && $cacheCheckStr === 'bg_ok'.$cacheCheckMd5) - || @ filemtime($cacheCheckFile) + $this->cacheTTL > $_SERVER['REQUEST_TIME'] && $cacheCheckStr === ($checkonly? 'bg_ok' : 'ok').$cacheCheckMd5 + || (@ filemtime($cacheCheckFile) + $this->cacheTTL > $_SERVER['REQUEST_TIME'] && $cacheCheckStr === ($checkonly? 'bg_ok' : 'ok').$cacheCheckMd5) ) { return false; } diff --git a/xoops_trust_path/modules/xupdate/preload/AssetPreload.class.php b/xoops_trust_path/modules/xupdate/preload/AssetPreload.class.php index a029ec35f..d588e85ad 100644 --- a/xoops_trust_path/modules/xupdate/preload/AssetPreload.class.php +++ b/xoops_trust_path/modules/xupdate/preload/AssetPreload.class.php @@ -68,7 +68,7 @@ public function preBlockFilter() $this->mRoot->mDelegateManager->add('Legacy_Utils.CreateBlockProcedure', 'Xupdate_AssetPreloadBase::getBlock'); $this->mRoot->mDelegateManager->add('Legacy.Admin.Event.ModuleListSave.Success', array(&$this, '_setNeedCacheRemake')); - $this->mRoot->mDelegateManager->add('Legacy.Admin.Event.ModuleInstall.Success', array(&$this, '_setNeedCacheRemake')); + $this->mRoot->mDelegateManager->add('Legacy.Admin.Event.ModuleInstall.Success', array(&$this, '_setNeedCacheRemakeOnInstall')); $this->mRoot->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.Success', array(&$this, '_setNeedCacheRemake')); $this->mRoot->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.Success', array(&$this, '_setNeedCacheRemake')); @@ -127,6 +127,12 @@ public function _setNeedCacheRemake() $handler->setNeedCacheRemake(); } + public function _setNeedCacheRemakeOnInstall() + { + $handler = Legacy_Utils::getModuleHandler('store', 'xupdate'); + $handler->setNeedCacheRemake(true); + } + /** * getManager * diff --git a/xoops_trust_path/modules/xupdate/xoops_version.php b/xoops_trust_path/modules/xupdate/xoops_version.php index 153e35590..726dd773b 100644 --- a/xoops_trust_path/modules/xupdate/xoops_version.php +++ b/xoops_trust_path/modules/xupdate/xoops_version.php @@ -22,7 +22,7 @@ // $modversion['name'] = _MI_XUPDATE_LANG_XUPDATE; $modversion['version'] = '0.72'; -$modversion['detailed_version'] = '0.72.0'; +$modversion['detailed_version'] = '0.72.1'; $modversion['description'] = _MI_XUPDATE_DESC_XUPDATE; $modversion['author'] = _MI_XUPDATE_LANG_AUTHOR; $modversion['credits'] = _MI_XUPDATE_LANG_CREDITS;