From 0e9f0ac4ecc636336603cc6932ce21a550c7087e Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 20 Oct 2002 19:19:07 +0000 Subject: Mostly changes to turn userdata into user->data, lang into user->lang + bitstring 2nd format + inheritance for permission admin and various other updates/fixes/changes ... note that user->lang & user->theme isn't final git-svn-id: file:///svn/phpbb/trunk@2958 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_forums.php | 128 +++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'phpBB/admin/admin_forums.php') diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php index 956bc010b6..915a63a56f 100644 --- a/phpBB/admin/admin_forums.php +++ b/phpBB/admin/admin_forums.php @@ -45,7 +45,7 @@ include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); // if (!$auth->acl_get('a_forum')) { - message_die(MESSAGE, $lang['No_admin']); + message_die(MESSAGE, $user->lang['No_admin']); } // @@ -202,7 +202,7 @@ switch ($mode) VALUES ($forum_id, '$forum_name', '$forum_desc', $parent_id, $left_id, $right_id, $forum_status, $forum_style, $post_count_inc, $prune_enable, $prune_days, $prune_freq)"; $db->sql_query($sql); - $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + $message = $user->lang['Forums_updated'] . "

" . sprintf($user->lang['Click_return_forumadmin'], '', '') . '

' . sprintf($user->lang['Click_return_admin_index'], '', ''); message_die(MESSAGE, $message); break; @@ -252,7 +252,7 @@ switch ($mode) $db->sql_query_array('UPDATE ' . FORUMS_TABLE . " SET WHERE forum_id = $forum_id", $sql); - $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + $message = $user->lang['Forums_updated'] . "

" . sprintf($user->lang['Click_return_forumadmin'], '', '') . '

' . sprintf($user->lang['Click_return_admin_index'], '', ''); message_die(MESSAGE, $message); break; @@ -280,7 +280,7 @@ switch ($mode) { if (empty($_POST['posts_to_id'])) { - $message = $lang['No_destination_forum'] . '

' . sprintf($lang['Click_return_forumadmin'], '', ''); + $message = $user->lang['No_destination_forum'] . '

' . sprintf($user->lang['Click_return_forumadmin'], '', ''); message_die(ERROR, $message); } @@ -305,7 +305,7 @@ switch ($mode) { if (empty($_POST['subforums_to_id'])) { - $message = $lang['No_destination_forum'] . '

' . sprintf($lang['Click_return_forumadmin'], '', ''); + $message = $user->lang['No_destination_forum'] . '

' . sprintf($user->lang['Click_return_forumadmin'], '', ''); message_die(ERROR, $message); } @@ -340,7 +340,7 @@ switch ($mode) $db->sql_query($sql); $return_id = (!empty($_POST['subforums_to_id'])) ? $_POST['subforums_to_id'] : $parent_id; - $message = $lang['Forum_deleted'] . '

' . sprintf($lang['Click_return_forumadmin'], '', ''); + $message = $user->lang['Forum_deleted'] . '

' . sprintf($user->lang['Click_return_forumadmin'], '', ''); message_die(MESSAGE, $message); break; @@ -371,9 +371,9 @@ switch ($mode) $parents_list = make_forums_list('all', $parent_id, $subforums_id); - $l_title = ($forum_status != ITEM_CATEGORY) ? $lang['Edit_forum'] : $lang['Edit_category']; + $l_title = ($forum_status != ITEM_CATEGORY) ? $user->lang['Edit_forum'] : $user->lang['Edit_category']; $newmode = 'modify'; - $buttonvalue = $lang['Update']; + $buttonvalue = $user->lang['Update']; $prune_enabled = ($prune_enable) ? 'checked="checked" ' : ''; if ($forum_status != ITEM_CATEGORY) @@ -390,9 +390,9 @@ switch ($mode) } $parents_list = make_forums_list('all', $parent_id); - $l_title = $lang['Create_forum']; + $l_title = $user->lang['Create_forum']; $newmode = 'create'; - $buttonvalue = $lang['Create_forum']; + $buttonvalue = $user->lang['Create_forum']; $forum_desc = ''; $forum_style = ''; @@ -414,27 +414,27 @@ switch ($mode) $forum_checked = ($forum_status != ITEM_CATEGORY) ? 'checked="checked" ' : ''; $category_checked = ($forum_status == ITEM_CATEGORY) ? 'checked="checked" ' : ''; - $statuslist = '\n"; - $statuslist .= '\n"; + $statuslist = '\n"; + $statuslist .= '\n"; page_header($l_title); ?>

-

+

lang['Forum_edit_delete_explain'] ?>

" method="post"> - + - + - + - - + + - + - - + + - + - + - + - - + - + @@ -542,7 +542,7 @@ switch ($mode) break; case 'delete': - page_header($lang['Forum_delete']); + page_header($user->lang['Forum_delete']); extract(get_forum_info($_GET['f'])); $subforums_id = array(); @@ -556,17 +556,17 @@ switch ($mode) $move_posts_list = make_forums_list('forums', $parent_id, $subforums_id); ?> -

+

lang['Forum_delete'] ?>

-

+

lang['Forum_delete_explain'] ?>

lang['General_settings'] ?>
lang['Forum_name'] : $user->lang['Category_name'] ?>
lang['Forum_desc'] ?>
/>   />lang['Forum_type'] ?>/>lang['Forum'] ?>   />lang['Category'] ?>
lang['Parent'] ?>
lang['Style'] ?>
lang['Forum_settings'] ?>
lang['Forum_status'] ?>
lang['Options'] ?> - /> + />lang['Disable_post_count'] ?> 0) { @@ -488,7 +488,7 @@ switch ($mode) { ?>
- /> + />lang['Display_on_index'] ?>

-      
-       +
lang['Forum_type'] ?>lang['Set_as_category'] ?>
+      lang['Delete_all_posts'] ?>
+      lang['Move_posts_to'] ?>
lang['Forum_pruning'] ?> - + - - + + - - + +
lang['Enabled'] ?> />
  lang['prune_days'] ?>  lang['Days'] ?>
  lang['prune_freq'] ?>  lang['Days'] ?>
- + - + - - + + - + - - + + - + - +
lang['Forum_delete'] ?>
lang['Category_name'] : $user->lang['Forum_name'] ?>
lang['Action'] ?> lang['Delete_all_posts'] ?>
lang['Move_posts_to'] ?>
lang['Action'] ?> lang['Delete_subforums'] ?>
lang['Move_subforums_to'] ?>
@@ -615,7 +615,7 @@ if (empty($show_index)) page_footer(); } -page_header($lang['Manage']); +page_header($user->lang['Manage']); $parent_id = (!empty($_GET['parent_id'])) ? $_GET['parent_id'] : 0; @@ -648,7 +648,7 @@ else
"> - + sql_fetchrow($result)) ?> - - - + + + @@ -732,17 +732,17 @@ while ($row = $db->sql_fetchrow($result)) - - - - + + + + - + sql_fetchrow($result)) - - - - + + + + sql_fetchrow($result)) ?> - +
lang['Forum_admin'] ?>
lang['Edit'] ?>lang['Delete'] ?>lang['Move_up'] ?> lang['Move_down'] ?>  
>

lang['Edit'] ?>lang['Delete'] ?>lang['Move_up'] ?>
lang['Move_down'] ?>
lang['Resync'] : ' ' ?>
>

lang['Edit'] ?>lang['Delete'] ?>lang['Move_up'] ?>
lang['Move_down'] ?>
lang['Resync'] ?>
-- cgit v1.2.1