From 607823713b27f1f2cae7396a2add17710a4ebcc7 Mon Sep 17 00:00:00 2001 From: acydburn Date: Sat, 3 Nov 2007 11:10:07 +0000 Subject: [PATCH] some changes git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8223 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 22 ++++++---------------- phpBB/includes/mcp/mcp_front.php | 8 ++++++++ phpBB/includes/mcp/mcp_reports.php | 2 +- phpBB/install/database_update.php | 2 +- phpBB/install/install_convert.php | 2 +- phpBB/language/en/install.php | 12 +++++------- phpBB/styles/subsilver2/template/ucp_footer.html | 2 +- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 80a6facec..5ef95761e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -89,7 +89,8 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false) if ($type == 'array') { reset($default); - list($sub_key_type, $sub_type) = each(current($default)); + $default = current($default); + list($sub_key_type, $sub_type) = each($default); $sub_type = gettype($sub_type); $sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type; $sub_key_type = gettype($sub_key_type); @@ -269,23 +270,12 @@ function phpbb_hash($password) $random = ''; $count = 6; - if (($fh = @fopen('/dev/urandom', 'rb'))) + for ($i = 0; $i < $count; $i += 16) { - $random = fread($fh, $count); - fclose($fh); - } - - if (strlen($random) < $count) - { - $random = ''; - - for ($i = 0; $i < $count; $i += 16) - { - $random_state = md5(unique_id() . $random_state); - $random .= pack('H*', md5($random_state)); - } - $random = substr($random, 0, $count); + $random_state = md5(unique_id() . $random_state); + $random .= pack('H*', md5($random_state)); } + $random = substr($random, 0, $count); $hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64); diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index d67a51cd8..707fe2268 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -73,6 +73,14 @@ function mcp_front_view($id, $mode, $action) } $db->sql_freeresult($result); + if (empty($post_list)) + { + $total = 0; + } + } + + if ($total) + { $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, u.username_clean, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u WHERE ' . $db->sql_in_set('p.post_id', $post_list) . ' diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 0faa1dc8b..37ea7e513 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -599,7 +599,7 @@ function close_report($report_id_list, $mode, $action) } } - foreach($post_info as $post) + foreach ($post_info as $post) { $forum_ids[$post['forum_id']] = $post['forum_id']; $topic_ids[$post['topic_id']] = $post['topic_id']; diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4c4c1eb69..3f39b7d49 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1178,7 +1178,7 @@ if (version_compare($current_version, '3.0.RC2', '<=')) } $db->sql_freeresult($result); - foreach($smileys as $id => $code) + foreach ($smileys as $id => $code) { // 2.0 only entitized lt and gt; We need to do something about double quotes. if (strchr($code, '"') === false) diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 2496018f8..d1e36ec4a 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1177,7 +1177,7 @@ class install_convert extends module if (!empty($schema['group_by'])) { $schema['group_by'] = array($schema['group_by']); - foreach($sql_data['select_fields'] as $select) + foreach ($sql_data['select_fields'] as $select) { $alias = strpos(strtolower($select), ' as '); $select = ($alias) ? substr($select, 0, $alias) : $select; diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 55ed3eaa8..de39cf096 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -190,8 +190,8 @@ $lang = array_merge($lang, array(

Go live with your phpBB3!

Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Documentation and the support forums, see the README for further information.

Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.

', 'INSTALL_INTRO' => 'Welcome to Installation', -// TODO: write some more introductions here - 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.

In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:

+ + 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.

In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need: