Index: branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php =================================================================== diff -u -r5508 -r5573 --- branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5508) +++ branches/unlabeled/unlabeled-1.64.2/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5573) @@ -1290,7 +1290,6 @@ $event->redirect = $this->getModuleFolder($event).'/export'; $redirect_params = Array( 'm_opener' => 'd', - 'index_file' => 'index4.php', $this->Prefix.'.export_event' => 'OnNew', 'pass' => 'all,'.$this->Prefix.'.export'); @@ -1570,24 +1569,6 @@ } /** - * Shows export dialog - * - * @param kEvent $event - */ - function OnImport(&$event) - { - - $event->redirect = $this->getModuleFolder($event).'/import'; - - $redirect_params = Array( 'm_opener' => 'd', - 'index_file' => 'index4.php', - $this->Prefix.'.import_event' => 'OnNew', - 'pass' => 'all,'.$this->Prefix.'.import'); - - $event->setRedirectParams($redirect_params); - } - - /** * Prepares item for import/export operations * * @param kEvent $event Index: branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_tag_processor.php =================================================================== diff -u -r5560 -r5573 --- branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 5560) +++ branches/unlabeled/unlabeled-1.4.2/core/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 5573) @@ -22,7 +22,7 @@ $item_prefix.'_event' => 'OnEdit', $item_prefix.'_id' => $item_id, 'pass' => 'all,'.$item_prefix - ), 'index4.php'); + ), 'index.php'); } /** Index: branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php =================================================================== diff -u -r5508 -r5573 --- branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5508) +++ branches/unlabeled/unlabeled-1.64.2/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 5573) @@ -1290,7 +1290,6 @@ $event->redirect = $this->getModuleFolder($event).'/export'; $redirect_params = Array( 'm_opener' => 'd', - 'index_file' => 'index4.php', $this->Prefix.'.export_event' => 'OnNew', 'pass' => 'all,'.$this->Prefix.'.export'); @@ -1570,24 +1569,6 @@ } /** - * Shows export dialog - * - * @param kEvent $event - */ - function OnImport(&$event) - { - - $event->redirect = $this->getModuleFolder($event).'/import'; - - $redirect_params = Array( 'm_opener' => 'd', - 'index_file' => 'index4.php', - $this->Prefix.'.import_event' => 'OnNew', - 'pass' => 'all,'.$this->Prefix.'.import'); - - $event->setRedirectParams($redirect_params); - } - - /** * Prepares item for import/export operations * * @param kEvent $event Index: branches/unlabeled/unlabeled-1.15.2/core/kernel/languages/phrases_cache.php =================================================================== diff -u -r5497 -r5573 --- branches/unlabeled/unlabeled-1.15.2/core/kernel/languages/phrases_cache.php (.../phrases_cache.php) (revision 5497) +++ branches/unlabeled/unlabeled-1.15.2/core/kernel/languages/phrases_cache.php (.../phrases_cache.php) (revision 5573) @@ -140,7 +140,7 @@ { $translation = '!'.$label.'!'; if($this->Application->isDebugMode() && constOn('DBG_PHRASES')) { - list($edit_tpl, $index_file) = $this->Application->IsAdmin() ? Array('regional/phrases_edit', 'index4.php') : Array('phrases_edit', 'index.php'); + list($edit_tpl, $index_file) = $this->Application->IsAdmin() ? Array('regional/phrases_edit', 'index.php') : Array('phrases_edit', 'index.php'); $edit_url = $this->Application->HREF($edit_tpl,'',Array('m_opener'=>'d','phrases_label'=>$original_label,'phrases_event'=>'OnNew', 'pass'=>'all,phrases'), $index_file ); $translation = '!'.$label.'!'; Index: branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php =================================================================== diff -u -r5449 -r5573 --- branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 5449) +++ branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 5573) @@ -1398,7 +1398,7 @@ $pass_events = $event->getEventParam('pass_events'); $redirect_params = array_merge_recursive2($event->redirect_params, Array('m_opener' => 'u', '__URLENCODE__' => 1)); - $new_level = 'index4.php|'.ltrim($this->Application->BuildEnv($t, $redirect_params, 'all', $pass_events), ENV_VAR_NAME.'='); + $new_level = 'index.php|'.ltrim($this->Application->BuildEnv($t, $redirect_params, 'all', $pass_events), ENV_VAR_NAME.'='); array_push($opener_stack, $new_level); $this->Application->StoreVar('opener_stack', serialize($opener_stack)); } Index: branches/unlabeled/unlabeled-1.25.2/admin/include/sections.php =================================================================== diff -u -r5438 -r5573 --- branches/unlabeled/unlabeled-1.25.2/admin/include/sections.php (.../sections.php) (revision 5438) +++ branches/unlabeled/unlabeled-1.25.2/admin/include/sections.php (.../sections.php) (revision 5573) @@ -86,7 +86,7 @@ $file = $this->Get('file'); - return ( strpos($path, 'index4.php') !== false || strpos($file, 'kernel4:') !== false) ? true : false; + return ( strpos($path, 'index.php') !== false || strpos($file, 'kernel4:') !== false) ? true : false; } function URL() Index: branches/unlabeled/unlabeled-1.11.2/kernel/admin/include/toolbar/advanced_view.php =================================================================== diff -u -r5303 -r5573 --- branches/unlabeled/unlabeled-1.11.2/kernel/admin/include/toolbar/advanced_view.php (.../advanced_view.php) (revision 5303) +++ branches/unlabeled/unlabeled-1.11.2/kernel/admin/include/toolbar/advanced_view.php (.../advanced_view.php) (revision 5573) @@ -274,7 +274,7 @@ set_hidden_field(prefix_special+'_mode', 't'); set_hidden_field('remove_specials['+prefix_special+']',1); - submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index4.php'); + submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index.php'); } function delete_items(prefix_special) Index: branches/unlabeled/unlabeled-1.63.2/kernel/units/users/users_event_handler.php =================================================================== diff -u -r5564 -r5573 --- branches/unlabeled/unlabeled-1.63.2/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5564) +++ branches/unlabeled/unlabeled-1.63.2/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5573) @@ -85,7 +85,7 @@ function OnSessionExpire() { if( $this->Application->IsAdmin() ) { - $this->Application->Redirect('index', Array('expired' => 1), '', 'index4.php'); + $this->Application->Redirect('index', Array('expired' => 1), '', 'index.php'); } else { $http_query =& $this->Application->recallObject('HTTPQuery'); Index: branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl =================================================================== diff -u -r5562 -r5573 --- branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5562) +++ branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5573) @@ -74,7 +74,13 @@ a_toolbar.AddButton( new ToolBarSeparator('sep3') ); a_toolbar.AddButton( new ToolBarButton('export', '', function() { - submit_event($Catalog.ActivePrefix, 'OnExport'); + var $export_prefixes = new Array('l', 'p'); + if (in_array($Catalog.ActivePrefix, $export_prefixes)) { + submit_event($Catalog.ActivePrefix, 'OnExport'); + } + else { + alert(''); + } } ) ); Index: branches/unlabeled/unlabeled-1.7.2/admin/import/step2.php =================================================================== diff -u -r5521 -r5573 --- branches/unlabeled/unlabeled-1.7.2/admin/import/step2.php (.../step2.php) (revision 5521) +++ branches/unlabeled/unlabeled-1.7.2/admin/import/step2.php (.../step2.php) (revision 5573) @@ -41,7 +41,7 @@ else { $application =& kApplication::Instance(); - $click_url = $application->HREF('import_redirect', '', null, 'index4.php'); // $adminURL."/import/step3.php".$var; + $click_url = $application->HREF('import_redirect', '', null, 'index.php'); // $adminURL."/import/step3.php".$var; $onClick = "ImportRedirect('import_form', ChoiseMade('import_form','choose'), '$click_url');"; } $objCatToolBar->Add("moveright",'la_ToolTip_NextStep','#',$MouseOver,$MouseOut,$onClick,"tool_next_f3.gif"); Index: branches/unlabeled/unlabeled-1.63.2/core/units/users/users_event_handler.php =================================================================== diff -u -r5564 -r5573 --- branches/unlabeled/unlabeled-1.63.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5564) +++ branches/unlabeled/unlabeled-1.63.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 5573) @@ -85,7 +85,7 @@ function OnSessionExpire() { if( $this->Application->IsAdmin() ) { - $this->Application->Redirect('index', Array('expired' => 1), '', 'index4.php'); + $this->Application->Redirect('index', Array('expired' => 1), '', 'index.php'); } else { $http_query =& $this->Application->recallObject('HTTPQuery'); Index: branches/unlabeled/unlabeled-1.17.2/kernel/admin/include/toolbar/browse.php =================================================================== diff -u -r4331 -r5573 --- branches/unlabeled/unlabeled-1.17.2/kernel/admin/include/toolbar/browse.php (.../browse.php) (revision 4331) +++ branches/unlabeled/unlabeled-1.17.2/kernel/admin/include/toolbar/browse.php (.../browse.php) (revision 5573) @@ -344,7 +344,7 @@ { opener_action('d'); set_hidden_field(prefix_special+'_mode', 't'); - submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index4.php'); + submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index.php'); } function delete_items(prefix_special) Index: branches/unlabeled/unlabeled-1.6.2/kernel/admin/include/toolbar/editcategory_relationselect.php =================================================================== diff -u -r5561 -r5573 --- branches/unlabeled/unlabeled-1.6.2/kernel/admin/include/toolbar/editcategory_relationselect.php (.../editcategory_relationselect.php) (revision 5561) +++ branches/unlabeled/unlabeled-1.6.2/kernel/admin/include/toolbar/editcategory_relationselect.php (.../editcategory_relationselect.php) (revision 5573) @@ -289,7 +289,7 @@ { opener_action('d'); set_hidden_field(prefix_special+'_mode', 't'); - submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index4.php'); + submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index.php'); } function delete_items(prefix_special) Index: branches/unlabeled/unlabeled-1.6.2/kernel/units/relationship/relationship_event_handler.php =================================================================== diff -u -r5561 -r5573 --- branches/unlabeled/unlabeled-1.6.2/kernel/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 5561) +++ branches/unlabeled/unlabeled-1.6.2/kernel/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 5573) @@ -40,7 +40,10 @@ $configs = $this->extractModulesInfo(); foreach($configs as $prefix => $config_data) { - if($config_data['ItemType'] == $target['type']) break; + if ($config_data['ItemType'] == $target['type']) { + if ($prefix == 'm') $prefix = 'c'; + break; + } } // this forces prepareOptions of kMultiLanguge formatter to substiture title field (if multilingual) of target item @@ -64,7 +67,7 @@ array_pop($opener_stack); $return_template = $this->Application->RecallVar('return_template'); - $new_level = 'index4.php|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'='); + $new_level = 'index.php|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'='); array_push($opener_stack,$new_level); $this->Application->StoreVar('opener_stack',serialize($opener_stack)); Index: branches/unlabeled/unlabeled-1.6.2/core/units/relationship/relationship_event_handler.php =================================================================== diff -u -r5561 -r5573 --- branches/unlabeled/unlabeled-1.6.2/core/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 5561) +++ branches/unlabeled/unlabeled-1.6.2/core/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 5573) @@ -40,7 +40,10 @@ $configs = $this->extractModulesInfo(); foreach($configs as $prefix => $config_data) { - if($config_data['ItemType'] == $target['type']) break; + if ($config_data['ItemType'] == $target['type']) { + if ($prefix == 'm') $prefix = 'c'; + break; + } } // this forces prepareOptions of kMultiLanguge formatter to substiture title field (if multilingual) of target item @@ -64,7 +67,7 @@ array_pop($opener_stack); $return_template = $this->Application->RecallVar('return_template'); - $new_level = 'index4.php|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'='); + $new_level = 'index.php|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'='); array_push($opener_stack,$new_level); $this->Application->StoreVar('opener_stack',serialize($opener_stack)); Index: branches/unlabeled/unlabeled-1.4.2/kernel/units/reviews/reviews_tag_processor.php =================================================================== diff -u -r5560 -r5573 --- branches/unlabeled/unlabeled-1.4.2/kernel/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 5560) +++ branches/unlabeled/unlabeled-1.4.2/kernel/units/reviews/reviews_tag_processor.php (.../reviews_tag_processor.php) (revision 5573) @@ -22,7 +22,7 @@ $item_prefix.'_event' => 'OnEdit', $item_prefix.'_id' => $item_id, 'pass' => 'all,'.$item_prefix - ), 'index4.php'); + ), 'index.php'); } /** Index: branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -r5562 -r5573 --- branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5562) +++ branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5573) @@ -74,7 +74,13 @@ a_toolbar.AddButton( new ToolBarSeparator('sep3') ); a_toolbar.AddButton( new ToolBarButton('export', '', function() { - submit_event($Catalog.ActivePrefix, 'OnExport'); + var $export_prefixes = new Array('l', 'p'); + if (in_array($Catalog.ActivePrefix, $export_prefixes)) { + submit_event($Catalog.ActivePrefix, 'OnExport'); + } + else { + alert(''); + } } ) ); Index: branches/unlabeled/unlabeled-1.27.2/kernel/admin/include/navmenu.php =================================================================== diff -u -r5528 -r5573 --- branches/unlabeled/unlabeled-1.27.2/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 5528) +++ branches/unlabeled/unlabeled-1.27.2/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 5573) @@ -37,12 +37,12 @@ $objSections->AddSection("in-portal:configure_categories", "la_tab_Settings", "la_tab_Settings", $admin."/config/", "edit_config.php?&module=In-Portal§ion=in-portal:configure_categories", -// $admin.'/index4.php?section=in-portal:configure_categories&module=In-Portal','kernel4:config/config_universal', +// $admin.'/index.php?section=in-portal:configure_categories&module=In-Portal','kernel4:config/config_universal', $admin."/icons/icon46_cat_settings.gif", $admin."/icons/icon24_cat_settings.gif", NULL, "in-portal:site","in-portal:advanced_view", "in-portal:configuration_search",0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_cat_settings.gif","la_updating_config"); $objSections->AddSection("in-portal:configuration_search", "la_tab_ConfigSearch", "la_tab_ConfigSearch", - $admin.'/index4.php?module=In-Portal§ion=in-portal:configuration_search&module_key=category','kernel4:config/config_search', + $admin.'/index.php?module=In-Portal§ion=in-portal:configuration_search&module_key=category','kernel4:config/config_search', $admin."/icons/icon46_settings_search.gif",$admin."/icons/icon24_settings_search.gif", NULL, "in-portal:site", "in-portal:configure_categories","in-portal:configuration_email",0,"",1, NULL,NULL,NULL,$admin."/icons/icon46_list_settings_search.gif","la_updating_config"); @@ -53,7 +53,7 @@ NULL,"in-portal:site", "in-portal:configuration_search", "in-portal:configuration_custom",0,"",1, NULL,NULL,NULL,$admin."/icons/icon46_list_settings_email.gif","la_updating_config"); -$objSections->AddSection("in-portal:configuration_custom","la_tab_ConfigCustom","la_tab_ConfigCustom",$admin.'/index4.php', +$objSections->AddSection("in-portal:configuration_custom","la_tab_ConfigCustom","la_tab_ConfigCustom",$admin.'/index.php', 'kernel4:custom_fields/custom_fields_list:cf----1-', $admin."/icons/icon46_settings_custom.gif",$admin."/icons/icon24_settings_custom.gif", NULL, "in-portal:site", "in-portal:configuration_email", NULL,0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_settings_custom.gif","la_updating_config"); @@ -140,13 +140,13 @@ $objSections->AddSection("in-portal:configure_styles", "la_tab_Stylesheets", "la_tab_Stylesheets", - $admin.'/index4.php','kernel4:stylesheets/stylesheets_list.tpl', + $admin.'/index.php','kernel4:stylesheets/stylesheets_list.tpl', $module_images.'/icons/icon46_style.gif', $module_images.'/icons/icon24_style.gif', NULL, "in-portal:system", "in-portal:configure_themes", 'in-portal:configure_lang',0,"",1, NULL,NULL,NULL,$module_images.'/icons/icon46_list_style.gif'); $objSections->AddSection("in-portal:configure_lang", "la_tab_Regional", "la_tab_Regional", - $admin.'/index4.php','kernel4:regional/languages_list.tpl', + $admin.'/index.php','kernel4:regional/languages_list.tpl', $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", NULL, "in-portal:system", "in-portal:configure_lang", NULL,0,"",1, NULL,NULL,NULL,$admin."/icons/icon46_list_conf_regional.gif"); @@ -185,7 +185,7 @@ NULL,"in-link", "in-portal:configure_users", "in-portal:user_custom",0,"",1, NULL,NULL,NULL,$admin."/icons/icon46_list_settings_email.gif","la_updating_config"); -$objSections->AddSection("in-portal:user_custom","la_tab_ConfigCustom","la_tab_ConfigCustom",$admin.'/index4.php', +$objSections->AddSection("in-portal:user_custom","la_tab_ConfigCustom","la_tab_ConfigCustom",$admin.'/index.php', 'kernel4:custom_fields/custom_fields_list:cf----6-', $admin."/icons/icon46_settings_custom.gif",$admin."/icons/icon24_settings_custom.gif", NULL, "in-portal:users", "in-portal:user_email", "in-portal:user_banlist",0,"",1, @@ -385,7 +385,7 @@ $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif", NULL, null, null, null, 1, '', 1, 0, 1); -$objSections->AddSection("in-portal:visits","la_tab_Visits","la_title_Visits",$admin."/index4.php","kernel4:visits/visits_list", +$objSections->AddSection("in-portal:visits","la_tab_Visits","la_title_Visits",$admin."/index.php","kernel4:visits/visits_list", $module_images."/icons/icon46_visits.gif",$module_images."/icons/icon24_visits.gif", NULL,"in-portal:reports",NULL,NULL,0,"",1,NULL,NULL,NULL,$module_images."/icons/icon46_list_visits.gif");