re-display download notice

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

phpBB/language/en/lang_admin.php

@@ -1322,6 +1322,7 @@ $lang += array(
 $lang += array(
 	'ADMIN_LOGS_EXPLAIN' => 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
 	'MOD_LOGS_EXPLAIN' => 'This lists the actions carried out by board moderators, select a forum from the drop down list. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
+	'CRITICAL_LOGS_EXPLAIN' => 'This lists the actions carried out by the board itself. These log provides you with information you are able to use for solving specific problems, for example non-delivery of emails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
 	'DISPLAY_LOG' => 'Display entries from previous',
 	'ALL_ENTRIES' => 'All entries',
 	'SORT_IP' => 'IP address',
@@ -1425,13 +1426,12 @@ $lang += array(
 	'EXTENSION_GROUP_EXIST'		=> 'The Extension Group %s already exist',
 
 	'MANAGE_EXTENSIONS'			=> 'Manage Extensions',
-	'MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed and forbidden file extensions. You are not able to manage forbidden file extensions with the extension groups management panel. To allow or disallow not forbidden file extensions, use the extension groups management panel.',
+	'MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your Extensions, please refer to the extension groups management panel. It is not recommended to add scripting extensions (such as php, php3, php4, phtml, pl, cgi, asp, aspx...)',
 	'COMMENT'					=> 'Comment',
 	'EXTENSION'					=> 'Extension',
 	'ADD_EXTENSION'				=> 'Add extension',
 	'EXTENSIONS_UPDATED'		=> 'Extensions successfully updated',
 	'EXTENSION_EXIST'			=> 'The Extension %s already exist',
-	'CANNOT_ADD_FORBIDDEN_EXTENSION' => 'The Extension %s is forbidden, you are not able to add it to the allowed Extensions',
 	'NOT_ASSIGNED'				=> 'Not assigned',
 );
 

phpBB/posting.php

@@ -1701,32 +1701,31 @@ function user_notification($mode, $subject, $forum_id, $topic_id, $post_id)
 	}
 	unset($email_list_ary);
 	
-	if (sizeof($delete_ids))
-	{
-		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
-			WHERE topic_id = $topic_id
-				AND user_id IN (" . implode(', ', $delete_ids) . ")";
-		$db->sql_query($sql);
-	}
-
-
 	if ($update_watched_sql_topic != '')
 	{
-		$sql = "UPDATE " . TOPICS_WATCH_TABLE . "
+		$sql = 'UPDATE ' . TOPICS_WATCH_TABLE . "
 			SET notify_status = 1
-			WHERE topic_id = " . $topic_id . "
+			WHERE topic_id = $topic_id
 				AND user_id IN (" . $update_watched_sql_topic . ")";
 		$db->sql_query($sql);
 	}
 
 	if ($update_watched_sql_forum != '')
 	{
-		$sql = "UPDATE " . FORUMS_WATCH_TABLE . "
+		$sql = 'UPDATE ' . FORUMS_WATCH_TABLE . "
 			SET notify_status = 1
-			WHERE forum_id = " . $forum_id . "
+			WHERE forum_id = $forum_id
 				AND user_id IN (" . $update_watched_sql_forum . ")";
 		$db->sql_query($sql);
 	}
+
+	if (sizeof($delete_ids))
+	{
+		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
+			WHERE topic_id = $topic_id
+				AND user_id IN (" . implode(', ', $delete_ids) . ")";
+		$db->sql_query($sql);
+	}
 }
 
 // Topic Review

phpBB/viewtopic.php

@@ -665,7 +665,7 @@ if (!empty($poll_start))
 
 // Container for user details, only process once
 $user_cache = $id_cache = $attachments = $attach_list = $rowset = $update_count = array();
-$has_attachments = FALSE;
+$has_attachments = $display_notice = FALSE;
 $force_encoding = '';
 $bbcode_bitfield = $i = 0;
 
@@ -688,7 +688,6 @@ if (!$row = $db->sql_fetchrow($result))
 // and the global bbcode_bitfield are built
 do
 {
-	$display_notice = FALSE;
 	$poster_id = $row['poster_id'];
 	$poster	= ($poster_id == ANONYMOUS) ? ((!empty($row['post_username'])) ? $row['post_username'] : $user->lang['GUEST']) : $row['username'];
 
@@ -734,8 +733,7 @@ do
 		'bbcode_bitfield'	=> $row['bbcode_bitfield'],
 		'enable_html'		=> $row['enable_html'],
 		'enable_smilies'	=> $row['enable_smilies'],
-		'enable_sig'		=> $row['enable_sig'],
+		'enable_sig'		=> $row['enable_sig']
-		'display_notice'	=> $display_notice
 	);
 
 	
@@ -1136,7 +1134,7 @@ foreach ($rowset as $i => $row)
 		'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? TRUE : FALSE,
 		'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? FALSE : TRUE,
 		'S_POST_REPORTED'	=> ($row['post_reported'] && $auth->acl_get('m_', $forum_id)) ? TRUE : FALSE,
-		'S_DISPLAY_NOTICE'	=> $row['display_notice'])
+		'S_DISPLAY_NOTICE'	=> $display_notice)
 	);
 
 	// Process Attachments for this post