[Phpbb-php5mod-cvs-checkins] phpbb-php5/admin admin_board.php,1.3,1.4 admin_disallow.php,1.2,1.3 adm
Brought to you by:
jelly_doughnut
Menu
▾
▴
[Phpbb-php5mod-cvs-checkins] phpbb-php5/admin admin_board.php,1.3,1.4 admin_disallow.php,1.2,1.3 admin_smilies.php,1.3,1.4 admin_styles.php,1.3,1.4 admin_ug_auth.php,1.9,1.10 admin_user_ban.php,1.4,1.5 admin_users.php,1.3,1.4 index.php,1.3,1.4 page_footer_admin.php,1.2,1.3
|
From: Josh <jel...@us...> - 2005-10-31 03:18:49
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30886/admin Modified Files: admin_board.php admin_disallow.php admin_smilies.php admin_styles.php admin_ug_auth.php admin_user_ban.php admin_users.php index.php page_footer_admin.php Log Message: 2.0.18 Index: admin_styles.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_styles.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_styles.php 16 Apr 2005 21:02:22 -0000 1.3 --- admin_styles.php 31 Oct 2005 03:18:40 -0000 1.4 *************** *** 583,586 **** --- 583,587 ---- "L_VALUE" => $lang['Value'], "L_STYLESHEET" => $lang['Stylesheet'], + "L_STYLESHEET_EXPLAIN" => $lang['Stylesheet_explain'], "L_BACKGROUND_IMAGE" => $lang['Background_image'], "L_BACKGROUND_COLOR" => $lang['Background_color'], Index: admin_users.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_users.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_users.php 19 Jul 2005 23:31:24 -0000 1.3 --- admin_users.php 31 Oct 2005 03:18:40 -0000 1.4 *************** *** 1,1153 **** ! <?php ! /*************************************************************************** ! * admin_users.php ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * [...2279 lines suppressed...] ! ! $template->assign_vars(array( ! 'L_USER_TITLE' => $lang['User_admin'], ! 'L_USER_EXPLAIN' => $lang['User_admin_explain'], ! 'L_USER_SELECT' => $lang['Select_a_User'], ! 'L_LOOK_UP' => $lang['Look_up_user'], ! 'L_FIND_USERNAME' => $lang['Find_username'], ! ! 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"), ! ! 'S_USER_ACTION' => append_sid("admin_users.$phpEx"), ! 'S_USER_SELECT' => $select_list) ! ); ! $template->pparse('body'); ! ! } ! ! include('./page_footer_admin.'.$phpEx); ! ! ?> Index: index.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.php 22 Feb 2005 01:21:01 -0000 1.3 --- index.php 31 Oct 2005 03:18:40 -0000 1.4 *************** *** 569,573 **** $errstr = $version_info = ''; ! if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr)) { @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); --- 569,573 ---- $errstr = $version_info = ''; ! if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10)) { @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); *************** *** 604,608 **** { $version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; } } --- 604,608 ---- { $version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . ' ' . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; } } Index: admin_ug_auth.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_ug_auth.php 19 Jul 2005 23:31:24 -0000 1.9 --- admin_ug_auth.php 31 Oct 2005 03:18:40 -0000 1.10 *************** *** 255,261 **** } ! $sql = "SELECT * ! FROM " . FORUMS_TABLE . " f ! ORDER BY forum_order"; if ( !($result = $db->sql_query($sql)) ) { --- 255,262 ---- } ! $sql = 'SELECT f.* ! FROM ' . FORUMS_TABLE . ' f, ' . CATEGORIES_TABLE . ' c ! WHERE f.cat_id = c.cat_id ! ORDER BY c.cat_order, f.forum_order'; if ( !($result = $db->sql_query($sql)) ) { *************** *** 601,615 **** $db->sql_freeresult($result); ! for($j = 0; $j < count($forum_auth_fields); $j++) { ! $forum_access[$i][$forum_auth_fields[$j]] . ' :: '; ! if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL ) { ! $forum_auth_level[$forum_id] = AUTH_ACL; ! $forum_auth_level_fields[$forum_id][] = $forum_auth_fields[$j]; } } - $sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user, ug.user_pending FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE "; $sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id"; --- 602,620 ---- $db->sql_freeresult($result); ! foreach ($forum_access as $i => $forum_data) { ! for($j = 0; $j < count($forum_auth_fields); $j++) { ! $forum_access[$i][$forum_auth_fields[$j]] . ' :: '; ! ! if ( $forum_data[$forum_auth_fields[$j]] == AUTH_ACL ) ! { ! $forum_id = $forum_data['forum_id']; ! $forum_auth_level[$forum_id] = AUTH_ACL; ! $forum_auth_level_fields[$forum_id][] = $forum_auth_fields[$j]; ! } } } $sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user, ug.user_pending FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE "; $sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id"; *************** *** 838,844 **** } if( count($name) ) { - $t_usergroup_list = $t_pending_list = ''; for($i = 0; $i < count($ug_info); $i++) { --- 843,849 ---- } + $t_usergroup_list = $t_pending_list = ''; if( count($name) ) { for($i = 0; $i < count($ug_info); $i++) { *************** *** 855,862 **** } } ! else ! { ! $t_usergroup_list = $lang['None']; ! } $s_column_span = 2; // Two columns always present --- 860,866 ---- } } ! ! $t_usergroup_list = ($t_usergroup_list == '') ? $lang['None'] : $t_usergroup_list; ! $t_pending_list = ($t_pending_list == '') ? $lang['None'] : $t_pending_list; $s_column_span = 2; // Two columns always present Index: admin_user_ban.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_user_ban.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_user_ban.php 20 Nov 2004 01:55:26 -0000 1.4 --- admin_user_ban.php 31 Oct 2005 03:18:40 -0000 1.5 *************** *** 156,160 **** // section) // ! if (preg_match('#^(([a-z0-9&.-_+])|(\*))+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*?[a-z]+$#is', trim($email_list_temp[$i]))) { $email_list[] = trim($email_list_temp[$i]); --- 156,160 ---- // section) // ! if (preg_match('/^(([a-z0-9&\'\.\-_\+])|(\*))+@(([a-z0-9\-])|(\*))+\.([a-z0-9\-]+\.)*?[a-z]+$/is', trim($email_list_temp[$i]))) { $email_list[] = trim($email_list_temp[$i]); Index: admin_smilies.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_smilies.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_smilies.php 8 May 2005 02:12:43 -0000 1.3 --- admin_smilies.php 31 Oct 2005 03:18:40 -0000 1.4 *************** *** 1,559 **** ! <?php ! /*************************************************************************** ! * admin_smilies.php ! * ------------------- ! * begin : Thu May 31, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * [...1091 lines suppressed...] ! "CODE" => $smilies[$i]['code'], ! "EMOT" => $smilies[$i]['emoticon'], ! ! "U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&id=" . $smilies[$i]['smilies_id']), ! "U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&id=" . $smilies[$i]['smilies_id'])) ! ); ! } ! ! // ! // Spit out the page. ! // ! $template->pparse("body"); ! } ! ! // ! // Page Footer ! // ! include('./page_footer_admin.'.$phpEx); ! ! ?> Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/page_footer_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_footer_admin.php 16 Apr 2005 21:02:22 -0000 1.2 --- page_footer_admin.php 31 Oct 2005 03:18:40 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- } + global $do_gzip_compress; + // // Show the overall footer. *************** *** 35,39 **** $template->assign_vars(array( 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', ! 'TRANSLATION_INFO' => $lang['TRANSLATION_INFO']) ); --- 37,41 ---- $template->assign_vars(array( 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : '')) ); Index: admin_disallow.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_disallow.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_disallow.php 30 Jul 2004 02:12:37 -0000 1.2 --- admin_disallow.php 31 Oct 2005 03:18:40 -0000 1.3 *************** *** 46,50 **** if ($disallowed_user == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } if( !validate_username($disallowed_user) ) --- 46,50 ---- if ($disallowed_user == '') { ! message_die(GENERAL_MESSAGE, $lang['Fields_empty']); } if( !validate_username($disallowed_user) ) Index: admin_board.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_board.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_board.php 20 Nov 2004 01:01:05 -0000 1.3 --- admin_board.php 31 Oct 2005 03:18:40 -0000 1.4 *************** *** 101,104 **** --- 101,108 ---- $confirm_no = (!$new['enable_confirm']) ? 'checked="checked"' : ''; + $allow_autologin_yes = ($new['allow_autologin']) ? 'checked="checked"' : ''; + $allow_autologin_no = (!$new['allow_autologin']) ? 'checked="checked"' : ''; + + $board_email_form_yes = ( $new['board_email_form'] ) ? "checked=\"checked\"" : ""; $board_email_form_no = ( !$new['board_email_form'] ) ? "checked=\"checked\"" : ""; *************** *** 166,169 **** --- 170,177 ---- "L_VISUAL_CONFIRM" => $lang['Visual_confirm'], "L_VISUAL_CONFIRM_EXPLAIN" => $lang['Visual_confirm_explain'], + "L_ALLOW_AUTOLOGIN" => $lang['Allow_autologin'], + "L_ALLOW_AUTOLOGIN_EXPLAIN" => $lang['Allow_autologin_explain'], + "L_AUTOLOGIN_TIME" => $lang['Autologin_time'], + "L_AUTOLOGIN_TIME_EXPLAIN" => $lang['Autologin_time_explain'], "L_COOKIE_SETTINGS" => $lang['Cookie_settings'], "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], *************** *** 255,259 **** "CONFIRM_ENABLE" => $confirm_yes, "CONFIRM_DISABLE" => $confirm_no, ! "ACTIVATION_NONE_CHECKED" => $activation_none, "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, --- 263,269 ---- "CONFIRM_ENABLE" => $confirm_yes, "CONFIRM_DISABLE" => $confirm_no, ! 'ALLOW_AUTOLOGIN_YES' => $allow_autologin_yes, ! 'ALLOW_AUTOLOGIN_NO' => $allow_autologin_no, ! 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'], "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, |
