aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/common.php3
-rw-r--r--phpBB/includes/acp/acp_users.php4
-rw-r--r--phpBB/includes/auth/auth_apache.php2
-rw-r--r--phpBB/includes/auth/auth_db.php23
-rw-r--r--phpBB/includes/auth/auth_ldap.php2
-rw-r--r--phpBB/includes/functions.php1324
-rw-r--r--phpBB/includes/functions_content.php1267
-rw-r--r--phpBB/includes/ucp/ucp_profile.php8
-rw-r--r--phpBB/includes/ucp/ucp_register.php2
-rw-r--r--phpBB/includes/ucp/ucp_remind.php2
-rw-r--r--phpBB/install/database_update.php7
-rwxr-xr-xphpBB/install/index.php6
-rwxr-xr-xphpBB/install/install_install.php2
13 files changed, 1462 insertions, 1190 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 25d5ce8a45..2e488b423d 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -184,7 +184,10 @@ require($phpbb_root_path . 'includes/cache.' . $phpEx);
require($phpbb_root_path . 'includes/template.' . $phpEx);
require($phpbb_root_path . 'includes/session.' . $phpEx);
require($phpbb_root_path . 'includes/auth.' . $phpEx);
+
require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index a7764a5d6e..237d1ba18b 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -694,7 +694,7 @@ class acp_users
// Which updates do we need to do?
$update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false;
- $update_password = ($data['new_password'] && $user_row['user_password'] != md5($data['new_password'])) ? true : false;
+ $update_password = ($data['new_password'] && !phpbb_check_hash($user_row['user_password'], $data['new_password'])) ? true : false;
$update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false;
if (!sizeof($error))
@@ -766,7 +766,7 @@ class acp_users
if ($update_password)
{
$sql_ary += array(
- 'user_password' => md5($data['new_password']),
+ 'user_password' => phpbb_hash($data['new_password']),
'user_passchg' => time(),
);
diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php
index 25631e9f87..21892d7668 100644
--- a/phpBB/includes/auth/auth_apache.php
+++ b/phpBB/includes/auth/auth_apache.php
@@ -194,7 +194,7 @@ function user_row_apache($username, $password)
// generate user account data
return array(
'username' => $username,
- 'user_password' => md5($password),
+ 'user_password' => phpbb_hash($password),
'user_email' => '',
'group_id' => (int) $row['group_id'],
'user_type' => USER_NORMAL,
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index 49e6b8fc5d..8804ac9b8e 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -125,15 +125,17 @@ function login_db(&$username, &$password)
// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])
{
+ $hash = phpbb_hash($password_new_format);
+
// Update the password in the users table to the new format and remove user_pass_convert flag
$sql = 'UPDATE ' . USERS_TABLE . '
- SET user_password = \'' . $db->sql_escape(md5($password_new_format)) . '\',
+ SET user_password = \'' . $db->sql_escape($hash) . '\',
user_pass_convert = 0
WHERE user_id = ' . $row['user_id'];
$db->sql_query($sql);
$row['user_pass_convert'] = 0;
- $row['user_password'] = md5($password_new_format);
+ $row['user_password'] = $hash;
}
else
{
@@ -154,8 +156,23 @@ function login_db(&$username, &$password)
}
// Check password ...
- if (!$row['user_pass_convert'] && md5($password) == $row['user_password'])
+ if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password']))
{
+ // Check for old password hash...
+ if (strlen($row['user_password']) == 32)
+ {
+ $hash = phpbb_hash($password);
+
+ // Update the password in the users table to the new format
+ $sql = 'UPDATE ' . USERS_TABLE . "
+ SET user_password = '" . $db->sql_escape($hash) . "',
+ user_pass_convert = 0
+ WHERE user_id = {$row['user_id']}";
+ $db->sql_query($sql);
+
+ $row['user_password'] = $hash;
+ }
+
if ($row['user_login_attempts'] != 0)
{
// Successful, reset login attempts (the user passed all stages)
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index 7f79a4862a..c6cdb4f4e4 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -204,7 +204,7 @@ function login_ldap(&$username, &$password)
// generate user account data
$ldap_user_row = array(
'username' => $username,
- 'user_password' => md5($password),
+ 'user_password' => phpbb_hash($password),
'user_email' => (!empty($config['ldap_email'])) ? $ldap_result[0][$config['ldap_email']][0] : '',
'group_id' => (int) $row['group_id'],
'user_type' => USER_NORMAL,
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1bf18b106d..d5cb2ce071 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -232,163 +232,207 @@ function still_on_time($extra_time = 15)
return (ceil($current_time - $start_time) < $max_execution_time) ? true : false;
}
-/**
-* Generate sort selection fields
+/**
+*
+* @version Version 0.1 / $Id$
+*
+* Portable PHP password hashing framework.
+*
+* Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
+* the public domain.
+*
+* There's absolutely no warranty.
+*
+* The homepage URL for this framework is:
+*
+* http://www.openwall.com/phpass/
+*
+* Please be sure to update the Version line if you edit this file in any way.
+* It is suggested that you leave the main version number intact, but indicate
+* your project name (after the slash) and add your own revision information.
+*
+* Please do not change the "private" password hashing method implemented in
+* here, thereby making your hashes incompatible. However, if you must, please
+* change the hash type identifier (the "$P$") to something different.
+*
+* Obviously, since this code is in the public domain, the above are not
+* requirements (there can be none), but merely suggestions.
+*
+*
+* Hash the password
*/
-function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param)
+function phpbb_hash($password)
{
- global $user;
+ $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
- $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
+ $random_state = unique_id();
+ $random = '';
+ $count = 6;
- // Check if the key is selectable. If not, we reset to the first key found.
- // This ensures the values are always valid.
- if (!isset($limit_days[$sort_days]))
+ if (($fh = @fopen('/dev/urandom', 'rb')))
{
- @reset($limit_days);
- $sort_days = key($limit_days);
+ $random = fread($fh, $count);
+ fclose($fh);
}
- if (!isset($sort_by_text[$sort_key]))
+ if (strlen($random) < $count)
{
- @reset($sort_by_text);
- $sort_key = key($sort_by_text);
- }
+ $random = '';
- if (!isset($sort_dir_text[$sort_dir]))
- {
- @reset($sort_dir_text);
- $sort_dir = key($sort_dir_text);
+ 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);
}
- $s_limit_days = '<select name="st">';
- foreach ($limit_days as $day => $text)
- {
- $selected = ($sort_days == $day) ? ' selected="selected"' : '';
- $s_limit_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
- }
- $s_limit_days .= '</select>';
+ $hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64);
- $s_sort_key = '<select name="sk">';
- foreach ($sort_by_text as $key => $text)
+ if (strlen($hash) == 34)
{
- $selected = ($sort_key == $key) ? ' selected="selected"' : '';
- $s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
+ return $hash;
}
- $s_sort_key .= '</select>';
- $s_sort_dir = '<select name="sd">';
- foreach ($sort_dir_text as $key => $value)
+ return md5($password);
+}
+
+/**
+* Check for correct password
+*/
+function phpbb_check_hash($password, $hash)
+{
+ $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+ if (strlen($hash) == 34)
{
- $selected = ($sort_dir == $key) ? ' selected="selected"' : '';
- $s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+ return (_hash_crypt_private($password, $hash, $itoa64) === $hash) ? true : false;
}
- $s_sort_dir .= '</select>';
- $u_sort_param = "st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
-
- return;
+ return (md5($password) === $hash) ? true : false;
}
/**
-* Generate Jumpbox
+* Generate salt for hash generation
*/
-function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false)
+function _hash_gensalt_private($input, &$itoa64, $iteration_count_log2 = 6)
{
- global $config, $auth, $template, $user, $db;
-
- if (!$config['load_jumpbox'])
+ if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
{
- return;
+ $iteration_count_log2 = 8;
}
- $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
- FROM ' . FORUMS_TABLE . '
- ORDER BY left_id ASC';
- $result = $db->sql_query($sql, 600);
+ $output = '$H$';
+ $output .= $itoa64[min($iteration_count_log2 + ((PHP_VERSION >= 5) ? 5 : 3), 30)];
+ $output .= _hash_encode64($input, 6, $itoa64);
- $right = $padding = 0;
- $padding_store = array('0' => 0);
- $display_jumpbox = false;
- $iteration = 0;
+ return $output;
+}
- // Sometimes it could happen that forums will be displayed here not be displayed within the index page
- // This is the result of forums not displayed at index, having list permissions and a parent of a forum with no permissions.
- // If this happens, the padding could be "broken"
+/**
+* Encode hash
+*/
+function _hash_encode64($input, $count, &$itoa64)
+{
+ $output = '';
+ $i = 0;
- while ($row = $db->sql_fetchrow($result))
+ do
{
- if ($row['left_id'] < $right)
- {
- $padding++;
- $padding_store[$row['parent_id']] = $padding;
- }
- else if ($row['left_id'] > $right + 1)
+ $value = ord($input[$i++]);
+ $output .= $itoa64[$value & 0x3f];
+
+ if ($i < $count)
{
- // Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it.
- // @todo digging deep to find out "how" this can happen.
- $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding;
+ $value |= ord($input[$i]) << 8;
}
- $right = $row['right_id'];
+ $output .= $itoa64[($value >> 6) & 0x3f];
- if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
+ if ($i++ >= $count)
{
- // Non-postable forum with no subforums, don't display
- continue;
+ break;
}
- if (!$auth->acl_get('f_list', $row['forum_id']))
+ if ($i < $count)
{
- // if the user does not have permissions to list this forum skip
- continue;
+ $value |= ord($input[$i]) << 16;
}
- if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id']))
+ $output .= $itoa64[($value >> 12) & 0x3f];
+
+ if ($i++ >= $count)
{
- continue;
+ break;
}
- if (!$display_jumpbox)
- {
- $template->assign_block_vars('jumpbox_forums', array(
- 'FORUM_ID' => ($select_all) ? 0 : -1,
- 'FORUM_NAME' => ($select_all) ? $user->lang['ALL_FORUMS'] : $user->lang['SELECT_FORUM'],
- 'S_FORUM_COUNT' => $iteration)
- );
+ $output .= $itoa64[($value >> 18) & 0x3f];
+ }
+ while ($i < $count);
- $iteration++;
- $display_jumpbox = true;
- }
+ return $output;
+}
- $template->assign_block_vars('jumpbox_forums', array(
- 'FORUM_ID' => $row['forum_id'],
- 'FORUM_NAME' => $row['forum_name'],
- 'SELECTED' => ($row['forum_id'] == $forum_id) ? ' selected="selected"' : '',
- 'S_FORUM_COUNT' => $iteration,
- 'S_IS_CAT' => ($row['forum_type'] == FORUM_CAT) ? true : false,
- 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false,
- 'S_IS_POST' => ($row['forum_type'] == FORUM_POST) ? true : false)
- );
+/**
+* The crypt function/replacement
+*/
+function _hash_crypt_private($password, $setting, &$itoa64)
+{
+ $output = '*';
+
+ // Check for correct hash
+ if (substr($setting, 0, 3) != '$H$')
+ {
+ return $output;
+ }
+
+ $count_log2 = strpos($itoa64, $setting[3]);
- for ($i = 0; $i < $padding; $i++)
+ if ($count_log2 < 7 || $count_log2 > 30)
+ {
+ return $output;
+ }
+
+ $count = 1 << $count_log2;
+ $salt = substr($setting, 4, 8);
+
+ if (strlen($salt) != 8)
+ {
+ return $output;
+ }
+
+ /**
+ * We're kind of forced to use MD5 here since it's the only
+ * cryptographic primitive available in all versions of PHP
+ * currently in use. To implement our own low-level crypto
+ * in PHP would result in much worse performance and
+ * consequently in lower iteration counts and hashes that are
+ * quicker to crack (by non-PHP code).
+ */
+ if (PHP_VERSION >= 5)
+ {
+ $hash = md5($salt . $password, true);
+ do
{
- $template->assign_block_vars('jumpbox_forums.level', array());
+ $hash = md5($hash . $password, true);
}
- $iteration++;
+ while (--$count);
+ }
+ else
+ {
+ $hash = pack('H*', md5($salt . $password));
+ do
+ {
+ $hash = pack('H*', md5($hash . $password));
+ }
+ while (--$count);
}
- $db->sql_freeresult($result);
- unset($padding_store);
- $template->assign_vars(array(
- 'S_DISPLAY_JUMPBOX' => $display_jumpbox,
- 'S_JUMPBOX_ACTION' => $action)
- );
+ $output = substr($setting, 0, 12);
+ $output .= _hash_encode64($hash, 16, $itoa64);
- return;
+ return $output;
}
-
// Compatibility functions
if (!function_exists('array_combine'))
@@ -2442,856 +2486,6 @@ function login_forum_box($forum_data)
page_footer();
}
-// Content related functions
-
-/**
-* Bump Topic Check - used by posting and viewtopic
-*/
-function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster)
-{
- global $config, $auth, $user;
-
- // Check permission and make sure the last post was not already bumped
- if (!$auth->acl_get('f_bump', $forum_id) || $topic_bumped)
- {
- return false;
- }
-
- // Check bump time range, is the user really allowed to bump the topic at this time?
- $bump_time = ($config['bump_type'] == 'm') ? $config['bump_interval'] * 60 : (($config['bump_type'] == 'h') ? $config['bump_interval'] * 3600 : $config['bump_interval'] * 86400);
-
- // Check bump time
- if ($last_post_time + $bump_time > time())
- {
- return false;
- }
-
- // Check bumper, only topic poster and last poster are allowed to bump
- if ($topic_poster != $user->data['user_id'] && $last_topic_poster != $user->data['user_id'])
- {
- return false;
- }
-
- // A bump time of 0 will completely disable the bump feature... not intended but might be useful.
- return $bump_time;
-}
-
-/**
-* Generates a text with approx. the specified length which contains the specified words and their context
-*
-* @param string $text The full text from which context shall be extracted
-* @param string $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!)
-* @param int $length The desired length of the resulting text, however the result might be shorter or longer than this value
-*
-* @return string Context of the specified words separated by "..."
-*/
-function get_context($text, $words, $length = 400)
-{
- // first replace all whitespaces with single spaces
- $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' '), $text);
-
- $word_indizes = array();
- if (sizeof($words))
- {
- $match = '';
- // find the starting indizes of all words
- foreach ($words as $word)
- {
- if ($word)
- {
- if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match))
- {
- $pos = utf8_strpos($text, $match[1]);
- if ($pos !== false)
- {
- $word_indizes[] = $pos;
- }
- }
- }
- }
- unset($match);
-
- if (sizeof($word_indizes))
- {
- $word_indizes = array_unique($word_indizes);
- sort($word_indizes);
-
- $wordnum = sizeof($word_indizes);
- // number of characters on the right and left side of each word
- $sequence_length = (int) ($length / (2 * $wordnum)) - 2;
- $final_text = '';
- $word = $j = 0;
- $final_text_index = -1;
-
- // cycle through every character in the original text
- for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++)
- {
- // if the current position is the start of one of the words then append $sequence_length characters to the final text
- if (isset($word_indizes[$word]) && ($i == $word_indizes[$word]))
- {
- if ($final_text_index < $i - $sequence_length - 1)
- {
- $final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length));
- }
- else
- {
- // if the final text is already nearer to the current word than $sequence_length we only append the text
- // from its current index on and distribute the unused length to all other sequenes
- $sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum));
- $final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1);
- }
- $final_text_index = $i - 1;
-
- // add the following characters to the final text (see below)
- $word++;
- $j = 1;
- }
-
- if ($j > 0)
- {
- // add the character to the final text and increment the sequence counter
- $final_text .= utf8_substr($text, $i, 1);
- $final_text_index++;
- $j++;
-
- // if this is a whitespace then check whether we are done with this sequence
- if (utf8_substr($text, $i, 1) == ' ')
- {
- // only check whether we have to exit the context generation completely if we haven't already reached the end anyway
- if ($i + 4 < $n)
- {
- if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length)
- {
- $final_text .= ' ...';
- break;
- }
- }
- else
- {
- // make sure the text really reaches the end
- $j -= 4;
- }
-
- // stop context generation and wait for the next word
- if ($j > $sequence_length)
- {
- $j = 0;
- }
- }
- }
- }
- return $final_text;
- }
- }
-
- if (!sizeof($words) || !sizeof($word_indizes))
- {
- return (utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text;
- }
-}
-
-/**
-* Decode text whereby text is coming from the db and expected to be pre-parsed content
-* We are placing this outside of the message parser because we are often in need of it...
-*/
-function decode_message(&$message, $bbcode_uid = '')
-{
- global $config;
-
- if ($bbcode_uid)
- {
- $match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
- $replace = array("\n", '', '', '', '');
- }
- else
- {
- $match = array('<br />');
- $replace = array("\n");
- }
-
- $message = str_replace($match, $replace, $message);
-
- $match = get_preg_expression('bbcode_htm');
- $replace = array('\1', '\1', '\2', '\1', '', '');
-
- $message = preg_replace($match, $replace, $message);
-}
-
-/**
-* Strips all bbcode from a text and returns the plain content
-*/
-function strip_bbcode(&$text, $uid = '')
-{
- if (!$uid)
- {
- $uid = '[0-9a-z]{5,}';
- }
-
- $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:&quot;.*&quot;|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text);
-
- $match = get_preg_expression('bbcode_htm');
- $replace = array('\1', '\1', '\2', '\1', '', '');
-
- $text = preg_replace($match, $replace, $text);
-}
-
-/**
-* For display of custom parsed text on user-facing pages
-* Expects $text to be the value directly from the database (stored value)
-*/
-function generate_text_for_display($text, $uid, $bitfield, $flags)
-{
- static $bbcode;
-
- if (!$text)
- {
- return '';
- }
-
- $text = censor_text($text);
-
- // Parse bbcode if bbcode uid stored and bbcode enabled
- if ($uid && ($flags & OPTION_FLAG_BBCODE))
- {
- if (!class_exists('bbcode'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
- }
-
- if (empty($bbcode))
- {
- $bbcode = new bbcode($bitfield);
- }
- else
- {
- $bbcode->bbcode($bitfield);
- }
-
- $bbcode->bbcode_second_pass($text, $uid);
- }
-
- $text = bbcode_nl2br($text);
- $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));
-
- return $text;
-}
-
-/**
-* For parsing custom parsed text to be stored within the database.
-* This function additionally returns the uid and bitfield that needs to be stored.
-* Expects $text to be the value directly from request_var() and in it's non-parsed form
-*/
-function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)
-{
- global $phpbb_root_path, $phpEx;
-
- $uid = $bitfield = '';
-
- if (!$text)
- {
- return;
- }
-
- if (!class_exists('parse_message'))
- {
- include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
- }
-
- $message_parser = new parse_message($text);
- $message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies);
-
- $text = $message_parser->message;
- $uid = $message_parser->bbcode_uid;
-
- // If the bbcode_bitfield is empty, there is no need for the uid to be stored.
- if (!$message_parser->bbcode_bitfield)
- {
- $uid = '';
- }
-
- $flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);
- $bitfield = $message_parser->bbcode_bitfield;
-
- return;
-}
-
-/**
-* For decoding custom parsed text for edits as well as extracting the flags
-* Expects $text to be the value directly from the database (pre-parsed content)
-*/
-function generate_text_for_edit($text, $uid, $flags)
-{
- global $phpbb_root_path, $phpEx;
-
- decode_message($text, $uid);
-
- return array(
- 'allow_bbcode' => ($flags & OPTION_FLAG_BBCODE) ? 1 : 0,
- 'allow_smilies' => ($flags & OPTION_FLAG_SMILIES) ? 1 : 0,
- 'allow_urls' => ($flags & OPTION_FLAG_LINKS) ? 1 : 0,
- 'text' => $text
- );
-}
-
-/**
-* A subroutine of make_clickable used with preg_replace
-* It places correct HTML around an url, shortens the displayed text
-* and makes sure no entities are inside URLs
-*/
-function make_clickable_callback($type, $whitespace, $url, $relative_url, $class)
-{
- $append = '';
- $url = htmlspecialchars_decode($url);
- $relative_url = htmlspecialchars_decode($relative_url);
-
- // make sure no HTML entities were matched
- $chars = array('<', '>', '"');
- $split = false;
-
- foreach ($chars as $char)
- {
- $next_split = strpos($url, $char);
- if ($next_split !== false)
- {
- $split = ($split !== false) ? min($split, $next_split) : $next_split;
- }
- }
-
- if ($split !== false)
- {
- // an HTML entity was found, so the URL has to end before it
- $append = substr($url, $split) . $relative_url;
- $url = substr($url, 0, $split);
- $relative_url = '';
- }
- else if ($relative_url)
- {
- // same for $relative_url
- $split = false;
- foreach ($chars as $char)
- {
- $next_split = strpos($relative_url, $char);
- if ($next_split !== false)
- {
- $split = ($split !== false) ? min($split, $next_split) : $next_split;
- }
- }
-
- if ($split !== false)
- {
- $append = substr($relative_url, $split);
- $relative_url = substr($relative_url, 0, $split);
- }
- }
-
- // if the last character of the url is a punctuation mark, exclude it from the url
- $last_char = ($relative_url) ? $relative_url[strlen($relative_url) - 1] : $url[strlen($url) - 1];
-
- switch ($last_char)
- {
- case '.':
- case '?':
- case '!':
- case ':':
- case ',':
- $append = $last_char;
- if ($relative_url)
- {
- $relative_url = substr($relative_url, 0, -1);
- }
- else
- {
- $url = substr($url, 0, -1);
- }
- break;
- }
-
- switch ($type)
- {
- case MAGIC_URL_LOCAL:
- $tag = 'l';
- $relative_url = preg_replace('/[&?]sid=[0-9a-f]{32}$/', '', preg_replace('/([&?])sid=[0-9a-f]{32}&/', '$1', $relative_url));
- $url = $url . '/' . $relative_url;
- $text = ($relative_url) ? $relative_url : $url;
- break;
-
- case MAGIC_URL_FULL:
- $tag = 'm';
- $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
- break;
-
- case MAGIC_URL_WWW:
- $tag = 'w';
- $url = 'http://' . $url;
- $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
- break;
-
- case MAGIC_URL_EMAIL:
- $tag = 'e';
- $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
- $url = 'mailto:' . $url;
- break;
- }
-
- $url = htmlspecialchars($url);
- $text = htmlspecialchars($text);
- $append = htmlspecialchars($append);
-
- $html = "$whitespace<!-- $tag --><a$class href=\"$url\">$text</a><!-- $tag -->$append";
-
- return $html;
-}
-
-/**
-* make_clickable function
-*
-* Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
-* Cuts down displayed size of link if over 50 chars, turns absolute links
-* into relative versions when the server/script path matches the link
-*/
-function make_clickable($text, $server_url = false, $class = 'postlink')
-{
- if ($server_url === false)
- {
- $server_url = generate_board_url();
- }
-
- static $magic_url_match;
- static $magic_url_replace;
- static $static_class;
-
- if (!is_array($magic_url_match) || $static_class != $class)
- {
- $static_class = $class;
- $class = ($static_class) ? ' class="' . $static_class . '"' : '';
- $local_class = ($static_class) ? ' class="' . $static_class . '-local"' : '';
-
- $magic_url_match = $magic_url_replace = array();
- // Be sure to not let the matches cross over. ;)
-
- // relative urls for this board
- $magic_url_match[] = '#(^|[\n\t (>])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie';
- $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')";
-
- // matches a xxxx://aaaaa.bbb.cccc. ...
- $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('url_inline') . ')#ie';
- $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')";
-
- // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
- $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#ie';
- $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')";
-
- // matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
- $magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie';
- $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')";
- }
-
- return preg_replace($magic_url_match, $magic_url_replace, $text);
-}
-
-/**
-* Censoring
-*/
-function censor_text($text)
-{
- static $censors;
- global $cache;
-
- if (!isset($censors) || !is_array($censors))
- {
- // obtain_word_list is taking care of the users censor option and the board-wide option
- $censors = $cache->obtain_word_list();
- }
-
- if (sizeof($censors))
- {
- return preg_replace($censors['match'], $censors['replace'], $text);
- }
-
- return $text;
-}
-
-/**
-* custom version of nl2br which takes custom BBCodes into account
-*/
-function bbcode_nl2br($text)
-{
- // custom BBCodes might contain carriage returns so they
- // are not converted into <br /> so now revert that
- $text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text);
- return $text;
-}
-
-/**
-* Smiley processing
-*/
-function smiley_text($text, $force_option = false)
-{
- global $config, $user, $phpbb_root_path;
-
- if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies'))
- {
- return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text);
- }
- else
- {
- return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text);
- }
-}
-
-/**
-* General attachment parsing
-*
-* @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
-* @param string &$message The post/private message
-* @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.
-* @param array &$update_count The attachment counts to be updated - will be filled
-* @param bool $preview If set to true the attachments are parsed for preview. Within preview mode the comments are fetched from the given $attachments array and not fetched from the database.
-*/
-function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $preview = false)
-{
- if (!sizeof($attachments))
- {
- return;
- }
-
- global $template, $cache, $user;
- global $extensions, $config, $phpbb_root_path, $phpEx;
-
- //
- $compiled_attachments = array();
-
- if (!isset($template->filename['attachment_tpl']))
- {
- $template->set_filenames(array(
- 'attachment_tpl' => 'attachment.html')
- );
- }
-
- if (empty($extensions) || !is_array($extensions))
- {
- $extensions = $cache->obtain_attach_extensions($forum_id);
- }
-
- // Look for missing attachment information...
- $attach_ids = array();
- foreach ($attachments as $pos => $attachment)
- {
- // If is_orphan is set, we need to retrieve the attachments again...
- if (!isset($attachment['extension']) && !isset($attachment['physical_filename']))
- {
- $attach_ids[(int) $attachment['attach_id']] = $pos;
- }
- }
-
- // Grab attachments (security precaution)
- if (sizeof($attach_ids))
- {
- global $db;
-
- $new_attachment_data = array();
-
- $sql = 'SELECT *
- FROM ' . ATTACHMENTS_TABLE . '
- WHERE ' . $db->sql_in_set('attach_id', array_keys($attach_ids));
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- if (!isset($attach_ids[$row['attach_id']]))
- {
- continue;
- }
-
- // If we preview attachments we will set some retrieved values here
- if ($preview)
- {
- $row['attach_comment'] = $attachments[$attach_ids[$row['attach_id']]]['attach_comment'];
- }
-
- $new_attachment_data[$attach_ids[$row['attach_id']]] = $row;
- }
- $db->sql_freeresult($result);
-
- $attachments = $new_attachment_data;
- unset($new_attachment_data);
- }
-
- // Sort correctly
- if ($config['display_order'])
- {
- // Ascending sort
- krsort($attachments);
- }
- else
- {
- // Descending sort
- ksort($attachments);
- }
-
- foreach ($attachments as $attachment)
- {
- if (!sizeof($attachment))
- {
- continue;
- }
-
- // We need to reset/empty the _file block var, because this function might be called more than once
- $template->destroy_block_vars('_file');
-
- $block_array = array();
-
- // Some basics...
- $attachment['extension'] = strtolower(trim($attachment['extension']));
- $filename = $phpbb_root_path . $config['upload_path'] . '/' . basename($attachment['physical_filename']);
- $thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . basename($attachment['physical_filename']);
-
- $upload_icon = '';
-
- if (isset($extensions[$attachment['extension']]))
- {
- if ($user->img('icon_topic_attach', '') && !$extensions[$attachment['extension']]['upload_icon'])
- {
- $upload_icon = $user->img('icon_topic_attach', '');
- }
- else if ($extensions[$attachment['extension']]['upload_icon'])
- {
- $upload_icon = '<img src="' . $phpbb_root_path . $config['upload_icons_path'] . '/' . trim($extensions[$attachment['extension']]['upload_icon']) . '" alt="" />';
- }
- }
-
- $filesize = $attachment['filesize'];
- $size_lang = ($filesize >= 1048576) ? $user->lang['MB'] : ( ($filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] );
- $filesize = ($filesize >= 1048576) ? round((round($filesize / 1048576 * 100) / 100), 2) : (($filesize >= 1024) ? round((round($filesize / 1024 * 100) / 100), 2) : $filesize);
-
- $comment = bbcode_nl2br(censor_text($attachment['attach_comment']));
-
- $block_array += array(
- 'UPLOAD_ICON' => $upload_icon,
- 'FILESIZE' => $filesize,
- 'SIZE_LANG' => $size_lang,
- 'DOWNLOAD_NAME' => basename($attachment['real_filename']),
- 'COMMENT' => $comment,
- );
-
- $denied = false;
-
- if (!extension_allowed($forum_id, $attachment['extension'], $extensions))
- {
- $denied = true;
-
- $block_array += array(
- 'S_DENIED' => true,
- 'DENIED_MESSAGE' => sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension'])
- );
- }
-
- if (!$denied)
- {
- $l_downloaded_viewed = $download_link = '';
- $display_cat = $extensions[$attachment['extension']]['display_cat'];
-
- if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)
- {
- if ($attachment['thumbnail'])
- {
- $display_cat = ATTACHMENT_CATEGORY_THUMB;
- }
- else
- {
- if ($config['img_display_inlined'])
- {
- if ($config['img_link_width'] || $config['img_link_height'])
- {
- $dimension = @getimagesize($filename);
-
- // If the dimensions could not be determined or the image being 0x0 we display it as a link for safety purposes
- if ($dimension === false || empty($dimension[0]) || empty($dimension[1]))
- {
- $display_cat = ATTACHMENT_CATEGORY_NONE;
- }
- else
- {
- $display_cat = ($dimension[0] <= $config['img_link_width'] && $dimension[1] <= $config['img_link_height']) ? ATTACHMENT_CATEGORY_IMAGE : ATTACHMENT_CATEGORY_NONE;
- }
- }
- }
- else
- {
- $display_cat = ATTACHMENT_CATEGORY_NONE;
- }
- }
- }
-
- // Make some descisions based on user options being set.
- if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg'))
- {
- $display_cat = ATTACHMENT_CATEGORY_NONE;
- }
-
- if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !$user->optionget('viewflash'))
- {
- $display_cat = ATTACHMENT_CATEGORY_NONE;
- }
-
- $download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id']);
-
- switch ($display_cat)
- {
- // Images
- case ATTACHMENT_CATEGORY_IMAGE:
- $l_downloaded_viewed = 'VIEWED_COUNT';
- $inline_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id']);
- $download_link .= '&amp;mode=view';
-
- $block_array += array(
- 'S_IMAGE' => true,
- 'U_INLINE_LINK' => $inline_link,
- );
-
- $update_count[] = $attachment['attach_id'];
- break;
-
- // Images, but display Thumbnail
- case ATTACHMENT_CATEGORY_THUMB:
- $l_downloaded_viewed = 'VIEWED_COUNT';
- $thumbnail_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1');
- $download_link .= '&amp;mode=view';
-
- $block_array += array(
- 'S_THUMBNAIL' => true,
- 'THUMB_IMAGE' => $thumbnail_link,
- );
- break;
-
- // Windows Media Streams
- case ATTACHMENT_CATEGORY_WM:
- $l_downloaded_viewed = 'VIEWED_COUNT';
-
- // Giving the filename directly because within the wm object all variables are in local context making it impossible
- // to validate against a valid session (all params can differ)
- // $download_link = $filename;
-
- $block_array += array(
- 'U_FORUM' => generate_board_url(),
- 'ATTACH_ID' => $attachment['attach_id'],
- 'S_WM_FILE' => true,
- );
-
- // Viewed/Heared File ... update the download count
- $update_count[] = $attachment['attach_id'];
- break;
-
- // Real Media Streams
- case ATTACHMENT_CATEGORY_RM:
- case ATTACHMENT_CATEGORY_QUICKTIME:
- $l_downloaded_viewed = 'VIEWED_COUNT';
-
- $block_array += array(
- 'S_RM_FILE' => ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false,
- 'S_QUICKTIME_FILE' => ($display_cat == ATTACHMENT_CATEGORY_QUICKTIME) ? true : false,
- 'U_FORUM' => generate_board_url(),
- 'ATTACH_ID' => $attachment['attach_id'],
- );
-
- // Viewed/Heared File ... update the download count
- $update_count[] = $attachment['attach_id'];
- break;
-
- // Macromedia Flash Files
- case ATTACHMENT_CATEGORY_FLASH:
- list($width, $height) = @getimagesize($filename);
-
- $l_downloaded_viewed = 'VIEWED_COUNT';
-
- $block_array += array(
- 'S_FLASH_FILE' => true,
- 'WIDTH' => $width,
- 'HEIGHT' => $height,
- );
-
- // Viewed/Heared File ... update the download count
- $update_count[] = $attachment['attach_id'];
- break;
-
- default:
- $l_downloaded_viewed = 'DOWNLOAD_COUNT';
-
- $block_array += array(
- 'S_FILE' => true,
- );
- break;
- }
-
- $l_download_count = (!isset($attachment['download_count']) || $attachment['download_count'] == 0) ? $user->lang[$l_downloaded_viewed . '_NONE'] : (($attachment['download_count'] == 1) ? sprintf($user->lang[$l_downloaded_viewed], $attachment['download_count']) : sprintf($user->lang[$l_downloaded_viewed . 'S'], $attachment['download_count']));
-
- $block_array += array(
- 'U_DOWNLOAD_LINK' => $download_link,
- 'L_DOWNLOAD_COUNT' => $l_download_count
- );
- }
-
- $template->assign_block_vars('_file', $block_array);
-
- $compiled_attachments[] = $template->assign_display('attachment_tpl');
- }
-
- $attachments = $compiled_attachments;
- unset($compiled_attachments);
-
- $tpl_size = sizeof($attachments);
-
- $unset_tpl = array();
-
- preg_match_all('#<!\-\- ia([0-9]+) \-\->(.*?)<!\-\- ia\1 \-\->#', $message, $matches, PREG_PATTERN_ORDER);
-
- $replace = array();
- foreach ($matches[0] as $num => $capture)
- {
- // Flip index if we are displaying the reverse way
- $index = ($config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num];
-
- $replace['from'][] = $matches[0][$num];
- $replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]);
-
- $unset_tpl[] = $index;
- }
-
- if (isset($replace['from']))
- {
- $message = str_replace($replace['from'], $replace['to'], $message);
- }
-
- $unset_tpl = array_unique($unset_tpl);
-
- // Needed to let not display the inlined attachments at the end of the post again
- foreach ($unset_tpl as $index)
- {
- unset($attachments[$index]);
- }
-}
-
-/**
-* Check if extension is allowed to be posted.
-*
-* @param mixed $forum_id The forum id to check or false if private message
-* @param string $extension The extension to check, for example zip.
-* @param array &$extensions The extension array holding the information from the cache (will be obtained if empty)
-*
-* @return bool False if the extension is not allowed to be posted, else true.
-*/
-function extension_allowed($forum_id, $extension, &$extensions)
-{
- if (empty($extensions))
- {
- global $cache;
- $extensions = $cache->obtain_attach_extensions($forum_id);
- }
-
- return (!isset($extensions['_allowed_'][$extension])) ? false : true;
-}
-
// Little helpers
/**
@@ -3603,134 +2797,6 @@ function short_ipv6($ip, $length)
}
/**
-* Truncates string while retaining special characters if going over the max length
-* The default max length is 60 at the moment
-*/
-function truncate_string($string, $max_length = 60, $allow_reply = true, $append = '')
-{
- $chars = array();
-
- $strip_reply = false;
- $stripped = false;
- if ($allow_reply && strpos($string, 'Re: ') === 0)
- {
- $strip_reply = true;
- $string = substr($string, 4);
- }
-
- $_chars = utf8_str_split(htmlspecialchars_decode($string));
- $chars = array_map('utf8_htmlspecialchars', $_chars);
-
- // Now check the length ;)
- if (sizeof($chars) > $max_length)
- {
- // Cut off the last elements from the array
- $string = implode('', array_slice($chars, 0, $max_length - utf8_strlen($append)));
- $stripped = true;
- }
-
- if ($strip_reply)
- {
- $string = 'Re: ' . $string;
- }
-
- if ($append != '' && $stripped)
- {
- $string = $string . $append;
- }
-
- return $string;
-}
-
-/**
-* Get username details for placing into templates.
-*
-* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link)
-* @param int $user_id The users id
-* @param string $username The users name
-* @param string $username_colour The users colour
-* @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
-* @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
-*
-* @return string A string consisting of what is wanted based on $mode.
-*/
-function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
-{
- global $phpbb_root_path, $phpEx, $user, $auth;
-
- $profile_url = '';
- $username_colour = ($username_colour) ? '#' . $username_colour : '';
-
- if ($guest_username === false)
- {
- $username = ($username) ? $username : $user->lang['GUEST'];
- }
- else
- {
- $username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $user->lang['GUEST']);
- }
-
- // Only show the link if not anonymous
- if ($mode != 'no_profile' && $user_id && $user_id != ANONYMOUS)
- {
- // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
- // For all others the link leads to a login page or the profile.
- if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile'))
- {
- $profile_url = '';
- }
- else
- {
- $profile_url = ($custom_profile_url !== false) ? $custom_profile_url . '&amp;u=' . (int) $user_id : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . (int) $user_id);
- }
- }
- else
- {
- $profile_url = '';
- }
-
- switch ($mode)
- {
- case 'profile':
- return $profile_url;
- break;
-
- case 'username':
- return $username;
- break;
-
- case 'colour':
- return $username_colour;
- break;
-
- case 'no_profile':
- case 'full':
- default:
-
- $tpl = '';
- if (!$profile_url && !$username_colour)
- {
- $tpl = '{USERNAME}';
- }
- else if (!$profile_url && $username_colour)
- {
- $tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
- }
- else if ($profile_url && !$username_colour)
- {
- $tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>';
- }
- else if ($profile_url && $username_colour)
- {
- $tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
- }
-
- return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl);
- break;
- }
-}
-
-/**
* Wrapper for php's checkdnsrr function.
*
* The windows failover is from the php manual
@@ -4456,98 +3522,4 @@ function phpbb_user_session_handler()
return;
}
-/**
-* @package phpBB3
-*/
-class bitfield
-{
- var $data;
-
- function bitfield($bitfield = '')
- {
- $this->data = base64_decode($bitfield);
- }
-
- /**
- */
- function get($n)
- {
- // Get the ($n / 8)th char
- $byte = $n >> 3;
-
- if (strlen($this->data) >= $byte + 1)
- {
- $c = $this->data[$byte];
-
- // Lookup the ($n % 8)th bit of the byte
- $bit = 7 - ($n & 7);
- return (bool) (ord($c) & (1 << $bit));
- }
- else
- {
- return false;
- }
- }
-
- function set($n)
- {
- $byte = $n >> 3;
- $bit = 7 - ($n & 7);
-
- if (strlen($this->data) >= $byte + 1)
- {
- $this->data[$byte] = $this->data[$byte] | chr(1 << $bit);
- }
- else
- {
- $this->data .= str_repeat("\0", $byte - strlen($this->data));
- $this->data .= chr(1 << $bit);
- }
- }
-
- function clear($n)
- {
- $byte = $n >> 3;
-
- if (strlen($this->data) >= $byte + 1)
- {
- $bit = 7 - ($n & 7);
- $this->data[$byte] = $this->data[$byte] &~ chr(1 << $bit);
- }
- }
-
- function get_blob()
- {
- return $this->data;
- }
-
- function get_base64()
- {
- return base64_encode($this->data);
- }
-
- function get_bin()
- {
- $bin = '';
- $len = strlen($this->data);
-
- for ($i = 0; $i < $len; ++$i)
- {
- $bin .= str_pad(decbin(ord($this->data[$i])), 8, '0', STR_PAD_LEFT);
- }
-
- return $bin;
- }
-
- function get_all_set()
- {
- return array_keys(array_filter(str_split($this->get_bin())));
- }
-
- function merge($bitfield)
- {
- $this->data = $this->data | $bitfield->get_blob();
- }
-}
-
?> \ No newline at end of file
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
new file mode 100644
index 0000000000..5e0780f048
--- /dev/null
+++ b/phpBB/includes/functions_content.php
@@ -0,0 +1,1267 @@
+<?php
+/**
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+/**
+* gen_sort_selects()
+* make_jumpbox()
+* bump_topic_allowed()
+* get_context()
+* decode_message()
+* strip_bbcode()
+* generate_text_for_display()
+* generate_text_for_storage()
+* generate_text_for_edit()
+* make_clickable_callback()
+* make_clickable()
+* censor_text()
+* bbcode_nl2br()
+* smiley_text()
+* parse_attachments()
+* extension_allowed()
+* truncate_string()
+* get_username_string()
+* class bitfield
+*/
+
+/**
+* Generate sort selection fields
+*/
+function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param)
+{
+ global $user;
+
+ $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
+
+ // Check if the key is selectable. If not, we reset to the first key found.
+ // This ensures the values are always valid.
+ if (!isset($limit_days[$sort_days]))
+ {
+ @reset($limit_days);
+ $sort_days = key($limit_days);
+ }
+
+ if (!isset($sort_by_text[$sort_key]))
+ {
+ @reset($sort_by_text);
+ $sort_key = key($sort_by_text);
+ }
+
+ if (!isset($sort_dir_text[$sort_dir]))
+ {
+ @reset($sort_dir_text);
+ $sort_dir = key($sort_dir_text);
+ }
+
+ $s_limit_days = '<select name="st">';
+ foreach ($limit_days as $day => $text)
+ {
+ $selected = ($sort_days == $day) ? ' selected="selected"' : '';
+ $s_limit_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
+ }
+ $s_limit_days .= '</select>';
+
+ $s_sort_key = '<select name="sk">';
+ foreach ($sort_by_text as $key => $text)
+ {
+ $selected = ($sort_key == $key) ? ' selected="selected"' : '';
+ $s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
+ }
+ $s_sort_key .= '</select>';
+
+ $s_sort_dir = '<select name="sd">';
+ foreach ($sort_dir_text as $key => $value)
+ {
+ $selected = ($sort_dir == $key) ? ' selected="selected"' : '';
+ $s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+ }
+ $s_sort_dir .= '</select>';
+
+ $u_sort_param = "st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
+
+ return;
+}
+
+/**
+* Generate Jumpbox
+*/
+function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false)
+{
+ global $config, $auth, $template, $user, $db;
+
+ if (!$config['load_jumpbox'])
+ {
+ return;
+ }
+
+ $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
+ FROM ' . FORUMS_TABLE . '
+ ORDER BY left_id ASC';
+ $result = $db->sql_query($sql, 600);
+
+ $right = $padding = 0;
+ $padding_store = array('0' => 0);
+ $display_jumpbox = false;
+ $iteration = 0;
+
+ // Sometimes it could happen that forums will be displayed here not be displayed within the index page
+ // This is the result of forums not displayed at index, having list permissions and a parent of a forum with no permissions.
+ // If this happens, the padding could be "broken"
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ if ($row['left_id'] < $right)
+ {
+ $padding++;
+ $padding_store[$row['parent_id']] = $padding;
+ }
+ else if ($row['left_id'] > $right + 1)
+ {
+ // Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it.
+ // @todo digging deep to find out "how" this can happen.
+ $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding;
+ }
+
+ $right = $row['right_id'];
+
+ if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
+ {
+ // Non-postable forum with no subforums, don't display
+ continue;
+ }
+
+ if (!$auth->acl_get('f_list', $row['forum_id']))
+ {
+ // if the user does not have permissions to list this forum skip
+ continue;
+ }
+
+ if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id']))
+ {
+ continue;
+ }
+
+ if (!$display_jumpbox)
+ {
+ $template->assign_block_vars('jumpbox_forums', array(
+ 'FORUM_ID' => ($select_all) ? 0 : -1,
+ 'FORUM_NAME' => ($select_all) ? $user->lang['ALL_FORUMS'] : $user->lang['SELECT_FORUM'],
+ 'S_FORUM_COUNT' => $iteration)
+ );
+
+ $iteration++;
+ $display_jumpbox = true;
+ }
+
+ $template->assign_block_vars('jumpbox_forums', array(
+ 'FORUM_ID' => $row['forum_id'],
+ 'FORUM_NAME' => $row['forum_name'],
+ 'SELECTED' => ($row['forum_id'] == $forum_id) ? ' selected="selected"' : '',
+ 'S_FORUM_COUNT' => $iteration,
+ 'S_IS_CAT' => ($row['forum_type'] == FORUM_CAT) ? true : false,
+ 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false,
+ 'S_IS_POST' => ($row['forum_type'] == FORUM_POST) ? true : false)
+ );
+
+ for ($i = 0; $i < $padding; $i++)
+ {
+ $template->assign_block_vars('jumpbox_forums.level', array());
+ }
+ $iteration++;
+ }
+ $db->sql_freeresult($result);
+ unset($padding_store);
+
+ $template->assign_vars(array(
+ 'S_DISPLAY_JUMPBOX' => $display_jumpbox,
+ 'S_JUMPBOX_ACTION' => $action)
+ );
+
+ return;
+}
+
+/**
+* Bump Topic Check - used by posting and viewtopic
+*/
+function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster)
+{
+ global $config, $auth, $user;
+
+ // Check permission and make sure the last post was not already bumped
+ if (!$auth->acl_get('f_bump', $forum_id) || $topic_bumped)
+ {
+ return false;
+ }
+
+ // Check bump time range, is the user really allowed to bump the topic at this time?
+ $bump_time = ($config['bump_type'] == 'm') ? $config['bump_interval'] * 60 : (($config['bump_type'] == 'h') ? $config['bump_interval'] * 3600 : $config['bump_interval'] * 86400);
+
+ // Check bump time
+ if ($last_post_time + $bump_time > time())
+ {
+ return false;
+ }
+
+ // Check bumper, only topic poster and last poster are allowed to bump
+ if ($topic_poster != $user->data['user_id'] && $last_topic_poster != $user->data['user_id'])
+ {
+ return false;
+ }
+
+ // A bump time of 0 will completely disable the bump feature... not intended but might be useful.
+ return $bump_time;
+}
+
+/**
+* Generates a text with approx. the specified length which contains the specified words and their context
+*
+* @param string $text The full text from which context shall be extracted
+* @param string $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!)
+* @param int $length The desired length of the resulting text, however the result might be shorter or longer than this value
+*
+* @return string Context of the specified words separated by "..."
+*/
+function get_context($text, $words, $length = 400)
+{
+ // first replace all whitespaces with single spaces
+ $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' '), $text);
+
+ $word_indizes = array();
+ if (sizeof($words))
+ {
+ $match = '';
+ // find the starting indizes of all words
+ foreach ($words as $word)
+ {
+ if ($word)
+ {
+ if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match))
+ {
+ $pos = utf8_strpos($text, $match[1]);
+ if ($pos !== false)
+ {
+ $word_indizes[] = $pos;
+ }
+ }
+ }
+ }
+ unset($match);
+
+ if (sizeof($word_indizes))
+ {
+ $word_indizes = array_unique($word_indizes);
+ sort($word_indizes);
+
+ $wordnum = sizeof($word_indizes);
+ // number of characters on the right and left side of each word
+ $sequence_length = (int) ($length / (2 * $wordnum)) - 2;
+ $final_text = '';
+ $word = $j = 0;
+ $final_text_index = -1;
+
+ // cycle through every character in the original text
+ for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++)
+ {
+ // if the current position is the start of one of the words then append $sequence_length characters to the final text
+ if (isset($word_indizes[$word]) && ($i == $word_indizes[$word]))
+ {
+ if ($final_text_index < $i - $sequence_length - 1)
+ {
+ $final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length));
+ }
+ else
+ {
+ // if the final text is already nearer to the current word than $sequence_length we only append the text
+ // from its current index on and distribute the unused length to all other sequenes
+ $sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum));
+ $final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1);
+ }
+ $final_text_index = $i - 1;
+
+ // add the following characters to the final text (see below)
+ $word++;
+ $j = 1;
+ }
+
+ if ($j > 0)
+ {
+ // add the character to the final text and increment the sequence counter
+ $final_text .= utf8_substr($text, $i, 1);
+ $final_text_index++;
+ $j++;
+
+ // if this is a whitespace then check whether we are done with this sequence
+ if (utf8_substr($text, $i, 1) == ' ')
+ {
+ // only check whether we have to exit the context generation completely if we haven't already reached the end anyway
+ if ($i + 4 < $n)
+ {
+ if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length)
+ {
+ $final_text .= ' ...';
+ break;
+ }
+ }
+ else
+ {
+ // make sure the text really reaches the end
+ $j -= 4;
+ }
+
+ // stop context generation and wait for the next word
+ if ($j > $sequence_length)
+ {
+ $j = 0;
+ }
+ }
+ }
+ }
+ return $final_text;
+ }
+ }
+
+ if (!sizeof($words) || !sizeof($word_indizes))
+ {
+ return (utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text;
+ }
+}
+
+/**
+* Decode text whereby text is coming from the db and expected to be pre-parsed content
+* We are placing this outside of the message parser because we are often in need of it...
+*/
+function decode_message(&$message, $bbcode_uid = '')
+{
+ global $config;
+
+ if ($bbcode_uid)
+ {
+ $match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
+ $replace = array("\n", '', '', '', '');
+ }
+ else
+ {
+ $match = array('<br />');
+ $replace = array("\n");
+ }
+
+ $message = str_replace($match, $replace, $message);
+
+ $match = get_preg_expression('bbcode_htm');
+ $replace = array('\1', '\1', '\2', '\1', '', '');
+
+ $message = preg_replace($match, $replace, $message);
+}
+
+/**
+* Strips all bbcode from a text and returns the plain content
+*/
+function strip_bbcode(&$text, $uid = '')
+{
+ if (!$uid)
+ {
+ $uid = '[0-9a-z]{5,}';
+ }
+
+ $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:&quot;.*&quot;|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text);
+
+ $match = get_preg_expression('bbcode_htm');
+ $replace = array('\1', '\1', '\2', '\1', '', '');
+
+ $text = preg_replace($match, $replace, $text);
+}
+
+/**
+* For display of custom parsed text on user-facing pages
+* Expects $text to be the value directly from the database (stored value)
+*/
+function generate_text_for_display($text, $uid, $bitfield, $flags)
+{
+ static $bbcode;
+
+ if (!$text)
+ {
+ return '';
+ }
+
+ $text = censor_text($text);
+
+ // Parse bbcode if bbcode uid stored and bbcode enabled
+ if ($uid && ($flags & OPTION_FLAG_BBCODE))
+ {
+ if (!class_exists('bbcode'))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
+ }
+
+ if (empty($bbcode))
+ {
+ $bbcode = new bbcode($bitfield);
+ }
+ else
+ {
+ $bbcode->bbcode($bitfield);
+ }
+
+ $bbcode->bbcode_second_pass($text, $uid);
+ }
+
+ $text = bbcode_nl2br($text);
+ $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));
+
+ return $text;
+}
+
+/**
+* For parsing custom parsed text to be stored within the database.
+* This function additionally returns the uid and bitfield that needs to be stored.
+* Expects $text to be the value directly from request_var() and in it's non-parsed form
+*/
+function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)
+{
+ global $phpbb_root_path, $phpEx;
+
+ $uid = $bitfield = '';
+
+ if (!$text)
+ {
+ return;
+ }
+
+ if (!class_exists('parse_message'))
+ {
+ include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
+ }
+
+ $message_parser = new parse_message($text);
+ $message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies);
+
+ $text = $message_parser->message;
+ $uid = $message_parser->bbcode_uid;
+
+ // If the bbcode_bitfield is empty, there is no need for the uid to be stored.
+ if (!$message_parser->bbcode_bitfield)
+ {
+ $uid = '';
+ }
+
+ $flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);
+ $bitfield = $message_parser->bbcode_bitfield;
+
+ return;
+}
+
+/**
+* For decoding custom parsed text for edits as well as extracting the flags
+* Expects $text to be the value directly from the database (pre-parsed content)
+*/
+function generate_text_for_edit($text, $uid, $flags)
+{
+ global $phpbb_root_path, $phpEx;
+
+ decode_message($text, $uid);
+
+ return array(
+ 'allow_bbcode' => ($flags & OPTION_FLAG_BBCODE) ? 1 : 0,
+ 'allow_smilies' => ($flags & OPTION_FLAG_SMILIES) ? 1 : 0,
+ 'allow_urls' => ($flags & OPTION_FLAG_LINKS) ? 1 : 0,
+ 'text' => $text
+ );
+}
+
+/**
+* A subroutine of make_clickable used with preg_replace
+* It places correct HTML around an url, shortens the displayed text
+* and makes sure no entities are inside URLs
+*/
+function make_clickable_callback($type, $whitespace, $url, $relative_url, $class)
+{
+ $append = '';
+ $url = htmlspecialchars_decode($url);
+ $relative_url = htmlspecialchars_decode($relative_url);
+
+ // make sure no HTML entities were matched
+ $chars = array('<', '>', '"');
+ $split = false;
+
+ foreach ($chars as $char)
+ {
+ $next_split = strpos($url, $char);
+ if ($next_split !== false)
+ {
+ $split = ($split !== false) ? min($split, $next_split) : $next_split;
+ }
+ }
+
+ if ($split !== false)
+ {
+ // an HTML entity was found, so the URL has to end before it
+ $append = substr($url, $split) . $relative_url;
+ $url = substr($url, 0, $split);
+ $relative_url = '';
+ }
+ else if ($relative_url)
+ {
+ // same for $relative_url
+ $split = false;
+ foreach ($chars as $char)
+ {
+ $next_split = strpos($relative_url, $char);
+ if ($next_split !== false)
+ {
+ $split = ($split !== false) ? min($split, $next_split) : $next_split;
+ }
+ }
+
+ if ($split !== false)
+ {
+ $append = substr($relative_url, $split);
+ $relative_url = substr($relative_url, 0, $split);
+ }
+ }
+
+ // if the last character of the url is a punctuation mark, exclude it from the url
+ $last_char = ($relative_url) ? $relative_url[strlen($relative_url) - 1] : $url[strlen($url) - 1];
+
+ switch ($last_char)
+ {
+ case '.':
+ case '?':
+ case '!':
+ case ':':
+ case ',':
+ $append = $last_char;
+ if ($relative_url)
+ {
+ $relative_url = substr($relative_url, 0, -1);
+ }
+ else
+ {
+ $url = substr($url, 0, -1);
+ }
+ break;
+ }
+
+ switch ($type)
+ {
+ case MAGIC_URL_LOCAL:
+ $tag = 'l';
+ $relative_url = preg_replace('/[&?]sid=[0-9a-f]{32}$/', '', preg_replace('/([&?])sid=[0-9a-f]{32}&/', '$1', $relative_url));
+ $url = $url . '/' . $relative_url;
+ $text = ($relative_url) ? $relative_url : $url;
+ break;
+
+ case MAGIC_URL_FULL:
+ $tag = 'm';
+ $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
+ break;
+
+ case MAGIC_URL_WWW:
+ $tag = 'w';
+ $url = 'http://' . $url;
+ $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
+ break;
+
+ case MAGIC_URL_EMAIL:
+ $tag = 'e';
+ $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
+ $url = 'mailto:' . $url;
+ break;
+ }
+
+ $url = htmlspecialchars($url);
+ $text = htmlspecialchars($text);
+ $append = htmlspecialchars($append);
+
+ $html = "$whitespace<!-- $tag --><a$class href=\"$url\">$text</a><!-- $tag -->$append";
+
+ return $html;
+}
+
+/**
+* make_clickable function
+*
+* Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
+* Cuts down displayed size of link if over 50 chars, turns absolute links
+* into relative versions when the server/script path matches the link
+*/
+function make_clickable($text, $server_url = false, $class = 'postlink')
+{
+ if ($server_url === false)
+ {
+ $server_url = generate_board_url();
+ }
+
+ static $magic_url_match;
+ static $magic_url_replace;
+ static $static_class;
+
+ if (!is_array($magic_url_match) || $static_class != $class)
+ {
+ $static_class = $class;
+ $class = ($static_class) ? ' class="' . $static_class . '"' : '';
+ $local_class = ($static_class) ? ' class="' . $static_class . '-local"' : '';
+
+ $magic_url_match = $magic_url_replace = array();
+ // Be sure to not let the matches cross over. ;)
+
+ // relative urls for this board
+ $magic_url_match[] = '#(^|[\n\t (>])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie';
+ $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')";
+
+ // matches a xxxx://aaaaa.bbb.cccc. ...
+ $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('url_inline') . ')#ie';
+ $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')";
+
+ // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
+ $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#ie';
+ $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')";
+
+ // matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
+ $magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie';
+ $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')";
+ }
+
+ return preg_replace($magic_url_match, $magic_url_replace, $text);
+}
+
+/**
+* Censoring
+*/
+function censor_text($text)
+{
+ static $censors;
+ global $cache;
+
+ if (!isset($censors) || !is_array($censors))
+ {
+ // obtain_word_list is taking care of the users censor option and the board-wide option
+ $censors = $cache->obtain_word_list();
+ }
+
+ if (sizeof($censors))
+ {
+ return preg_replace($censors['match'], $censors['replace'], $text);
+ }
+
+ return $text;
+}
+
+/**
+* custom version of nl2br which takes custom BBCodes into account
+*/
+function bbcode_nl2br($text)
+{
+ // custom BBCodes might contain carriage returns so they
+ // are not converted into <br /> so now revert that
+ $text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text);
+ return $text;
+}
+
+/**
+* Smiley processing
+*/
+function smiley_text($text, $force_option = false)
+{
+ global $config, $user, $phpbb_root_path;
+
+ if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies'))
+ {
+ return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text);
+ }
+ else
+ {
+ return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text);
+ }
+}
+
+/**
+* General attachment parsing
+*
+* @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
+* @param string &$message The post/private message
+* @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.
+* @param array &$update_count The attachment counts to be updated - will be filled
+* @param bool $preview If set to true the attachments are parsed for preview. Within preview mode the comments are fetched from the given $attachments array and not fetched from the database.
+*/
+function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $preview = false)
+{
+ if (!sizeof($attachments))
+ {
+ return;
+ }
+
+ global $template, $cache, $user;
+ global $extensions, $config, $phpbb_root_path, $phpEx;
+
+ //
+ $compiled_attachments = array();
+
+ if (!isset($template->filename['attachment_tpl']))
+ {
+ $template->set_filenames(array(
+ 'attachment_tpl' => 'attachment.html')
+ );
+ }
+
+ if (empty($extensions) || !is_array($extensions))
+ {
+ $extensions = $cache->obtain_attach_extensions($forum_id);
+ }
+
+ // Look for missing attachment information...
+ $attach_ids = array();
+ foreach ($attachments as $pos => $attachment)
+ {
+ // If is_orphan is set, we need to retrieve the attachments again...
+ if (!isset($attachment['extension']) && !isset($attachment['physical_filename']))
+ {
+ $attach_ids[(int) $attachment['attach_id']] = $pos;
+ }
+ }
+
+ // Grab attachments (security precaution)
+ if (sizeof($attach_ids))
+ {
+ global $db;
+
+ $new_attachment_data = array();
+
+ $sql = 'SELECT *
+ FROM ' . ATTACHMENTS_TABLE . '
+ WHERE ' . $db->sql_in_set('attach_id', array_keys($attach_ids));
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ if (!isset($attach_ids[$row['attach_id']]))
+ {
+ continue;
+ }
+
+ // If we preview attachments we will set some retrieved values here
+ if ($preview)
+ {
+ $row['attach_comment'] = $attachments[$attach_ids[$row['attach_id']]]['attach_comment'];
+ }
+
+ $new_attachment_data[$attach_ids[$row['attach_id']]] = $row;
+ }
+ $db->sql_freeresult($result);
+
+ $attachments = $new_attachment_data;
+ unset($new_attachment_data);
+ }
+
+ // Sort correctly
+ if ($config['display_order'])
+ {
+ // Ascending sort
+ krsort($attachments);
+ }
+ else
+ {
+ // Descending sort
+ ksort($attachments);
+ }
+
+ foreach ($attachments as $attachment)
+ {
+ if (!sizeof($attachment))
+ {
+ continue;
+ }
+
+ // We need to reset/empty the _file block var, because this function might be called more than once
+ $template->destroy_block_vars('_file');
+
+ $block_array = array();
+
+ // Some basics...
+ $attachment['extension'] = strtolower(trim($attachment['extension']));
+ $filename = $phpbb_root_path . $config['upload_path'] . '/' . basename($attachment['physical_filename']);
+ $thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . basename($attachment['physical_filename']);
+
+ $upload_icon = '';
+
+ if (isset($extensions[$attachment['extension']]))
+ {
+ if ($user->img('icon_topic_attach', '') && !$extensions[$attachment['extension']]['upload_icon'])
+ {
+ $upload_icon = $user->img('icon_topic_attach', '');
+ }
+ else if ($extensions[$attachment['extension']]['upload_icon'])
+ {
+ $upload_icon = '<img src="' . $phpbb_root_path . $config['upload_icons_path'] . '/' . trim($extensions[$attachment['extension']]['upload_icon']) . '" alt="" />';
+ }
+ }
+
+ $filesize = $attachment['filesize'];
+ $size_lang = ($filesize >= 1048576) ? $user->lang['MB'] : ( ($filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] );
+ $filesize = ($filesize >= 1048576) ? round((round($filesize / 1048576 * 100) / 100), 2) : (($filesize >= 1024) ? round((round($filesize / 1024 * 100) / 100), 2) : $filesize);
+
+ $comment = bbcode_nl2br(censor_text($attachment['attach_comment']));
+
+ $block_array += array(
+ 'UPLOAD_ICON' => $upload_icon,
+ 'FILESIZE' => $filesize,
+ 'SIZE_LANG' => $size_lang,
+ 'DOWNLOAD_NAME' => basename($attachment['real_filename']),
+ 'COMMENT' => $comment,
+ );
+
+ $denied = false;
+
+ if (!extension_allowed($forum_id, $attachment['extension'], $extensions))
+ {
+ $denied = true;
+
+ $block_array += array(
+ 'S_DENIED' => true,
+ 'DENIED_MESSAGE' => sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension'])
+ );
+ }
+
+ if (!$denied)
+ {
+ $l_downloaded_viewed = $download_link = '';
+ $display_cat = $extensions[$attachment['extension']]['display_cat'];
+
+ if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)
+ {
+ if ($attachment['thumbnail'])
+ {
+ $display_cat = ATTACHMENT_CATEGORY_THUMB;
+ }
+ else
+ {
+ if ($config['img_display_inlined'])
+ {
+ if ($config['img_link_width'] || $config['img_link_height'])
+ {
+ $dimension = @getimagesize($filename);
+
+ // If the dimensions could not be determined or the image being 0x0 we display it as a link for safety purposes
+ if ($dimension === false || empty($dimension[0]) || empty($dimension[1]))
+ {
+ $display_cat = ATTACHMENT_CATEGORY_NONE;
+ }
+ else
+ {
+ $display_cat = ($dimension[0] <= $config['img_link_width'] && $dimension[1] <= $config['img_link_height']) ? ATTACHMENT_CATEGORY_IMAGE : ATTACHMENT_CATEGORY_NONE;
+ }
+ }
+ }
+ else
+ {
+ $display_cat = ATTACHMENT_CATEGORY_NONE;
+ }
+ }
+ }
+
+ // Make some descisions based on user options being set.
+ if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg'))
+ {
+ $display_cat = ATTACHMENT_CATEGORY_NONE;
+ }
+
+ if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !$user->optionget('viewflash'))
+ {
+ $display_cat = ATTACHMENT_CATEGORY_NONE;
+ }
+
+ $download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id']);
+
+ switch ($display_cat)
+ {
+ // Images
+ case ATTACHMENT_CATEGORY_IMAGE:
+ $l_downloaded_viewed = 'VIEWED_COUNT';
+ $inline_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id']);
+ $download_link .= '&amp;mode=view';
+
+ $block_array += array(
+ 'S_IMAGE' => true,
+ 'U_INLINE_LINK' => $inline_link,
+ );
+
+ $update_count[] = $attachment['attach_id'];
+ break;
+
+ // Images, but display Thumbnail
+ case ATTACHMENT_CATEGORY_THUMB:
+ $l_downloaded_viewed = 'VIEWED_COUNT';
+ $thumbnail_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1');
+ $download_link .= '&amp;mode=view';
+
+ $block_array += array(
+ 'S_THUMBNAIL' => true,
+ 'THUMB_IMAGE' => $thumbnail_link,
+ );
+ break;
+
+ // Windows Media Streams
+ case ATTACHMENT_CATEGORY_WM:
+ $l_downloaded_viewed = 'VIEWED_COUNT';
+
+ // Giving the filename directly because within the wm object all variables are in local context making it impossible
+ // to validate against a valid session (all params can differ)
+ // $download_link = $filename;
+
+ $block_array += array(
+ 'U_FORUM' => generate_board_url(),
+ 'ATTACH_ID' => $attachment['attach_id'],
+ 'S_WM_FILE' => true,
+ );
+
+ // Viewed/Heared File ... update the download count
+ $update_count[] = $attachment['attach_id'];
+ break;
+
+ // Real Media Streams
+ case ATTACHMENT_CATEGORY_RM:
+ case ATTACHMENT_CATEGORY_QUICKTIME:
+ $l_downloaded_viewed = 'VIEWED_COUNT';
+
+ $block_array += array(
+ 'S_RM_FILE' => ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false,
+ 'S_QUICKTIME_FILE' => ($display_cat == ATTACHMENT_CATEGORY_QUICKTIME) ? true : false,
+ 'U_FORUM' => generate_board_url(),
+ 'ATTACH_ID' => $attachment['attach_id'],
+ );
+
+ // Viewed/Heared File ... update the download count
+ $update_count[] = $attachment['attach_id'];
+ break;
+
+ // Macromedia Flash Files
+ case ATTACHMENT_CATEGORY_FLASH:
+ list($width, $height) = @getimagesize($filename);
+
+ $l_downloaded_viewed = 'VIEWED_COUNT';
+
+ $block_array += array(
+ 'S_FLASH_FILE' => true,
+ 'WIDTH' => $width,
+ 'HEIGHT' => $height,
+ );
+
+ // Viewed/Heared File ... update the download count
+ $update_count[] = $attachment['attach_id'];
+ break;
+
+ default:
+ $l_downloaded_viewed = 'DOWNLOAD_COUNT';
+
+ $block_array += array(
+ 'S_FILE' => true,
+ );
+ break;
+ }
+
+ $l_download_count = (!isset($attachment['download_count']) || $attachment['download_count'] == 0) ? $user->lang[$l_downloaded_viewed . '_NONE'] : (($attachment['download_count'] == 1) ? sprintf($user->lang[$l_downloaded_viewed], $attachment['download_count']) : sprintf($user->lang[$l_downloaded_viewed . 'S'], $attachment['download_count']));
+
+ $block_array += array(
+ 'U_DOWNLOAD_LINK' => $download_link,
+ 'L_DOWNLOAD_COUNT' => $l_download_count
+ );
+ }
+
+ $template->assign_block_vars('_file', $block_array);
+
+ $compiled_attachments[] = $template->assign_display('attachment_tpl');
+ }
+
+ $attachments = $compiled_attachments;
+ unset($compiled_attachments);
+
+ $tpl_size = sizeof($attachments);
+
+ $unset_tpl = array();
+
+ preg_match_all('#<!\-\- ia([0-9]+) \-\->(.*?)<!\-\- ia\1 \-\->#', $message, $matches, PREG_PATTERN_ORDER);
+
+ $replace = array();
+ foreach ($matches[0] as $num => $capture)
+ {
+ // Flip index if we are displaying the reverse way
+ $index = ($config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num];
+
+ $replace['from'][] = $matches[0][$num];
+ $replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]);
+
+ $unset_tpl[] = $index;
+ }
+
+ if (isset($replace['from']))
+ {
+ $message = str_replace($replace['from'], $replace['to'], $message);
+ }
+
+ $unset_tpl = array_unique($unset_tpl);
+
+ // Needed to let not display the inlined attachments at the end of the post again
+ foreach ($unset_tpl as $index)
+ {
+ unset($attachments[$index]);
+ }
+}
+
+/**
+* Check if extension is allowed to be posted.
+*
+* @param mixed $forum_id The forum id to check or false if private message
+* @param string $extension The extension to check, for example zip.
+* @param array &$extensions The extension array holding the information from the cache (will be obtained if empty)
+*
+* @return bool False if the extension is not allowed to be posted, else true.
+*/
+function extension_allowed($forum_id, $extension, &$extensions)
+{
+ if (empty($extensions))
+ {
+ global $cache;
+ $extensions = $cache->obtain_attach_extensions($forum_id);
+ }
+
+ return (!isset($extensions['_allowed_'][$extension])) ? false : true;
+}
+
+/**
+* Truncates string while retaining special characters if going over the max length
+* The default max length is 60 at the moment
+*/
+function truncate_string($string, $max_length = 60, $allow_reply = true, $append = '')
+{
+ $chars = array();
+
+ $strip_reply = false;
+ $stripped = false;
+ if ($allow_reply && strpos($string, 'Re: ') === 0)
+ {
+ $strip_reply = true;
+ $string = substr($string, 4);
+ }
+
+ $_chars = utf8_str_split(htmlspecialchars_decode($string));
+ $chars = array_map('utf8_htmlspecialchars', $_chars);
+
+ // Now check the length ;)
+ if (sizeof($chars) > $max_length)
+ {
+ // Cut off the last elements from the array
+ $string = implode('', array_slice($chars, 0, $max_length - utf8_strlen($append)));
+ $stripped = true;
+ }
+
+ if ($strip_reply)
+ {
+ $string = 'Re: ' . $string;
+ }
+
+ if ($append != '' && $stripped)
+ {
+ $string = $string . $append;
+ }
+
+ return $string;
+}
+
+/**
+* Get username details for placing into templates.
+*
+* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link)
+* @param int $user_id The users id
+* @param string $username The users name
+* @param string $username_colour The users colour
+* @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
+* @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
+*
+* @return string A string consisting of what is wanted based on $mode.
+*/
+function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
+{
+ global $phpbb_root_path, $phpEx, $user, $auth;
+
+ $profile_url = '';
+ $username_colour = ($username_colour) ? '#' . $username_colour : '';
+
+ if ($guest_username === false)
+ {
+ $username = ($username) ? $username : $user->lang['GUEST'];
+ }
+ else
+ {
+ $username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $user->lang['GUEST']);
+ }
+
+ // Only show the link if not anonymous
+ if ($mode != 'no_profile' && $user_id && $user_id != ANONYMOUS)
+ {
+ // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
+ // For all others the link leads to a login page or the profile.
+ if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile'))
+ {
+ $profile_url = '';
+ }
+ else
+ {
+ $profile_url = ($custom_profile_url !== false) ? $custom_profile_url . '&amp;u=' . (int) $user_id : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . (int) $user_id);
+ }
+ }
+ else
+ {
+ $profile_url = '';
+ }
+
+ switch ($mode)
+ {
+ case 'profile':
+ return $profile_url;
+ break;
+
+ case 'username':
+ return $username;
+ break;
+
+ case 'colour':
+ return $username_colour;
+ break;
+
+ case 'no_profile':
+ case 'full':
+ default:
+
+ $tpl = '';
+ if (!$profile_url && !$username_colour)
+ {
+ $tpl = '{USERNAME}';
+ }
+ else if (!$profile_url && $username_colour)
+ {
+ $tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
+ }
+ else if ($profile_url && !$username_colour)
+ {
+ $tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>';
+ }
+ else if ($profile_url && $username_colour)
+ {
+ $tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
+ }
+
+ return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl);
+ break;
+ }
+}
+
+/**
+* @package phpBB3
+*/
+class bitfield
+{
+ var $data;
+
+ function bitfield($bitfield = '')
+ {
+ $this->data = base64_decode($bitfield);
+ }
+
+ /**
+ */
+ function get($n)
+ {
+ // Get the ($n / 8)th char
+ $byte = $n >> 3;
+
+ if (strlen($this->data) >= $byte + 1)
+ {
+ $c = $this->data[$byte];
+
+ // Lookup the ($n % 8)th bit of the byte
+ $bit = 7 - ($n & 7);
+ return (bool) (ord($c) & (1 << $bit));
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ function set($n)
+ {
+ $byte = $n >> 3;
+ $bit = 7 - ($n & 7);
+
+ if (strlen($this->data) >= $byte + 1)
+ {
+ $this->data[$byte] = $this->data[$byte] | chr(1 << $bit);
+ }
+ else
+ {
+ $this->data .= str_repeat("\0", $byte - strlen($this->data));
+ $this->data .= chr(1 << $bit);
+ }
+ }
+
+ function clear($n)
+ {
+ $byte = $n >> 3;
+
+ if (strlen($this->data) >= $byte + 1)
+ {
+ $bit = 7 - ($n & 7);
+ $this->data[$byte] = $this->data[$byte] &~ chr(1 << $bit);
+ }
+ }
+
+ function get_blob()
+ {
+ return $this->data;
+ }
+
+ function get_base64()
+ {
+ return base64_encode($this->data);
+ }
+
+ function get_bin()
+ {
+ $bin = '';
+ $len = strlen($this->data);
+
+ for ($i = 0; $i < $len; ++$i)
+ {
+ $bin .= str_pad(decbin(ord($this->data[$i])), 8, '0', STR_PAD_LEFT);
+ }
+
+ return $bin;
+ }
+
+ function get_all_set()
+ {
+ return array_keys(array_filter(str_split($this->get_bin())));
+ }
+
+ function merge($bitfield)
+ {
+ $this->data = $this->data | $bitfield->get_blob();
+ }
+}
+
+?> \ No newline at end of file
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 41eb93ce09..b89af840b6 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -75,13 +75,13 @@ class ucp_profile
$error[] = 'NEW_PASSWORD_ERROR';
}
- if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && md5($data['cur_password']) != $user->data['user_password'])
+ if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password']))
{
$error[] = 'CUR_PASSWORD_ERROR';
}
// Only check the new password against the previous password if there have been no errors
- if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && md5($data['new_password']) == $user->data['user_password'])
+ if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], $user->data['user_password']))
{
$error[] = 'SAME_PASSWORD_ERROR';
}
@@ -103,7 +103,7 @@ class ucp_profile
'username_clean' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'],
'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'],
'user_email_hash' => ($auth->acl_get('u_chgemail')) ? crc32($data['email']) . strlen($data['email']) : $user->data['user_email_hash'],
- 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? md5($data['new_password']) : $user->data['user_password'],
+ 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'],
'user_passchg' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0,
);
@@ -112,7 +112,7 @@ class ucp_profile
add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_NAME', $user->data['username'], $data['username']);
}
- if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && md5($data['new_password']) != $user->data['user_password'])
+ if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], $user->data['user_password']))
{
$user->reset_login_keys();
add_log('user', $user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']);
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index f321eb5b25..571ea423e5 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -300,7 +300,7 @@ class ucp_register
$user_row = array(
'username' => $data['username'],
- 'user_password' => md5($data['new_password']),
+ 'user_password' => phpbb_hash($data['new_password']),
'user_email' => $data['email'],
'group_id' => (int) $group_id,
'user_timezone' => (float) $data['tz'],
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index b761e772f6..3f2c737045 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -67,7 +67,7 @@ class ucp_remind
$user_password = gen_rand_string(8);
$sql = 'UPDATE ' . USERS_TABLE . "
- SET user_newpasswd = '" . $db->sql_escape(md5($user_password)) . "', user_actkey = '" . $db->sql_escape($user_actkey) . "'
+ SET user_newpasswd = '" . $db->sql_escape(phpbb_hash($user_password)) . "', user_actkey = '" . $db->sql_escape($user_actkey) . "'
WHERE user_id = " . $user_row['user_id'];
$db->sql_query($sql);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 66a22213f9..cea393724f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -55,7 +55,14 @@ require($phpbb_root_path . 'includes/cache.' . $phpEx);
require($phpbb_root_path . 'includes/template.' . $phpEx);
require($phpbb_root_path . 'includes/session.' . $phpEx);
require($phpbb_root_path . 'includes/auth.' . $phpEx);
+
require($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
+{
+ require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+}
+
require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index d30a48be98..f3a833a872 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -149,6 +149,12 @@ else
// Include essential scripts
require($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
+{
+ require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+}
+
include($phpbb_root_path . 'includes/auth.' . $phpEx);
include($phpbb_root_path . 'includes/session.' . $phpEx);
include($phpbb_root_path . 'includes/template.' . $phpEx);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index ca86816e9c..7bc0f32be3 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1309,7 +1309,7 @@ class install_install extends module
WHERE config_name = 'avatar_salt'",
'UPDATE ' . $data['table_prefix'] . "users
- SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
+ SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(phpbb_hash($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
WHERE username = 'Admin'",
'UPDATE ' . $data['table_prefix'] . "moderator_cache