We do not support nesting code tags - #10763

#10741
Confirm box on pruning forums - #10619
Not stripping empty lines on parsing messages - #10579
Remove reports alongside with users - #10501


git-svn-id: file:///svn/phpbb/trunk@7527 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/acp/acp_prune.php

@@ -66,6 +66,8 @@ class acp_prune
 		}
 
 		if ($submit)
+		{
+			if (confirm_box(true))
 			{
 				$prune_posted = request_var('prune_days', 0);
 				$prune_viewed = request_var('prune_vieweddays', 0);
@@ -149,6 +151,23 @@ class acp_prune
 
 				return;
 			}
+			else
+			{
+				confirm_box(false, $user->lang['PRUNE_FORUM_CONFIRM'], build_hidden_fields(array(
+					'i'				=> $id,
+					'mode'			=> $mode,
+					'submit'		=> 1,
+					'all_forums'	=> $all_forums,
+					'f'				=> $forum_id,
+
+					'prune_days'		=> request_var('prune_days', 0),
+					'prune_vieweddays'	=> request_var('prune_vieweddays', 0),
+					'prune_old_polls'	=> request_var('prune_old_polls', 0),
+					'prune_announce'	=> request_var('prune_announce', 0),
+					'prune_sticky'		=> request_var('prune_sticky', 0),
+				)));
+			}
+		}
 
 		// If they haven't selected a forum for pruning yet then
 		// display a select box to use for pruning.

phpBB/includes/acp/acp_styles.php

