diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-27 12:30:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-27 12:30:54 +0000 |
| commit | 3c5c5154abddff39ec270ca82495a7923e4b254c (patch) | |
| tree | 884af8b67353e50a2e1a91c986502bde5d5c2323 | |
| parent | 9ebe6b6b1f05ac8fb0a4fdc395a76224ad17fbe7 (diff) | |
| download | forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar.gz forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar.bz2 forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar.xz forums-3c5c5154abddff39ec270ca82495a7923e4b254c.zip | |
#7424
- rebuild username_clean column due to changes in utf8_clean_string()
git-svn-id: file:///svn/phpbb/trunk@6934 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/db/oracle.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 13 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 25 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
5 files changed, 34 insertions, 10 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index dcb972d119..860c7a3614 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -46,7 +46,7 @@ class dbal_oracle extends dbal */ function sql_server_info() { - return 'Oracle ' . @ociserverversion($this->db_connect_id); + return @ociserverversion($this->db_connect_id); } /** diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5c2d77ced0..5aadb5017e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1580,7 +1580,18 @@ function redirect($url, $return = false) if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE'))) { header('Refresh: 0; URL=' . $url); - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . $url . '"><title>Redirect</title></head><body><div align="center">' . sprintf($user->lang['URL_REDIRECT'], '<a href="' . $url . '">', '</a>') . '</div></body></html>'; + + echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'; + echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '" xml:lang="' . $user->lang['USER_LANG'] . '">'; + echo '<head>'; + echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'; + echo '<meta http-equiv="refresh" content="0; url=' . $url . '" />'; + echo '<title>' . $user->lang['REDIRECT'] . '</title>'; + echo '</head>'; + echo '<body>'; + echo '<div style="text-align: center;">' . sprintf($user->lang['URL_REDIRECT'], '<a href="' . $url . '">', '</a>') . '</div>'; + echo '</body>'; + echo '</html>'; exit; } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4d8fc449a0..9870b47706 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -411,7 +411,7 @@ $errored = false; <p><?php echo $lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br /> <?php -// To let set_config() calls success, we need to make the config array available globally +// To let set_config() calls succeed, we need to make the config array available globally $config = array(); $sql = 'SELECT * FROM ' . CONFIG_TABLE; @@ -627,21 +627,26 @@ if (version_compare($current_version, '3.0.b4', '<=')) WHERE module_class = 'acp' AND module_mode = 'version_check' AND module_auth = 'acl_a_'"; _sql($sql, $errored, $error_ary); - // Because the email hash could have been calculated wrongly, we will update it for every user. + // Because the email hash could have been calculated wrongly as well as the clean string function changed, + // we will update it for every user. + // Since this is not used in a live environment there are not much... not used in a live environment, yes! - $sql = 'SELECT user_id, user_email + $sql = 'SELECT user_id, user_email, username FROM ' . USERS_TABLE; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { + $sql = 'UPDATE ' . USERS_TABLE . " + SET username_clean = '" . $db->sql_escape(utf8_clean_string($row['username'])) . "'"; + if ($row['user_email']) { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_email_hash = ' . (crc32($row['user_email']) . strlen($row['user_email'])) . ' - WHERE user_id = ' . $row['user_id']; - _sql($sql, $errored, $error_ary); + $sql .= ', user_email_hash = ' . (crc32($row['user_email']) . strlen($row['user_email'])); } + + $sql .= ' WHERE user_id = ' . $row['user_id']; + _sql($sql, $errored, $error_ary); } $db->sql_freeresult($result); @@ -1355,6 +1360,12 @@ function add_bots() $db->sql_query($sql); } } + else + { + // If the old bots are missing we can safely assume the user tries to execute the database update twice and + // fiddled around... + return; + } if (!function_exists('user_add')) { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index b6bf1dd03d..ba80f40eb2 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -416,11 +416,12 @@ class install_install extends module $fp = @fopen($phpbb_root_path . $dir . 'test_lock', 'wb'); if ($fp !== false) { - @unlink($phpbb_root_path . $dir . 'test_lock'); $write = true; } @fclose($fp); + @unlink($phpbb_root_path . $dir . 'test_lock'); + $passed['files'] = ($exists && $write && $passed['files']) ? true : false; $exists = ($exists) ? '<b style="color:green">' . $lang['FOUND'] . '</b>' : '<b style="color:red">' . $lang['NOT_FOUND'] . '</b>'; diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3f00ca609b..6d2220ded9 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -406,6 +406,7 @@ $lang = array_merge($lang, array( 'READ_PROFILE' => 'Profile', 'REASON' => 'Reason', 'RECORD_ONLINE_USERS' => 'Most users ever online was <strong>%1$s</strong> on %2$s', + 'REDIRECT' => 'Redirect', 'REDIRECTS' => 'Total redirects', 'REGISTER' => 'Register', 'REGISTERED_USERS' => 'Registered users:', |