checking in some fixes. ;) Most of them are really minor, including:

- correctly enter report notification into db
- fix double-quote pm issue


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

phpBB/adm/style/acp_forums.html

@@ -413,7 +413,7 @@
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr>
-				<td style="width: 5%;">{forums.FOLDER_IMAGE}</td>
+				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
 				<td>
 					<!-- IF forums.FORUM_IMAGE --><div style="float: left; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>

phpBB/adm/style/acp_modules.html

@@ -147,7 +147,7 @@
 		<tbody>
 		<!-- BEGIN modules -->
 			<tr>
-				<td style="width: 5%;">{modules.MODULE_IMAGE}</td>
+				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">

phpBB/adm/style/acp_users.html

@@ -218,7 +218,7 @@
 
 	</form>
 
-	<br clear="all" />
+	<div class="clearfix">&nbsp;</div>
 
 	<!-- INCLUDE permission_mask.html -->
 

phpBB/adm/style/permission_mask.html

@@ -28,8 +28,7 @@
 			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
 		<!-- ELSE -->
 		<!-- ENDIF -->
-		
+		<!-- {p_mask.f_mask.PADDING} -->{p_mask.f_mask.NAME}
-		{p_mask.f_mask.NAME}
 	</legend>
 	<!-- IF not p_mask.S_VIEW -->
 		<div class="permissions-switch">

phpBB/includes/acp/auth.php

@@ -556,35 +556,9 @@ class auth_admin extends auth
 						$s_role_options = '<option value="0"' . ((!$current_role_id) ? ' selected="selected"' : '') . ' title="' . htmlspecialchars($user->lang['NO_ROLE_ASSIGNED_EXPLAIN']) . '">' . $user->lang['NO_ROLE_ASSIGNED'] . '</option>' . $s_role_options;
 					}
 
-					if (!$forum_id)
-					{
-						$folder_image = '';
-					}
-					else
-					{
-						if ($forum_names_ary[$forum_id]['forum_status'] == ITEM_LOCKED)
-						{
-							$folder_image = '<img src="images/icon_folder_lock_small.gif" alt="' . $user->lang['FORUM_LOCKED'] . '" />';
-						}
-						else
-						{
-							switch ($forum_names_ary[$forum_id]['forum_type'])
-							{
-								case FORUM_LINK:
-									$folder_image = '<img src="images/icon_folder_link_small.gif" width="22" height="18" alt="' . $user->lang['FORUM_LINK'] . '" />';
-								break;
-
-								default:
-									$folder_image = ($forum_names_ary[$forum_id]['left_id'] + 1 != $forum_names_ary[$forum_id]['right_id']) ? '<img src="images/icon_folder_sub_small.gif" width="22" height="18" alt="' . $user->lang['SUBFORUM'] . '" />' : '<img src="images/icon_folder_small.gif" alt="' . $user->lang['FOLDER'] . '" />';
-								break;
-							}
-						}
-					}
-
 					$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
 						'NAME'				=> ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],
 						'PADDING'			=> ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],
-						'FOLDER_IMAGE'		=> $folder_image,
 						'S_ROLE_OPTIONS'	=> $s_role_options,
 						'UG_ID'				=> $ug_id,
 						'FORUM_ID'			=> $forum_id)

phpBB/includes/ucp/ucp_pm_compose.php

@@ -651,7 +651,7 @@ function compose_pm($id, $mode, $action)
 
 	$message_parser->decode_message($bbcode_uid);
 
