Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9583] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules
|
From: <ma...@us...> - 2012-05-23 17:34:14
|
Revision: 9583
http://xoops.svn.sourceforge.net/xoops/?rev=9583&view=rev
Author: mageg
Date: 2012-05-23 17:34:07 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Add CleanCache function in system class
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/center.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/center.php 2012-05-23 07:30:18 UTC (rev 9582)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/center.php 2012-05-23 17:34:07 UTC (rev 9583)
@@ -59,46 +59,23 @@
$tables_op = $system->cleanVars($_REQUEST, 'maintenance', array(), 'array');
$db = XoopsDatabaseFactory::getDatabaseConnection();
//Cache
+ $res_cache = $system->CleanCache($cache);
if (!empty($cache)) {
for ($i = 0; $i < count($cache); $i++) {
switch ($cache[$i]) {
case 1:
- $files = glob(XOOPS_VAR_PATH . '/caches/smarty_cache/*.*');
- $total_smarty_cache = 0;
- foreach ($files as $filename) {
- if (basename(strtolower($filename)) != 'index.html') {
- unlink($filename);
- $total_smarty_cache++;
- }
- }
$xoops->tpl->assign('smarty_cache', true);
- $xoops->tpl->assign('result_smarty_cache', sprintf(_AM_MAINTENANCE_CENTER_RESULT_SMARTY_CACHE, $total_smarty_cache));
+ $xoops->tpl->assign('result_smarty_cache', sprintf(_AM_MAINTENANCE_CENTER_RESULT_SMARTY_CACHE, $res_cache['smarty_cache']));
break;
case 2:
- $files = glob(XOOPS_VAR_PATH . '/caches/smarty_compile/*.*');
- $total_smarty_compile = 0;
- foreach ($files as $filename) {
- if (basename(strtolower($filename)) != 'index.html') {
- unlink($filename);
- $total_smarty_compile++;
- }
- }
$xoops->tpl->assign('smarty_compile', true);
- $xoops->tpl->assign('result_smarty_compile', sprintf(_AM_MAINTENANCE_CENTER_RESULT_SMARTY_COMPILE, $total_smarty_compile));
+ $xoops->tpl->assign('result_smarty_compile', sprintf(_AM_MAINTENANCE_CENTER_RESULT_SMARTY_COMPILE, $res_cache['smarty_compile']));
break;
case 3:
- $files = glob(XOOPS_VAR_PATH . '/caches/xoops_cache/*.*');
- $total_xoops_cache = 0;
- foreach ($files as $filename) {
- if (basename(strtolower($filename)) != 'index.html') {
- unlink($filename);
- $total_xoops_cache++;
- }
- }
$xoops->tpl->assign('xoops_cache', true);
- $xoops->tpl->assign('result_xoops_cache', sprintf(_AM_MAINTENANCE_CENTER_RESULT_XOOPS_CACHE, $total_xoops_cache));
+ $xoops->tpl->assign('result_xoops_cache', sprintf(_AM_MAINTENANCE_CENTER_RESULT_XOOPS_CACHE, $res_cache['xoops_cache']));
break;
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2012-05-23 07:30:18 UTC (rev 9582)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2012-05-23 17:34:07 UTC (rev 9583)
@@ -226,6 +226,8 @@
$xoops->tpl->assign('title', _AM_SYSTEM_MODULES_UNINSTALL);
$xoops->tpl->assign('log', $system_module->trace);
}
+ $folder = array(1, 3);
+ $system->CleanCache($folder);
// Call Footer
$xoops->footer();
break;
@@ -257,13 +259,11 @@
$xoops->tpl->assign('title', _AM_SYSTEM_MODULES_UPDATE);
$xoops->tpl->assign('log', $system_module->trace);
}
- // Call Footer
- $xoops->footer();
- require_once $xoops->path('modules/system/class/maintenance.php');
- $maintenance = new SystemMaintenance();
$folder = array(1, 3);
- $maintenance->CleanCache($folder);
+ $system->CleanCache($folder);
//Set active modules in cache folder
$xoops->setActiveModules();
+ // Call Footer
+ $xoops->footer();
break;
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php 2012-05-23 07:30:18 UTC (rev 9582)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/main.php 2012-05-23 17:34:07 UTC (rev 9583)
@@ -127,6 +127,8 @@
$xoops->tpl->assign('title', _AM_SYSTEM_PLUGINS_UNINSTALL);
$xoops->tpl->assign('log', $system_plugin->trace);
}
+ $folder = array(1, 3);
+ $system->CleanCache($folder);
// Call Footer
$xoops->footer();
break;
@@ -158,13 +160,11 @@
$xoops->tpl->assign('title', _AM_SYSTEM_PLUGINS_UPDATE);
$xoops->tpl->assign('log', $system_plugin->trace);
}
- // Call Footer
- $xoops->footer();
- require_once $xoops->path('modules/system/class/maintenance.php');
- $maintenance = new SystemMaintenance();
$folder = array(1, 3);
- $maintenance->CleanCache($folder);
+ $system->CleanCache($folder);
//Set active modules in cache folder
$xoops->setActiveModules();
+ // Call Footer
+ $xoops->footer();
break;
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-05-23 07:30:18 UTC (rev 9582)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-05-23 17:34:07 UTC (rev 9583)
@@ -164,12 +164,8 @@
// Clean cached files, may take long time
// User reigister_shutdown_function to keep running after connection closes so that cleaning cached files can be finished
// Cache management should be performed on a separate page
- require_once $xoops->path('modules/maintenance/class/maintenance.php');
- $maintenance = new Maintenance();
$options = array(1); //1 goes for cache
- //register_shutdown_function( array( &$xoopsTpl, 'clear_all_cache' ) );
- register_shutdown_function(array(&$maintenance, 'CleanCache'), $options);
-
+ register_shutdown_function(array(&$system, 'CleanCache'), $options);
if (isset($redirect) && $redirect != '') {
$xoops->redirect($redirect, 2, _AM_SYSTEM_DBUPDATED);
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php 2012-05-23 07:30:18 UTC (rev 9582)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php 2012-05-23 17:34:07 UTC (rev 9583)
@@ -157,4 +157,59 @@
}
return '';
}
+ /**
+ * System Clean cache 'xoops_data/caches/smarty_cache'
+ *
+ * @param array cache
+ * @return
+ */
+ function CleanCache($cache) {
+ $total_smarty_cache = 0;
+ $total_smarty_compile = 0;
+ $total_xoops_cache = 0;
+ if (!empty($cache)) {
+ for ($i = 0; $i < count($cache); $i++) {
+ switch ($cache[$i]) {
+ case 1:
+ $files = glob(XOOPS_VAR_PATH . '/caches/smarty_cache/*.*');
+ $total_smarty_cache = 0;
+ foreach ($files as $filename) {
+ if (basename(strtolower($filename)) != 'index.html') {
+ unlink($filename);
+ $total_smarty_cache++;
+ }
+ }
+ break;
+
+ case 2:
+ $files = glob(XOOPS_VAR_PATH . '/caches/smarty_compile/*.*');
+ $total_smarty_compile = 0;
+ foreach ($files as $filename) {
+ if (basename(strtolower($filename)) != 'index.html') {
+ unlink($filename);
+ $total_smarty_compile++;
+ }
+ }
+ break;
+
+ case 3:
+ $files = glob(XOOPS_VAR_PATH . '/caches/xoops_cache/*.*');
+ $total_xoops_cache = 0;
+ foreach ($files as $filename) {
+ if (basename(strtolower($filename)) != 'index.html') {
+ unlink($filename);
+ $total_xoops_cache++;
+ }
+ }
+ break;
+ }
+ }
+ $ret['smarty_cache'] = $total_smarty_cache;
+ $ret['smarty_compile'] = $total_smarty_compile;
+ $ret['xoops_cache'] = $total_xoops_cache;
+ return $ret;
+ } else {
+ return false;
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
