Changeset 1592

Show
Ignore:
Timestamp:
04/11/08 21:20:48 (5 months ago)
Author:
Neal
Message:

Removed userlist/search links from header if the current group can not view the board.
Fixed forum names being improperly leaked in the quickjump when g_read_board is set to 0.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/punbb-1.3-dev/upload/footer.php

    r1533 r1592  
    154154 
    155155// Display the "Jump to" drop list 
    156 if ($pun_config['o_quickjump'] == '1') 
     156if ($pun_user['g_read_board'] == '1' && $pun_config['o_quickjump'] == '1') 
    157157{ 
    158158        // Load cached quickjump 

  • branches/punbb-1.3-dev/upload/include/functions.php

    r1583 r1592  
    478478        $links[] = '<li id="navindex"'.((PUN_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['index']).'"><span>'.$lang_common['Index'].'</span></a></li>'; 
    479479 
    480         if ($pun_user['g_view_users'] == '1') 
     480        if ($pun_user['g_read_board'] == '1' && $pun_user['g_view_users'] == '1') 
    481481                $links[] = '<li id="navuserlist"'.((PUN_PAGE == 'userlist') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['users']).'"><span>'.$lang_common['User list'].'</span></a></li>'; 
    482482 
    …… 
    486486        if ($pun_user['is_guest']) 
    487487        { 
    488                 if ($pun_user['g_search'] == '1') 
     488                if ($pun_user['g_read_board'] == '1' && $pun_user['g_search'] == '1') 
    489489                        $links[] = '<li id="navsearch"'.((PUN_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['search']).'"><span>'.$lang_common['Search'].'</span></a></li>'; 
    490490 
    …… 
    496496                if (!$pun_user['is_admmod']) 
    497497                { 
    498                         if ($pun_user['g_search'] == '1') 
     498                        if ($pun_user['g_read_board'] == '1' && $pun_user['g_search'] == '1') 
    499499                                $links[] = '<li id="navsearch"'.((PUN_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['search']).'"><span>'.$lang_common['Search'].'</span></a></li>'; 
    500500