These are the Changes from phpBB 2.0.18 to phpBB 2.0.19 summed up into a little Mod. This might be very helpful if you want to update your Board and have installed a bunch of Mods. Then it's normally easier to apply the Code Changes than to install all Mods again.
When you find a 'AFTER, ADD'-Statement, the Code have to be added after the last line quoted in the 'FIND'-Statement.
When you find a 'BEFORE, ADD'-Statement, the Code have to be added before the first line quoted in the 'FIND'-Statement.
When you find a 'REPLACE WITH'-Statement, the Code quoted in the 'FIND'-Statement have to be replaced completely with the quoted Code in the 'REPLACE WITH'-Statement.
After you have finished this tutorial, you have to upload the install/update_to_latest.php file, execute it and then delete it from your webspace.
- admin/admin_board.php[/color][/size]
-
FIND - Line 19
REPLACE WITH
Code: Selecteer alles
$module['General']['Configuration'] = "$file";
Code: Selecteer alles
$module['General']['Configuration'] = $file;
-
FIND - Line 194
AFTER, ADD
Code: Selecteer alles
"L_MAX_POLL_OPTIONS" => $lang['Max_poll_options'], "L_FLOOD_INTERVAL" => $lang['Flood_Interval'], "L_FLOOD_INTERVAL_EXPLAIN" => $lang['Flood_Interval_explain'],
Code: Selecteer alles
'L_MAX_LOGIN_ATTEMPTS' => $lang['Max_login_attempts'], 'L_MAX_LOGIN_ATTEMPTS_EXPLAIN' => $lang['Max_login_attempts_explain'], 'L_LOGIN_RESET_TIME' => $lang['Login_reset_time'], 'L_LOGIN_RESET_TIME_EXPLAIN' => $lang['Login_reset_time_explain'], 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'], 'LOGIN_RESET_TIME' => $new['login_reset_time'],
- admin/admin_db_utilities.php[/color][/size]
-
FIND - Line 696
REPLACE WITH
Code: Selecteer alles
$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words', 'confirm');
Code: Selecteer alles
$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words', 'confirm', 'sessions_keys');
- admin/admin_disallow.php[/color][/size]
-
FIND - Line 28
REPLACE WITH
Code: Selecteer alles
$module['Users']['Disallow'] = append_sid($filename);
Code: Selecteer alles
$module['Users']['Disallow'] = $filename;
- admin/admin_ranks.php[/color][/size]
-
FIND - Line 27
REPLACE WITH
Code: Selecteer alles
$module['Users']['Ranks'] = "$file";
Code: Selecteer alles
$module['Users']['Ranks'] = $file;
- admin/admin_styles.php[/color][/size]
-
FIND - Line 30
REPLACE WITH
Code: Selecteer alles
$module['Styles']['Manage'] = "$file";
Code: Selecteer alles
$module['Styles']['Manage'] = $file;
- admin/admin_users.php[/color][/size]
-
FIND - Line 180
AFTER, ADD
Code: Selecteer alles
message_die(GENERAL_ERROR, 'Could not delete user from banlist table', '', __LINE__, __FILE__, $sql); }
Code: Selecteer alles
$sql = "DELETE FROM " . SESSIONS_TABLE . " WHERE session_user_id = $user_id"; if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Could not delete sessions for this user', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . SESSIONS_KEYS_TABLE . " WHERE user_id = $user_id"; if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Could not delete auto-login keys for this user', '', __LINE__, __FILE__, $sql); }
-
FIND - Line 234
REPLACE WITH
Code: Selecteer alles
$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['username']))) : '';
Code: Selecteer alles
$username = ( !empty($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : '';
-
FIND - Line 407
REPLACE WITH
Code: Selecteer alles
if( @file_exists(@phpbb_realpath("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) ) { @unlink("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
Code: Selecteer alles
if( @file_exists(@phpbb_realpath('./../' . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) ) { @unlink('./../' . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
- admin/admin_words.php[/color][/size]
-
FIND - Line 28
REPLACE WITH
Code: Selecteer alles
$module['General']['Word_Censor'] = "$file";
Code: Selecteer alles
$module['General']['Word_Censor'] = $file;
- admin/index.php[/color][/size]
-
FIND - Line 63
REPLACE WITH
Code: Selecteer alles
include($file);
Code: Selecteer alles
include('./' . $file);
-
FIND - Line 237
REPLACE WITH
Code: Selecteer alles
if( preg_match("/^(3\.23|4\.)/", $version) ) { $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)/", $version) ) ? "`$dbname`" : $dbname;
Code: Selecteer alles
if( preg_match("/^(3\.23|4\.|5\.)/", $version) ) { $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)|(5\.)/", $version) ) ? "`$dbname`" : $dbname;
- includes/bbcode.php[/color][/size]
-
FIND - Line 203
REPLACE WITH
Code: Selecteer alles
$patterns[] = "#\[url\]([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*?)\[/url\]#is"; $replacements[] = $bbcode_tpl['url1']; // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). $patterns[] = "#\[url\]((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*?)\[/url\]#is";
Code: Selecteer alles
$patterns[] = "#\[url\]([\w]+?://([\w\#$%&~/.\-;:=,?@\]+]|\[(?!url=))*?)\[/url\]#is"; $replacements[] = $bbcode_tpl['url1']; // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). $patterns[] = "#\[url\]((www|ftp)\.([\w\#$%&~/.\-;:=,?@\]+]|\[(?!url=))*?)\[/url\]#is";
-
FIND - Line 255
REPLACE WITH
Code: Selecteer alles
$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\".*?\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
Code: Selecteer alles
$text = bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]");
-
FIND - Line 392
REPLACE WITH
Code: Selecteer alles
if( preg_match('#\[quote=\\\"#si', $possible_start, $match) && !preg_match('#\[quote=\\\"(.*?)\\\"\]#si', $possible_start) ) { // OK we are in a quote tag that probably contains a ] bracket. // Grab a bit more of the string to hopefully get all of it.. if ($close_pos = strpos($text, '"]', $curr_pos + 9)) { if (strpos(substr($text, $curr_pos + 9, $close_pos - ($curr_pos + 9)), '[quote') === false) { $possible_start = substr($text, $curr_pos, $close_pos - $curr_pos + 2);
Code: Selecteer alles
if( preg_match('#\[quote=\\\"#si', $possible_start, $match) && !preg_match('#\[quote=\\\"(.*?)\\\"\]#si', $possible_start) ) { // OK we are in a quote tag that probably contains a ] bracket. // Grab a bit more of the string to hopefully get all of it.. if ($close_pos = strpos($text, '"]', $curr_pos + 14)) { if (strpos(substr($text, $curr_pos + 14, $close_pos - ($curr_pos + 14)), '[quote') === false) { $possible_start = substr($text, $curr_pos, $close_pos - $curr_pos + 7);
- common.php[/color][/size]
-
FIND - Line 223
REPLACE WITH
Code: Selecteer alles
message_die(GENERAL_MESSAGE, 'Please ensure both the install/ and contrib/ directories are deleted');
Code: Selecteer alles
message_die(GENERAL_MESSAGE, 'Please_remove_install_contrib');
- includes/functions.php[/color][/size]
-
FIND - Line 161
REPLACE WITH
Code: Selecteer alles
$sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" . $user . "'" ) . " AND user_id <> " . ANONYMOUS;
Code: Selecteer alles
$sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" . str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS;
- includes/functions_post.php[/color][/size]
-
FIND - Line 28
REPLACE WITH
Code: Selecteer alles
$html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#'); $html_entities_replace = array('&', '<', '>');
Code: Selecteer alles
$html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#'); $html_entities_replace = array('&', '<', '>', '"');
- includes/usercp_confirm.php[/color][/size]
-
FIND - Line 156
REPLACE WITH
Code: Selecteer alles
if (!empty($HTTP_GET_VARS['c'])) { $_png = define_raw_pngs(); $char = substr($code, intval($HTTP_GET_VARS['c']) - 1, 1); header('Content-Type: image/png'); header('Cache-control: no-cache, no-store'); echo base64_decode($_png[$char]); unset($_png); exit; }
Code: Selecteer alles
$_png = define_raw_pngs(); $char = substr($code, -1); header('Content-Type: image/png'); header('Cache-control: no-cache, no-store'); echo base64_decode($_png[$char]); unset($_png); exit;
- includes/usercp_register.php[/color][/size]
-
FIND - Line 110
REPLACE WITH
Code: Selecteer alles
$strip_var_list = array('username' => 'username', 'email' => 'email', 'icq' => 'icq', 'aim' => 'aim', 'msn' => 'msn', 'yim' => 'yim', 'website' => 'website', 'location' => 'location', 'occupation' => 'occupation', 'interests' => 'interests'); $strip_var_list['confirm_code'] = 'confirm_code';
Code: Selecteer alles
$strip_var_list = array('email' => 'email', 'icq' => 'icq', 'aim' => 'aim', 'msn' => 'msn', 'yim' => 'yim', 'website' => 'website', 'location' => 'location', 'occupation' => 'occupation', 'interests' => 'interests', 'confirm_code' => 'confirm_code');
-
FIND - Line 126
BEFORE, ADD
Code: Selecteer alles
$trim_var_list = array('cur_password' => 'cur_password', 'new_password' => 'new_password', 'password_confirm' => 'password_confirm', 'signature' => 'signature');
Code: Selecteer alles
$username = ( !empty($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : '';
-
FIND - Line 301
BEFORE, ADD
Code: Selecteer alles
if ($row['code'] != $confirm_code)
Code: Selecteer alles
// Only compare one char if the zlib-extension is not loaded if (!@extension_loaded('zlib')) { $row['code'] = substr($row['code'], -1); }
- language/lang_english/lang_admin.php[/color][/size]
-
FIND - Line 749
BEFORE, ADD
Code: Selecteer alles
// // That's all Folks!
Code: Selecteer alles
// // Login attempts configuration // $lang['Max_login_attempts'] = 'Allowed login attempts'; $lang['Max_login_attempts_explain'] = 'The number of allowed board login attempts.'; $lang['Login_reset_time'] = 'Login lock time'; $lang['Login_reset_time_explain'] = 'Time in minutes the user have to wait until he is allowed to login again after exceeding the number of allowed login attempts.';
- language/lang_english/lang_main.php[/color][/size]
-
FIND - Line 1021
BEFORE, ADD
Code: Selecteer alles
// // That's all, Folks!
Code: Selecteer alles
$lang['Login_attempts_exceeded'] = 'The maximum number of %s login attempts has been exceeded. You are not allowed to login for the next %s minutes.'; $lang['Please_remove_install_contrib'] = 'Please ensure both the install/ and contrib/ directories are deleted';
- login.php[/color][/size]
-
FIND - Line 60
REPLACE WITH
Code: Selecteer alles
$sql = "SELECT user_id, username, user_password, user_active, user_level
Code: Selecteer alles
$sql = "SELECT user_id, username, user_password, user_active, user_level, user_login_tries, user_last_login_try
-
FIND - Line 79
BEFORE, ADD
Code: Selecteer alles
if( md5($password) == $row['user_password'] && $row['user_active'] )
Code: Selecteer alles
// If the last login is more than x minutes ago, then reset the login tries/time if ($row['user_last_login_try'] && $board_config['login_reset_time'] && $row['user_last_login_try'] < (time() - ($board_config['login_reset_time'] * 60))) { $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']); $row['user_last_login_try'] = $row['user_login_tries'] = 0; } // Check to see if user is allowed to login again... if his tries are exceeded if ($row['user_last_login_try'] && $board_config['login_reset_time'] && $board_config['max_login_attempts'] && $row['user_last_login_try'] >= (time() - ($board_config['login_reset_time'] * 60)) && $row['user_login_tries'] >= $board_config['max_login_attempts']) { message_die(GENERAL_MESSAGE, sprintf($lang['Login_attempts_exceeded'], $board_config['max_login_attempts'], $board_config['login_reset_time'])); }
-
FIND - Line 97
AFTER, ADD
Code: Selecteer alles
$admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
Code: Selecteer alles
// Reset login tries $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']);
-
FIND - Line 115
BEFORE, ADD
Code: Selecteer alles
$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; $redirect = str_replace('?', '&', $redirect);
Code: Selecteer alles
// Save login tries and last login if ($row['user_id'] != ANONYMOUS) { $sql = 'UPDATE ' . USERS_TABLE . ' SET user_login_tries = user_login_tries + 1, user_last_login_try = ' . time() . ' WHERE user_id = ' . $row['user_id']; $db->sql_query($sql); }
- privmsg.php[/color][/size]
-
FIND - Line 38
REPLACE WITH
Code: Selecteer alles
$html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#'); $html_entities_replace = array('&', '<', '>');
Code: Selecteer alles
$html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#'); $html_entities_replace = array('&', '<', '>', '"');
- templates/subSilver/admin/board_config_body.tpl[/color][/size]
-
FIND - Line 59
AFTER, ADD
Code: Selecteer alles
<td class="row2"><input class="post" type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}" /></td> </tr>
Code: Selecteer alles
<tr> <td class="row1">{L_MAX_LOGIN_ATTEMPTS}<br /><span class="gensmall">{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" size="3" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></td> </tr> <tr> <td class="row1">{L_LOGIN_RESET_TIME}<br /><span class="gensmall">{L_LOGIN_RESET_TIME_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" size="3" maxlength="4" name="login_reset_time" value="{LOGIN_RESET_TIME}" /></td> </tr>
- templates/subSilver/admin/index_body.tpl[/color][/size]
-
FIND - Line 46
AFTER, ADD
Code: Selecteer alles
<td class="row2"><b>{GZIP_COMPRESSION}</b></td> </tr> </table>
Code: Selecteer alles
<h1>{L_VERSION_INFORMATION}</h1> {VERSION_INFO} <br />
-
FIND - Line 87
REPLACE WITH (just remove the lines)
Code: Selecteer alles
<h1>{L_VERSION_INFORMATION}</h1> {VERSION_INFO} <br />
Code: Selecteer alles
lang_admin.php
Code: Selecteer alles
//
// Login attempts configuration
//
$lang['Max_login_attempts'] = 'Toegestane aantal loginpogingen';
$lang['Max_login_attempts_explain'] = 'Aantal toegestane pogingen om in te loggen op je forum';
$lang['Login_reset_time'] = 'Wachttijd tussen twee loginpogingen';
$lang['Login_reset_time_explain'] = 'Stel de tijd in waarop een gebruiker moet wachten als hij of zij het maximale aantal loginpogingen heeft overschreden';
Code: Selecteer alles
$lang['Login_attempts_exceeded'] = 'Het maximale aantal loginpogingen van %s pogingen is overschreden. Je zult niet binnen %s minuten kunnen inloggen';
$lang['Please_remove_install_contrib'] = 'Garandeer dat de install/ en contrib/ mappen zijn verwijderd';