Index: /branches/Ver2.1/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php =================================================================== --- /branches/Ver2.1/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 400) +++ /branches/Ver2.1/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 401) @@ -585,7 +585,7 @@ if (xpress_is_wp_version('>=','2.1')){ - $output = '' . $link_title . ''; - } else { - $output = '' . $link_title . ''; + $output = '' . $link_title . ''; + } else { + $output = '' . $link_title . ''; } if ($echo) Index: /branches/Ver2.1/xpressme_integration_kit/xoops_version.php =================================================================== --- /branches/Ver2.1/xpressme_integration_kit/xoops_version.php (revision 400) +++ /branches/Ver2.1/xpressme_integration_kit/xoops_version.php (revision 401) @@ -83,28 +83,35 @@ $modversion['hasMain'] = 1; - -if(is_object($GLOBALS["xoopsUser"])){ - global $current_user; - if (@$current_user->user_level > 0) { - $modversion['sub'][1]['name'] = constant( '_MI_XP2_MENU_POST_NEW'); - if (wp_version_compare($wp_version, '>=','2.1')) - $modversion['sub'][1]['url'] = "wp-admin/post-new.php"; - else - $modversion['sub'][1]['url'] = "wp-admin/post.php"; - $modversion['sub'][2]['name'] = constant( '_MI_XP2_MENU_EDIT'); - $modversion['sub'][2]['url'] = "wp-admin/edit.php"; - $modversion['sub'][3]['name'] = constant( '_MI_XP2_MENU_ADMIN'); - $modversion['sub'][3]['url'] = "wp-admin/"; +if (function_exists('get_bloginfo')){ + //$add_url for wpmu multiblog + $pattern = '/.*\/' . $mydirname . '/'; + $add_url = preg_replace($pattern,'',get_bloginfo('url')); + if (!empty($add_url)){ + $pattern = '/^\//'; + $add_url = preg_replace($pattern,'',$add_url) . '/'; } - if (@$current_user->user_level > 9) { - $modversion['sub'][4]['name'] = constant( '_MI_XP2_MENU_XPRESS'); -// $modversion['sub'][4]['url'] = "wp-admin/options-general.php?page=xpressme_config"; - $modversion['sub'][4]['url'] = "wp-admin/admin.php?page=xpressme\\xpressme.php"; + + if(is_object($GLOBALS["xoopsUser"])){ + global $current_user , $xoops_config; + if (@$current_user->user_level > 0) { + $modversion['sub'][1]['name'] = constant( '_MI_XP2_MENU_POST_NEW'); + if (wp_version_compare($wp_version, '>=','2.1')) + $modversion['sub'][1]['url'] = $add_url . "wp-admin/post-new.php"; + else + $modversion['sub'][1]['url'] = $add_url . "wp-admin/post.php"; + $modversion['sub'][2]['name'] = constant( '_MI_XP2_MENU_EDIT'); + $modversion['sub'][2]['url'] = $add_url . "wp-admin/edit.php"; + $modversion['sub'][3]['name'] = constant( '_MI_XP2_MENU_ADMIN'); + $modversion['sub'][3]['url'] = $add_url . "wp-admin/"; + } + if (@$current_user->user_level > 9) { + $modversion['sub'][4]['name'] = constant( '_MI_XP2_MENU_XPRESS'); + $modversion['sub'][4]['url'] = $add_url . "wp-admin/admin.php?page=xpressme\\xpressme.php"; + } + if($GLOBALS["xoopsUserIsAdmin"]){ + $modversion['sub'][5]['name'] = constant( '_MI_XP2_MOD_ADMIN'); + $modversion['sub'][5]['url'] = "admin/index.php"; + } } - if($GLOBALS["xoopsUserIsAdmin"]){ - $modversion['sub'][5]['name'] = constant( '_MI_XP2_MOD_ADMIN'); - $modversion['sub'][5]['url'] = "admin/index.php"; - } - } Index: /trunk/xpressme_integration_kit/xoops_version.php =================================================================== --- /trunk/xpressme_integration_kit/xoops_version.php (revision 400) +++ /trunk/xpressme_integration_kit/xoops_version.php (revision 401) @@ -83,28 +83,35 @@ $modversion['hasMain'] = 1; - -if(is_object($GLOBALS["xoopsUser"])){ - global $current_user; - if (@$current_user->user_level > 0) { - $modversion['sub'][1]['name'] = constant( '_MI_XP2_MENU_POST_NEW'); - if (wp_version_compare($wp_version, '>=','2.1')) - $modversion['sub'][1]['url'] = "wp-admin/post-new.php"; - else - $modversion['sub'][1]['url'] = "wp-admin/post.php"; - $modversion['sub'][2]['name'] = constant( '_MI_XP2_MENU_EDIT'); - $modversion['sub'][2]['url'] = "wp-admin/edit.php"; - $modversion['sub'][3]['name'] = constant( '_MI_XP2_MENU_ADMIN'); - $modversion['sub'][3]['url'] = "wp-admin/"; +if (function_exists('get_bloginfo')){ + //$add_url for wpmu multiblog + $pattern = '/.*\/' . $mydirname . '/'; + $add_url = preg_replace($pattern,'',get_bloginfo('url')); + if (!empty($add_url)){ + $pattern = '/^\//'; + $add_url = preg_replace($pattern,'',$add_url) . '/'; } - if (@$current_user->user_level > 9) { - $modversion['sub'][4]['name'] = constant( '_MI_XP2_MENU_XPRESS'); -// $modversion['sub'][4]['url'] = "wp-admin/options-general.php?page=xpressme_config"; - $modversion['sub'][4]['url'] = "wp-admin/admin.php?page=xpressme\\xpressme.php"; + + if(is_object($GLOBALS["xoopsUser"])){ + global $current_user , $xoops_config; + if (@$current_user->user_level > 0) { + $modversion['sub'][1]['name'] = constant( '_MI_XP2_MENU_POST_NEW'); + if (wp_version_compare($wp_version, '>=','2.1')) + $modversion['sub'][1]['url'] = $add_url . "wp-admin/post-new.php"; + else + $modversion['sub'][1]['url'] = $add_url . "wp-admin/post.php"; + $modversion['sub'][2]['name'] = constant( '_MI_XP2_MENU_EDIT'); + $modversion['sub'][2]['url'] = $add_url . "wp-admin/edit.php"; + $modversion['sub'][3]['name'] = constant( '_MI_XP2_MENU_ADMIN'); + $modversion['sub'][3]['url'] = $add_url . "wp-admin/"; + } + if (@$current_user->user_level > 9) { + $modversion['sub'][4]['name'] = constant( '_MI_XP2_MENU_XPRESS'); + $modversion['sub'][4]['url'] = $add_url . "wp-admin/admin.php?page=xpressme\\xpressme.php"; + } + if($GLOBALS["xoopsUserIsAdmin"]){ + $modversion['sub'][5]['name'] = constant( '_MI_XP2_MOD_ADMIN'); + $modversion['sub'][5]['url'] = "admin/index.php"; + } } - if($GLOBALS["xoopsUserIsAdmin"]){ - $modversion['sub'][5]['name'] = constant( '_MI_XP2_MOD_ADMIN'); - $modversion['sub'][5]['url'] = "admin/index.php"; - } - }