mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9582] MSSQL native backups can now be restored. [ticket/9582] Advanced search cannot be accessed using MSSQL native. [ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native. [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver. [ticket/9582] Custom profile fields cannot be created under MSSQL native. [ticket/9520] Additionally filter requests for {common,config}.php [ticket/9520] New web.config file as suggested by Microsoft using request filter [ticket/9520] Removed per directory web.config files. [ticket/9520] Add suggested web.config for root files as suggested by Microsoft. [ticket/9520] Add some default web.config files for IIS. [develop-olympus] Basic gitignore file for cache files and backups. [ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters. [feature/webpi] Validate inline with MSSQL password policy.
This commit is contained in:
commit
0ed69d91b2
9 changed files with 37 additions and 3 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
phpBB/cache/*.php
|
||||||
|
*~
|
|
@ -116,12 +116,12 @@
|
||||||
|
|
||||||
<parameter
|
<parameter
|
||||||
name="Database Password"
|
name="Database Password"
|
||||||
description="Password for your phpBB database. (Minimum 4 characters)"
|
description="Password for your phpBB database. (Must be at least 8 characters, contain at least one lower case letter, one upper case letter and one digit)"
|
||||||
tags="New, Password,SQL, DbUserPassword">
|
tags="New, Password,SQL, DbUserPassword">
|
||||||
|
|
||||||
<parameterValidation
|
<parameterValidation
|
||||||
type = "RegularExpression"
|
type = "RegularExpression"
|
||||||
validationString = "^.{4,}$" />
|
validationString = "^.*(?=.{8,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).*$" />
|
||||||
|
|
||||||
<parameterEntry
|
<parameterEntry
|
||||||
type="TextFile"
|
type="TextFile"
|
||||||
|
|
|
@ -394,6 +394,7 @@ class acp_database
|
||||||
|
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
|
while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
|
||||||
{
|
{
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
|
@ -1480,6 +1480,7 @@ class acp_profile
|
||||||
|
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
|
|
||||||
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
|
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
|
||||||
$sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] ";
|
$sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] ";
|
||||||
|
|
|
@ -233,6 +233,7 @@ class acp_reasons
|
||||||
// Standard? What's that?
|
// Standard? What's that?
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
// Change the reports using this reason to 'other'
|
// Change the reports using this reason to 'other'
|
||||||
$sql = "DECLARE @ptrval binary(16)
|
$sql = "DECLARE @ptrval binary(16)
|
||||||
|
|
||||||
|
|
|
@ -366,6 +366,7 @@ class custom_profile
|
||||||
case 'sqlite':
|
case 'sqlite':
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
$right_delim = ']';
|
$right_delim = ']';
|
||||||
$left_delim = '[';
|
$left_delim = '[';
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -300,7 +300,7 @@ class bbcode_firstpass extends bbcode
|
||||||
|
|
||||||
if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
|
if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
|
||||||
{
|
{
|
||||||
$stats = @getimagesize($in);
|
$stats = @getimagesize(htmlspecialchars_decode($in));
|
||||||
|
|
||||||
if ($stats === false)
|
if ($stats === false)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1155,6 +1155,7 @@ if ($auth->acl_get('a_search'))
|
||||||
|
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
$sql = 'SELECT search_time, search_keywords
|
$sql = 'SELECT search_time, search_keywords
|
||||||
FROM ' . SEARCH_RESULTS_TABLE . '
|
FROM ' . SEARCH_RESULTS_TABLE . '
|
||||||
WHERE DATALENGTH(search_keywords) > 0
|
WHERE DATALENGTH(search_keywords) > 0
|
||||||
|
|
27
phpBB/web.config
Normal file
27
phpBB/web.config
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<configuration>
|
||||||
|
<system.webServer>
|
||||||
|
<security>
|
||||||
|
<requestFiltering>
|
||||||
|
<hiddenSegments>
|
||||||
|
<add segment="cache" />
|
||||||
|
<add segment="files" />
|
||||||
|
<add segment="store" />
|
||||||
|
<add segment="config.php" />
|
||||||
|
<add segment="common.php" />
|
||||||
|
</hiddenSegments>
|
||||||
|
</requestFiltering>
|
||||||
|
</security>
|
||||||
|
</system.webServer>
|
||||||
|
<location path="images/avatars">
|
||||||
|
<system.webServer>
|
||||||
|
<security>
|
||||||
|
<requestFiltering>
|
||||||
|
<hiddenSegments>
|
||||||
|
<add segment="upload" />
|
||||||
|
</hiddenSegments>
|
||||||
|
</requestFiltering>
|
||||||
|
</security>
|
||||||
|
</system.webServer>
|
||||||
|
</location>
|
||||||
|
</configuration>
|
Loading…
Add table
Reference in a new issue