1 files changed, 91 insertions, 13 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 863450a4b2..bb94967606 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -20,6 +20,7 @@ if (!defined('IN_PHPBB'))
 * make_jumpbox()
 * bump_topic_allowed()
 * get_context()
+* phpbb_clean_search_string()
 * decode_message()
 * strip_bbcode()
 * generate_text_for_display()
@@ -360,6 +361,23 @@ function get_context($text, $words, $length = 400)
 }
 
 /**
+* Cleans a search string by removing single wildcards from it and replacing multiple spaces with a single one.
+*
+* @param string $search_string The full search string which should be cleaned.
+*
+* @return string The cleaned search string without any wildcards and multiple spaces.
+*/
+function phpbb_clean_search_string($search_string)
+{
+	// This regular expressions matches every single wildcard.
+	// That means one after a whitespace or the beginning of the string or one before a whitespace or the end of the string.
+	$search_string = preg_replace('#(?<=^|\s)\*+(?=\s|$)#', '', $search_string);
+	$search_string = trim($search_string);
+	$search_string = preg_replace(array('#\s+#u', '#\*+#u'), array(' ', '*'), $search_string);
+	return $search_string;
+}
+
+/**
 * 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...
 */
@@ -427,13 +445,13 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
 	* @var string	bitfield		The BBCode Bitfield
 	* @var int		flags			The BBCode Flags
 	* @var bool		censor_text		Whether or not to apply word censors
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'bitfield', 'flags', 'censor_text');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_before', compact($vars)));
 
 	if ($censor_text)
-	{		
+	{
 		$text = censor_text($text);
 	}
 
@@ -469,7 +487,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
 	* @var string	uid			The BBCode UID
 	* @var string	bitfield	The BBCode Bitfield
 	* @var int		flags		The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'bitfield', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_after', compact($vars)));
@@ -481,6 +499,16 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_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
+*
+* @param string $text The text to be replaced with the parsed one
+* @param string $uid The BBCode uid for this parse
+* @param string $bitfield The BBCode bitfield for this parse
+* @param int $flags The allow_bbcode, allow_urls and allow_smilies compiled into a single integer.
+* @param bool $allow_bbcode If BBCode is allowed (i.e. if BBCode is parsed)
+* @param bool $allow_urls If urls is allowed
+* @param bool $allow_smilies If smilies are allowed
+*
+* @return array	An array of string with the errors that occurred while parsing
 */
 function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)
 {
@@ -497,9 +525,17 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 	* @var bool		allow_bbcode	Whether or not to parse BBCode
 	* @var bool		allow_urls		Whether or not to parse URLs
 	* @var bool		allow_smilies	Whether or not to parse Smilies
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
-	$vars = array('text', 'uid', 'bitfield', 'flags', 'allow_bbcode', 'allow_urls', 'allow_smilies');
+	$vars = array(
+		'text',
+		'uid',
+		'bitfield',
+		'flags',
+		'allow_bbcode',
+		'allow_urls',
+		'allow_smilies',
+	);
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_before', compact($vars)));
 
 	$uid = $bitfield = '';
@@ -537,12 +573,12 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 	* @var string	uid				The BBCode UID
 	* @var string	bitfield		The BBCode Bitfield
 	* @var int		flags			The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'bitfield', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_after', compact($vars)));
 
-	return;
+	return $message_parser->warn_msg;
 }
 
 /**
@@ -560,7 +596,7 @@ function generate_text_for_edit($text, $uid, $flags)
 	* @var string	text			The text to parse
 	* @var string	uid				The BBCode UID
 	* @var int		flags			The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'uid', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_edit_before', compact($vars)));
@@ -573,7 +609,7 @@ function generate_text_for_edit($text, $uid, $flags)
 	* @event core.modify_text_for_edit_after
 	* @var string	text			The text to parse
 	* @var int		flags			The BBCode Flags
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
 	$vars = array('text', 'flags');
 	extract($phpbb_dispatcher->trigger_event('core.modify_text_for_edit_after', compact($vars)));
@@ -773,7 +809,8 @@ function make_clickable($text, $server_url = false, $class = 'postlink')
 		{
 			$text = preg_replace_callback($magic_args[0], function($matches) use ($magic_args)
 			{
-				return make_clickable_callback($magic_args[1], $matches[1], $matches[2], $matches[3], $magic_args[2]);
+				$relative_url = isset($matches[3]) ? $matches[3] : '';
+				return make_clickable_callback($magic_args[1], $matches[1], $matches[2], $relative_url, $magic_args[2]);
 			}, $text);
 		}
 	}
@@ -1363,7 +1400,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 	{
 		$username_string = str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_profile'] : $_profile_cache['tpl_profile_colour']);
 	}
-	
+
 	/**
 	* Use this event to change the output of get_username_string()
 	*
@@ -1379,9 +1416,18 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 	*								profile url.
 	* @var string username_string	The string that has been generated
 	* @var array _profile_cache		Array of original return templates
-	* @since 3.1-A1
+	* @since 3.1.0-a1
 	*/
-	$vars = array('mode', 'user_id', 'username', 'username_colour', 'guest_username', 'custom_profile_url', 'username_string', '_profile_cache');
+	$vars = array(
+		'mode',
+		'user_id',
+		'username',
+		'username_colour',
+		'guest_username',
+		'custom_profile_url',
+		'username_string',
+		'_profile_cache',
+	);
 	extract($phpbb_dispatcher->trigger_event('core.modify_username_string', compact($vars)));
 
 	return $username_string;
@@ -1404,6 +1450,38 @@ function phpbb_add_quickmod_option($option, $lang_string)
 }
 
 /**
+* Concatenate an array into a string list.
+*
+* @param array $items Array of items to concatenate
+* @param object $user The phpBB $user object.
+*
+* @return string String list. Examples: "A"; "A and B"; "A, B, and C"
+*/
+function phpbb_generate_string_list($items, $user)
+{
+	if (empty($items))
+	{
+		return '';
+	}
+
+	$count = sizeof($items);
+	$last_item = array_pop($items);
+	$lang_key = 'STRING_LIST_MULTI';
+
+	if ($count == 1)
+	{
+		return $last_item;
+	}
+	else if ($count == 2)
+	{
+		$lang_key = 'STRING_LIST_SIMPLE';
+	}
+	$list = implode($user->lang['COMMA_SEPARATOR'], $items);
+
+	return $user->lang($lang_key, $list, $last_item);
+}
+
+/**
 * @package phpBB3
 */
 class bitfield