@@ -967,6 +967,7 @@ parse_css_file = {PARSE_CSS_FILE}
 
 		foreach ($file_ary as $file)
 		{
+			$file = str_replace('/', '.', $file);
 			$filename = "{$cache_prefix}_$file.html.$phpEx";
 
 			$template->assign_block_vars('file', array(

phpBB/includes/functions_user.php

@@ -293,6 +293,65 @@ function user_delete($mode, $user_id, $post_username = false)
 
 	$db->sql_transaction('begin');
 
+	// Before we begin, we will remove the reports the user issued.
+	$sql = 'SELECT r.post_id, p.topic_id
+		FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
+		WHERE r.user_id = ' . $user_id . '
+			AND p.post_id = r.post_id';
+	$result = $db->sql_query($sql);
+
+	$report_posts = $report_topics = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$report_posts[] = $row['post_id'];
+		$report_topics[] = $row['topic_id'];
+	}
+	$db->sql_freeresult($result);
+
+	if (sizeof($report_posts))
+	{
+		$report_posts = array_unique($report_posts);
+		$report_topics = array_unique($report_topics);
+
+		// Get a list of topics that still contain reported posts
+		$sql = 'SELECT DISTINCT topic_id
+			FROM ' . POSTS_TABLE . '
+			WHERE ' . $db->sql_in_set('topic_id', $report_topics) . '
+				AND post_reported = 1
+				AND ' . $db->sql_in_set('post_id', $report_posts, true);
+		$result = $db->sql_query($sql);
+
+		$keep_report_topics = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$keep_report_topics[] = $row['topic_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (sizeof($keep_report_topics))
+		{
+			$report_topics = array_diff($report_topics, $keep_report_topics);
+		}
+		unset($keep_report_topics);
+
+		// Now set the flags back
+		$sql = 'UPDATE ' . POSTS_TABLE . '
+			SET post_reported = 0
+			WHERE ' . $db->sql_in_set('post_id', $report_posts);
+		$db->sql_query($sql);
+
+		if (sizeof($report_topics))
+		{
+			$sql = 'UPDATE ' . TOPICS_TABLE . '
+				SET topic_reported = 0
+				WHERE ' . $db->sql_in_set('topic_id', $report_topics);
+			$db->sql_query($sql);
+		}
+	}
+
+	// Remove reports
+	$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE user_id = ' . $user_id);
+
 	switch ($mode)
 	{
 		case 'retain':

phpBB/includes/message_parser.php

@@ -374,38 +374,13 @@ class bbcode_firstpass extends bbcode
 		// Having it here saves us one preg_replace per message containing [code] blocks
 		// Additionally, magic url parsing should go after parsing bbcodes, but for safety those are stripped out too...
 		$htm_match = get_preg_expression('bbcode_htm');
-//		$htm_match[3] = '/&#([0-9]+);/';
 		unset($htm_match[4], $htm_match[5]);
-
+		$htm_replace = array('\1', '\1', '\2', '\1');
-		$htm_replace = array('\1', '\1', '\2', '\1'); //, '&#\1;');
 
 		$out = '';
 
-		do
+		// Strip the last [/code] block from $in
-		{
+		$code = substr($in, 0, -7);
-			$pos = stripos($in, '[/code]') + 7;
-			$code = substr($in, 0, $pos);
-			$in = substr($in, $pos);
-			
-			// $code contains everything that was between code tags (including the ending tag) but we're trying to grab as much extra text as possible, as long as it does not contain open [code] tags
-			while ($in)
-			{
-				$pos = stripos($in, '[/code]') + 7;
-				$buffer = substr($in, 0, $pos);
-
-				if (preg_match('#\[code(?:=([a-z]+))?\]#i', $buffer))
-				{
-					break;
-				}
-				else
-				{
-					$in = substr($in, $pos);
-					$code .= $buffer;
-				}
-			}
-
-			$code = substr($code, 0, -7);
-//			$code = preg_replace('#^[\r\n]*(.*?)[\n\r\s\t]*$#s', '$1', $code);
 		$code = preg_replace($htm_match, $htm_replace, $code);
 
 		switch (strtolower($stx))
@@ -467,15 +442,6 @@ class bbcode_firstpass extends bbcode
 			break;
 		}
 
-			if (preg_match('#(.*?)\[code(?:=([a-z]+))?\](.+)#is', $in, $m))
-			{
-				$out .= $m[1];
-				$stx = $m[2];
-				$in = $m[3];
-			}
-		}
-		while ($in);
-
 		return $out;
 	}
 
@@ -979,10 +945,8 @@ class parse_message extends bbcode_firstpass
 
 		// Do some general 'cleanup' first before processing message,
 		// e.g. remove excessive newlines(?), smilies(?)
-		// Transform \r\n and \r into \n
+		$match = array('#(script|about|applet|activex|chrome):#i');
-		// TODO: Second regex looks wrong...
+		$replace = array("\\1:");
-		$match = array('#\r\n?#', "#(\n\s+){3,}#u", '#(script|about|applet|activex|chrome):#i');
-		$replace = array("\n", "\n\n", "\\1:");
 		$this->message = preg_replace($match, $replace, trim($this->message));
 
 		// Message length check. -1 disables this check completely.

phpBB/install/install_install.php

@@ -1304,9 +1304,8 @@ class install_install extends module
 				SET forum_last_post_time = $current_time", 
 		);
 
-		if (!@extension_loaded('gd'))
+		if (@extension_loaded('gd') || can_load_dll('gd'))
 		{
-			can_load_dll('gd');
 			$sql_ary[] = 'UPDATE ' . $table_prefix . "config
 				SET config_value = '1'
 				WHERE config_name = 'captcha_gd'";

phpBB/language/en/acp/prune.php

@@ -72,6 +72,7 @@ $lang = array_merge($lang, array(
 	'PRUNE_ANNOUNCEMENTS'			=> 'Prune announcements',
 	'PRUNE_FINISHED_POLLS'			=> 'Prune closed polls',
 	'PRUNE_FINISHED_POLLS_EXPLAIN'	=> 'Removes topics with polls which have ended.',
+	'PRUNE_FORUM_CONFIRM'			=> 'Are you sure you want to prune the selected forums with the settings specified? Once removed, there is no way to recover the pruned posts and topics.',
 	'PRUNE_NOT_POSTED'				=> 'Days since last posted',
 	'PRUNE_NOT_VIEWED'				=> 'Days since last viewed',
 	'PRUNE_OLD_POLLS'				=> 'Prune old polls',