|
From: Jon O. <jon...@us...> - 2008-03-09 23:39:17
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18258/mx_navmenu Modified Files: mx_menu_nav.php mx_site_nav.php Log Message: Virtual pages See notes is Dev area Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_menu_nav.php 11 Feb 2008 22:50:14 -0000 1.31 --- mx_menu_nav.php 9 Mar 2008 23:39:14 -0000 1.32 *************** *** 61,64 **** --- 61,65 ---- // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation'))) *************** *** 322,325 **** --- 323,331 ---- } + // + // Virtual + // + $menu_link = !empty($virtual_id) ? $menu_link . '&virtual=' . $virtual_id : $menu_link; + $link_target = ( $menuData['link_target'] == 0 || $menuData['link_target'] == 2 ) ? '' : '_blank'; $row_color_over = $theme['tr_color2']; Index: mx_site_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_site_nav.php 6 Feb 2008 23:44:03 -0000 1.6 --- mx_site_nav.php 9 Mar 2008 23:39:14 -0000 1.7 *************** *** 61,64 **** --- 61,65 ---- // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation'))) *************** *** 103,107 **** 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! //phpBB 'U_SEARCH' => mx_append_sid(PHPBB_URL .'search.'.$phpEx), --- 104,108 ---- 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! //phpBB 'U_SEARCH' => mx_append_sid(PHPBB_URL .'search.'.$phpEx), *************** *** 109,113 **** 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), ! // // css --- 110,114 ---- 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), ! // // css |