Changeset 1605

Show
Ignore:
Timestamp:
04/20/08 02:49:44 (3 months ago)
Author:
Neal
Message:

Removed the ability to send a POST request that sets a redirect URL for a forum with topics in it.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/punbb-1.3-dev/upload/admin/forums.php

    r1587 r1605  
    238238                message($lang_common['Bad request']); 
    239239 
     240        // Fetch forum info 
     241        $query = array( 
     242                'SELECT'        => 'f.id, f.forum_name, f.forum_desc, f.redirect_url, f.num_topics, f.sort_by, f.cat_id', 
     243                'FROM'          => 'forums AS f', 
     244                'WHERE'         => 'id='.$forum_id 
     245        ); 
     246 
     247        ($hook = get_hook('afo_qr_get_forum_details')) ? eval($hook) : null; 
     248        $result = $db->query_build($query) or error(__FILE__, __LINE__); 
     249        if (!$db->num_rows($result)) 
     250                message($lang_common['Bad request']); 
     251 
     252        $cur_forum = $db->fetch_assoc($result); 
     253 
    240254        // Update group permissions for $forum_id 
    241255        if (isset($_POST['save'])) 
    …… 
    248262                $cat_id = intval($_POST['cat_id']); 
    249263                $sort_by = intval($_POST['sort_by']); 
    250                 $redirect_url = isset($_POST['redirect_url']) ? trim($_POST['redirect_url']) : null; 
     264                $redirect_url = isset($_POST['redirect_url']) && $cur_forum['num_topics'] == 0 ? trim($_POST['redirect_url']) : null; 
    251265 
    252266                if ($forum_name == '') 
    …… 
    382396                redirect(pun_link($pun_url['admin_forums']).'?edit_forum='.$forum_id, $lang_admin['Permissions reverted'].' '.$lang_admin['Redirect']); 
    383397        } 
    384  
    385         // Fetch forum info 
    386         $query = array( 
    387                 'SELECT'        => 'f.id, f.forum_name, f.forum_desc, f.redirect_url, f.num_topics, f.sort_by, f.cat_id', 
    388                 'FROM'          => 'forums AS f', 
    389                 'WHERE'         => 'id='.$forum_id 
    390         ); 
    391  
    392         ($hook = get_hook('afo_qr_get_forum_details')) ? eval($hook) : null; 
    393         $result = $db->query_build($query) or error(__FILE__, __LINE__); 
    394         if (!$db->num_rows($result)) 
    395                 message($lang_common['Bad request']); 
    396  
    397         $cur_forum = $db->fetch_assoc($result); 
    398398 
    399399        $pun_page['form_info'] = array();