[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.2.0-b1" />
-	<property name="prevversion" value="3.2.0-a2" />
-	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.2.0-a1" />
+	<property name="newversion" value="3.2.0-a2" />
+	<property name="prevversion" value="3.2.0-a1" />
+	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -303,25 +303,9 @@
 
 	<target name="clean-vendor-dir">
 		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
-		<delete dir="${dir}/vendor/bantu/ini-get-wrapper/tests" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.gitignore" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.scrutinizer.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.travis.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/README.md" />
-
-		<delete dir="${dir}/vendor/google/recaptcha/examples" />
-		<delete dir="${dir}/vendor/google/recaptcha/tests" />
-		<delete file="${dir}/vendor/google/recaptcha/.gitignore" />
-		<delete file="${dir}/vendor/google/recaptcha/.travis.yml" />
-		<delete file="${dir}/vendor/google/recaptcha/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/google/recaptcha/README.md" />
-
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
@@ -407,19 +391,12 @@
 		<delete file="${dir}/vendor/symfony/routing/README.md" />
 		<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
 
-		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/twig-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/phpunit.xml.dist" />
-
 		<delete dir="${dir}/vendor/symfony/yaml/.git" />
-		<delete dir="${dir}/vendor/symfony/yaml/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/phpunit.xml.dist" />
+		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
 
 		<delete dir="${dir}/vendor/twig/twig/doc" />
 		<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -427,9 +404,38 @@
 		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
 		<delete file="${dir}/vendor/twig/twig/.gitignore" />
 		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
+		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.rst" />
+		<delete file="${dir}/vendor/twig/twig/README.markdown" />
+
+		<delete dir="${dir}/vendor/symfony/security-core/.git" />
+		<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/security/.git" />
+		<delete dir="${dir}/vendor/symfony/security/Tests" />
+		<delete file="${dir}/vendor/symfony/security/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security/README.md" />
+		<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
 	</target>
 
 	<target name="clean-diff-dir">

build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php

@@ -87,11 +87,6 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 				$old_simple_statement = $simple_statement;
 
 				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
-
-				if ($simple_class_name_start === false) {
-					continue;
-				}
-
 				$simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);
 
 				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));

phpBB/adm/style/acp_groups.html

@@ -267,12 +267,11 @@
 
 	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -282,7 +281,7 @@
 		<!-- IF groups.S_SPECIAL -->
 		<!-- IF groups.S_FIRST_ROW -->
 			<tr>
-				<td colspan="6" class="row3">{L_NO_GROUPS_CREATED}</td>
+				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
 			</tr>
 		<!-- ENDIF -->
 	</tbody>
@@ -303,12 +302,11 @@
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -318,7 +316,6 @@
 		<tr>
 			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>

phpBB/adm/style/acp_users_prefs.html

@@ -52,7 +52,7 @@
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" /></div></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>

phpBB/adm/style/admin.css

@@ -2554,7 +2554,6 @@ fieldset.permissions .padding {
 #progress-bar {
 	position: relative;
 	width: 90%;
-	text-align: center;
 	height: 25px;
 	margin: 20px auto;
 	border: 1px solid #cecece;
@@ -2564,7 +2563,10 @@ fieldset.permissions .padding {
 	position: absolute;
 	top: 0;
 	width: 100%;
-	color: #000;
+	text-align: center;
+	line-height: 25px;
+	font-weight: bold;
+	color: #fff;
 }
 
 #progress-bar #progress-bar-filler {
@@ -2575,11 +2577,4 @@ fieldset.permissions .padding {
 	background-color: #3c84ad;
 	width: 0;
 	height: 25px;
-	overflow: hidden;
-	color: #fff;
-}
-
-#progress-bar p {
-	line-height: 25px;
-	font-weight: bold;
 }

phpBB/adm/style/installer_convert.html

@@ -1,87 +0,0 @@
-<!-- INCLUDE installer_header.html -->
-<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
-<!-- IF S_ERROR_BOX -->
-<div class="errorbox">
-	<h3>{ERROR_TITLE}</h3>
-	<p>{ERROR_MSG}</p>
-</div>
-<!-- ENDIF -->
-<!-- IF .errors -->
-<div id="error-container">
-<!-- BEGIN errors -->
-	<strong>{errors.TITLE}</strong>
-	<!-- IF errors.DESCRIPTION --><p>{errors.DESCRIPTION}</p><!-- ENDIF -->
-<!-- END errors -->
-</div>
-<!-- ENDIF -->
-<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
-<!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
-<!-- IF S_CONV_IN_PROGRESS -->
-<p class="centered-text"><a href="{U_ACTION}" class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->"<!-- IF S_REFRESH --> onclick="return false;"<!-- ENDIF -->>{L_SUBMIT}</a></p>
-<!-- ENDIF -->
-<!-- IF S_CONTINUE -->
-<div id="download-wrapper" class="download-box">
-	<p class="centered-text">
-		<a href="{U_NEW_ACTION}" class="button1">{L_CONVERT_NEW_CONVERSION}</a>
-		<a href="{U_CONTINUE_ACTION}" class="button1">{L_CONTINUE_OLD_CONVERSION}</a>
-	</p>
-</div>
-<!-- ENDIF -->
-<!-- IF S_LIST -->
-<table class="table1">
-	<caption>{L_AVAILABLE_CONVERTORS}</caption>
-	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_SOFTWARE}</th>
-		<th>{L_VERSION}</th>
-		<th>{L_AUTHOR}</th>
-		<th>{L_CONVERT_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .convertors -->
-	<!-- BEGIN convertors -->
-	<tr>
-		<td>{convertors.SOFTWARE}</td>
-		<td>{convertors.VERSION}</td>
-		<td>{convertors.AUTHOR}</td>
-		<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-	</tr>
-	<!-- END convertors -->
-	<!-- ELSE -->
-	<tr>
-		<td>{L_NO_CONVERTORS}</td>
-		<td>-</td>
-		<td>-</td>
-		<td>-</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-</table>
-<!-- ENDIF -->
-<!-- IF .checks -->
-<fieldset>
-
-	<!-- BEGIN checks -->
-	<!-- IF checks.S_LEGEND -->
-	<!-- IF not checks.S_FIRST_ROW -->
-</fieldset>
-
-<fieldset>
-	<!-- ENDIF -->
-	<legend>{checks.LEGEND}</legend>
-	<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-	<!-- ELSE -->
-
-	<dl>
-		<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-		<dd>{checks.RESULT}</dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- END checks -->
-
-</fieldset>
-<!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
-<!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_footer.html

@@ -12,8 +12,8 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 

phpBB/adm/style/installer_header.html

@@ -6,7 +6,7 @@
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>
 
-	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">

phpBB/adm/style/installer_install.html

@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_update.html

@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_update_file_status.html

@@ -4,7 +4,7 @@
 <p>{L_FILES_DELETED_EXPLAIN}</p>
 
 <fieldset id="deleted">
-	<legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 	<!-- BEGIN deleted -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
@@ -20,7 +20,7 @@
 <p>{L_FILES_CONFLICT_EXPLAIN}</p>
 
 <fieldset id="conflict">
-	<legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 	<!-- BEGIN conflict -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
@@ -36,7 +36,7 @@
 <p>{L_FILES_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="modified">
-	<legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 	<!-- BEGIN modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
@@ -52,7 +52,7 @@
 <p>{L_FILES_NEW_EXPLAIN}</p>
 
 <fieldset id="new_files" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 	<!-- BEGIN new -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
@@ -69,7 +69,7 @@
 <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="not_modified" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
 	<!-- BEGIN not_modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>

phpBB/adm/style/overall_footer.html

@@ -34,7 +34,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->

phpBB/adm/style/overall_header.html

@@ -49,7 +49,7 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-
+	
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
@@ -103,7 +103,7 @@ function popup(url, width, height, name)
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
-
+	
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -120,7 +120,7 @@ function popup(url, width, height, name)
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
-
+	
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
 							<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -129,13 +129,13 @@ function popup(url, width, height, name)
 								<ul>
 							<!-- DEFINE $LI_USED = 1 -->
 							<!-- ENDIF -->
-
+	
 							<!-- BEGIN l_block3 -->
 								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
 								<!-- DEFINE $LI_USED = 1 -->
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
-
+						
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						<!-- IF $LI_USED -->
@@ -143,13 +143,6 @@ function popup(url, width, height, name)
 							</div>
 						<!-- ENDIF -->
 					</div>
-
+	
 					<div id="main">
 						<div class="main">
-							{% if CONTAINER_EXCEPTION !== false %}
-							<div class="errorbox">
-								<p>{{ lang('CONTAINER_EXCEPTION') }}</p><br />
-								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
-								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
-							</div>
-							{% endif %}

phpBB/adm/style/simple_footer.html

@@ -17,7 +17,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->

phpBB/assets/javascript/installer.js

@@ -177,7 +177,7 @@
 	 * @param progressObject
 	 */
 	function setProgress(progressObject) {
-		var $statusText, $progressBar, $progressText, $progressFiller, $progressFillerText;
+		var $statusText, $progressBar, $progressText, $progressFiller;
 
 		if (progressObject.task_name.length) {
 			if (!progressBarTriggered) {
@@ -189,34 +189,27 @@
 				$progressBar.attr('id', 'progress-bar');
 				$progressText = $('<p />');
 				$progressText.attr('id', 'progress-bar-text');
-				$progressFiller = $('<div />');
+				$progressFiller = $('<span />');
 				$progressFiller.attr('id', 'progress-bar-filler');
-				$progressFillerText = $('<p />');
-				$progressFillerText.attr('id', 'progress-bar-filler-text');
+				$progressFiller.html($progressText);
 
 				$statusText = $('<p />');
 				$statusText.attr('id', 'progress-status-text');
 
-				$progressFiller.append($progressFillerText);
-				$progressBar.append($progressText);
 				$progressBar.append($progressFiller);
 
 				$progressBarWrapper.append($statusText);
 				$progressBarWrapper.append($progressBar);
 
-				$progressFillerText.css('width', $progressBar.width());
-
 				progressBarTriggered = true;
 			} else if (progressObject.hasOwnProperty('restart')) {
 				clearInterval(progressTimer);
 
 				$progressFiller = $('#progress-bar-filler');
-				$progressFillerText = $('#progress-bar-filler-text');
 				$progressText = $('#progress-bar-text');
 				$statusText = $('#progress-status-text');
 
 				$progressText.text('0%');
-				$progressFillerText.text('0%');
 				$progressFiller.css('width', '0%');
 
 				currentProgress = 0;
@@ -243,22 +236,6 @@
 		}
 	}
 
-	// Redirects user
-	function redirect(url, use_ajax) {
-		if (use_ajax) {
-			resetPolling();
-
-			var xhReq = createXhrObject();
-			xhReq.open('GET', url, true);
-			xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-			xhReq.send();
-
-			startPolling(xhReq);
-		} else {
-			window.location.href = url;
-		}
-	}
-
 	/**
 	 * Parse messages from the response object
 	 *
@@ -325,10 +302,6 @@
 		if (responseObject.hasOwnProperty('refresh')) {
 			refreshRequested = true;
 		}
-
-		if (responseObject.hasOwnProperty('redirect')) {
-			redirect(responseObject.redirect.url, responseObject.redirect.use_ajax);
-		}
 	}
 
 	/**
@@ -369,20 +342,15 @@
 	 *
 	 * @param $progressText
 	 * @param $progressFiller
-	 * @param $progressFillerText
 	 * @param progressLimit
 	 */
-	function incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit) {
+	function incrementFiller($progressText, $progressFiller, progressLimit) {
 		if (currentProgress >= progressLimit || currentProgress >= 100) {
 			clearInterval(progressTimer);
 			return;
 		}
 
-		var $progressBar = $('#progress-bar');
-
 		currentProgress++;
-		$progressFillerText.css('width', $progressBar.width());
-		$progressFillerText.text(currentProgress + '%');
 		$progressText.text(currentProgress + '%');
 		$progressFiller.css('width', currentProgress + '%');
 	}
@@ -394,14 +362,13 @@
 	 */
 	function incrementProgressBar(progressLimit) {
 		var $progressFiller = $('#progress-bar-filler');
-		var $progressFillerText = $('#progress-bar-filler-text');
 		var $progressText = $('#progress-bar-text');
 		var progressStart = $progressFiller.width() / $progressFiller.offsetParent().width() * 100;
 		currentProgress = Math.floor(progressStart);
 
 		clearInterval(progressTimer);
 		progressTimer = setInterval(function() {
-			incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit);
+			incrementFiller($progressText, $progressFiller, progressLimit);
 		}, 10);
 	}
 

phpBB/bin/phpbbcli.php

@@ -70,8 +70,6 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
 /* @var $user \phpbb\user */
 $user = $phpbb_container->get('user');
-$user->data['user_id'] = ANONYMOUS;
-$user->ip = '127.0.0.1';
 $user->add_lang('acp/common');
 $user->add_lang('cli');
 

phpBB/common.php

@@ -90,14 +90,8 @@ include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-if (PHPBB_ENVIRONMENT === 'development')
-{
-	\phpbb\debug\debug::enable();
-}
-else
-{
-	set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-}
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
@@ -110,17 +104,10 @@ try
 }
 catch (InvalidArgumentException $e)
 {
-	if (PHPBB_ENVIRONMENT !== 'development')
-	{
-		trigger_error(
-			'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
-			E_USER_ERROR
-		);
-	}
-	else
-	{
-		throw $e;
-	}
+	trigger_error(
+		'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
+		E_USER_ERROR
+	);
 }
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));

phpBB/composer.json

@@ -27,27 +27,27 @@
 	"require": {
 		"php": ">=5.4,<7.1",
 		"bantu/ini-get-wrapper": "1.0.*",
-		"google/recaptcha": "~1.1",
-		"lusitanian/oauth": "^0.8.1",
+	  	"google/recaptcha": "~1.1",
+		"lusitanian/oauth": "0.2.*",
 		"marc1706/fast-image-size": "1.1.*",
 		"patchwork/utf8": "1.1.*",
-		"s9e/text-formatter": "^0.4.2",
+		"s9e/text-formatter": "dev-release/php5.3",
 		"symfony/config": "2.8.*",
 		"symfony/console": "2.8.*",
-		"symfony/debug": "2.8.*",
 		"symfony/dependency-injection": "2.8.*",
 		"symfony/event-dispatcher": "2.8.*",
 		"symfony/filesystem": "2.8.*",
 		"symfony/finder": "2.8.*",
-		"symfony/http-foundation": "2.8.*",
 		"symfony/http-kernel": "2.8.*",
 		"symfony/routing": "2.8.*",
+		"symfony/security-core": "2.8.*",
+		"symfony/security-csrf": "2.8.*",
 		"symfony/twig-bridge": "2.8.*",
 		"symfony/yaml": "2.8.*",
 		"twig/twig": "1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "~2.0",
+		"fabpot/goutte": "1.0.*",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
 		"phpunit/phpunit": "4.1.*",
@@ -55,11 +55,9 @@
 		"squizlabs/php_codesniffer": "2.*",
 		"symfony/browser-kit": "2.8.*",
 		"symfony/css-selector": "2.8.*",
-		"symfony/dom-crawler": "2.8.*"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.2.x-dev"
-		}
+		"symfony/debug": "2.8.*",
+		"symfony/dom-crawler": "2.8.*",
+		"symfony/http-foundation": "2.8.*",
+		"symfony/process": "2.8.*"
 	}
 }

phpBB/config/default/container/services_auth.yml

@@ -58,7 +58,6 @@ services:
             - '@request'
             - '@user'
             - '%tables.auth_provider_oauth_token_storage%'
-            - '%tables.auth_provider_oauth_states%'
             - '%tables.auth_provider_oauth_account_assoc%'
             - '@auth.provider.oauth.service_collection'
             - '%tables.users%'

phpBB/config/default/container/services_cron.yml

@@ -106,8 +106,6 @@ services:
         arguments:
             - '%core.root_path%'
             - '@config'
-            - '@log'
-            - '@user'
         calls:
             - [set_name, [cron.task.core.tidy_plupload]]
         tags:

phpBB/config/default/container/services_text_formatter.yml

@@ -33,14 +33,10 @@ services:
             - '@cache.driver'
             - '@dispatcher'
             - '@config'
-            - '@text_formatter.s9e.link_helper'
             - '%text_formatter.cache.dir%'
             - '%text_formatter.cache.parser.key%'
             - '%text_formatter.cache.renderer.key%'
 
-    text_formatter.s9e.link_helper:
-        class: phpbb\textformatter\s9e\link_helper
-
     text_formatter.s9e.parser:
         class: phpbb\textformatter\s9e\parser
         arguments:

phpBB/config/default/container/tables.yml

@@ -6,7 +6,6 @@ parameters:
     tables.acl_users: '%core.table_prefix%acl_users'
     tables.attachments: '%core.table_prefix%attachments'
     tables.auth_provider_oauth_token_storage: '%core.table_prefix%oauth_tokens'
-    tables.auth_provider_oauth_states: '%core.table_prefix%oauth_states'
     tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts'
     tables.banlist: '%core.table_prefix%banlist'
     tables.bbcodes: '%core.table_prefix%bbcodes'

phpBB/config/installer/container/services_install_controller.yml

@@ -49,18 +49,3 @@ services:
         class: phpbb\install\controller\archive_download
         arguments:
             - '@installer.helper.config'
-
-    phpbb.installer.controller.convert:
-        class: phpbb\convert\controller\convertor
-        arguments:
-            - '@installer.helper.container_factory'
-            - '@installer.helper.database'
-            - '@phpbb.installer.controller.helper'
-            - '@installer.helper.install_helper'
-            - '@installer.helper.iohandler_factory'
-            - '@language'
-            - '@installer.navigation.provider'
-            - '@request'
-            - '@template'
-            - '%core.root_path%'
-            - '%core.php_ext%'

phpBB/config/installer/container/services_install_navigation.yml

@@ -33,10 +33,3 @@ services:
         tags:
             - { name: installer.navigation }
 
-    installer.navigation.convertor_navigation:
-        class: phpbb\install\helper\navigation\convertor_navigation
-        arguments:
-            - '@installer.helper.install_helper'
-        scope: prototype
-        tags:
-            - { name: installer.navigation }

phpBB/config/installer/routing/installer.yml

@@ -35,28 +35,3 @@ phpbb_installer_update_conflict_download:
     path: /download/conflict
     defaults:
         _controller: phpbb.installer.controller.file_downloader:conflict_archive
-
-phpbb_convert_intro:
-    path: /convert/{start_new}
-    defaults:
-        _controller: phpbb.installer.controller.convert:intro
-        start_new: 0
-
-phpbb_convert_settings:
-    path: /convert/settings/{convertor}
-    defaults:
-        _controller: phpbb.installer.controller.convert:settings
-    requirements:
-        converter: "[a-zA-Z0-9_]+"
-
-phpbb_convert_convert:
-    path: /convert/in_progress/{converter}
-    defaults:
-        _controller: phpbb.installer.controller.convert:convert
-    requirements:
-        converter: "[a-zA-Z0-9_]+"
-
-phpbb_convert_finish:
-    path: /convert/finished
-    defaults:
-        _controller: phpbb.installer.controller.convert:finish

phpBB/develop/add_permissions.php

@@ -389,7 +389,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 						foreach ($sql_subary as $sql)
 						{
 							$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)";
-							$db->sql_query($sql);
+							$result = $db->sql_query($sql);
 							$sql = '';
 						}
 				}
@@ -397,7 +397,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 				if ($sql != '')
 				{
 					$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql";
-					$db->sql_query($sql);
+					$result = $db->sql_query($sql);
 				}
 				break;
 
@@ -405,7 +405,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 			case 'delete':
 				foreach ($sql_subary as $sql)
 				{
-					$db->sql_query($sql);
+					$result = $db->sql_query($sql);
 					$sql = '';
 				}
 				break;

phpBB/develop/benchmark.php

@@ -143,7 +143,7 @@ function filldb($newposts)
 		if ((rand(0,30) < 1) || ($forum_topic_count[$forum] == 0))
 		{
 			// create a new topic 1 in 30 times (or when there are none);
-			make_topic($userid, "Testing topic $i", $forum);
+			$topic = make_topic($userid, "Testing topic $i", $forum);
 			$forum_topic_count[$forum]++;
 		} 
 		else 

phpBB/develop/unicode_testing.php

@@ -19,7 +19,7 @@ if (!headers_sent())
 function unicode_to_utf8($string)
 {
 	$utf8 = '';
-
+	$chars = array();
 	for ($i = 0; $i < strlen($string); $i++)
 	{
 		if (isset($string[$i + 5]) && substr($string, $i, 2) == '\\u' && ctype_xdigit(substr($string, $i + 2, 4)))

phpBB/docs/CHANGELOG.html

@@ -49,10 +49,8 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
-		<li><a href="#v320a2">Changes since 3.2.0-a2</a></li>
 		<li><a href="#v320a1">Changes since 3.2.0-a1</a></li>
 		<li><a href="#v31x">Changes since 3.1.x</a></li>
-		<li><a href="#v317">Changes since 3.1.7</a></li>
 		<li><a href="#v316">Changes since 3.1.6</a></li>
 		<li><a href="#v315">Changes since 3.1.5</a></li>
 		<li><a href="#v314">Changes since 3.1.4</a></li>
@@ -118,54 +116,7 @@
 
 		<div class="content">
 
-			<a name="v320a2"></a><h3>Changes since 3.2.0-a2</h3>
-			<h4>Bug</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10628">PHPBB3-10628</a>] - http:// prepended to &quot;www.&quot; urls (but not reflected in preview)</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11875">PHPBB3-11875</a>] - mediumint(8) too small for post_id</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12221">PHPBB3-12221</a>] - URLs Containing javascript: are Garbled</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14129">PHPBB3-14129</a>] - Adding custom extensions autoloaders feature slow downs the board</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14321">PHPBB3-14321</a>] - Fatal error on download the merged conflicts archive during update from 3.1.6 to 3.2-a1</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14323">PHPBB3-14323</a>] - Long urls are no longer shortened</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14368">PHPBB3-14368</a>] - Post Editors Text Should Be Black, Not Blue</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14371">PHPBB3-14371</a>] - Small fix for the aligment quick links</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14373">PHPBB3-14373</a>] - Do not use strpos() on arrays in iohandler_base::add_error_message()</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14378">PHPBB3-14378</a>] - Maintain consistent template var paths in 3.2 installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14380">PHPBB3-14380</a>] - Maintain consistent template var paths in 3.2 installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14402">PHPBB3-14402</a>] - Tidy plupload cron should not rely on user id/ip being available</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14403">PHPBB3-14403</a>] - phpbb\log should still work even when no user data is given</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14405">PHPBB3-14405</a>] - Text processor parses invalid use of url bbcode</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14419">PHPBB3-14419</a>] - Update composer dependencies and fix outdated composer lock file</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14420">PHPBB3-14420</a>] - Search Results pagination not up to date / broken</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14428">PHPBB3-14428</a>] - Use other links for files remote test</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14431">PHPBB3-14431</a>] - Remote avatar uploading does not support https</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14432">PHPBB3-14432</a>] - The lang() function needs to handle key array</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14434">PHPBB3-14434</a>] - Schema generator fails if extensions have non-migrations in migrations dir</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14436">PHPBB3-14436</a>] - Default data type migration misses oauth_states dependency</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14442">PHPBB3-14442</a>] - Use Goutte ~2.0 after allowing PHP &gt;= 5.4</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14444">PHPBB3-14444</a>] - Fatal error in functions_messenger.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14446">PHPBB3-14446</a>] - Add predefined placeholder variables to twig</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14452">PHPBB3-14452</a>] - Undefined $progressFillerText in installer.js</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14453">PHPBB3-14453</a>] - Missing dependency in the text_reparser migration</li>
-			</ul>
-			<h4>Improvement</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13454">PHPBB3-13454</a>] - Remove unused variables, globals, parameters</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13733">PHPBB3-13733</a>] - Allow non-migration files inside migrations folder</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14177">PHPBB3-14177</a>] - Catch exceptions and display a nice error page</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14253">PHPBB3-14253</a>] - Show group requests pending aproval at the ACP groups summary</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14377">PHPBB3-14377</a>] - Allow extensions to register custom compiler pass</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14418">PHPBB3-14418</a>] - Add missing language string PM_TOOLS</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14445">PHPBB3-14445</a>] - Force page refresh before the installer generates the schema</li>
-			</ul>
-			<h4>Task</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14250">PHPBB3-14250</a>] - Review/bump composer dependencies</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14262">PHPBB3-14262</a>] - Move converter code into a controller</li>
-			</ul>
-
-			<a name="v320a1"></a><h3>Changes since 3.2.0-a1</h3>
-			<h4>Bug</h4>
+			<a name="v320a1"></a><h3>Changes since 3.2.0-a1</h3><h4>Bug</h4>
 			<ul>
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9791">PHPBB3-9791</a>] - invalid [] - chars on search URI</li>
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13451">PHPBB3-13451</a>] - A very long string inside message crashes PHP</li>
@@ -437,17 +388,6 @@
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14265">PHPBB3-14265</a>] - Make all tables available in the container</li>
 			</ul>
 
-			<a name="v317"></a><h3>Changes since 3.1.7</h3>
-
-	<h4>Security Issue</h4>
-	<ul>
-		<li>[SECURITY-188] - Check form key in acp_bbcodes</li>
-	</ul>
-	<h4>Bug</h4>
-	<ul>
-		<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Undefined variable $phpbb_dispatcher when (un-)locking a topic or post</li>
-	</ul>
-
 			<a name="v316"></a><h3>Changes since 3.1.6</h3>
 
 	<h4>Bug</h4>

phpBB/docs/events.md

@@ -1028,20 +1028,6 @@ navbar_header_quick_links_before
 * Since: 3.1.0-RC2
 * Purpose: Add links to the top of the quick-links drop-down menu in the header
 
-navbar_header_user_profile_append
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.8-RC1
-* Purpose: Add links to the right of the user drop down area
-
-navbar_header_user_profile_prepend
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.8-RC1
-* Purpose: Add links to the left of the notification area
-
 navbar_header_username_append
 ===
 * Locations:
@@ -2239,34 +2225,6 @@ viewtopic_body_post_subject_before
 * Since: 3.1.7-RC1
 * Purpose: Add data before post icon and subject
 
-viewtopic_body_postrow_back2top_after
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom after the back to top link 
-
-viewtopic_body_postrow_back2top_append
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom directly before the back to top link 
-
-viewtopic_body_postrow_back2top_before
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom before the back to top link 
-
-viewtopic_body_postrow_back2top_prepend
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom directly before the back to top link 
-
 viewtopic_body_postrow_custom_fields_after
 ===
 * Locations:

phpBB/includes/acp/acp_attachments.php

@@ -709,6 +709,8 @@ class acp_attachments
 							$forum_ids = array();
 						}
 
+						$extensions = array();
+
 						$sql = 'SELECT *
 							FROM ' . EXTENSIONS_TABLE . "
 							WHERE group_id = $group_id
@@ -1570,6 +1572,7 @@ class acp_attachments
 						if ($ip_2_counter == 0 && $ip_2_end == 254)
 						{
 							$ip_2_counter = 256;
+							$ip_2_fragment = 256;
 
 							$iplist[] = "'$ip_1_counter.*'";
 						}
@@ -1582,6 +1585,7 @@ class acp_attachments
 							if ($ip_3_counter == 0 && $ip_3_end == 254)
 							{
 								$ip_3_counter = 256;
+								$ip_3_fragment = 256;
 
 								$iplist[] = "'$ip_1_counter.$ip_2_counter.*'";
 							}
@@ -1594,6 +1598,7 @@ class acp_attachments
 								if ($ip_4_counter == 0 && $ip_4_end == 254)
 								{
 									$ip_4_counter = 256;
+									$ip_4_fragment = 256;
 
 									$iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.*'";
 								}

phpBB/includes/acp/acp_ban.php

@@ -195,6 +195,7 @@ class acp_ban
 			case 'user':
 
 				$field = 'username';
+				$l_ban_cell = $user->lang['USERNAME'];
 
 				$sql = 'SELECT b.*, u.user_id, u.username, u.username_clean
 					FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u
@@ -207,6 +208,7 @@ class acp_ban
 			case 'ip':
 
 				$field = 'ban_ip';
+				$l_ban_cell = $user->lang['IP_HOSTNAME'];
 
 				$sql = 'SELECT *
 					FROM ' . BANLIST_TABLE . '
@@ -219,6 +221,7 @@ class acp_ban
 			case 'email':
 
 				$field = 'ban_email';
+				$l_ban_cell = $user->lang['EMAIL_ADDRESS'];
 
 				$sql = 'SELECT *
 					FROM ' . BANLIST_TABLE . '

phpBB/includes/acp/acp_bbcodes.php

@@ -25,15 +25,14 @@ class acp_bbcodes
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
-		global $phpbb_log;
+		global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log;
 
 		$user->add_lang('acp/posting');
 
 		// Set up general vars
 		$action	= $request->variable('action', '');
 		$bbcode_id = $request->variable('bbcode', 0);
-		$submit = $request->is_set_post('submit');
 
 		$this->tpl_name = 'acp_bbcodes';
 		$this->page_title = 'ACP_BBCODES';
@@ -41,11 +40,6 @@ class acp_bbcodes
 
 		add_form_key($form_key);
 
-		if ($submit && !check_form_key($form_key))
-		{
-			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
 		// Set up mode-specific vars
 		switch ($action)
 		{
@@ -373,7 +367,7 @@ class acp_bbcodes
 		*
 		* @event core.acp_bbcodes_display_form
 		* @var	string	action			Type of the action: modify|create
-		* @var	array	sql_ary			The SQL array to get custom bbcode data
+		* @var	string	sql_ary			The SQL array to get custom bbcode data
 		* @var	array	template_data	Array with form template data
 		* @var	string	u_action		The u_action link
 		* @since 3.1.0-a3

phpBB/includes/acp/acp_board.php

@@ -30,12 +30,13 @@ class acp_board
 
 	function main($id, $mode)
 	{
-		global $user, $template, $request;
-		global $config, $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_log;
 
 		$user->add_lang('acp/board');
 
+		$action	= $request->variable('action', '');
 		$submit = (isset($_POST['submit']) || isset($_POST['allow_quick_reply_enable'])) ? true : false;
 
 		$form_key = 'acp_board';
@@ -759,7 +760,7 @@ class acp_board
 	*/
 	function select_auth_method($selected_method, $key = '')
 	{
-		global $phpbb_container;
+		global $phpbb_root_path, $phpEx, $phpbb_container;
 
 		/* @var $auth_providers \phpbb\auth\provider_collection */
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
@@ -939,6 +940,8 @@ class acp_board
 	*/
 	function board_disable($value, $key)
 	{
+		global $user;
+
 		$radio_ary = array(1 => 'YES', 0 => 'NO');
 
 		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
@@ -1048,6 +1051,8 @@ class acp_board
 	*/
 	function select_news_forums($value, $key)
 	{
+		global $user, $config;
+
 		$forum_list = make_forum_select(false, false, true, true, true, false, true);
 
 		// Build forum options
@@ -1065,6 +1070,8 @@ class acp_board
 
 	function select_exclude_forums($value, $key)
 	{
+		global $user, $config;
+
 		$forum_list = make_forum_select(false, false, true, true, true, false, true);
 
 		// Build forum options
@@ -1120,7 +1127,7 @@ class acp_board
 	*/
 	function enable_mod_rewrite($value, $key)
 	{
-		global $user;
+		global $user, $config;
 
 		// Determine whether mod_rewrite is enabled on the server
 		// NOTE: This only works on Apache servers on which PHP is NOT

phpBB/includes/acp/acp_bots.php

@@ -25,8 +25,8 @@ class acp_bots
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $template, $cache, $request, $phpbb_log;
-		global $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $cache, $request, $phpbb_log;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
 
 		$action = $request->variable('action', '');
 		$submit = (isset($_POST['submit'])) ? true : false;

phpBB/includes/acp/acp_captcha.php

@@ -25,8 +25,8 @@ class acp_captcha
 
 	function main($id, $mode)
 	{
-		global $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_container;
+		global $user, $auth, $template, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;
 
 		$user->add_lang('acp/board');
 
@@ -178,7 +178,7 @@ class acp_captcha
 	*/
 	function deliver_demo($selected)
 	{
-		global $phpbb_container;
+		global $db, $user, $config, $phpbb_container;
 
 		$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
 		$captcha->init(CONFIRM_REG);

phpBB/includes/acp/acp_database.php

@@ -37,6 +37,7 @@ class acp_database
 		$this->page_title = 'ACP_DATABASE';
 
 		$action	= $request->variable('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
 
 		$template->assign_vars(array(
 			'MODE'	=> $mode

phpBB/includes/acp/acp_disallow.php

@@ -25,7 +25,8 @@ class acp_disallow
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache, $phpbb_log, $request;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $config, $phpbb_admin_path;
 
 		$user->add_lang('acp/posting');
 

phpBB/includes/acp/acp_email.php

@@ -25,8 +25,8 @@ class acp_email
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $template, $phpbb_log, $request;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_dispatcher;
+		global $config, $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $phpbb_dispatcher;
 
 		$user->add_lang('acp/email');
 		$this->tpl_name = 'acp_email';

phpBB/includes/acp/acp_extensions.php

@@ -34,7 +34,7 @@ class acp_extensions
 	function main()
 	{
 		// Start the page
-		global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_root_path, $phpbb_log, $cache;
+		global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_root_path, $phpEx, $phpbb_log, $cache;
 
 		$this->db = $db;
 		$this->config = $config;
@@ -122,6 +122,8 @@ class acp_extensions
 					'U_ACTION' 				=> $this->u_action,
 				));
 
+				add_form_key('version_check_settings');
+
 				$this->tpl_name = 'acp_ext_list';
 			break;
 
@@ -539,7 +541,7 @@ class acp_extensions
 
 		$version_helper = new \phpbb\version_helper($this->cache, $this->config, new \phpbb\file_downloader(), $this->user);
 		$version_helper->set_current_version($meta['version']);
-		$version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename'], isset($version_check['ssl']) ? $version_check['ssl'] : false);
+		$version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename']);
 		$version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null);
 
 		return $updates = $version_helper->get_suggested_updates($force_update, $force_cache);

phpBB/includes/acp/acp_forums.php

@@ -27,7 +27,7 @@ class acp_forums
 	function main($id, $mode)
 	{
 		global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher;
-		global $phpbb_admin_path, $phpbb_root_path, $phpEx, $phpbb_log;
+		global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx, $phpbb_log;
 
 		$user->add_lang('acp/forums');
 		$this->tpl_name = 'acp_forums';
@@ -1264,6 +1264,8 @@ class acp_forums
 							return array($user->lang['NO_FORUM']);
 						}
 
+						$subforums_to_name = $_row['forum_name'];
+
 						$sql = 'SELECT forum_id
 							FROM ' . FORUMS_TABLE . "
 							WHERE parent_id = {$row['forum_id']}";
@@ -1381,7 +1383,7 @@ class acp_forums
 	{
 		global $db, $user, $phpbb_dispatcher;
 
-		$errors = array();
+		$to_data = $moved_ids = $errors = array();
 
 		// Check if we want to move to a parent with link type
 		if ($to_id > 0)

phpBB/includes/acp/acp_groups.php

@@ -26,7 +26,7 @@ class acp_groups
 	function main($id, $mode)
 	{
 		global $config, $db, $user, $auth, $template, $cache;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
 		global $request, $phpbb_container, $phpbb_dispatcher;
 
 		$user->add_lang('acp/groups');
@@ -306,6 +306,8 @@ class acp_groups
 					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 				}
 
+				$data = $submit_ary = array();
+
 				if ($action == 'edit' && !$group_id)
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -674,8 +676,9 @@ class acp_groups
 						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
+						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
-							'avatar' => $driver->get_acp_template_name(),
+							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
 						if ($driver->prepare_form($request, $template, $user, $avatar_data, $avatar_error))
@@ -930,12 +933,11 @@ class acp_groups
 			// used for easy access to the data within a group
 			$cached_group_data[$type][$row['group_id']] = $row;
 			$cached_group_data[$type][$row['group_id']]['total_members'] = 0;
-			$cached_group_data[$type][$row['group_id']]['pending_members'] = 0;
 		}
 		$db->sql_freeresult($result);
 
 		// How many people are in which group?
-		$sql = 'SELECT COUNT(ug.user_id) AS total_members, SUM(ug.user_pending) AS pending_members, ug.group_id
+		$sql = 'SELECT COUNT(ug.user_id) AS total_members, ug.group_id
 			FROM ' . USER_GROUP_TABLE . ' ug
 			WHERE ' . $db->sql_in_set('ug.group_id', array_keys($lookup)) . '
 			GROUP BY ug.group_id';
@@ -945,7 +947,6 @@ class acp_groups
 		{
 			$type = $lookup[$row['group_id']];
 			$cached_group_data[$type][$row['group_id']]['total_members'] = $row['total_members'];
-			$cached_group_data[$type][$row['group_id']]['pending_members'] = $row['pending_members'];
 		}
 		$db->sql_freeresult($result);
 
@@ -974,7 +975,6 @@ class acp_groups
 
 					'GROUP_NAME'	=> $group_name,
 					'TOTAL_MEMBERS'	=> $row['total_members'],
-					'PENDING_MEMBERS' => $row['pending_members']
 				));
 			}
 		}
@@ -1095,6 +1095,7 @@ class acp_groups
 			ORDER BY group_legend ASC, group_type DESC, group_name ASC';
 		$result = $db->sql_query($sql);
 
+		$s_group_select_legend = '';
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$group_name = $group_helper->get_name($row['group_name']);
@@ -1132,6 +1133,7 @@ class acp_groups
 			ORDER BY t.teampage_position ASC';
 		$result = $db->sql_query($sql);
 
+		$category_data = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
 			if ($row['teampage_id'] == $category_id)
@@ -1174,6 +1176,7 @@ class acp_groups
 			ORDER BY g.group_type DESC, g.group_name ASC';
 		$result = $db->sql_query($sql);
 
+		$s_group_select_teampage = '';
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$group_name = $group_helper->get_name($row['group_name']);

phpBB/includes/acp/acp_icons.php

@@ -28,8 +28,8 @@ class acp_icons
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache;
-		global $config, $phpbb_root_path;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request, $phpbb_container;
 
 		$user->add_lang('acp/posting');
@@ -194,6 +194,7 @@ class acp_icons
 
 				$data = array();
 				$after = false;
+				$display = 0;
 				$order_lists = array('', '');
 				$add_order_lists = array('', '');
 				$display_count = 0;
@@ -208,6 +209,7 @@ class acp_icons
 					if ($row[$fields . '_id'] == $icon_id)
 					{
 						$after = true;
+						$display = $row['display_on_posting'];
 						$data[$row[$fields . '_url']] = $row;
 					}
 					else

phpBB/includes/acp/acp_inactive.php

@@ -32,7 +32,7 @@ class acp_inactive
 	function main($id, $mode)
 	{
 		global $config, $db, $user, $auth, $template, $phpbb_container, $phpbb_log, $request;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
 
 		if (!function_exists('user_active_flip'))
 		{

phpBB/includes/acp/acp_jabber.php

@@ -29,8 +29,8 @@ class acp_jabber
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$user->add_lang('acp/board');
 
@@ -39,6 +39,7 @@ class acp_jabber
 			include($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
 		}
 
+		$action	= $request->variable('action', '');
 		$submit = (isset($_POST['submit'])) ? true : false;
 
 		if ($mode != 'settings')
@@ -67,6 +68,8 @@ class acp_jabber
 				trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
 			}
 
+			$error = array();
+
 			$message = $user->lang['JAB_SETTINGS_CHANGED'];
 			$log = 'JAB_SETTINGS_CHANGED';
 

phpBB/includes/acp/acp_logs.php

@@ -25,8 +25,8 @@ class acp_logs
 
 	function main($id, $mode)
 	{
-		global $user, $auth, $template, $phpbb_container;
-		global $config;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request;
 
 		$user->add_lang('mcp');
@@ -34,6 +34,7 @@ class acp_logs
 		// Set up general vars
 		$action		= $request->variable('action', '');
 		$forum_id	= $request->variable('f', 0);
+		$topic_id	= $request->variable('t', 0);
 		$start		= $request->variable('start', 0);
 		$deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST);
 		$deleteall	= $request->variable('delall', false, false, \phpbb\request\request_interface::POST);

phpBB/includes/acp/acp_modules.php

@@ -579,7 +579,7 @@ class acp_modules
 	*/
 	function make_module_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $ignore_noncat = false)
 	{
-		global $db, $user;
+		global $db, $user, $auth, $config;
 
 		$sql = 'SELECT module_id, module_enabled, module_basename, parent_id, module_langname, left_id, right_id, module_auth
 			FROM ' . MODULES_TABLE . "

phpBB/includes/acp/acp_permission_roles.php

@@ -26,8 +26,8 @@ class acp_permission_roles
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $phpbb_container;
-		global $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request, $phpbb_log;
 
 		if (!function_exists('user_get_id_name'))
@@ -477,7 +477,7 @@ class acp_permission_roles
 	*/
 	function display_auth_options($auth_options)
 	{
-		global $template, $phpbb_container;
+		global $template, $user, $phpbb_container;
 
 		/* @var $phpbb_permissions \phpbb\permissions */
 		$phpbb_permissions = $phpbb_container->get('acl.permissions');

phpBB/includes/acp/acp_permissions.php

@@ -31,8 +31,8 @@ class acp_permissions
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $phpbb_container, $request;
-		global $config, $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $cache, $phpbb_container, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		if (!function_exists('user_get_id_name'))
 		{
@@ -167,6 +167,8 @@ class acp_permissions
 		}
 
 		// Define some common variables for every mode
+		$error = array();
+
 		$permission_scope = (strpos($mode, '_global') !== false) ? 'global' : 'local';
 
 		// Showing introductionary page?
@@ -690,6 +692,8 @@ class acp_permissions
 			trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
+		$ug_id = $forum_id = 0;
+
 		// We loop through the auth settings defined in our submit
 		list($ug_id, ) = each($psubmit);
 		list($forum_id, ) = each($psubmit[$ug_id]);

phpBB/includes/acp/acp_php_info.php

@@ -25,7 +25,8 @@ class acp_php_info
 
 	function main($id, $mode)
 	{
-		global $template;
+		global $db, $user, $auth, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		if ($mode != 'info')
 		{

phpBB/includes/acp/acp_profile.php

@@ -33,8 +33,8 @@ class acp_profile
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $template;
-		global $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $cache;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
 		global $request, $phpbb_container, $phpbb_log, $phpbb_dispatcher;
 
 		if (!function_exists('generate_smilies'))
@@ -55,6 +55,7 @@ class acp_profile
 		$action = (isset($_POST['create'])) ? 'create' : $request->variable('action', '');
 
 		$error = array();
+		$s_hidden_fields = '';
 
 		if (!$field_id && in_array($action, array('delete','activate', 'deactivate', 'move_up', 'move_down', 'edit')))
 		{
@@ -775,7 +776,7 @@ class acp_profile
 	*/
 	function build_language_options(&$cp, $field_type, $action = 'create')
 	{
-		global $user, $config, $db, $request;
+		global $user, $config, $db, $phpbb_container, $request;
 
 		$default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][$config['default_lang']];
 

phpBB/includes/acp/acp_prune.php

@@ -25,7 +25,7 @@ class acp_prune
 
 	function main($id, $mode)
 	{
-		global $user, $phpEx, $phpbb_root_path;
+		global $user, $phpEx, $phpbb_admin_path, $phpbb_root_path;
 
 		$user->add_lang('acp/prune');
 
@@ -55,7 +55,8 @@ class acp_prune
 	*/
 	function prune_forums($id, $mode)
 	{
-		global $db, $user, $auth, $template, $phpbb_log, $request;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$all_forums = $request->variable('all_forums', 0);
 		$forum_id = $request->variable('f', array(0));
@@ -232,8 +233,8 @@ class acp_prune
 	*/
 	function prune_users($id, $mode)
 	{
-		global $db, $user, $auth, $template, $phpbb_log, $request;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;
 
 		/** @var \phpbb\group\helper $group_helper */
 		$group_helper = $phpbb_container->get('group_helper');
@@ -440,6 +441,7 @@ class acp_prune
 			}
 
 			$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
+			$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit');
 
 			$where_sql = '';
 			$where_sql .= ($username) ? ' AND username_clean ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), utf8_clean_string($username))) : '';

phpBB/includes/acp/acp_ranks.php

@@ -25,8 +25,8 @@ class acp_ranks
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache, $request, $phpbb_dispatcher;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpbb_log;
+		global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log;
 
 		$user->add_lang('acp/posting');
 
@@ -162,7 +162,7 @@ class acp_ranks
 			case 'edit':
 			case 'add':
 
-				$ranks = $existing_imgs = array();
+				$data = $ranks = $existing_imgs = array();
 
 				$sql = 'SELECT *
 					FROM ' . RANKS_TABLE . '

phpBB/includes/acp/acp_reasons.php

@@ -25,7 +25,8 @@ class acp_reasons
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template;
+		global $db, $user, $auth, $template, $cache;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request, $phpbb_log;
 
 		$user->add_lang(array('mcp', 'acp/posting'));

phpBB/includes/acp/acp_search.php

@@ -50,8 +50,8 @@ class acp_search
 
 	function settings($id, $mode)
 	{
-		global $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_admin_path, $phpEx;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$submit = (isset($_POST['submit'])) ? true : false;
 
@@ -232,8 +232,8 @@ class acp_search
 
 	function index($id, $mode)
 	{
-		global $db, $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_admin_path, $phpEx;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$action = $request->variable('action', '');
 		$this->state = explode(',', $config['search_indexing_state']);
@@ -551,7 +551,7 @@ class acp_search
 
 	function get_search_types()
 	{
-		global $phpbb_extension_manager;
+		global $phpbb_root_path, $phpEx, $phpbb_extension_manager;
 
 		$finder = $phpbb_extension_manager->get_finder();
 

phpBB/includes/acp/acp_styles.php

@@ -201,6 +201,7 @@ class acp_styles
 		$messages = array();
 		$installed_names = array();
 		$installed_dirs = array();
+		$last_installed = false;
 		foreach ($dirs as $dir)
 		{
 			if (in_array($dir, $this->reserved_style_names))
@@ -223,6 +224,7 @@ class acp_styles
 					$style['style_id'] = $this->install_style($style);
 					$style['_installed'] = true;
 					$found = true;
+					$last_installed = $style['style_id'];
 					$installed_names[] = $style['style_name'];
 					$installed_dirs[] = $style['style_path'];
 					$messages[] = sprintf($this->user->lang['STYLE_INSTALLED'], htmlspecialchars($style['style_name']));

phpBB/includes/acp/acp_users.php

@@ -31,8 +31,8 @@ class acp_users
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $cache;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
 		global $phpbb_dispatcher, $request;
 		global $phpbb_container, $phpbb_log;
 
@@ -298,11 +298,13 @@ class acp_users
 								case 'banuser':
 									$ban[] = $user_row['username'];
 									$reason = 'USER_ADMIN_BAN_NAME_REASON';
+									$log = 'LOG_USER_BAN_USER';
 								break;
 
 								case 'banemail':
 									$ban[] = $user_row['user_email'];
 									$reason = 'USER_ADMIN_BAN_EMAIL_REASON';
+									$log = 'LOG_USER_BAN_EMAIL';
 								break;
 
 								case 'banip':
@@ -320,6 +322,7 @@ class acp_users
 									$db->sql_freeresult($result);
 
 									$reason = 'USER_ADMIN_BAN_IP_REASON';
+									$log = 'LOG_USER_BAN_IP';
 								break;
 							}
 
@@ -1268,10 +1271,17 @@ class acp_users
 				$user->add_lang('mcp');
 
 				// Set up general vars
+				$start		= $request->variable('start', 0);
 				$deletemark	= (isset($_POST['delmarked'])) ? true : false;
 				$deleteall	= (isset($_POST['delall'])) ? true : false;
 				$confirm	= (isset($_POST['confirm'])) ? true : false;
 				$marked		= $request->variable('mark', array(0));
+				$message	= $request->variable('message', '', true);
+
+				// Sort keys
+				$sort_days	= $request->variable('st', 0);
+				$sort_key	= $request->variable('sk', 't');
+				$sort_dir	= $request->variable('sd', 'd');
 
 				// Delete entries if requested and able
 				if ($deletemark || $deleteall || $confirm)
@@ -1536,6 +1546,7 @@ class acp_users
 					$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
 					$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
 				}
+				$s_birthday_year_options = '';
 
 				$now = getdate();
 				$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';
@@ -1616,7 +1627,7 @@ class acp_users
 				if ($submit)
 				{
 					$error = validate_data($data, array(
-						'dateformat'	=> array('string', false, 1, 64),
+						'dateformat'	=> array('string', false, 1, 30),
 						'lang'			=> array('match', false, '#^[a-z_\-]{2,}$#i'),
 						'tz'			=> array('timezone'),
 
@@ -1908,8 +1919,9 @@ class acp_users
 						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
+						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
-							'avatar' => $driver->get_acp_template_name(),
+							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
 						if ($driver->prepare_form($request, $template, $user, $avatar_data, $error))
@@ -1929,12 +1941,8 @@ class acp_users
 					}
 				}
 
-				// Avatar manager is not initialized if avatars are disabled
-				if (isset($phpbb_avatar_manager))
-				{
-					// Replace "error" strings with their real, localised form
-					$error = $phpbb_avatar_manager->localize_errors($user, $error);
-				}
+				// Replace "error" strings with their real, localised form
+				$error = $phpbb_avatar_manager->localize_errors($user, $error);
 
 				$avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);
 
@@ -2289,6 +2297,10 @@ class acp_users
 						trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
 					}
 				}
+				else
+				{
+					$founder_manage = 0;
+				}
 
 				switch ($action)
 				{

phpBB/includes/acp/acp_words.php

@@ -28,7 +28,8 @@ class acp_words
 
 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache, $phpbb_log, $request, $phpbb_container;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$user->add_lang('acp/posting');
 

phpBB/includes/acp/auth.php

@@ -266,7 +266,7 @@ class auth_admin extends \phpbb\auth\auth
 	*/
 	function display_mask($mode, $permission_type, &$hold_ary, $user_mode = 'user', $local = false, $group_display = true)
 	{
-		global $template, $user, $db, $phpbb_container;
+		global $template, $user, $db, $phpbb_root_path, $phpEx, $phpbb_container;
 
 		/* @var $phpbb_permissions \phpbb\permissions */
 		$phpbb_permissions = $phpbb_container->get('acl.permissions');
@@ -607,7 +607,7 @@ class auth_admin extends \phpbb\auth\auth
 	*/
 	function display_role_mask(&$hold_ary)
 	{
-		global $db, $template, $user, $phpbb_root_path, $phpEx;
+		global $db, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $phpbb_container;
 
 		if (!sizeof($hold_ary))
@@ -1106,7 +1106,7 @@ class auth_admin extends \phpbb\auth\auth
 	*/
 	function assign_cat_array(&$category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $s_view, $show_trace = false)
 	{
-		global $template, $phpbb_admin_path, $phpEx, $phpbb_container;
+		global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;
 
 		/* @var $phpbb_permissions \phpbb\permissions */
 		$phpbb_permissions = $phpbb_container->get('acl.permissions');
@@ -1195,7 +1195,7 @@ class auth_admin extends \phpbb\auth\auth
 	*/
 	function build_permission_array(&$permission_row, &$content_array, &$categories, $key_sort_array)
 	{
-		global $phpbb_container;
+		global $user, $phpbb_container;
 
 		/* @var $phpbb_permissions \phpbb\permissions */
 		$phpbb_permissions = $phpbb_container->get('acl.permissions');

phpBB/includes/bbcode.php

@@ -140,7 +140,7 @@ class bbcode
 	*/
 	function bbcode_cache_init()
 	{
-		global $user, $phpbb_dispatcher, $phpbb_extension_manager, $phpbb_container, $phpbb_filesystem;
+		global $phpbb_root_path, $phpEx, $config, $user, $phpbb_dispatcher, $phpbb_extension_manager, $phpbb_path_helper, $phpbb_container, $phpbb_filesystem;
 
 		if (empty($this->template_filename))
 		{

phpBB/includes/constants.php

@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-@define('PHPBB_VERSION', '3.2.0-b1');
+@define('PHPBB_VERSION', '3.2.0-a2');
 
 // QA-related
 // define('PHPBB_QA', 1);

phpBB/includes/functions.php

@@ -955,7 +955,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 */
 function get_topic_tracking($forum_id, $topic_ids, &$rowset, $forum_mark_time, $global_announce_list = false)
 {
-	global $user;
+	global $config, $user;
 
 	$last_read = array();
 
@@ -1260,7 +1260,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
 */
 function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false)
 {
-	global $db, $tracking_topics, $user, $config, $request, $phpbb_container;
+	global $db, $tracking_topics, $user, $config, $auth, $request, $phpbb_container;
 
 	// Determine the users last forum mark time if not given.
 	if ($mark_time_forum === false)
@@ -1318,6 +1318,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 	else if ($config['load_anon_lastread'] || $user->data['is_registered'])
 	{
 		// Get information from cookie
+		$row = false;
+
 		if (!isset($tracking_topics['tf'][$forum_id]))
 		{
 			// We do not need to mark read, this happened before. Therefore setting this to true
@@ -1717,7 +1719,9 @@ function generate_board_url($without_script_path = false)
 */
 function redirect($url, $return = false, $disable_cd_check = false)
 {
-	global $user, $phpbb_path_helper, $phpbb_dispatcher;
+	global $db, $cache, $config, $user, $phpbb_root_path, $phpbb_filesystem, $phpbb_path_helper, $phpEx, $phpbb_dispatcher;
+
+	$failover_flag = false;
 
 	if (!$user->is_setup())
 	{
@@ -2237,7 +2241,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
 */
 function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true)
 {
-	global $user, $template, $auth, $phpEx, $phpbb_root_path, $config;
+	global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config;
 	global $request, $phpbb_container, $phpbb_dispatcher, $phpbb_log;
 
 	$err = '';
@@ -3209,7 +3213,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 function msg_handler($errno, $msg_text, $errfile, $errline)
 {
 	global $cache, $db, $auth, $template, $config, $user, $request;
-	global $phpbb_root_path, $msg_title, $msg_long_text, $phpbb_log;
+	global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text, $phpbb_log;
 
 	// Do not display notices if we suppress them via @
 	if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
@@ -3541,7 +3545,7 @@ function obtain_guest_count($item_id = 0, $item = 'forum')
 */
 function obtain_users_online($item_id = 0, $item = 'forum')
 {
-	global $db, $config;
+	global $db, $config, $user;
 
 	$reading_sql = '';
 	if ($item_id !== 0)
@@ -3607,6 +3611,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum'
 {
 	global $config, $db, $user, $auth, $phpbb_dispatcher;
 
+	$guests_online = $hidden_online = $l_online_users = $online_userlist = $visible_online = '';
 	$user_online_link = $rowset = array();
 	// Need caps version of $item for language-strings
 	$item_caps = strtoupper($item);
@@ -3632,7 +3637,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum'
 		* @var	string	item			Restrict online users to a certain
 		*								session item, e.g. forum for
 		*								session_forum_id
-		* @var	array	sql_ary			SQL query array to obtain users online data
+		* @var	string	sql_ary			SQL query to obtain users online data
 		* @since 3.1.4-RC1
 		* @changed 3.1.7-RC1			Change sql query into array and adjust var accordingly. Allows extension authors the ability to adjust the sql_ary.
 		*/
@@ -4003,7 +4008,8 @@ function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config
 */
 function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
 {
-	global $user, $config;
+	global $user, $config, $cache, $phpbb_root_path, $phpEx;
+	global $request;
 	global $phpbb_container, $phpbb_dispatcher;
 
 	if (!$config['allow_avatar'] && !$ignore_config)
@@ -4554,7 +4560,7 @@ function phpbb_generate_debug_output(\phpbb\db\driver\driver_interface $db, \php
 */
 function page_footer($run_cron = true, $display_template = true, $exit_handler = true)
 {
-	global $db, $config, $template, $user, $auth, $cache, $phpEx;
+	global $db, $config, $template, $user, $auth, $cache, $starttime, $phpbb_root_path, $phpEx;
 	global $request, $phpbb_dispatcher, $phpbb_admin_path;
 
 	// A listener can set this variable to `true` when it overrides this function
@@ -4695,7 +4701,7 @@ function garbage_collection()
 */
 function exit_handler()
 {
-	global $phpbb_hook;
+	global $phpbb_hook, $config;
 
 	if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__))
 	{

phpBB/includes/functions_acp.php

@@ -24,9 +24,9 @@ if (!defined('IN_PHPBB'))
 */
 function adm_page_header($page_title)
 {
-	global $config, $user, $template;
+	global $config, $db, $user, $template;
 	global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID;
-	global $phpbb_dispatcher, $phpbb_container;
+	global $phpbb_dispatcher;
 
 	if (defined('HEADER_INC'))
 	{
@@ -105,8 +105,6 @@ function adm_page_header($page_title)
 		'S_CONTENT_ENCODING'	=> 'UTF-8',
 		'S_CONTENT_FLOW_BEGIN'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
 		'S_CONTENT_FLOW_END'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
-
-		'CONTAINER_EXCEPTION'	=> $phpbb_container->hasParameter('container_exception') ? $phpbb_container->getParameter('container_exception') : false,
 	));
 
 	// An array of http headers that phpbb will set. The following event may override these.
@@ -142,8 +140,8 @@ function adm_page_header($page_title)
 */
 function adm_page_footer($copyright_html = true)
 {
-	global $db, $config, $template, $user, $auth;
-	global $phpbb_root_path;
+	global $db, $config, $template, $user, $auth, $cache;
+	global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 	global $request, $phpbb_dispatcher;
 
 	// A listener can set this variable to `true` when it overrides this function
@@ -275,7 +273,7 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars)
 		break;
 
 		case 'number':
-			$max = $maxlength = '';
+			$min = $max = $maxlength = '';
 			$min = ( isset($tpl_type[1]) ) ? (int) $tpl_type[1] : false;
 			if ( isset($tpl_type[2]) )
 			{
@@ -287,7 +285,7 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars)
 		break;
 
 		case 'dimension':
-			$max = $maxlength = $size = '';
+			$min = $max = $maxlength = $size = '';
 
 			$min = (int) $tpl_type[1];
 
@@ -323,6 +321,8 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars)
 		case 'select':
 		case 'custom':
 
+			$return = '';
+
 			if (isset($vars['method']))
 			{
 				$call = array($module->module, $vars['method']);
@@ -652,6 +652,8 @@ function validate_range($value_ary, &$error)
 	foreach ($value_ary as $value)
 	{
 		$column = explode(':', $value['column_type']);
+		$max = $min = 0;
+		$type = 0;
 		if (!isset($column_types[$column[0]]))
 		{
 			continue;

phpBB/includes/functions_admin.php

@@ -65,7 +65,7 @@ function recalc_nested_sets(&$new_id, $pkey, $table, $parent_id = 0, $where = ar
 */
 function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $only_acl_post = false, $return_array = false)
 {
-	global $db, $auth;
+	global $db, $user, $auth;
 
 	// This query is identical to the jumpbox one
 	$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, forum_flags, forum_options, left_id, right_id
@@ -2009,6 +2009,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					AND u.user_id = p.poster_id';
 			$result = $db->sql_query($sql);
 
+			$post_ids = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
 				$topic_id = intval($row['topic_id']);
@@ -2081,6 +2082,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 							AND u.user_id = p.poster_id';
 					$result = $db->sql_query($sql);
 
+					$post_ids = array();
 					while ($row = $db->sql_fetchrow($result))
 					{
 						$topic_id = (int) $row['topic_id'];
@@ -2375,7 +2377,7 @@ function phpbb_cache_moderators($db, $cache, $auth)
 	}
 
 	// We add moderators who have forum moderator permissions without an explicit ACL_NEVER setting
-	$sql_ary = array();
+	$hold_ary = $ug_id_ary = $sql_ary = array();
 
 	// Grab all users having moderative options...
 	$hold_ary = $auth->acl_user_raw_data(false, 'm_%', false);
@@ -2791,9 +2793,9 @@ function get_database_size()
 			{
 				$version = $row['mysql_version'];
 
-				if (preg_match('#(3\.23|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria)#', $version))
+				if (preg_match('#(3\.23|[45]\.)#', $version))
 				{
-					$db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria#', $version)) ? "`{$db->get_db_name()}`" : $db->get_db_name();
+					$db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.#', $version)) ? "`{$db->get_db_name()}`" : $db->get_db_name();
 
 					$sql = 'SHOW TABLE STATUS
 						FROM ' . $db_name;
@@ -2802,7 +2804,7 @@ function get_database_size()
 					$database_size = 0;
 					while ($row = $db->sql_fetchrow($result))
 					{
-						if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB' || $row['Engine'] == 'Aria')))
+						if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB')))
 						{
 							if ($table_prefix != '')
 							{

phpBB/includes/functions_compress.php

@@ -56,6 +56,7 @@ class compress
 			// Clean up path, add closing / if not present
 			$src_path = ($src_path && substr($src_path, -1) != '/') ? $src_path . '/' : $src_path;
 
+			$filelist = array();
 			$filelist = filelist("$phpbb_root_path$src", '', '*');
 			krsort($filelist);
 

phpBB/includes/functions_content.php

@@ -651,7 +651,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 */
 function generate_text_for_edit($text, $uid, $flags)
 {
-	global $phpbb_dispatcher;
+	global $phpbb_root_path, $phpEx, $phpbb_dispatcher;
 
 	/**
 	* Use this event to modify the text before it is decoded for editing
@@ -1056,6 +1056,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
 		// Some basics...
 		$attachment['extension'] = strtolower(trim($attachment['extension']));
 		$filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);
+		$thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . utf8_basename($attachment['physical_filename']);
 
 		$upload_icon = '';
 
@@ -1097,6 +1098,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
 
 		if (!$denied)
 		{
+			$l_downloaded_viewed = $download_link = '';
 			$display_cat = $extensions[$attachment['extension']]['display_cat'];
 
 			if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)
@@ -1314,6 +1316,8 @@ function extension_allowed($forum_id, $extension, &$extensions)
 */
 function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
 {
+	$chars = array();
+
 	$strip_reply = false;
 	$stripped = false;
 	if ($allow_reply && strpos($string, 'Re: ') === 0)

phpBB/includes/functions_convert.php

@@ -423,7 +423,7 @@ function remote_avatar_dims()
 
 function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false)
 {
-	global $config, $convert, $user;
+	global $config, $convert, $phpbb_root_path, $user;
 
 	$relative_path = empty($convert->convertor['source_path_absolute']);
 
@@ -492,7 +492,7 @@ function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false
 
 function import_attachment_files($category_name = '')
 {
-	global $config, $convert, $db, $user;
+	global $config, $convert, $phpbb_root_path, $db, $user;
 
 	$sql = 'SELECT config_value AS upload_path
 		FROM ' . CONFIG_TABLE . "
@@ -590,7 +590,7 @@ function import_attachment($source, $use_target = false)
 		return '';
 	}
 
-	global $convert, $config, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	// check for trailing slash
 	if (rtrim($convert->convertor['upload_path'], '/') === '')
@@ -632,7 +632,7 @@ function import_rank($source, $use_target = false)
 		return '';
 	}
 
-	global $convert, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	if (!isset($convert->convertor['ranks_path']))
 	{
@@ -650,7 +650,7 @@ function import_smiley($source, $use_target = false)
 		return '';
 	}
 
-	global $convert, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	// check for trailing slash
 	if (rtrim($convert->convertor['smilies_path'], '/') === '')
@@ -671,7 +671,7 @@ function import_avatar($source, $use_target = false, $user_id = false)
 		return;
 	}
 
-	global $convert, $config, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	// check for trailing slash
 	if (rtrim($convert->convertor['avatar_path'], '/') === '')
@@ -684,7 +684,7 @@ function import_avatar($source, $use_target = false, $user_id = false)
 		$use_target = $config['avatar_salt'] . '_' . $user_id . '.' . substr(strrchr($source, '.'), 1);
 	}
 
-	_import_check('avatar_path', $source, $use_target);
+	$result = _import_check('avatar_path', $source, $use_target);
 
 	return ((!empty($user_id)) ? $user_id : $use_target) . '.' . substr(strrchr($source, '.'), 1);
 }
@@ -750,7 +750,7 @@ function get_smiley_dim($source, $axis)
 		return $smiley_cache[$source][$axis];
 	}
 
-	global $convert, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	$orig_source = $source;
 
@@ -858,12 +858,14 @@ function get_upload_avatar_dim($source, $axis)
 		return $cachedims[$axis];
 	}
 
+	$orig_source = $source;
+
 	if (substr($source, 0, 7) == 'upload:')
 	{
 		$source = substr($source, 7);
 	}
 
-	global $convert, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	if (!isset($convert->convertor['avatar_path']))
 	{
@@ -905,7 +907,7 @@ function get_gallery_avatar_dim($source, $axis)
 		return $avatar_cache[$source][$axis];
 	}
 
-	global $convert, $user;
+	global $convert, $phpbb_root_path, $config, $user;
 
 	$orig_source = $source;
 
@@ -1120,7 +1122,7 @@ function words_unique(&$words)
 */
 function add_user_group($group_id, $user_id, $group_leader = false)
 {
-	global $db;
+	global $convert, $phpbb_root_path, $config, $user, $db;
 
 	$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
 		'group_id'		=> $group_id,
@@ -1140,7 +1142,7 @@ function add_user_group($group_id, $user_id, $group_leader = false)
 */
 function user_group_auth($group, $select_query, $use_src_db)
 {
-	global $convert, $user, $db, $src_db, $same_db;
+	global $convert, $phpbb_root_path, $config, $user, $db, $src_db, $same_db;
 
 	if (!in_array($group, array('guests', 'registered', 'registered_coppa', 'global_moderators', 'administrators', 'bots')))
 	{
@@ -1196,7 +1198,7 @@ function get_config()
 		return $convert_config;
 	}
 
-	global $src_db, $same_db;
+	global $src_db, $same_db, $phpbb_root_path, $config;
 	global $convert;
 
 	if ($convert->config_schema['table_format'] != 'file')
@@ -1275,7 +1277,7 @@ function get_config()
 */
 function restore_config($schema)
 {
-	global $config;
+	global $db, $config;
 
 	$convert_config = get_config();
 
@@ -1320,7 +1322,7 @@ function restore_config($schema)
 */
 function update_folder_pm_count()
 {
-	global $db;
+	global $db, $convert, $user;
 
 	$sql = 'SELECT user_id, folder_id, COUNT(msg_id) as num_messages
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1379,7 +1381,7 @@ function extract_variables_from_file($_filename)
 
 function get_path($src_path, $src_url, $test_file)
 {
-	global $phpbb_root_path, $phpEx;
+	global $config, $phpbb_root_path, $phpEx;
 
 	$board_config = get_config();
 
@@ -1490,7 +1492,7 @@ function compare_table($tables, $tablename, &$prefixes)
 */
 function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO)
 {
-	global $db;
+	global $db, $convert, $user, $config;
 	static $acl_option_ids, $group_ids;
 
 	if (($ug_type == 'group' || $ug_type == 'group_role') && is_string($ug_id))
@@ -2037,7 +2039,7 @@ function update_dynamic_config()
 */
 function update_topics_posted()
 {
-	global $db;
+	global $db, $config;
 
 	switch ($db->get_sql_layer())
 	{
@@ -2178,7 +2180,7 @@ function fix_empty_primary_groups()
 */
 function remove_invalid_users()
 {
-	global $db, $phpEx, $phpbb_root_path;
+	global $convert, $db, $phpEx, $phpbb_root_path;
 
 	// username_clean is UNIQUE
 	$sql = 'SELECT user_id
@@ -2314,7 +2316,7 @@ function convert_bbcode($message, $convert_size = true, $extended_bbcodes = fals
 
 function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
 {
-	global $convert, $phpbb_root_path, $user, $phpbb_filesystem;
+	global $convert, $phpbb_root_path, $config, $user, $db, $phpbb_filesystem;
 
 	/** @var \phpbb\filesystem\filesystem_interface $filesystem */
 	$filesystem = $phpbb_filesystem;
@@ -2371,7 +2373,7 @@ function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $sour
 
 function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
 {
-	global $convert, $phpbb_root_path, $config, $user, $phpbb_filesystem;
+	global $convert, $phpbb_root_path, $config, $user, $db, $phpbb_filesystem;
 
 	/** @var \phpbb\filesystem\filesystem_interface $filesystem */
 	$filesystem = $phpbb_filesystem;
@@ -2483,7 +2485,7 @@ function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_
 
 function relative_base($path, $is_relative = true, $line = false, $file = false)
 {
-	global $convert, $user;
+	global $convert, $phpbb_root_path, $config, $user, $db;
 
 	if (!$is_relative)
 	{

phpBB/includes/functions_display.php

@@ -30,6 +30,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 
 	$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();
 	$parent_id = $visible_forums = 0;
+	$sql_from = '';
 
 	// Mark forums read?
 	$mark_read = $request->variable('mark', '');
@@ -731,7 +732,7 @@ function generate_forum_rules(&$forum_data)
 		return;
 	}
 
-	global $template;
+	global $template, $phpbb_root_path, $phpEx;
 
 	if ($forum_data['forum_rules'])
 	{
@@ -751,7 +752,7 @@ function generate_forum_rules(&$forum_data)
 */
 function generate_forum_nav(&$forum_data_ary)
 {
-	global $template, $auth, $config;
+	global $db, $user, $template, $auth, $config;
 	global $phpEx, $phpbb_root_path, $phpbb_dispatcher;
 
 	if (!$auth->acl_get('f_list', $forum_data_ary['forum_id']))
@@ -759,7 +760,7 @@ function generate_forum_nav(&$forum_data_ary)
 		return;
 	}
 
-	$navlinks_parents = $forum_template_data = array();
+	$navlinks = $navlinks_parents = $forum_template_data = array();
 
 	// Get forum parents
 	$forum_parents = get_forum_parents($forum_data_ary);
@@ -886,7 +887,7 @@ function get_forum_parents(&$forum_data)
 */
 function get_moderators(&$forum_moderators, $forum_id = false)
 {
-	global $db, $phpbb_root_path, $phpEx, $user, $auth;
+	global $config, $template, $db, $phpbb_root_path, $phpEx, $user, $auth;
 	global $phpbb_container;
 
 	$forum_id_ary = array();
@@ -1002,6 +1003,8 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 {
 	global $user, $config;
 
+	$folder = $folder_new = '';
+
 	if ($topic_row['topic_status'] == ITEM_MOVED)
 	{
 		$topic_type = $user->lang['VIEW_TOPIC_MOVED'];
@@ -1292,7 +1295,7 @@ function display_user_activity(&$userdata_ary)
 */
 function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0, $item_title = '')
 {
-	global $db, $user, $phpEx, $start, $phpbb_root_path;
+	global $template, $db, $user, $phpEx, $start, $phpbb_root_path;
 	global $request;
 
 	$table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;

phpBB/includes/functions_download.php

@@ -123,7 +123,7 @@ function wrap_img_in_html($src, $title)
 */
 function send_file_to_browser($attachment, $upload_dir, $category)
 {
-	global $user, $db, $phpbb_root_path, $request;
+	global $user, $db, $config, $phpbb_root_path, $request;
 
 	$filename = $phpbb_root_path . $upload_dir . '/' . $attachment['physical_filename'];
 

phpBB/includes/functions_messenger.php

@@ -206,7 +206,7 @@ class messenger
 	*/
 	function template($template_file, $template_lang = '', $template_path = '')
 	{
-		global $config, $phpbb_root_path, $user;
+		global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
 
 		$this->setup_template();
 
@@ -349,7 +349,7 @@ class messenger
 	*/
 	function error($type, $msg)
 	{
-		global $user, $config, $request, $phpbb_log;
+		global $user, $phpEx, $phpbb_root_path, $config, $request, $phpbb_log;
 
 		// Session doesn't exist, create it
 		if (!isset($user->session_id) || $user->session_id === '')
@@ -359,6 +359,7 @@ class messenger
 
 		$calling_page = htmlspecialchars_decode($request->server('PHP_SELF'));
 
+		$message = '';
 		switch ($type)
 		{
 			case 'EMAIL':
@@ -452,7 +453,7 @@ class messenger
 	*/
 	function msg_email()
 	{
-		global $config;
+		global $config, $user;
 
 		if (empty($config['email_enable']))
 		{
@@ -550,7 +551,7 @@ class messenger
 	*/
 	function msg_jabber()
 	{
-		global $config, $user, $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $phpbb_root_path, $phpEx;
 
 		if (empty($config['jab_enable']) || empty($config['jab_host']) || empty($config['jab_username']) || empty($config['jab_password']))
 		{
@@ -622,7 +623,7 @@ class messenger
 	*/
 	protected function setup_template()
 	{
-		global $phpbb_extension_manager, $phpbb_container, $phpbb_filesystem;
+		global $config, $phpbb_path_helper, $user, $phpbb_extension_manager, $phpbb_container, $phpbb_filesystem;
 
 		if ($this->template instanceof \phpbb\template\template)
 		{
@@ -714,7 +715,7 @@ class queue
 	*/
 	function process()
 	{
-		global $config, $phpEx, $phpbb_root_path, $user;
+		global $db, $config, $phpEx, $phpbb_root_path, $user;
 
 		$lock = new \phpbb\lock\flock($this->cache_file);
 		$lock->acquire();
@@ -1257,6 +1258,8 @@ class smtp_class
 	{
 		global $user;
 
+		$err_msg = '';
+
 		// Here we try to determine the *real* hostname (reverse DNS entry preferrably)
 		$local_host = $user->host;
 
@@ -1291,7 +1294,7 @@ class smtp_class
 			$this->server_send("QUIT");
 			fclose($this->socket);
 
-			$this->pop_before_smtp($hostname, $username, $password);
+			$result = $this->pop_before_smtp($hostname, $username, $password);
 			$username = $password = $default_auth_method = '';
 
 			// We need to close the previous session, else the server is not

phpBB/includes/functions_module.php

@@ -82,8 +82,8 @@ class p_master
 	*/
 	function list_modules($p_class)
 	{
-		global $db, $user, $cache;
-		global $phpbb_dispatcher;
+		global $auth, $db, $user, $cache;
+		global $config, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
 
 		// Sanitise for future path use, it's escaped as appropriate for queries
 		$this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class));
@@ -729,6 +729,8 @@ class p_master
 	*/
 	function get_parents($parent_id, $left_id, $right_id, &$all_parents)
 	{
+		global $db;
+
 		$parents = array();
 
 		if ($parent_id > 0)
@@ -820,7 +822,7 @@ class p_master
 		// Make sure the module_url has a question mark set, effectively determining the delimiter to use
 		$delim = (strpos($module_url, '?') === false) ? '?' : '&';
 
-		$current_depth = 0;
+		$current_padding = $current_depth = 0;
 		$linear_offset 	= 'l_block1';
 		$tabular_offset = 't_block2';
 

phpBB/includes/functions_posting.php

@@ -333,7 +333,7 @@ function posting_gen_topic_icons($mode, $icon_id)
 */
 function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL)
 {
-	global $auth, $user, $template;
+	global $auth, $user, $template, $topic_type;
 
 	$toggle = false;
 
@@ -833,7 +833,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0, $pm_action = '', $ms
 	foreach ($draft_rows as $draft)
 	{
 		$link_topic = $link_forum = $link_pm = false;
-		$view_url = $title = '';
+		$insert_url = $view_url = $title = '';
 
 		if (isset($topic_rows[$draft['topic_id']])
 			&& (
@@ -886,7 +886,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0, $pm_action = '', $ms
 */
 function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
 {
-	global $user, $auth, $db, $template;
+	global $user, $auth, $db, $template, $cache;
 	global $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
 
 	/* @var $phpbb_content_visibility \phpbb\content_visibility */
@@ -959,9 +959,11 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 	$db->sql_freeresult($result);
 
 	// Grab extensions
-	$attachments = array();
+	$extensions = $attachments = array();
 	if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
 	{
+		$extensions = $cache->obtain_attach_extensions($forum_id);
+
 		// Get attachments...
 		$sql = 'SELECT *
 			FROM ' . ATTACHMENTS_TABLE . '
@@ -1099,7 +1101,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 */
 function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $softdelete_reason = '')
 {
-	global $db, $user, $phpbb_container;
+	global $db, $user, $auth, $phpbb_container;
 	global $config, $phpEx, $phpbb_root_path;
 
 	// Specify our post mode
@@ -1188,6 +1190,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 
 			if ($is_soft)
 			{
+				$topic_row = array();
 				$phpbb_content_visibility->set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
 			}
 			else
@@ -1359,7 +1362,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 */
 function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data_ary, $update_message = true, $update_search_index = true)
 {
-	global $db, $auth, $user, $config, $phpEx, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $phpbb_log, $request;
+	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $phpbb_log, $request;
 
 	$poll = $poll_ary;
 	$data = $data_ary;
@@ -1586,6 +1589,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
 
 		break;
 	}
+	$topic_row = array();
 
 	// And the topic ladies and gentlemen
 	switch ($post_mode)

phpBB/includes/functions_privmsgs.php

@@ -226,7 +226,7 @@ function get_folder($user_id, $folder_id = false)
 */
 function clean_sentbox($num_sentbox_messages)
 {
-	global $db, $user;
+	global $db, $user, $config;
 
 	// Check Message Limit
 	if ($user->data['message_limit'] && $num_sentbox_messages > $user->data['message_limit'])
@@ -255,6 +255,8 @@ function clean_sentbox($num_sentbox_messages)
 */
 function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
 {
+	global $user, $config;
+
 	if (!isset($rules[$rule_row['rule_check']][$rule_row['rule_connection']]))
 	{
 		return false;
@@ -333,7 +335,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
 		break;
 
 		case ACTION_DELETE_MESSAGE:
-			global $db;
+			global $db, $auth;
 
 			// Check for admins/mods - users are not allowed to remove those messages...
 			// We do the check here to make sure the data we use is consistent
@@ -544,7 +546,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 	}
 
 	// We place actions into arrays, to save queries.
-	$unread_ids = $delete_ids = $important_ids = array();
+	$sql = $unread_ids = $delete_ids = $important_ids = array();
 
 	foreach ($action_ary as $msg_id => $msg_ary)
 	{
@@ -940,6 +942,7 @@ function handle_mark_actions($user_id, $mark_action)
 
 	$msg_ids		= $request->variable('marked_msg_id', array(0));
 	$cur_folder_id	= $request->variable('cur_folder_id', PRIVMSGS_NO_BOX);
+	$confirm		= (isset($_POST['confirm'])) ? true : false;
 
 	if (!sizeof($msg_ids))
 	{
@@ -1004,7 +1007,7 @@ function handle_mark_actions($user_id, $mark_action)
 */
 function delete_pm($user_id, $msg_ids, $folder_id)
 {
-	global $db, $user, $phpbb_container, $phpbb_dispatcher;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
 
 	$user_id	= (int) $user_id;
 	$folder_id	= (int) $folder_id;
@@ -1174,6 +1177,8 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 */
 function phpbb_delete_user_pms($user_id)
 {
+	global $db, $user, $phpbb_root_path, $phpEx;
+
 	$user_id = (int) $user_id;
 
 	if (!$user_id)
@@ -1193,7 +1198,7 @@ function phpbb_delete_user_pms($user_id)
 */
 function phpbb_delete_users_pms($user_ids)
 {
-	global $db, $phpbb_container;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
 
 	$user_id_sql = $db->sql_in_set('user_id', $user_ids);
 	$author_id_sql = $db->sql_in_set('author_id', $user_ids);
@@ -1391,6 +1396,8 @@ function phpbb_delete_users_pms($user_ids)
 */
 function rebuild_header($check_ary)
 {
+	global $db;
+
 	$address = array();
 
 	foreach ($check_ary as $check_type => $address_field)
@@ -1570,7 +1577,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false)
 */
 function get_folder_status($folder_id, $folder)
 {
-	global $user;
+	global $db, $user, $config;
 
 	if (isset($folder[$folder_id]))
 	{
@@ -1603,7 +1610,7 @@ function get_folder_status($folder_id, $folder)
 */
 function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
 {
-	global $db, $auth, $config, $user, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $request;
+	global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $request;
 
 	// We do not handle erasing pms here
 	if ($mode == 'delete')
@@ -1757,6 +1764,8 @@ function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
 
 	if (sizeof($sql_data))
 	{
+		$query = '';
+
 		if ($mode == 'post' || $mode == 'reply' || $mode == 'quote' || $mode == 'quotepost' || $mode == 'forward')
 		{
 			$db->sql_query('INSERT INTO ' . PRIVMSGS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_data));
@@ -1957,7 +1966,7 @@ function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
 */
 function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode = false)
 {
-	global $db, $user, $template, $phpbb_root_path, $phpEx, $auth;
+	global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $auth;
 
 	// Select all receipts and the author from the pm we currently view, to only display their pm-history
 	$sql = 'SELECT author_id, user_id

phpBB/includes/functions_transfer.php

@@ -406,6 +406,9 @@ class ftp extends transfer
 	*/
 	function _put($from_file, $to_file)
 	{
+		// get the file extension
+		$file_extension = strtolower(substr(strrchr($to_file, '.'), 1));
+
 		// We only use the BINARY file mode to cicumvent rewrite actions from ftp server (mostly linefeeds being replaced)
 		$mode = FTP_BINARY;
 

phpBB/includes/functions_user.php

@@ -166,7 +166,7 @@ function user_update_name($old_name, $new_name)
 */
 function user_add($user_row, $cp_data = false, $notifications_data = null)
 {
-	global $db, $config;
+	global $db, $user, $auth, $config, $phpbb_root_path, $phpEx;
 	global $phpbb_dispatcher, $phpbb_container;
 
 	if (empty($user_row['username']) || !isset($user_row['group_id']) || !isset($user_row['user_email']) || !isset($user_row['user_type']))
@@ -866,7 +866,7 @@ function user_active_flip($mode, $user_id_ary, $reason = INACTIVE_MANUAL)
 */
 function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason = '')
 {
-	global $db, $user, $cache, $phpbb_log;
+	global $db, $user, $auth, $cache, $phpbb_log;
 
 	// Delete stale bans
 	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
@@ -1015,6 +1015,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 						if ($ip_2_counter == 0 && $ip_2_end == 254)
 						{
 							$ip_2_counter = 256;
+							$ip_2_fragment = 256;
 
 							$banlist_ary[] = "$ip_1_counter.*";
 						}
@@ -1027,6 +1028,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 							if ($ip_3_counter == 0 && $ip_3_end == 254)
 							{
 								$ip_3_counter = 256;
+								$ip_3_fragment = 256;
 
 								$banlist_ary[] = "$ip_1_counter.$ip_2_counter.*";
 							}
@@ -1039,6 +1041,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 								if ($ip_4_counter == 0 && $ip_4_end == 254)
 								{
 									$ip_4_counter = 256;
+									$ip_4_fragment = 256;
 
 									$banlist_ary[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.*";
 								}
@@ -1289,7 +1292,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 */
 function user_unban($mode, $ban)
 {
-	global $db, $user, $cache, $phpbb_log;
+	global $db, $user, $auth, $cache, $phpbb_log;
 
 	// Delete stale bans
 	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
@@ -2138,7 +2141,7 @@ function phpbb_style_is_active($style_id)
 */
 function avatar_delete($mode, $row, $clean_db = false)
 {
-	global $phpbb_root_path, $config;
+	global $phpbb_root_path, $config, $db, $user;
 
 	// Check if the users avatar is actually *not* a group avatar
 	if ($mode == 'user')
@@ -2210,7 +2213,7 @@ function phpbb_avatar_explanation_string()
 */
 function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false)
 {
-	global $db, $user, $phpbb_container, $phpbb_log;
+	global $phpbb_root_path, $config, $db, $user, $file_upload, $phpbb_container, $phpbb_log;
 
 	/** @var \phpbb\group\helper $group_helper */
 	$group_helper = $phpbb_container->get('group_helper');
@@ -2322,6 +2325,8 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		// Setting the log message before we set the group id (if group gets added)
 		$log = ($group_id) ? 'LOG_GROUP_UPDATED' : 'LOG_GROUP_CREATED';
 
+		$query = '';
+
 		if ($group_id)
 		{
 			$sql = 'SELECT user_id
@@ -2503,7 +2508,7 @@ function group_correct_avatar($group_id, $old_entry)
 */
 function avatar_remove_db($avatar_name)
 {
-	global $db;
+	global $config, $db;
 
 	$sql = 'UPDATE ' . USERS_TABLE . "
 		SET user_avatar = '',
@@ -3007,7 +3012,7 @@ function remove_default_rank($group_id, $user_ids)
 */
 function group_user_attributes($action, $group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $group_attributes = false)
 {
-	global $db, $auth, $user, $phpbb_container, $phpbb_log;
+	global $db, $auth, $user, $phpbb_root_path, $phpEx, $config, $phpbb_container, $phpbb_log;
 
 	// We need both username and user_id info
 	$result = user_get_id_name($user_id_ary, $username_ary);
@@ -3154,7 +3159,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
 */
 function group_validate_groupname($group_id, $group_name)
 {
-	global $db;
+	global $config, $db;
 
 	$group_name =  utf8_clean_string($group_name);
 
@@ -3351,7 +3356,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 */
 function get_group_name($group_id)
 {
-	global $db, $phpbb_container;
+	global $db, $user, $phpbb_container;
 
 	$sql = 'SELECT group_name, group_type
 		FROM ' . GROUPS_TABLE . '

phpBB/includes/mcp/mcp_forum.php

@@ -241,6 +241,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 	foreach ($topic_list as $topic_id)
 	{
+		$topic_title = '';
+
 		$row_ary = &$topic_rows[$topic_id];
 
 		$replies = $phpbb_content_visibility->get_count('topic_posts', $row_ary, $forum_id) - 1;
@@ -356,7 +358,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 */
 function mcp_resync_topics($topic_ids)
 {
-	global $db, $user, $phpbb_log, $request;
+	global $auth, $db, $template, $phpEx, $user, $phpbb_root_path, $phpbb_log, $request;
 
 	if (!sizeof($topic_ids))
 	{
@@ -404,7 +406,7 @@ function mcp_resync_topics($topic_ids)
 */
 function merge_topics($forum_id, $topic_ids, $to_topic_id)
 {
-	global $db, $template, $user, $phpEx, $phpbb_root_path, $phpbb_log, $request;
+	global $db, $template, $user, $phpEx, $phpbb_root_path, $auth, $phpbb_log, $request;
 
 	if (!sizeof($topic_ids))
 	{
@@ -477,7 +479,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		'redirect'		=> $redirect,
 		'topic_id_list'	=> $topic_ids)
 	);
-	$return_link = '';
+	$success_msg = $return_link = '';
 
 	if (confirm_box(true))
 	{

phpBB/includes/mcp/mcp_front.php

@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 function mcp_front_view($id, $mode, $action)
 {
-	global $phpEx, $phpbb_root_path;
+	global $phpEx, $phpbb_root_path, $config;
 	global $template, $db, $user, $auth, $module;
 	global $phpbb_dispatcher, $request;
 
@@ -54,8 +54,8 @@ function mcp_front_view($id, $mode, $action)
 			* Allow altering the query to get the number of unapproved posts
 			*
 			* @event core.mcp_front_queue_unapproved_total_before
-			* @var	array	sql_ary			Query array to get the total number of unapproved posts
-			* @var	array	forum_list		List of forums to look for unapproved posts
+			* @var	int		sql_ary						Query to get the total number of unapproved posts
+			* @var	array	forum_list					List of forums to look for unapproved posts
 			* @since 3.1.5-RC1
 			*/
 			$vars = array('sql_ary', 'forum_list');
@@ -179,7 +179,7 @@ function mcp_front_view($id, $mode, $action)
 			* Alter sql query to count the number of reported posts
 			*
 			* @event core.mcp_front_reports_count_query_before
-			* @var	string	sql				The query string used to get the number of reports that exist
+			* @var	int		sql				The query string used to get the number of reports that exist
 			* @var	array	forum_list		List of forums that contain the posts
 			* @since 3.1.5-RC1
 			*/
@@ -226,8 +226,8 @@ function mcp_front_view($id, $mode, $action)
 				* Alter sql query to get latest reported posts
 				*
 				* @event core.mcp_front_reports_listing_query_before
-				* @var	array	sql_ary			Associative array with the query to be executed
-				* @var	array	forum_list		List of forums that contain the posts
+				* @var	int		sql_ary						Associative array with the query to be executed
+				* @var	array	forum_list					List of forums that contain the posts
 				* @since 3.1.0-RC3
 				*/
 				$vars = array('sql_ary', 'forum_list');

phpBB/includes/mcp/mcp_logs.php

@@ -36,7 +36,7 @@ class mcp_logs
 	function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $request;
-		global $config, $phpbb_container, $phpbb_log;
+		global $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_log;
 
 		$user->add_lang('acp/common');
 

phpBB/includes/mcp/mcp_main.php

@@ -35,8 +35,8 @@ class mcp_main
 
 	function main($id, $mode)
 	{
-		global $auth, $user, $action;
-		global $phpbb_root_path, $phpEx, $request;
+		global $auth, $db, $user, $template, $action;
+		global $config, $phpbb_root_path, $phpEx, $request;
 		global $phpbb_dispatcher;
 
 		$quickmod = ($mode == 'quickmod') ? true : false;
@@ -262,7 +262,7 @@ class mcp_main
 */
 function lock_unlock($action, $ids)
 {
-	global $user, $db, $request, $phpbb_log, $phpbb_dispatcher;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_log;
 
 	if ($action == 'lock' || $action == 'unlock')
 	{
@@ -306,6 +306,7 @@ function lock_unlock($action, $ids)
 		'action'			=> $action,
 		'redirect'			=> $redirect)
 	);
+	$success_msg = '';
 
 	if (confirm_box(true))
 	{
@@ -366,7 +367,7 @@ function lock_unlock($action, $ids)
 */
 function change_topic_type($action, $topic_ids)
 {
-	global $user, $db, $request, $phpbb_log;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_log;
 
 	switch ($action)
 	{
@@ -411,6 +412,7 @@ function change_topic_type($action, $topic_ids)
 		'action'		=> $action,
 		'redirect'		=> $redirect,
 	);
+	$success_msg = '';
 
 	if (confirm_box(true))
 	{
@@ -727,7 +729,7 @@ function mcp_move_topic($topic_ids)
 */
 function mcp_restore_topic($topic_ids)
 {
-	global $user, $phpEx, $phpbb_root_path, $request, $phpbb_container, $phpbb_log;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container, $phpbb_log;
 
 	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
 	{
@@ -875,7 +877,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 
 		if (!$is_soft)
 		{
-			delete_topics('topic_id', $topic_ids);
+			$return = delete_topics('topic_id', $topic_ids);
 		}
 	}
 	else
@@ -1344,6 +1346,8 @@ function mcp_fork_topic($topic_ids)
 
 			if ($topic_row['poll_start'])
 			{
+				$poll_rows = array();
+
 				$sql = 'SELECT *
 					FROM ' . POLL_OPTIONS_TABLE . "
 					WHERE topic_id = $topic_id";

phpBB/includes/mcp/mcp_notes.php

@@ -35,8 +35,8 @@ class mcp_notes
 
 	function main($id, $mode)
 	{
-		global $user, $template, $request;
-		global $phpbb_root_path, $phpEx;
+		global $auth, $db, $user, $template, $request;
+		global $config, $phpbb_root_path, $phpEx;
 
 		$action = $request->variable('action', array('' => ''));
 
@@ -74,7 +74,7 @@ class mcp_notes
 	*/
 	function mcp_notes_user_view($action)
 	{
-		global $config, $phpbb_log, $request;
+		global $phpEx, $phpbb_root_path, $config, $phpbb_log, $request;
 		global $template, $db, $user, $auth, $phpbb_container;
 
 		$user_id = $request->variable('u', 0);

phpBB/includes/mcp/mcp_pm_reports.php

@@ -35,7 +35,7 @@ class mcp_pm_reports
 
 	function main($id, $mode)
 	{
-		global $auth, $db, $user, $template, $request;
+		global $auth, $db, $user, $template, $cache, $request;
 		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);

phpBB/includes/mcp/mcp_post.php

@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 function mcp_post_details($id, $mode, $action)
 {
 	global $phpEx, $phpbb_root_path, $config, $request;
-	global $template, $db, $user, $auth;
+	global $template, $db, $user, $auth, $cache;
 	global $phpbb_dispatcher;
 
 	$user->add_lang('posting');
@@ -128,6 +128,7 @@ function mcp_post_details($id, $mode, $action)
 	$users_ary = $usernames_ary = array();
 	$attachments = $extensions = array();
 	$post_id = $post_info['post_id'];
+	$topic_tracking_info = array();
 
 	// Get topic tracking info
 	if ($config['load_db_lastread'])
@@ -149,6 +150,8 @@ function mcp_post_details($id, $mode, $action)
 
 	if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 	{
+		$extensions = $cache->obtain_attach_extensions($post_info['forum_id']);
+
 		$sql = 'SELECT *
 			FROM ' . ATTACHMENTS_TABLE . '
 			WHERE post_msg_id = ' . $post_id . '

phpBB/includes/mcp/mcp_queue.php

@@ -35,7 +35,7 @@ class mcp_queue
 
 	public function main($id, $mode)
 	{
-		global $auth, $db, $user, $template, $request;
+		global $auth, $db, $user, $template, $cache, $request;
 		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;
 		global $phpbb_dispatcher;
 
@@ -195,7 +195,7 @@ class mcp_queue
 					));
 				}
 
-				$attachments = $topic_tracking_info = array();
+				$extensions = $attachments = $topic_tracking_info = array();
 
 				// Get topic tracking info
 				if ($config['load_db_lastread'])
@@ -217,6 +217,8 @@ class mcp_queue
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 				{
+					$extensions = $cache->obtain_attach_extensions($post_info['forum_id']);
+
 					$sql = 'SELECT *
 						FROM ' . ATTACHMENTS_TABLE . '
 						WHERE post_msg_id = ' . $post_id . '
@@ -400,6 +402,7 @@ class mcp_queue
 						trigger_error('NOT_MODERATOR');
 					}
 
+					$forum_info = $forum_info[$forum_id];
 					$forum_list = $forum_id;
 				}
 
@@ -414,6 +417,7 @@ class mcp_queue
 				$sort_by_sql = $sort_order_sql = array();
 				phpbb_mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
 
+				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
 
 				$forum_names = array();
@@ -617,7 +621,7 @@ class mcp_queue
 	*/
 	static public function approve_posts($action, $post_id_list, $id, $mode)
 	{
-		global $template, $user, $request, $phpbb_container, $phpbb_dispatcher;
+		global $db, $template, $user, $config, $request, $phpbb_container, $phpbb_dispatcher;
 		global $phpEx, $phpbb_root_path, $phpbb_log;
 
 		if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
@@ -627,7 +631,7 @@ class mcp_queue
 
 		$redirect = $request->variable('redirect', build_url(array('quickmod')));
 		$redirect = reapply_sid($redirect);
-		$post_url = '';
+		$success_msg = $post_url = '';
 		$approve_log = array();
 		$num_topics = 0;
 
@@ -872,7 +876,7 @@ class mcp_queue
 	*/
 	static public function approve_topics($action, $topic_id_list, $id, $mode)
 	{
-		global $db, $template, $user, $phpbb_log;
+		global $db, $template, $user, $config, $phpbb_log;
 		global $phpEx, $phpbb_root_path, $request, $phpbb_container, $phpbb_dispatcher;
 
 		if (!phpbb_check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
@@ -1069,7 +1073,7 @@ class mcp_queue
 	*/
 	static public function disapprove_posts($post_id_list, $id, $mode)
 	{
-		global $db, $template, $user, $phpbb_container, $phpbb_dispatcher;
+		global $db, $template, $user, $config, $phpbb_container, $phpbb_dispatcher;
 		global $phpEx, $phpbb_root_path, $request, $phpbb_log;
 
 		if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
@@ -1081,7 +1085,7 @@ class mcp_queue
 		$redirect = reapply_sid($redirect);
 		$reason = $request->variable('reason', '', true);
 		$reason_id = $request->variable('reason_id', 0);
-		$additional_msg = '';
+		$success_msg = $additional_msg = '';
 
 		$s_hidden_fields = build_hidden_fields(array(
 			'i'				=> $id,
@@ -1139,7 +1143,7 @@ class mcp_queue
 
 		if (confirm_box(true))
 		{
-			$disapprove_log_topics = $disapprove_log_posts = array();
+			$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
 			$topic_posts_unapproved = $post_disapprove_list = $topic_information = array();
 
 			// Build a list of posts to be disapproved and get the related topics real replies count

phpBB/includes/mcp/mcp_reports.php

@@ -35,7 +35,7 @@ class mcp_reports
 
 	function main($id, $mode)
 	{
-		global $auth, $db, $user, $template, $request;
+		global $auth, $db, $user, $template, $cache, $request;
 		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container, $phpbb_dispatcher;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
@@ -96,7 +96,7 @@ class mcp_reports
 				*
 				* @event core.mcp_reports_report_details_query_before
 				* @var	array	sql_ary			The array in the format of the query builder with the query
-				* @var	int		forum_id		The forum_id, the number in the f GET parameter
+				* @var	mixed	forum_id		The forum_id, the number in the f GET parameter
 				* @var	int		post_id			The post_id of the report being viewed (if 0, it is meaningless)
 				* @var	int		report_id		The report_id of the report being viewed
 				* @since 3.1.5-RC1
@@ -119,10 +119,10 @@ class mcp_reports
 				*
 				* @event core.mcp_reports_report_details_query_after
 				* @var	array	sql_ary		The array in the format of the query builder with the query that had been executted
-				* @var	int		forum_id	The forum_id, the number in the f GET parameter
+				* @var	mixed	forum_id	The forum_id, the number in the f GET parameter
 				* @var	int		post_id		The post_id of the report being viewed (if 0, it is meaningless)
 				* @var	int		report_id	The report_id of the report being viewed
-				* @var	array	report		The query's resulting row.
+				* @var	int		report		The query's resulting row.
 				* @since 3.1.5-RC1
 				*/
 				$vars = array(
@@ -182,7 +182,7 @@ class mcp_reports
 					));
 				}
 
-				$attachments = array();
+				$topic_tracking_info = $extensions = $attachments = array();
 				// Get topic tracking info
 				if ($config['load_db_lastread'])
 				{
@@ -351,6 +351,8 @@ class mcp_reports
 						trigger_error('NOT_MODERATOR');
 					}
 
+					$global_id = $forum_list[0];
+
 					$sql = 'SELECT SUM(forum_topics_approved) as sum_forum_topics
 						FROM ' . FORUMS_TABLE . '
 						WHERE ' . $db->sql_in_set('forum_id', $forum_list);
@@ -367,6 +369,7 @@ class mcp_reports
 						trigger_error('NOT_MODERATOR');
 					}
 
+					$forum_info = $forum_info[$forum_id];
 					$forum_list = array($forum_id);
 				}
 
@@ -388,6 +391,7 @@ class mcp_reports
 				$sort_by_sql = $sort_order_sql = array();
 				phpbb_mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
 
+				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 				$limit_time_sql = ($sort_days) ? 'AND r.report_time >= ' . (time() - ($sort_days * 86400)) : '';
 
 				if ($mode == 'reports')
@@ -456,6 +460,7 @@ class mcp_reports
 						ORDER BY ' . $sort_order_sql;
 					$result = $db->sql_query($sql);
 
+					$report_data = $rowset = array();
 					while ($row = $db->sql_fetchrow($result))
 					{
 						$template->assign_block_vars('postrow', array(
@@ -517,7 +522,7 @@ class mcp_reports
 */
 function close_report($report_id_list, $mode, $action, $pm = false)
 {
-	global $db, $user, $auth, $phpbb_log, $request;
+	global $db, $template, $user, $config, $auth, $phpbb_log, $request;
 	global $phpEx, $phpbb_root_path, $phpbb_container;
 
 	$pm_where = ($pm) ? ' AND r.post_id = 0 ' : ' AND r.pm_id = 0 ';

phpBB/includes/mcp/mcp_topic.php

@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 function mcp_topic_view($id, $mode, $action)
 {
 	global $phpEx, $phpbb_root_path, $config, $request;
-	global $template, $db, $user, $auth, $phpbb_container, $phpbb_dispatcher;
+	global $template, $db, $user, $auth, $cache, $phpbb_container, $phpbb_dispatcher;
 
 	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . phpbb_extra_url());
 
@@ -156,6 +156,8 @@ function mcp_topic_view($id, $mode, $action)
 	}
 	$db->sql_freeresult($result);
 
+	$topic_tracking_info = array();
+
 	// Get topic tracking info
 	if ($config['load_db_lastread'])
 	{
@@ -171,9 +173,11 @@ function mcp_topic_view($id, $mode, $action)
 	$has_unapproved_posts = $has_deleted_posts = false;
 
 	// Grab extensions
-	$attachments = array();
+	$extensions = $attachments = array();
 	if ($topic_info['topic_attachment'] && sizeof($post_id_list))
 	{
+		$extensions = $cache->obtain_attach_extensions($topic_info['forum_id']);
+
 		// Get attachments...
 		if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id']))
 		{
@@ -267,6 +271,8 @@ function mcp_topic_view($id, $mode, $action)
 			'U_MCP_REPORT'		=> ($auth->acl_get('m_report', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $topic_info['forum_id'] . '&p=' . $row['post_id']) : '',
 		);
 
+		$current_row_number = $i;
+
 		/**
 		* Event to modify the template data block for topic reviews in the MCP
 		*
@@ -475,6 +481,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 		'to_forum_id'	=> $to_forum_id,
 		'icon'			=> $request->variable('icon', 0))
 	);
+	$success_msg = $return_link = '';
 
 	if (confirm_box(true))
 	{
@@ -637,7 +644,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 */
 function merge_posts($topic_id, $to_topic_id)
 {
-	global $db, $template, $user, $phpEx, $phpbb_root_path, $phpbb_log, $request;
+	global $db, $template, $user, $phpEx, $phpbb_root_path, $auth, $phpbb_log, $request;
 
 	if (!$to_topic_id)
 	{
@@ -689,7 +696,7 @@ function merge_posts($topic_id, $to_topic_id)
 		'redirect'		=> $redirect,
 		't'				=> $topic_id)
 	);
-	$return_link = '';
+	$success_msg = $return_link = '';
 
 	if (confirm_box(true))
 	{

phpBB/includes/mcp/mcp_warn.php

@@ -35,7 +35,8 @@ class mcp_warn
 
 	function main($id, $mode)
 	{
-		global $request;
+		global $auth, $db, $user, $template, $request;
+		global $config, $phpbb_root_path, $phpEx;
 
 		$action = $request->variable('action', array('' => ''));
 
@@ -77,8 +78,8 @@ class mcp_warn
 	*/
 	function mcp_warn_front_view()
 	{
-		global $phpEx, $phpbb_root_path;
-		global $template, $db, $user;
+		global $phpEx, $phpbb_root_path, $config;
+		global $template, $db, $user, $auth;
 
 		$template->assign_vars(array(
 			'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp&field=username&select_single=true'),
@@ -131,7 +132,7 @@ class mcp_warn
 	function mcp_warn_list_view($action)
 	{
 		global $phpEx, $phpbb_root_path, $config, $phpbb_container;
-		global $template, $user, $auth, $request;
+		global $template, $db, $user, $auth, $request;
 
 		/* @var $pagination \phpbb\pagination */
 		$pagination = $phpbb_container->get('pagination');
@@ -190,7 +191,7 @@ class mcp_warn
 	function mcp_warn_post_view($action)
 	{
 		global $phpEx, $phpbb_root_path, $config, $request;
-		global $template, $db, $user, $phpbb_dispatcher;
+		global $template, $db, $user, $auth, $phpbb_dispatcher;
 
 		$post_id = $request->variable('p', 0);
 		$forum_id = $request->variable('f', 0);
@@ -369,8 +370,8 @@ class mcp_warn
 	*/
 	function mcp_warn_user_view($action)
 	{
-		global $phpEx, $phpbb_root_path, $config, $request;
-		global $template, $db, $user, $phpbb_dispatcher;
+		global $phpEx, $phpbb_root_path, $config, $module, $request;
+		global $template, $db, $user, $auth, $phpbb_dispatcher;
 
 		$user_id = $request->variable('u', 0);
 		$username = $request->variable('username', '', true);
@@ -523,7 +524,7 @@ class mcp_warn
 function add_warning($user_row, $warning, $send_pm = true, $post_id = 0)
 {
 	global $phpEx, $phpbb_root_path, $config, $phpbb_log;
-	global $db, $user;
+	global $template, $db, $user, $auth;
 
 	if ($send_pm)
 	{

phpBB/includes/message_parser.php

@@ -798,6 +798,8 @@ class bbcode_firstpass extends bbcode
 	*/
 	function bbcode_quote($in)
 	{
+		global $config, $user;
+
 		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
 
 		if (!$in)
@@ -1007,6 +1009,8 @@ class bbcode_firstpass extends bbcode
 	*/
 	function validate_url($var1, $var2)
 	{
+		global $config;
+
 		$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
 		$var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2)));
 
@@ -1151,7 +1155,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
 	{
-		global $config, $user, $phpbb_dispatcher, $phpbb_container;
+		global $config, $db, $user, $phpbb_dispatcher, $phpbb_container;
 
 		$this->mode = $mode;
 
@@ -1766,7 +1770,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function get_submitted_attachment_data($check_user_id = false)
 	{
-		global $user, $db;
+		global $user, $db, $phpbb_root_path, $phpEx, $config;
 		global $request;
 
 		$this->filename_data['filecomment'] = $request->variable('filecomment', '', true);
@@ -1854,7 +1858,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function parse_poll(&$poll)
 	{
-		global $user, $config;
+		global $auth, $user, $config;
 
 		$poll_max_options = $poll['poll_max_options'];
 

phpBB/includes/questionnaire/questionnaire.php

@@ -257,7 +257,7 @@ class phpbb_questionnaire_phpbb_data_provider
 	*/
 	function get_data()
 	{
-		global $phpbb_config_php_file;
+		global $phpbb_root_path, $phpEx, $phpbb_config_php_file;
 
 		extract($phpbb_config_php_file->get_all());
 		unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution

phpBB/includes/sphinxapi.php

@@ -1659,6 +1659,7 @@ class SphinxClient
 			return false;
 		}
 
+		$res = substr ( $response, 4 ); // just ignore length, error handling, etc
 		$p = 0;
 		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
 

phpBB/includes/ucp/ucp_activate.php

@@ -30,7 +30,7 @@ class ucp_activate
 	function main($id, $mode)
 	{
 		global $config, $phpbb_root_path, $phpEx, $request;
-		global $db, $user, $auth, $phpbb_container, $phpbb_log, $phpbb_dispatcher;
+		global $db, $user, $auth, $template, $phpbb_container, $phpbb_log, $phpbb_dispatcher;
 
 		$user_id = $request->variable('u', 0);
 		$key = $request->variable('k', '');

phpBB/includes/ucp/ucp_attachments.php

@@ -36,6 +36,7 @@ class ucp_attachments
 		$sort_dir	= $request->variable('sd', 'a');
 
 		$delete		= (isset($_POST['delete'])) ? true : false;
+		$confirm	= (isset($_POST['confirm'])) ? true : false;
 		$delete_ids	= array_keys($request->variable('attachment', array(0)));
 
 		if ($delete && sizeof($delete_ids))

phpBB/includes/ucp/ucp_confirm.php

@@ -36,7 +36,7 @@ class ucp_confirm
 
 	function main($id, $mode)
 	{
-		global $config, $phpbb_container, $request;
+		global $db, $user, $phpbb_root_path, $config, $phpEx, $phpbb_container, $request;
 
 		$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
 		$captcha->init($request->variable('type', 0));

phpBB/includes/ucp/ucp_groups.php

@@ -38,6 +38,8 @@ class ucp_groups
 
 		$mark_ary	= $request->variable('mark', array(0));
 		$submit		= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
+		$delete		= $request->variable('delete', false, false, \phpbb\request\request_interface::POST);
+		$error = $data = array();
 
 		/** @var \phpbb\group\helper $group_helper */
 		$group_helper = $phpbb_container->get('group_helper');
@@ -460,8 +462,11 @@ class ucp_groups
 							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
+						$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
 						$user->add_lang(array('acp/groups', 'acp/common'));
 
+						$data = $submit_ary = array();
+
 						$update	= (isset($_POST['update'])) ? true : false;
 
 						$error = array();
@@ -530,6 +535,7 @@ class ucp_groups
 							{
 								// Handle avatar
 								$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
+								$config_name = preg_replace('#^avatar\.driver.#', '', $driver_name);
 
 								if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 								{
@@ -618,6 +624,7 @@ class ucp_groups
 						}
 						else if (!$group_id)
 						{
+							$group_name = $request->variable('group_name', '', true);
 							$group_desc_data = array(
 								'text'			=> '',
 								'allow_bbcode'	=> true,

phpBB/includes/ucp/ucp_login_link.php

@@ -99,7 +99,7 @@ class ucp_login_link
 					else
 					{
 						// Finish login
-						$user->session_create($login_result['user_row']['user_id'], false, false, true);
+						$result = $user->session_create($login_result['user_row']['user_id'], false, false, true);
 
 						// Perform a redirect as the account has been linked
 						$this->perform_redirect();
@@ -182,7 +182,7 @@ class ucp_login_link
 	*/
 	protected function process_login_result($result)
 	{
-		global $config, $template, $user, $phpbb_container;
+		global $config, $request, $template, $user, $phpbb_container;
 
 		$login_error = null;
 

phpBB/includes/ucp/ucp_main.php

@@ -221,6 +221,7 @@ class ucp_main
 					{
 						$forums = array_keys($request->variable('f', array(0 => 0)));
 						$topics = array_keys($request->variable('t', array(0 => 0)));
+						$msg = '';
 
 						if (sizeof($forums) || sizeof($topics))
 						{

phpBB/includes/ucp/ucp_pm_compose.php

@@ -598,7 +598,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		$enable_urls	= true;
 	}
 
-	$drafts = false;
+	$enable_magic_url = $drafts = false;
 
 	// User own some drafts?
 	if ($auth->acl_get('u_savedrafts') && $action != 'delete')
@@ -739,6 +739,16 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		$enable_urls 		= (isset($_POST['disable_magic_url'])) ? 0 : 1;
 		$enable_sig			= (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false);
 
+		if ($submit)
+		{
+			$status_switch	= (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1);
+			$status_switch = ($status_switch != $check_value);
+		}
+		else
+		{
+			$status_switch = 1;
+		}
+
 		// Parse Attachments - before checksum is calculated
 		$message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
 
@@ -1052,6 +1062,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		}
 
 		// Now Build the address list
+		$plain_address_field = '';
 		foreach ($address_list as $type => $adr_ary)
 		{
 			foreach ($adr_ary as $id => $field)

phpBB/includes/ucp/ucp_pm_options.php

@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 function message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions)
 {
-	global $phpbb_root_path, $phpEx, $user, $template, $config, $db, $request;
+	global $phpbb_root_path, $phpEx, $user, $template, $auth, $config, $db, $request;
 
 	$redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=options");
 
@@ -80,6 +80,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		if (check_form_key('ucp_pm_options'))
 		{
 			$folder_name = $request->variable('foldername', '', true);
+			$msg = '';
 
 			if ($folder_name)
 			{
@@ -610,7 +611,7 @@ function define_check_option($hardcoded, $check_option, $check_lang)
 */
 function define_action_option($hardcoded, $action_option, $action_lang, $folder)
 {
-	global $template;
+	global $db, $template, $user;
 
 	$l_action = $s_action_options = '';
 	if ($hardcoded)
@@ -721,6 +722,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 
 	// Define Condition
 	$condition = $global_rule_conditions[$rule_option];
+	$current_value = '';
 
 	switch ($condition)
 	{

phpBB/includes/ucp/ucp_pm_viewfolder.php

@@ -41,6 +41,9 @@ function view_folder($id, $mode, $folder_id, $folder)
 
 		$color_rows = array('marked', 'replied');
 
+		// only show the friend/foe color rows if the module is enabled
+		$zebra_enabled = false;
+
 		$_module = new p_master();
 		$_module->list_modules('ucp');
 		$_module->set_active('zebra');

phpBB/includes/ucp/ucp_pm_viewmessage.php

@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 {
-	global $user, $template, $auth, $db, $phpbb_container;
+	global $user, $template, $auth, $db, $cache, $phpbb_container;
 	global $phpbb_root_path, $request, $phpEx, $config, $phpbb_dispatcher;
 
 	$user->add_lang(array('viewtopic', 'memberlist'));
@@ -50,6 +50,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
 	}
 
+	// Grab icons
+	$icons = $cache->obtain_icons();
+
 	// Load the custom profile fields
 	if ($config['load_cpf_pm'])
 	{
@@ -354,7 +357,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 */
 function get_user_information($user_id, $user_row)
 {
-	global $db, $auth, $user;
+	global $db, $auth, $user, $cache;
 	global $phpbb_root_path, $phpEx, $config;
 
 	if (!$user_id)