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_groups.php | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'phpBB/admin/admin_groups.php') diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php index 048673d344..893672498b 100644 --- a/phpBB/admin/admin_groups.php +++ b/phpBB/admin/admin_groups.php @@ -47,7 +47,7 @@ require('pagestart.' . $phpEx); // if ( !$auth->acl_get('a_group') ) { - message_die(MESSAGE, $lang['No_admin']); + message_die(MESSAGE, $user->lang['No_admin']); } if( isset($_POST[POST_GROUPS_URL]) || isset($_GET[POST_GROUPS_URL]) ) @@ -96,7 +96,7 @@ if( isset($_POST['edit']) || isset($_POST['new']) ) if( !$db->sql_numrows($result) ) { - message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); + message_die(GENERAL_MESSAGE, $user->lang['Group_not_exist']); } $group_info = $db->sql_fetchrow($result); @@ -151,23 +151,23 @@ if( isset($_POST['edit']) || isset($_POST['new']) ) "GROUP_DESCRIPTION" => $group_info['group_description'], "GROUP_MODERATOR" => $group_moderator, - "L_GROUP_TITLE" => $lang['Group_administration'], - "L_GROUP_EDIT_DELETE" => ( isset($_POST['new']) ) ? $lang['New_group'] : $lang['Edit_group'], - "L_GROUP_NAME" => $lang['group_name'], - "L_GROUP_DESCRIPTION" => $lang['group_description'], - "L_GROUP_MODERATOR" => $lang['group_moderator'], - "L_FIND_USERNAME" => $lang['Find_username'], - "L_GROUP_STATUS" => $lang['group_status'], - "L_GROUP_OPEN" => $lang['group_open'], - "L_GROUP_CLOSED" => $lang['group_closed'], - "L_GROUP_HIDDEN" => $lang['group_hidden'], - "L_GROUP_DELETE" => $lang['group_delete'], - "L_GROUP_DELETE_CHECK" => $lang['group_delete_check'], - "L_SUBMIT" => $lang['Submit'], - "L_RESET" => $lang['Reset'], - "L_DELETE_MODERATOR" => $lang['delete_group_moderator'], - "L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'], - "L_YES" => $lang['Yes'], + "L_GROUP_TITLE" => $user->lang['Group_administration'], + "L_GROUP_EDIT_DELETE" => ( isset($_POST['new']) ) ? $user->lang['New_group'] : $user->lang['Edit_group'], + "L_GROUP_NAME" => $user->lang['group_name'], + "L_GROUP_DESCRIPTION" => $user->lang['group_description'], + "L_GROUP_MODERATOR" => $user->lang['group_moderator'], + "L_FIND_USERNAME" => $user->lang['Find_username'], + "L_GROUP_STATUS" => $user->lang['group_status'], + "L_GROUP_OPEN" => $user->lang['group_open'], + "L_GROUP_CLOSED" => $user->lang['group_closed'], + "L_GROUP_HIDDEN" => $user->lang['group_hidden'], + "L_GROUP_DELETE" => $user->lang['group_delete'], + "L_GROUP_DELETE_CHECK" => $user->lang['group_delete_check'], + "L_SUBMIT" => $user->lang['Submit'], + "L_RESET" => $user->lang['Reset'], + "L_DELETE_MODERATOR" => $user->lang['delete_group_moderator'], + "L_DELETE_MODERATOR_EXPLAIN" => $user->lang['delete_moderator_explain'], + "L_YES" => $user->lang['Yes'], "U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), @@ -212,7 +212,7 @@ else if( isset($_POST['group_update']) ) message_die(GENERAL_ERROR, "Couldn't update auth_access", "", __LINE__, __FILE__, $sql); } - $message = $lang['Deleted_group'] . "

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

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

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

" . sprintf($user->lang['Click_return_admin_index'], "", "");; message_die(GENERAL_MESSAGE, $message); } @@ -226,11 +226,11 @@ else if( isset($_POST['group_update']) ) if( $group_name == "" ) { - message_die(GENERAL_MESSAGE, $lang['No_group_name']); + message_die(GENERAL_MESSAGE, $user->lang['No_group_name']); } else if( $group_moderator == "" ) { - message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); + message_die(GENERAL_MESSAGE, $user->lang['No_group_moderator']); } $this_userdata = get_userdata($group_moderator); @@ -238,7 +238,7 @@ else if( isset($_POST['group_update']) ) if( !$group_moderator ) { - message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); + message_die(GENERAL_MESSAGE, $user->lang['No_group_moderator']); } if( $mode == "editgroup" ) @@ -253,7 +253,7 @@ else if( isset($_POST['group_update']) ) } if( !$db->sql_numrows($result) ) { - message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); + message_die(GENERAL_MESSAGE, $user->lang['Group_not_exist']); } $group_info = $db->sql_fetchrow($result); @@ -284,7 +284,7 @@ else if( isset($_POST['group_update']) ) message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql); } - $message = $lang['Updated_group'] . "

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

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

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

" . sprintf($user->lang['Click_return_admin_index'], "", "");; message_die(GENERAL_MESSAGE, $message); } @@ -314,29 +314,29 @@ else if( isset($_POST['group_update']) ) message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql); } - $message = $lang['Added_new_group'] . "

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

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

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

" . sprintf($user->lang['Click_return_admin_index'], "", "");; message_die(GENERAL_MESSAGE, $message); } else { - message_die(GENERAL_MESSAGE, $lang['Group_mode_not_selected']); + message_die(GENERAL_MESSAGE, $user->lang['Group_mode_not_selected']); } } } -page_header($lang['Manage']); +page_header($user->lang['Manage']); ?> -

+

lang['Manage']; ?>

-

+

lang['Group_manage_explain']; ?>

"> - + lang[$group_ary['group_name']]) ) ? $user->lang[$group_ary['group_name']] : $group_ary['group_name']; ?> - - + + - - + +
lang['Manage']; ?>