Index: trunk/core/kernel/processors/main_processor.php =================================================================== diff -u -r4358 -r4457 --- trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 4358) +++ trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 4457) @@ -2,15 +2,14 @@ class kMainTagProcessor extends TagProcessor { - function Init($prefix,$special) + function Init($prefix, $special, $event_params = null) { - parent::Init($prefix,$special); + parent::Init($prefix, $special, $event_params); $actions =& $this->Application->recallObject('kActions'); $actions->Set('t', $this->Application->GetVar('t')); $actions->Set('sid', $this->Application->GetSID()); $actions->Set('m_opener', $this->Application->GetVar('m_opener') ); - } /** @@ -676,15 +675,6 @@ return $o; } - function AfterScript($params) - { - $after_script = $this->Application->GetVar('after_script'); - if ( $after_script ) { - return ''; - } - return ''; - } - function LoggedIn($params) { return $this->Application->LoggedIn(); @@ -816,16 +806,6 @@ } } - function SaveReturnScript($params) - { - // admin/save_redirect.php?do= - $url = str_replace($this->Application->BaseURL(), '', $this->Link($params) ); - $url = explode('?', $url, 2); - $url = 'save_redirect.php?'.$url[1].'&do='.$url[0]; - - $this->Application->StoreVar('ReturnScript', $url); - } - function ConstOn($params) { $name = $this->SelectParam($params,'name,const'); @@ -838,64 +818,7 @@ $module =& $this->Application->recallObject('mod.'.$module_name); $this->Application->SetVar('m_cat_id', $module->GetDBField('RootCat') ); } - - function ImportRedirect($params) - { - $import_id = $this->Application->GetVar('import_id'); - if ($import_id) { - // redirect forward to step3 (import parameters coosing) - $this->Application->StoreVar('ImportScriptID', $import_id); - - $sql = 'SELECT * - FROM '.TABLE_PREFIX.'ImportScripts - WHERE is_id = '.$import_id; - - $db =& $this->Application->GetADODBConnection(); - $is_params = $db->GetRow($sql); - - if ($is_params['is_type'] == 'db') { - $this->Application->Redirect('', null, '', 'import/step3.php'); - } - elseif ($is_params['is_type'] == 'csv') { - $module = strtolower($is_params['is_Module']); - $template = $module.'/import'; - $sql = 'SELECT Var - FROM '.TABLE_PREFIX.'Modules - WHERE LOWER(Name) = '.$db->qstr($module); - $item_prefix = $db->GetOne($sql); - $pass_params = Array('m_opener' => 'd', $item_prefix.'.import_id' => 0, $item_prefix.'.import_event' => 'OnNew', 'pass' => 'm,'.$item_prefix.'.import'); - $this->Application->Redirect($template, $pass_params); - } - } - else { - // redirect back to step2 (import type choosing) - $this->Application->Redirect('', null, '', 'import/step2.php'); - } - } - - function GetSectionTitle($params) - { - $params['name'] = replaceModuleSection($params['phrase']); - return $this->Phrase($params); - } - - function GetSectionIcon($params) - { - return replaceModuleSection($params['icon']); - } - - function StoreSystemVars($params) - { - // save theese variables to session, because they are useful for most configuration templates - $this->Application->LinkVar('module'); - $this->Application->LinkVar('section'); - } - function StoreMainPrefix($params) - { - $this->Application->LinkVar('main_prefix'); // window prefix, that opener selector - $this->Application->LinkVar('dst_field'); // field to set value choosed in selector - $this->Application->LinkVar('return_template'); // template to go, when something was coosen from popup (from finalizePopup) - } + function XMLTemplate($params) { define('DBG_SKIP_REPORTING', 1);