|
From: Bart v. B. <ba...@us...> - 2001-11-27 20:58:03
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv2984
Modified Files:
admin_forums.php
Log Message:
Fixed bug #486170
Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** admin_forums.php 2001/11/26 20:46:54 1.28
--- admin_forums.php 2001/11/27 20:57:58 1.29
***************
*** 310,314 ****
$template->assign_vars(array(
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
'S_SUBMIT_VALUE' => $buttonvalue,
'S_CAT_LIST' => $catlist,
--- 310,314 ----
$template->assign_vars(array(
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
! 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_SUBMIT_VALUE' => $buttonvalue,
'S_CAT_LIST' => $catlist,
***************
*** 316,327 ****
'S_PRUNE_ENABLED' => $prune_enabled,
! "L_FORUM_TITLE" => $l_title,
! "L_FORUM_EXPLAIN" => $lang['Forum_edit_delete_explain'],
! "L_FORUM_SETTINGS" => $lang['Forum_settings'],
! "L_FORUM_NAME" => $lang['Forum_name'],
! "L_CATEGORY" => $lang['Category'],
! "L_FORUM_DESCRIPTION" => $lang['Forum_desc'],
! "L_FORUM_STATUS" => $lang['Forum_status'],
! "L_AUTO_PRUNE" => $lang['Forum_pruning'],
'L_ENABLED' => $lang['Enabled'],
'L_PRUNE_DAYS' => $lang['prune_days'],
--- 316,327 ----
'S_PRUNE_ENABLED' => $prune_enabled,
! 'L_FORUM_TITLE' => $l_title,
! 'L_FORUM_EXPLAIN' => $lang['Forum_edit_delete_explain'],
! 'L_FORUM_SETTINGS' => $lang['Forum_settings'],
! 'L_FORUM_NAME' => $lang['Forum_name'],
! 'L_CATEGORY' => $lang['Category'],
! 'L_FORUM_DESCRIPTION' => $lang['Forum_desc'],
! 'L_FORUM_STATUS' => $lang['Forum_status'],
! 'L_AUTO_PRUNE' => $lang['Forum_pruning'],
'L_ENABLED' => $lang['Enabled'],
'L_PRUNE_DAYS' => $lang['prune_days'],
***************
*** 522,534 ****
$template->assign_vars(array(
! "CAT_TITLE" => $cat_title,
! "L_EDIT_CATEGORY" => $lang['Edit_Category'],
! "L_EDIT_CATEGORY_EXPLAIN" => $lang['Edit_Category_explain'],
! "L_CATEGORY" => $lang['Category'],
! "S_HIDDEN_FIELDS" => $s_hidden_fields,
'S_SUBMIT_VALUE' => $buttonvalue,
! "S_FORUM_ACTION" => append_sid("admin_forums.$phpEx"))
);
--- 522,534 ----
$template->assign_vars(array(
! 'CAT_TITLE' => $cat_title,
! 'L_EDIT_CATEGORY' => $lang['Edit_Category'],
! 'L_EDIT_CATEGORY_EXPLAIN' => $lang['Edit_Category_explain'],
! 'L_CATEGORY' => $lang['Category'],
! 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_SUBMIT_VALUE' => $buttonvalue,
! 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"))
);
***************
*** 575,584 ****
$template->assign_vars(array(
! "NAME" => $name,
! "L_FORUM_DELETE" => $lang['Forum_delete'],
! "L_FORUM_DELETE_EXPLAIN" => $lang['Forum_delete_explain'],
! "L_MOVE_CONTENTS" => $lang['Move_contents'],
! "L_FORUM_NAME" => $lang['Forum_name'],
"S_HIDDEN_FIELDS" => $s_hidden_fields,
--- 575,584 ----
$template->assign_vars(array(
! 'NAME' => $name,
! 'L_FORUM_DELETE' => $lang['Forum_delete'],
! 'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'],
! 'L_MOVE_CONTENTS' => $lang['Move_contents'],
! 'L_FORUM_NAME' => $lang['Forum_name'],
"S_HIDDEN_FIELDS" => $s_hidden_fields,
***************
*** 693,702 ****
$template->assign_vars(array(
! "NAME" => $name,
! "L_FORUM_DELETE" => $lang['Forum_delete'],
! "L_FORUM_DELETE_EXPLAIN" => $lang['Forum_delete_explain'],
! "L_MOVE_CONTENTS" => $lang['Move_contents'],
! "L_FORUM_NAME" => $lang['Forum_name'],
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
--- 693,702 ----
$template->assign_vars(array(
! 'NAME' => $name,
! 'L_FORUM_DELETE' => $lang['Forum_delete'],
! 'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'],
! 'L_MOVE_CONTENTS' => $lang['Move_contents'],
! 'L_FORUM_NAME' => $lang['Forum_name'],
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
***************
*** 821,833 ****
$template->assign_vars(array(
! "L_FORUM_TITLE" => $lang['Forum_admin'],
! "L_FORUM_EXPLAIN" => $lang['Forum_admin_explain'],
! "L_CREATE_FORUM" => $lang['Create_forum'],
! "L_CREATE_CATEGORY" => $lang['Create_category'],
! "L_EDIT" => $lang['Edit'],
! "L_DELETE" => $lang['Delete'],
! "L_MOVE_UP" => $lang['Move_up'],
! "L_MOVE_DOWN" => $lang['Move_down'],
! "L_RESYNC" => $lang['Resync'])
);
--- 821,834 ----
$template->assign_vars(array(
! 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
! 'L_FORUM_TITLE' => $lang['Forum_admin'],
! 'L_FORUM_EXPLAIN' => $lang['Forum_admin_explain'],
! 'L_CREATE_FORUM' => $lang['Create_forum'],
! 'L_CREATE_CATEGORY' => $lang['Create_category'],
! 'L_EDIT' => $lang['Edit'],
! 'L_DELETE' => $lang['Delete'],
! 'L_MOVE_UP' => $lang['Move_up'],
! 'L_MOVE_DOWN' => $lang['Move_down'],
! 'L_RESYNC' => $lang['Resync'])
);
***************
*** 866,880 ****
$template->assign_block_vars("catrow", array(
! "S_ADD_FORUM_SUBMIT" => "addforum[$cat_id]",
! "S_ADD_FORUM_NAME" => "forumname[$cat_id]",
! "CAT_ID" => $cat_id,
! "CAT_DESC" => $category_rows[$i]['cat_title'],
! "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"))
);
--- 867,881 ----
$template->assign_block_vars("catrow", array(
! 'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]",
! 'S_ADD_FORUM_NAME' => "forumname[$cat_id]",
! 'CAT_ID' => $cat_id,
! 'CAT_DESC' => $category_rows[$i]['cat_title'],
! '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"))
);
***************
*** 887,902 ****
$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"))
);
--- 888,903 ----
$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"))
);
|