diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-29 22:45:13 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-29 22:45:13 +0000 |
| commit | b7ca8131fa2c9f93f94cc8176e98191d798ae0c5 (patch) | |
| tree | 51ff54b97d02415ada4b684e2a3a0eb0368a84d4 /phpBB/admin | |
| parent | 45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df (diff) | |
| download | forums-b7ca8131fa2c9f93f94cc8176e98191d798ae0c5.tar forums-b7ca8131fa2c9f93f94cc8176e98191d798ae0c5.tar.gz forums-b7ca8131fa2c9f93f94cc8176e98191d798ae0c5.tar.bz2 forums-b7ca8131fa2c9f93f94cc8176e98191d798ae0c5.tar.xz forums-b7ca8131fa2c9f93f94cc8176e98191d798ae0c5.zip | |
Fix bug #487265
git-svn-id: file:///svn/phpbb/trunk@1487 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
| -rw-r--r-- | phpBB/admin/admin_forums.php | 94 |
1 files changed, 46 insertions, 48 deletions
diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php index 3c7a4c9087..faae94b16f 100644 --- a/phpBB/admin/admin_forums.php +++ b/phpBB/admin/admin_forums.php @@ -715,7 +715,7 @@ if( !empty($mode) ) $from_id = intval($HTTP_POST_VARS['from_id']); $to_id = intval($HTTP_POST_VARS['to_id']); - if (isset($to_id)) + if (!empty($to_id)) { $sql = "SELECT * FROM " . CATEGORIES_TABLE . " @@ -741,7 +741,6 @@ if( !empty($mode) ) $sql = "DELETE FROM " . CATEGORIES_TABLE ." WHERE cat_id = $from_id"; - echo $sql; if( !$result = $db->sql_query($sql) ) { message_die(GENERAL_ERROR, "Couldn't delete category", "", __LINE__, __FILE__, $sql); @@ -855,62 +854,61 @@ if( $total_categories = $db->sql_numrows($q_categories) ) message_die(GENERAL_ERROR, "Could not query forums information", "", __LINE__, __FILE__, $sql); } - $forum_rows = $db->sql_fetchrowset($q_forums); - if( $total_forums = $db->sql_numrows($q_forums) ) { - // - // Okay, let's build the index - // - $gen_cat = array(); + $forum_rows = $db->sql_fetchrowset($q_forums); + } - for($i = 0; $i < $total_categories; $i++) - { - $cat_id = $category_rows[$i]['cat_id']; + // + // Okay, let's build the index + // + $gen_cat = array(); - $template->assign_block_vars("catrow", array( - 'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", - 'S_ADD_FORUM_NAME' => "forumname[$cat_id]", + for($i = 0; $i < $total_categories; $i++) + { + $cat_id = $category_rows[$i]['cat_id']; - 'CAT_ID' => $cat_id, - 'CAT_DESC' => $category_rows[$i]['cat_title'], + $template->assign_block_vars("catrow", array( + 'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", + 'S_ADD_FORUM_NAME' => "forumname[$cat_id]", - 'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&cat_id=$cat_id"), - 'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"), - 'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"), - 'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"), - 'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id")) - ); + 'CAT_ID' => $cat_id, + 'CAT_DESC' => $category_rows[$i]['cat_title'], - for($j = 0; $j < $total_forums; $j++) - { - $forum_id = $forum_rows[$j]['forum_id']; - - if ($forum_rows[$j]['cat_id'] == $cat_id) - { + 'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&cat_id=$cat_id"), + 'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"), + 'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"), + 'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"), + 'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id")) + ); - $template->assign_block_vars("catrow.forumrow", array( - 'FORUM_NAME' => $forum_rows[$j]['forum_name'], - 'FORUM_DESC' => $forum_rows[$j]['forum_desc'], - 'ROW_COLOR' => $row_color, - 'NUM_TOPICS' => $forum_rows[$j]['forum_topics'], - 'NUM_POSTS' => $forum_rows[$j]['forum_posts'], - - 'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']), - 'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&forum_id=$forum_id"), - 'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&forum_id=$forum_id"), - 'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&move=-15&forum_id=$forum_id"), - 'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&move=15&forum_id=$forum_id"), - 'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&forum_id=$forum_id")) - ); - - }// if ... forumid == catid - - } // for ... forums + for($j = 0; $j < $total_forums; $j++) + { + $forum_id = $forum_rows[$j]['forum_id']; + + if ($forum_rows[$j]['cat_id'] == $cat_id) + { - } // for ... categories + $template->assign_block_vars("catrow.forumrow", array( + 'FORUM_NAME' => $forum_rows[$j]['forum_name'], + 'FORUM_DESC' => $forum_rows[$j]['forum_desc'], + 'ROW_COLOR' => $row_color, + 'NUM_TOPICS' => $forum_rows[$j]['forum_topics'], + 'NUM_POSTS' => $forum_rows[$j]['forum_posts'], + + 'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']), + 'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&forum_id=$forum_id"), + 'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&forum_id=$forum_id"), + 'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&move=-15&forum_id=$forum_id"), + 'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&move=15&forum_id=$forum_id"), + 'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&forum_id=$forum_id")) + ); + + }// if ... forumid == catid + + } // for ... forums - }// if ... total_forums + } // for ... categories }// if ... total_categories |