Index: trunk/core/units/users/users_config.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/core/units/users/users_config.php (.../users_config.php) (revision 4607) +++ trunk/core/units/users/users_config.php (.../users_config.php) (revision 4620) @@ -86,7 +86,7 @@ 'parent' => 'in-portal:root', 'icon' => 'community', 'label' => 'la_tab_Community', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, @@ -106,7 +106,7 @@ 'parent' => 'in-portal:users', 'icon' => 'users_settings', 'label' => 'la_tab_ConfigSettings', - 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 3, 'type' => stTREE, @@ -116,7 +116,7 @@ 'parent' => 'in-portal:users', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 4, 'type' => stTREE, @@ -136,7 +136,7 @@ 'parent' => 'in-portal:users', 'icon' => 'banlist', 'label' => 'la_tab_BanList', - 'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 6, 'type' => stTREE, Index: trunk/core/units/categories/categories_config.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4607) +++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4620) @@ -56,7 +56,7 @@ 'parent' => 'in-portal:root', 'icon' => 'struct', 'label' => 'la_tab_Site_Structure', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, @@ -67,7 +67,7 @@ 'icon' => 'catalog', 'label' => 'la_tab_Browse', 'url' => Array('index_file' => 'browse.php', 'pass' => 'm'), - 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), + 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, @@ -97,7 +97,7 @@ 'parent' => 'in-portal:site', 'icon' => 'cat_settings', 'label' => 'la_tab_Settings', - 'url' => Array('index_file' => 'config/edit_config.php', 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 4, 'type' => stTREE, @@ -107,7 +107,7 @@ 'parent' => 'in-portal:site', 'icon' => 'settings_search', 'label' => 'la_tab_ConfigSearch', - 'url' => Array('t' => 'config/config_search', 'index_file' => 'index4.php', 'module_key' => 'category', 'pass' => 'm'), + 'url' => Array('t' => 'config/config_search', 'index_file' => 'index4.php', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 5, 'type' => stTREE, @@ -117,7 +117,7 @@ 'parent' => 'in-portal:site', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/units/users/users_config.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4607) +++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4620) @@ -86,7 +86,7 @@ 'parent' => 'in-portal:root', 'icon' => 'community', 'label' => 'la_tab_Community', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, @@ -106,7 +106,7 @@ 'parent' => 'in-portal:users', 'icon' => 'users_settings', 'label' => 'la_tab_ConfigSettings', - 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 3, 'type' => stTREE, @@ -116,7 +116,7 @@ 'parent' => 'in-portal:users', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 4, 'type' => stTREE, @@ -136,7 +136,7 @@ 'parent' => 'in-portal:users', 'icon' => 'banlist', 'label' => 'la_tab_BanList', - 'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 6, 'type' => stTREE, Index: trunk/core/units/admin/admin_config.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4607) +++ trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4620) @@ -23,7 +23,7 @@ 'parent' => null, 'icon' => 'site', 'label' => $this->Application->ConfigValue('Site_Name'), - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm', 'no_amp' => 1), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1), 'permissions' => Array('view', 'advanced:admin', 'advanced:login'), 'priority' => 0, 'type' => stTREE, @@ -34,7 +34,7 @@ 'parent' => 'in-portal:root', 'icon' => 'summary_logs', 'label' => 'la_tab_Reports', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 4, 'type' => stTREE, @@ -95,7 +95,7 @@ 'parent' => 'in-portal:root', 'icon' => 'conf', 'label' => 'la_tab_Sys_Config', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 5, 'type' => stTREE, @@ -105,7 +105,7 @@ 'parent' => 'in-portal:system', 'icon' => 'conf_general', 'label' => 'la_tab_General', - 'url' => Array('index_file' => 'config/edit_config.php', 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, @@ -116,7 +116,7 @@ 'parent' => 'in-portal:system', 'icon' => 'modules', 'label' => 'la_tab_ModulesManagement', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1.1, 'type' => stTREE, @@ -157,7 +157,7 @@ 'parent' => 'in-portal:root', 'icon' => 'tools', 'label' => 'la_tab_Tools', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/units/admin/admin_config.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4607) +++ trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4620) @@ -23,7 +23,7 @@ 'parent' => null, 'icon' => 'site', 'label' => $this->Application->ConfigValue('Site_Name'), - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm', 'no_amp' => 1), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1), 'permissions' => Array('view', 'advanced:admin', 'advanced:login'), 'priority' => 0, 'type' => stTREE, @@ -34,7 +34,7 @@ 'parent' => 'in-portal:root', 'icon' => 'summary_logs', 'label' => 'la_tab_Reports', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 4, 'type' => stTREE, @@ -95,7 +95,7 @@ 'parent' => 'in-portal:root', 'icon' => 'conf', 'label' => 'la_tab_Sys_Config', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 5, 'type' => stTREE, @@ -105,7 +105,7 @@ 'parent' => 'in-portal:system', 'icon' => 'conf_general', 'label' => 'la_tab_General', - 'url' => Array('index_file' => 'config/edit_config.php', 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, @@ -116,7 +116,7 @@ 'parent' => 'in-portal:system', 'icon' => 'modules', 'label' => 'la_tab_ModulesManagement', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1.1, 'type' => stTREE, @@ -157,7 +157,7 @@ 'parent' => 'in-portal:root', 'icon' => 'tools', 'label' => 'la_tab_Tools', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/units/categories/categories_config.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4607) +++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4620) @@ -56,7 +56,7 @@ 'parent' => 'in-portal:root', 'icon' => 'struct', 'label' => 'la_tab_Site_Structure', - 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, @@ -67,7 +67,7 @@ 'icon' => 'catalog', 'label' => 'la_tab_Browse', 'url' => Array('index_file' => 'browse.php', 'pass' => 'm'), - 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), + 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, @@ -97,7 +97,7 @@ 'parent' => 'in-portal:site', 'icon' => 'cat_settings', 'label' => 'la_tab_Settings', - 'url' => Array('index_file' => 'config/edit_config.php', 'pass' => 'm'), + 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 4, 'type' => stTREE, @@ -107,7 +107,7 @@ 'parent' => 'in-portal:site', 'icon' => 'settings_search', 'label' => 'la_tab_ConfigSearch', - 'url' => Array('t' => 'config/config_search', 'index_file' => 'index4.php', 'module_key' => 'category', 'pass' => 'm'), + 'url' => Array('t' => 'config/config_search', 'index_file' => 'index4.php', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit'), 'priority' => 5, 'type' => stTREE, @@ -117,7 +117,7 @@ 'parent' => 'in-portal:site', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/units/general/helpers/sections_helper.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/kernel/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4607) +++ trunk/kernel/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4620) @@ -35,13 +35,17 @@ if ($section_params['type'] != stTREE) continue; $section_params['SectionPrefix'] = $prefix; $section_params['url']['m_opener'] = 'r'; - $section_params['url']['section'] = $section_name; - - if (!isset($section_params['url']['module'])) { - $module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name'); - $section_params['url']['module'] = $module_name; + + $pass_section = getArrayValue($section_params, 'url', 'pass_section'); + + if ($pass_section) { + unset($section_params['url']['pass_section']); + $section_params['url']['section'] = $section_name; + if (!isset($section_params['url']['module'])) { + $module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name'); + $section_params['url']['module'] = $module_name; + } } - if (!isset($section_params['url']['t'])) { $section_params['url']['t'] = 'index'; } Index: trunk/core/units/general/helpers/sections_helper.php =================================================================== diff -u -N -r4607 -r4620 --- trunk/core/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4607) +++ trunk/core/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4620) @@ -35,13 +35,17 @@ if ($section_params['type'] != stTREE) continue; $section_params['SectionPrefix'] = $prefix; $section_params['url']['m_opener'] = 'r'; - $section_params['url']['section'] = $section_name; - - if (!isset($section_params['url']['module'])) { - $module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name'); - $section_params['url']['module'] = $module_name; + + $pass_section = getArrayValue($section_params, 'url', 'pass_section'); + + if ($pass_section) { + unset($section_params['url']['pass_section']); + $section_params['url']['section'] = $section_name; + if (!isset($section_params['url']['module'])) { + $module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name'); + $section_params['url']['module'] = $module_name; + } } - if (!isset($section_params['url']['t'])) { $section_params['url']['t'] = 'index'; }