Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r14609 -r14637 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14609) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14637) @@ -1,6 +1,6 @@ Conn->Query('DELETE FROM ' . TABLE_PREFIX . 'CachedUrls'); + + $event->SetRedirectParam('action_completed', 1); } /** @@ -122,6 +124,7 @@ } $event->SetRedirectParam('refresh_tree', 1); + $event->SetRedirectParam('action_completed', 1); } function OnResetConfigsCache(&$event) @@ -161,6 +164,8 @@ if ( $this->Application->GetVar('validate_configs') ) { $event->SetRedirectParam('validate_configs', 1); } + + $event->SetRedirectParam('action_completed', 1); } function OnResetMemcache(&$event) @@ -170,6 +175,7 @@ } $this->Application->resetCache(); + $event->SetRedirectParam('action_completed', 1); } function OnCompileTemplates(&$event) @@ -188,37 +194,44 @@ */ function OnDeleteCompiledTemplates(&$event) { - if ($this->Application->GetVar('ajax') == 'yes') { + if ( $this->Application->GetVar('ajax') == 'yes' ) { $event->status = kEvent::erSTOP; } $base_path = WRITEABLE . DIRECTORY_SEPARATOR . 'cache'; // delete debugger reports - $debugger_reports = glob($base_path . '/debug_@*@.txt'); + $debugger_reports = glob(RESTRICTED . '/debug_@*@.txt'); - foreach ($debugger_reports as $debugger_report) { - unlink($debugger_report); + if ( $debugger_reports ) { + foreach ($debugger_reports as $debugger_report) { + unlink($debugger_report); + } } $this->_deleteCompiledTemplates($base_path); + $event->SetRedirectParam('action_completed', 1); } function _deleteCompiledTemplates($folder, $unlink_folder = false) { $sub_folders = glob($folder . '/*', GLOB_ONLYDIR); - foreach ($sub_folders as $sub_folder) { - $this->_deleteCompiledTemplates($sub_folder, true); + if ( is_array($sub_folders) ) { + foreach ($sub_folders as $sub_folder) { + $this->_deleteCompiledTemplates($sub_folder, true); + } } $files = glob($folder . '/*.php'); - foreach ($files as $file) { - unlink($file); + if ( is_array($files) ) { + foreach ($files as $file) { + unlink($file); + } } - if ($unlink_folder) { + if ( $unlink_folder ) { rmdir($folder); } } @@ -407,6 +420,8 @@ /* @var $themes_helper kThemesHelper */ $themes_helper->refreshThemes(); + + $event->SetRedirectParam('action_completed', 1); } function OnSaveColumns(&$event) @@ -1368,6 +1383,8 @@ /* @var $deployment_helper DeploymentHelper */ $deployment_helper->deployAll(); + + $event->SetRedirectParam('action_completed', 1); } /** @@ -1383,6 +1400,9 @@ if ( !$deployment_helper->deployAll(true) ) { $event->status = kEvent::erFAIL; } + else { + $event->SetRedirectParam('action_completed', 1); + } } }