Testers #216: SID in main menu

This commit is contained in:
Ice
2008-02-05 18:50:56 +00:00
parent 52beb03adc
commit 5a0882fab8
4 changed files with 25 additions and 20 deletions

View File

@@ -122,21 +122,19 @@ if ( $load_center === TRUE )
// show login box and user menu // show login box and user menu
// only registered user see user menu // only registered user see user menu
if ($user->data['is_registered']) if ($user->data['is_registered'])
{ {
include($phpbb_root_path . 'portal/block/user_menu.'.$phpEx); include($phpbb_root_path . 'portal/block/user_menu.'.$phpEx);
} }
else else
{ {
include($phpbb_root_path . 'portal/block/login_box.'.$phpEx); include($phpbb_root_path . 'portal/block/login_box.'.$phpEx);
} }
if ($portal_config['portal_main_menu']) if ($portal_config['portal_main_menu'])
{ {
$template->assign_vars(array( include($phpbb_root_path . 'portal/block/main_menu.'.$phpEx);
'S_DISPLAY_MAINMENU' => true,
));
} }
if ($portal_config['portal_user_menu']) if ($portal_config['portal_user_menu'])

View File

@@ -19,5 +19,12 @@ if (!defined('IN_PORTAL'))
{ {
exit; exit;
} }
//we main delete this aswell? Oo
$template->assign_vars(array(
'S_DISPLAY_MAINMENU' => true,
'U_M_BBCODE' => append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode'),
'U_M_TERMS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_M_PRV' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
));
?> ?>

View File

@@ -27,9 +27,9 @@
<strong>{L_M_HELP}</strong> <strong>{L_M_HELP}</strong>
<ul> <ul>
<li><a href="{U_FAQ}">{L_FAQ}</a></li> <li><a href="{U_FAQ}">{L_FAQ}</a></li>
<li><a href="faq.php?mode=bbcode">{L_M_BBCODE}</a></li> <li><a href="{U_M_BBCODE}">{L_M_BBCODE}</a></li>
<li><a href="ucp.php?mode=terms">{L_M_TERMS}</a></li> <li><a href="{U_M_TERMS}">{L_M_TERMS}</a></li>
<li><a href="ucp.php?mode=privacy">{L_M_PRV}</a></li> <li><a href="{U_M_PRV}">{L_M_PRV}</a></li>
</ul> </ul>
</div> </div>

View File

@@ -59,19 +59,19 @@
<a href="{U_FAQ}">{L_FAQ}</a> <a href="{U_FAQ}">{L_FAQ}</a>
</td> </td>
</tr> </tr>
<tr class="row1"> <tr class="row1">
<td> <td>
<a href="faq.php?mode=bbcode">{L_M_BBCODE}</a> <a href="{U_M_BBCODE}">{L_M_BBCODE}</a>
</td> </td>
</tr> </tr>
<tr class="row1"> <tr class="row1">
<td> <td>
<a href="ucp.php?mode=terms">{L_M_TERMS}</a> <a href="{U_M_TERMS}">{L_M_TERMS}</a>
</td> </td>
</tr> </tr>
<tr class="row1"> <tr class="row1">
<td> <td>
<a href="ucp.php?mode=privacy">{L_M_PRV}</a> <a href="{U_M_PRV}">{L_M_PRV}</a>
</td> </td>
</tr> </tr>