-	if (($action == 'quote' || $action == 'quotepost') && !$preview && !$refresh)
+	if (($action == 'quote' || $action == 'quotepost') && !$preview && !$refresh && !$submit)
 	{
 		if ($action == 'quotepost')
 		{

phpBB/language/en/acp/groups.php

@@ -102,14 +102,14 @@ $lang = array_merge($lang, array(
 	'NO_USERS'					=> 'You haven’t entered any users.',
 
 	'SPECIAL_GROUPS'			=> 'Predefined groups',
-	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings. By clicking “Default” you can set the relevant group to the default for all its members.',
+	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
 
 	'TOTAL_MEMBERS'				=> 'Members',
 
 	'USERS_APPROVED'				=> 'Users approved successfully.',
 	'USER_DEFAULT'					=> 'User default',
 	'USER_DEF_GROUPS'				=> 'User defined groups',
-	'USER_DEF_GROUPS_EXPLAIN'		=> 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group. By clicking “Default” you can set the relevant group to the default for all its members.',
+	'USER_DEF_GROUPS_EXPLAIN'		=> 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group.',
 	'USER_GROUP_DEFAULT'			=> 'Set as default group',
 	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users',
 	'USER_GROUP_LEADER'				=> 'Set as group leader',

phpBB/language/en/acp/permissions.php

@@ -43,7 +43,7 @@ $lang = array_merge($lang, array(
 		<h2>Permission Roles</h2>
 		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
 
-		<h2>Permission Mask</h2>
+		<h2>Permission Masks</h2>
 		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
 	
 		<br />

phpBB/language/en/mcp.php

@@ -32,6 +32,7 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'ACTION'				=> 'Action',
+	'ACTION_NOTE'			=> 'Action/Note',
 	'ADD_FEEDBACK'			=> 'Add feedback',
 	'ADD_FEEDBACK_EXPLAIN'	=> 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
 	'ADD_WARNING'			=> 'Add warning',
@@ -100,7 +101,7 @@ $lang = array_merge($lang, array(
 
 	'LATEST_LOGS'				=> 'Latest 5 logged actions',
 	'LATEST_REPORTED'			=> 'Latest 5 reports',
-	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting for approval',
+	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting approval',
 	'LATEST_WARNING_TIME'		=> 'Latest warning issued',
 	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
 	'LEAVE_SHADOW'				=> 'Leave shadow topic in place',
@@ -278,7 +279,7 @@ $lang = array_merge($lang, array(
 	'SELECT_ACTION'						=> 'Select desired action',
 	'SELECT_FORUM_GLOBAL_ANNOUNCEMENT'	=> 'Please select the forum you wish this global announcement to be displayed.',
 	'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS'	=> 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.',
-	'SELECT_MERGE'						=> 'Select for merging',
+	'SELECT_MERGE'						=> 'Select for merge',
 	'SELECT_TOPICS_FROM'				=> 'Select topics from',
 	'SELECT_TOPIC'						=> 'Select topic',
 	'SELECT_USER'						=> 'Select user',

phpBB/language/en/ucp.php

@@ -83,6 +83,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.',
+	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s',
 	'AVATAR_PAGE'					=> 'Page',
@@ -229,7 +230,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
 	'LOGOUT_REDIRECT'			=> 'You have been successfully logged out.',
 
-	'MARK_IMPORTANT'				=> 'Mark as important',
+	'MARK_IMPORTANT'				=> 'Mark/Unmark as important',
 	'MARKED_MESSAGE'				=> 'Marked message',
 	'MAX_FOLDER_REACHED'			=> 'Maximum number of allowed user defined folders reached',
 	'MESSAGE_BY_AUTHOR'				=> 'by',

phpBB/report.php

@@ -26,8 +26,8 @@ $forum_id		= request_var('f', 0);
 $post_id		= request_var('p', 0);
 $reason_id		= request_var('reason_id', 0);
 $report_text	= utf8_normalize_nfc(request_var('report_text', '', true));
+$user_notify	= ($user->data['is_registered']) ? request_var('notify', 0) : false;
 
-$user_notify = (isset($_POST['notify']) && $user->data['is_registered']) ? true : false;
 $submit = (isset($_POST['submit'])) ? true : false;
 
 if (!$post_id)

phpBB/styles/prosilver/template/attachment.html

@@ -7,25 +7,23 @@
 		<!-- IF _file.S_THUMBNAIL -->
 		<dl class="thumbnail">
 			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>
-			
 			<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF -->
 		</dl>
 		<!-- ENDIF -->
 
 
 		<!-- IF _file.S_IMAGE -->
-		
+		<dl class="file">
-			<img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" />
+			<dt><img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
-
+			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
-		<p>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</p>
+			<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
+		</dl>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_FILE -->
 		<dl class="file">
 			<dt><!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF --><a class="postlink" href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a></dt> 
-			<!-- IF not _file.S_THUMBNAIL and _file.COMMENT -->
+			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
-				<dd><em>{_file.COMMENT}</em></dd>
-			<!-- ENDIF -->
 			<dd>({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
 		</dl>			
 		<!-- ENDIF -->

phpBB/styles/prosilver/template/mcp_notes_user.html

@@ -62,7 +62,7 @@
 		<th>{L_REPORT_BY}</th>
 		<th style="text-align: center">{L_IP}</th>
 		<th style="text-align: center">{L_TIME}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION_NOTE}</th>
 		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
 	</tr>
 	</thead>

phpBB/styles/prosilver/template/memberlist_search.html

@@ -89,6 +89,10 @@ function insert_single(user)
 		<dt><label for="ip">{L_POST_IP}:</label></dt>
 		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="search_group_id">{L_GROUP}:</label></dt>
+		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
+	</dl>
 	<dl>
 		<dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt>
 		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>

phpBB/styles/prosilver/template/memberlist_view.html

@@ -17,7 +17,7 @@
 	<dl class="left-box details" style="width: 80%;">
 		<dt>{L_USERNAME}:</dt>
 		<dd>
-			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
+			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
 			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
 			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
 		</dd>

phpBB/styles/prosilver/template/ucp_avatar_options.html

@@ -1,6 +1,9 @@
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
+	<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_DISPLAY_GALLERY -->
+		<p>{L_AVATAR_FEATURES_DISABLED}</p>
+	<!-- ENDIF -->
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->

phpBB/styles/subsilver2/template/ucp_pm_options.html

@@ -76,8 +76,8 @@
 </tr>
 <!-- BEGIN rule -->
 	<tr>
-		<td class="row1" width="25" align="center"><span class="gen">{rule.COUNT}</span></td>
+		<td class="row1" width="25" align="center"><span class="gen">#{rule.COUNT}</span></td>
-		<td class="row2" width="120"><span class="gen">{rule.CHECK}</span></td>
+		<td class="row2" width="120"><span class="gen"><strong>{L_IF}</strong> {rule.CHECK}</span></td>
 		<td class="row1" width="120"><span class="gen">{rule.RULE}</span></td>
 		<td class="row2" width="120"><span class="gen"><!-- IF rule.STRING -->{rule.STRING}<!-- ENDIF --></span></td>
 		<td class="row1"><span class="gen">{rule.ACTION}<!-- IF rule.FOLDER --> -&gt; {rule.FOLDER}<!-- ENDIF --></span></td>

phpBB/styles/subsilver2/template/ucp_profile_avatar.html

@@ -16,6 +16,11 @@
 		<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
 		<!-- ENDIF --></td>
 </tr>
+<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_DISPLAY_GALLERY -->
+	<tr>
+		<td class="row3" colspan="2" align="center">{L_AVATAR_FEATURES_DISABLED}</td>
+	</tr>
+<!-- ENDIF -->
 <!-- IF S_UPLOAD_AVATAR_FILE -->
 	<tr> 
 		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}: </b></td>