Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r14092 -r14095 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14092) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14095) @@ -1,6 +1,6 @@ Application->GetVar('ajax') == 'yes') { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } $this->Conn->Query('DELETE FROM ' . TABLE_PREFIX . 'CachedUrls'); @@ -101,7 +101,7 @@ function OnResetSections(&$event) { if ($this->Application->GetVar('ajax') == 'yes') { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) { @@ -117,7 +117,7 @@ function OnResetConfigsCache(&$event) { if ($this->Application->GetVar('ajax') == 'yes') { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) { @@ -156,7 +156,7 @@ function OnResetMemcache(&$event) { if ($this->Application->GetVar('ajax') == 'yes') { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) { @@ -170,7 +170,7 @@ /* @var $compiler NParserCompiler */ $compiler->CompileTemplatesStep(); - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } /** @@ -181,7 +181,7 @@ function OnDeleteCompiledTemplates(&$event) { if ($this->Application->GetVar('ajax') == 'yes') { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } $base_path = WRITEABLE . DIRECTORY_SEPARATOR . 'cache'; @@ -381,7 +381,7 @@ Application->ParseBlock(Array('name' => 'incs/footer')); echo ob_get_clean(); - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } /** @@ -392,7 +392,7 @@ function OnRebuildThemes(&$event) { if ($this->Application->GetVar('ajax') == 'yes') { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } $themes_helper =& $this->Application->recallObject('ThemesHelper'); @@ -433,7 +433,7 @@ $this->Application->StorePersistentVar($var_name, $var_value); - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } /** @@ -493,14 +493,14 @@ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection'); if(!$this->Application->CheckPermission($perm_sections['main'].'.view')) { - $event->status = erPERM_FAIL; + $event->status = kEvent::erPERM_FAIL; return ; } $export_helper->PrefixSpecial = $prefix_special; $export_helper->grid = $this->Application->GetVar('grid'); $export_helper->ExportStep(); - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } /** @@ -518,7 +518,7 @@ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection'); if(!$this->Application->CheckPermission($perm_sections['main'].'.view')) { - $event->status = erPERM_FAIL; + $event->status = kEvent::erPERM_FAIL; return ; } @@ -537,7 +537,7 @@ $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection'); if(!$this->Application->CheckPermission($perm_sections['main'].'.add') && !$this->Application->CheckPermission($perm_sections['main'].'.edit')) { - $event->status = erPERM_FAIL; + $event->status = kEvent::erPERM_FAIL; return ; } @@ -564,7 +564,7 @@ if($event->redirect === false) { $object->SetError('ImportFile', $result); - $event->status = erFAIL; + $event->status = kEvent::erFAIL; } } @@ -582,12 +582,12 @@ $prefix_elems = split('\.|_', $prefix_special, 2); $perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection'); if(!$this->Application->CheckPermission($perm_sections['main'].'.add') && !$this->Application->CheckPermission($perm_sections['main'].'.edit')) { - $event->status = erPERM_FAIL; + $event->status = kEvent::erPERM_FAIL; return ; } $import_helper->ImportStep(); - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } /** @@ -618,7 +618,7 @@ echo $this->Application->ParseBlock(Array('name' => 'incs/footer')); echo ob_get_clean(); - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } function OnDropTempTablesByWID(&$event) @@ -635,7 +635,7 @@ } } echo 'OK'; - $event->status = erSTOP; + $event->status = kEvent::erSTOP; return ; } @@ -653,7 +653,7 @@ /* @var $file_helper FileHelper */ if (!$file_helper->CheckFolder($backup_path) || !is_writable($backup_path)) { - $event->status = erFAIL; + $event->status = kEvent::erFAIL; $this->Application->SetVar('error_msg', $this->Application->Phrase('la_Text_backup_access')); return ; @@ -723,7 +723,7 @@ } echo $done_percent; - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } /** @@ -957,7 +957,7 @@ } echo $done_percent; - $event->status = erSTOP; + $event->status = kEvent::erSTOP; } @@ -1185,7 +1185,7 @@ } $this->Application->SetVar('query_status', 1); - $event->status = erFAIL; + $event->status = kEvent::erFAIL; } function getMoment() @@ -1232,7 +1232,7 @@ */ function OnSaveMenuFrameWidth(&$event) { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; if (!$this->Application->ConfigValue('ResizableFrames')) { return ; @@ -1255,7 +1255,7 @@ */ function OnMemoryCacheGet(&$event) { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; $ret = Array ('message' => '', 'code' => 0); // 0 - ok, > 0 - error $key = $this->Application->GetVar('key'); @@ -1268,10 +1268,10 @@ $value = $this->Application->getCache($key); $ret['value'] =& $value; - $ret['size'] = is_string($value) ? formatSize( strlen($value) ) : '?'; + $ret['size'] = is_string($value) ? kUtil::formatSize( strlen($value) ) : '?'; $ret['type'] = gettype($value); - if (IsSerialized($value)) { + if (kUtil::IsSerialized($value)) { $value = unserialize($value); } @@ -1298,7 +1298,7 @@ */ function OnMemoryCacheSet(&$event) { - $event->status = erSTOP; + $event->status = kEvent::erSTOP; $ret = Array ('message' => '', 'code' => 0); // 0 - ok, > 0 - error $key = $this->Application->GetVar('key');