mirror of
https://github.com/phpbb/phpbb.git
synced 2025-09-11 08:40:44 +02:00
Compare commits
6 Commits
release-3.
...
release-3.
| Author | SHA1 | Date | |
|---|---|---|---|
|
7363b26ab2 | ||
|
21e55ea6d2 | ||
|
|
7eb16cbbd5 | ||
|
|
2345be38b6 | ||
|
|
c8da5ad9f4 | ||
|
|
7f21a5f461 |
@@ -1,5 +1,6 @@
|
||||
language: php
|
||||
php:
|
||||
- 5.2
|
||||
- 5.3.3
|
||||
- 5.3
|
||||
- 5.4
|
||||
@@ -16,14 +17,15 @@ before_script:
|
||||
- sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi"
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi"
|
||||
- sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then travis/install-phpunit-5-2.sh; fi"
|
||||
- cd phpBB
|
||||
- php ../composer.phar install --dev --no-interaction --prefer-source
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi"
|
||||
- cd ..
|
||||
- sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then sudo apt-get update; sudo apt-get install -y parallel libimage-exiftool-perl; fi"
|
||||
|
||||
script:
|
||||
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then php -d include_path='.:phpunit' phpunit/phpunit.php --configuration travis/phpunit-$DB-5-2-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
|
||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' || exit 1; fi"
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev
|
||||
|
||||
We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below:
|
||||
|
||||
* [](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
|
||||
* [](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
|
||||
* [](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x
|
||||
* develop [](http://travis-ci.org/phpbb/phpbb)
|
||||
* develop-ascraeus [](http://travis-ci.org/phpbb/phpbb)
|
||||
* develop-olympus [](http://travis-ci.org/phpbb/phpbb)
|
||||
|
||||
## LICENSE
|
||||
|
||||
|
||||
@@ -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.0.14" />
|
||||
<property name="prevversion" value="3.0.14-RC1" />
|
||||
<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12, 3.0.13, 3.0.13-PL1" />
|
||||
<property name="newversion" value="3.0.13" />
|
||||
<property name="prevversion" value="3.0.13-RC1" />
|
||||
<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12" />
|
||||
<!-- no configuration should be needed beyond this point -->
|
||||
|
||||
<property name="oldversions" value="${olderversions}, ${prevversion}" />
|
||||
|
||||
@@ -18,13 +18,13 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
|
||||
This would be nice, but currently causes various problems that need
|
||||
debugging.
|
||||
->addFromTags('release-3.0.*')
|
||||
->add('3.0.x', '3.0-next (olympus)')
|
||||
->add('develop-olympus', '3.0-next (olympus)')
|
||||
->addFromTags('release-3.1.*')
|
||||
->add('3.1.x', '3.1-next (ascraeus)')
|
||||
->add('master')
|
||||
->add('develop-ascraeus', '3.1-next (ascraeus)')
|
||||
->add('develop')
|
||||
*/
|
||||
->add('3.0.x')
|
||||
->add('3.1.x')
|
||||
->add('develop-olympus')
|
||||
->add('develop-ascraeus')
|
||||
;
|
||||
|
||||
return new Sami\Sami($iterator, $config);
|
||||
|
||||
BIN
composer.phar
BIN
composer.phar
Binary file not shown.
@@ -524,9 +524,6 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
|
||||
|
||||
$cfg_array[$config_name] = trim($destination);
|
||||
|
||||
// Absolute file path
|
||||
case 'absolute_path':
|
||||
case 'absolute_path_writable':
|
||||
// Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir...
|
||||
case 'path':
|
||||
case 'wpath':
|
||||
@@ -545,22 +542,20 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
|
||||
break;
|
||||
}
|
||||
|
||||
$path = in_array($config_definition['validate'], array('wpath', 'path', 'rpath', 'rwpath')) ? $phpbb_root_path . $cfg_array[$config_name] : $cfg_array[$config_name];
|
||||
|
||||
if (!file_exists($path))
|
||||
if (!file_exists($phpbb_root_path . $cfg_array[$config_name]))
|
||||
{
|
||||
$error[] = sprintf($user->lang['DIRECTORY_DOES_NOT_EXIST'], $cfg_array[$config_name]);
|
||||
}
|
||||
|
||||
if (file_exists($path) && !is_dir($path))
|
||||
if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_dir($phpbb_root_path . $cfg_array[$config_name]))
|
||||
{
|
||||
$error[] = sprintf($user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]);
|
||||
}
|
||||
|
||||
// Check if the path is writable
|
||||
if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath' || $config_definition['validate'] === 'absolute_path_writable')
|
||||
if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath')
|
||||
{
|
||||
if (file_exists($path) && !phpbb_is_writable($path))
|
||||
if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !phpbb_is_writable($phpbb_root_path . $cfg_array[$config_name]))
|
||||
{
|
||||
$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]);
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF NEXT_FEATURE_VERSION -->
|
||||
<div class="errorbox notice">
|
||||
<div class="errorbox">
|
||||
<p>{UPGRADE_INSTRUCTIONS}</p>
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
|
||||
@@ -24,10 +24,9 @@ phpBB Lead Developer: naderman (Nils Adermann)
|
||||
|
||||
phpBB Developers: bantu (Andreas Fischer)
|
||||
dhruv.goel92 (Dhruv Goel)
|
||||
Elsensee (Oliver Schramm)
|
||||
marc1706 (Marc Alexander)
|
||||
nickvergessen (Joas Schilling)
|
||||
Nicofuma (Tristan Darricau)
|
||||
nicofuma (Tristan Darricau)
|
||||
prototech (Cesar Gallegos)
|
||||
|
||||
Contributions by: leviatan21 (Gabriel Vazquez)
|
||||
|
||||
@@ -52,9 +52,7 @@
|
||||
|
||||
<ol>
|
||||
<li><a href="#changelog">Changelog</a>
|
||||
<ul>
|
||||
<li><a href="#v3013-PL1">Changes since 3.0.13-PL1</a></li>
|
||||
<li><a href="#v3013">Changes since 3.0.13</a></li>
|
||||
<ol style="list-style-type: lower-roman;">
|
||||
<li><a href="#v3012">Changes since 3.0.12</a></li>
|
||||
<li><a href="#v3011">Changes since 3.0.11</a></li>
|
||||
<li><a href="#v3010">Changes since 3.0.10</a></li>
|
||||
@@ -77,7 +75,7 @@
|
||||
<li><a href="#v30rc3">Changes since RC-3</a></li>
|
||||
<li><a href="#v30rc2">Changes since RC-2</a></li>
|
||||
<li><a href="#v30rc1">Changes since RC-1</a></li>
|
||||
</ul>
|
||||
</ol>
|
||||
</li>
|
||||
<li><a href="#disclaimer">Copyright and disclaimer</a></li>
|
||||
</ol>
|
||||
@@ -96,45 +94,7 @@
|
||||
|
||||
<div class="content">
|
||||
|
||||
<a name="v3013-PL1"></a><h3>Changes since 3.0.13-PL1</h3>
|
||||
|
||||
<h4>Security</h4>
|
||||
<ul>
|
||||
<li>[SECURITY-180] - An insufficient check allowed users of the Google Chrome browser to be redirected to external domains (e.g. on login)</li>
|
||||
</ul>
|
||||
<h4>Bug</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13348">PHPBB3-13348</a>] - sql_freeresult() should be called in feed base class</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13414">PHPBB3-13414</a>] - download/file.php sends Content-Length header even when issuing 304 Not Modified</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13555">PHPBB3-13555</a>] - Poll options preview rendered incorrectly by <br /> collision</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13568">PHPBB3-13568</a>] - Imagick path validated as relative path although ACP asks for absolute path</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13617">PHPBB3-13617</a>] - Bot session continuation with invalid f= query parameter causes SQL error</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13738">PHPBB3-13738</a>] - Sami still refers to develop-* branches</li>
|
||||
</ul>
|
||||
<h4>Improvement</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12089">PHPBB3-12089</a>] - Make HTTP status code assertion failure messages more informative</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13765">PHPBB3-13765</a>] - Verify that SERVER_PROTOCOL has the expected format</li>
|
||||
</ul>
|
||||
<h4>Task</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11539">PHPBB3-11539</a>] - Add unit tests for several functions in functions.php</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13572">PHPBB3-13572</a>] - Upgrade composer to 1.0.0-alpha9</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13599">PHPBB3-13599</a>] - Remove PHP 5.2 Travis environment</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13634">PHPBB3-13634</a>] - Update README to show new branch names</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13723">PHPBB3-13723</a>] - Update docs/AUTHORS for 3.0.14-RC1 / 3.1.4-RC1</li>
|
||||
</ul>
|
||||
|
||||
<a name="v3013"></a><h3>Changes since 3.0.13</h3>
|
||||
|
||||
<h4>Bug</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12933">PHPBB3-12933</a>] - The search operator for partial matches does not work</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13549">PHPBB3-13549</a>] - Compare ORIG_PATH_INFO with SCRIPT_NAME for checking trailing paths</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13554">PHPBB3-13554</a>] - Advertisement of feature release in red indicates a problem</li>
|
||||
</ul>
|
||||
|
||||
<a name="v3012"></a><h3>Changes since 3.0.12</h3>
|
||||
<a name="v3012"></a><h3>1.i. Changes since 3.0.12</h3>
|
||||
|
||||
<h4>Security</h4>
|
||||
<ul>
|
||||
@@ -270,7 +230,7 @@
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13324">PHPBB3-13324</a>] - Composer no longer downloads sami/sami and fabpot/goutte</li>
|
||||
</ul>
|
||||
|
||||
<a name="v3011"></a><h3>Changes since 3.0.11</h3>
|
||||
<a name="v3011"></a><h3>1.ii. Changes since 3.0.11</h3>
|
||||
|
||||
<h4>Bug</h4>
|
||||
<ul>
|
||||
@@ -425,7 +385,7 @@
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11753">PHPBB3-11753</a>] - Upgrade mysql_upgrader.php schema data.</li>
|
||||
</ul>
|
||||
|
||||
<a name="v3010"></a><h3>Changes since 3.0.10</h3>
|
||||
<a name="v3010"></a><h3>1.iii. Changes since 3.0.10</h3>
|
||||
|
||||
<h4>Bug</h4>
|
||||
<ul>
|
||||
@@ -550,7 +510,7 @@
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10909">PHPBB3-10909</a>] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2</li>
|
||||
</ul>
|
||||
|
||||
<a name="v309"></a><h3>Changes since 3.0.9</h3>
|
||||
<a name="v309"></a><h3>1.iv. Changes since 3.0.9</h3>
|
||||
|
||||
<h4>Bug</h4>
|
||||
<ul>
|
||||
@@ -686,7 +646,7 @@
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10480">PHPBB3-10480</a>] - Automate changelog building</li>
|
||||
</ul>
|
||||
|
||||
<a name="v308"></a><h3>Changes since 3.0.8</h3>
|
||||
<a name="v308"></a><h3>1.v. Changes since 3.0.8</h3>
|
||||
|
||||
<h4> Bug
|
||||
</h4>
|
||||
@@ -1054,7 +1014,7 @@
|
||||
</ul>
|
||||
|
||||
|
||||
<a name="v307-PL1"></a><h3>Changes since 3.0.7-PL1</h3>
|
||||
<a name="v307-PL1"></a><h3>1.vi. Changes since 3.0.7-PL1</h3>
|
||||
<h4> Security
|
||||
</h4>
|
||||
<ul>
|
||||
@@ -1512,13 +1472,13 @@
|
||||
</ul>
|
||||
|
||||
|
||||
<a name="v307"></a><h3>Changes since 3.0.7</h3>
|
||||
<a name="v307"></a><h3>1.vii. Changes since 3.0.7</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v306"></a><h3>Changes since 3.0.6</h3>
|
||||
<a name="v306"></a><h3>1.viii. Changes since 3.0.6</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
|
||||
@@ -1622,7 +1582,7 @@
|
||||
|
||||
</ul>
|
||||
|
||||
<a name="v305"></a><h3>Changes since 3.0.5</h3>
|
||||
<a name="v305"></a><h3>1.ix. Changes since 3.0.5</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
|
||||
@@ -1844,7 +1804,7 @@
|
||||
<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
|
||||
</ul>
|
||||
|
||||
<a name="v304"></a><h3>Changes since 3.0.4</h3>
|
||||
<a name="v304"></a><h3>1.x. Changes since 3.0.4</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
|
||||
@@ -1933,7 +1893,7 @@
|
||||
<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v303"></a><h3>Changes since 3.0.3</h3>
|
||||
<a name="v303"></a><h3>1.xi. Changes since 3.0.3</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
|
||||
@@ -1965,7 +1925,7 @@
|
||||
<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v302"></a><h3>Changes since 3.0.2</h3>
|
||||
<a name="v302"></a><h3>1.xii. Changes since 3.0.2</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
|
||||
@@ -2064,7 +2024,7 @@
|
||||
<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v301"></a><h3>Changes since 3.0.1</h3>
|
||||
<a name="v301"></a><h3>1.xiii. Changes since 3.0.1</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
|
||||
@@ -2112,7 +2072,7 @@
|
||||
<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v300"></a><h3>Changes since 3.0.0</h3>
|
||||
<a name="v300"></a><h3>1.xiv Changes since 3.0.0</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Change] Validate birthdays (Bug #15004)</li>
|
||||
@@ -2183,7 +2143,7 @@
|
||||
<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc8"></a><h3>Changes since 3.0.RC8</h3>
|
||||
<a name="v30rc8"></a><h3>1.xv. Changes since 3.0.RC8</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)</li>
|
||||
@@ -2192,7 +2152,7 @@
|
||||
<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc7"></a><h3>Changes since 3.0.RC7</h3>
|
||||
<a name="v30rc7"></a><h3>1.xvi. Changes since 3.0.RC7</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Fixed MSSQL related bug in the update system</li>
|
||||
@@ -2227,7 +2187,7 @@
|
||||
<li>[Fix] No duplication of active topics (Bug #15474)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc6"></a><h3>Changes since 3.0.RC6</h3>
|
||||
<a name="v30rc6"></a><h3>1.xvii. Changes since 3.0.RC6</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
|
||||
@@ -2237,7 +2197,7 @@
|
||||
<li>[Fix] Able to request new password (Bug #14743)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc5"></a><h3>Changes since 3.0.RC5</h3>
|
||||
<a name="v30rc5"></a><h3>1.xviii. Changes since 3.0.RC5</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
|
||||
@@ -2300,7 +2260,7 @@
|
||||
<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc4"></a><h3>Changes since 3.0.RC4</h3>
|
||||
<a name="v30rc4"></a><h3>1.xix. Changes since 3.0.RC4</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
|
||||
@@ -2351,7 +2311,7 @@
|
||||
<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
|
||||
</ul>
|
||||
|
||||
<a name="v30rc3"></a><h3>Changes since 3.0.RC3</h3>
|
||||
<a name="v30rc3"></a><h3>1.xx. Changes since 3.0.RC3</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
|
||||
@@ -2460,7 +2420,7 @@
|
||||
|
||||
</ul>
|
||||
|
||||
<a name="v30rc2"></a><h3>Changes since 3.0.RC2</h3>
|
||||
<a name="v30rc2"></a><h3>1.xxi. Changes since 3.0.RC2</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] Re-allow searching within the memberlist</li>
|
||||
@@ -2506,7 +2466,7 @@
|
||||
|
||||
</ul>
|
||||
|
||||
<a name="v30rc1"></a><h3>Changes since 3.0.RC1</h3>
|
||||
<a name="v30rc1"></a><h3>1.xxii. Changes since 3.0.RC1</h3>
|
||||
|
||||
<ul>
|
||||
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
|
||||
<p>This package is meant for those wanting to only replace the files that were changed between a previous version and the latest version.</p>
|
||||
|
||||
<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <strong>3.0.13</strong> you should select the appropriate <code>phpBB-3.0.14-files.zip/tar.bz2</code> file.</p>
|
||||
<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <strong>3.0.12</strong> you should select the appropriate <code>phpBB-3.0.13-files.zip/tar.bz2</code> file.</p>
|
||||
|
||||
<p>The directory structure has been preserved, enabling you (if you wish) to simply upload the uncompressed contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any modifications (MODs) these files will overwrite the originals, possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>
|
||||
|
||||
@@ -288,7 +288,7 @@
|
||||
|
||||
<p>The patch file is one solution for those with many Modifications (MODs) or other changes and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
|
||||
|
||||
<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.0.13</strong>, you need the <code>phpBB-3.0.14-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
|
||||
<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.0.12</strong>, you need the <code>phpBB-3.0.13-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
|
||||
|
||||
<p>If you do get failures, you should look at using the <a href="#update_files">Changed Files</a> package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
|
||||
|
||||
@@ -298,7 +298,7 @@
|
||||
|
||||
<p>This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.</p>
|
||||
|
||||
<p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.0.13</strong>, you need the <code>phpBB-3.0.13_to_3.0.14.zip/tar.bz2</code> file.</p>
|
||||
<p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.0.12</strong>, you need the <code>phpBB-3.0.12_to_3.0.13.zip/tar.bz2</code> file.</p>
|
||||
|
||||
<p>To perform the update, either follow the instructions from the <strong>Administration Control Panel->System</strong> Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.</p>
|
||||
|
||||
|
||||
@@ -509,18 +509,16 @@ function send_file_to_browser($attachment, $upload_dir, $category)
|
||||
}
|
||||
}
|
||||
|
||||
if ($size)
|
||||
{
|
||||
header("Content-Length: $size");
|
||||
}
|
||||
|
||||
// Close the db connection before sending the file
|
||||
$db->sql_close();
|
||||
|
||||
if (!set_modified_headers($attachment['filetime'], $user->browser))
|
||||
{
|
||||
// Send Content-Length only if set_modified_headers() does not send
|
||||
// status 304 - Not Modified
|
||||
if ($size)
|
||||
{
|
||||
header("Content-Length: $size");
|
||||
}
|
||||
|
||||
// Try to deliver in chunks
|
||||
@set_time_limit(0);
|
||||
|
||||
|
||||
@@ -464,9 +464,6 @@ class phpbb_feed_base
|
||||
*/
|
||||
var $separator_stats = "\xE2\x80\x94"; // —
|
||||
|
||||
/** @var mixed Query result handle */
|
||||
var $result;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@@ -620,9 +617,10 @@ class phpbb_feed_base
|
||||
|
||||
function get_item()
|
||||
{
|
||||
global $db;
|
||||
global $db, $cache;
|
||||
static $result;
|
||||
|
||||
if (!isset($this->result))
|
||||
if (!isset($result))
|
||||
{
|
||||
if (!$this->get_sql())
|
||||
{
|
||||
@@ -631,10 +629,10 @@ class phpbb_feed_base
|
||||
|
||||
// Query database
|
||||
$sql = $db->sql_build_query('SELECT', $this->sql);
|
||||
$this->result = $db->sql_query_limit($sql, $this->num_items);
|
||||
$result = $db->sql_query_limit($sql, $this->num_items);
|
||||
}
|
||||
|
||||
return $db->sql_fetchrow($this->result);
|
||||
return $db->sql_fetchrow($result);
|
||||
}
|
||||
|
||||
function user_viewprofile($row)
|
||||
|
||||
@@ -127,7 +127,7 @@ class acp_attachments
|
||||
'img_create_thumbnail' => array('lang' => 'CREATE_THUMBNAIL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
|
||||
'img_max_thumb_width' => array('lang' => 'MAX_THUMB_WIDTH', 'validate' => 'int', 'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
|
||||
'img_min_thumb_filesize' => array('lang' => 'MIN_THUMB_FILESIZE', 'validate' => 'int', 'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
|
||||
'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'absolute_path', 'type' => 'text:20:200', 'explain' => true, 'append' => ' <span>[ <a href="' . $this->u_action . '&action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
|
||||
'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'path', 'type' => 'text:20:200', 'explain' => true, 'append' => ' <span>[ <a href="' . $this->u_action . '&action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
|
||||
'img_max' => array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
|
||||
'img_link' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
|
||||
)
|
||||
|
||||
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
|
||||
*/
|
||||
|
||||
// phpBB Version
|
||||
define('PHPBB_VERSION', '3.0.14');
|
||||
define('PHPBB_VERSION', '3.0.13');
|
||||
|
||||
// QA-related
|
||||
// define('PHPBB_QA', 1);
|
||||
|
||||
@@ -2492,7 +2492,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
|
||||
// Attention: only able to redirect within the same domain if $disable_cd_check is false (yourdomain.com -> www.yourdomain.com will not work)
|
||||
if (!$disable_cd_check && $url_parts['host'] !== $user->host)
|
||||
{
|
||||
trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
|
||||
$url = generate_board_url();
|
||||
}
|
||||
}
|
||||
else if ($url[0] == '/')
|
||||
@@ -2579,12 +2579,6 @@ function redirect($url, $return = false, $disable_cd_check = false)
|
||||
}
|
||||
}
|
||||
|
||||
// Make sure we don't redirect to external URLs
|
||||
if (!$disable_cd_check && strpos($url, generate_board_url(true) . '/') !== 0)
|
||||
{
|
||||
trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
|
||||
}
|
||||
|
||||
// Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2
|
||||
if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false)
|
||||
{
|
||||
@@ -2788,7 +2782,7 @@ function send_status_line($code, $message)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!empty($_SERVER['SERVER_PROTOCOL']) && is_string($_SERVER['SERVER_PROTOCOL']) && preg_match('#^HTTP/[0-9]\.[0-9]$#', $_SERVER['SERVER_PROTOCOL']))
|
||||
if (!empty($_SERVER['SERVER_PROTOCOL']))
|
||||
{
|
||||
$version = $_SERVER['SERVER_PROTOCOL'];
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ class fulltext_native extends search_backend
|
||||
$this->search_query = $keywords;
|
||||
|
||||
$exact_words = array();
|
||||
preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
|
||||
preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
|
||||
$exact_words = $exact_words[1];
|
||||
|
||||
$common_ids = $words = array();
|
||||
|
||||
@@ -121,8 +121,6 @@ class session
|
||||
$script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/';
|
||||
$root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/';
|
||||
|
||||
$forum_id = (isset($_REQUEST['f']) && $_REQUEST['f'] > 0 && $_REQUEST['f'] < 16777215) ? (int) $_REQUEST['f'] : 0;
|
||||
|
||||
$page_array += array(
|
||||
'page_name' => $page_name,
|
||||
'page_dir' => $page_dir,
|
||||
@@ -132,7 +130,7 @@ class session
|
||||
'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)),
|
||||
|
||||
'page' => $page,
|
||||
'forum' => $forum_id,
|
||||
'forum' => (isset($_REQUEST['f']) && $_REQUEST['f'] > 0) ? (int) $_REQUEST['f'] : 0,
|
||||
);
|
||||
|
||||
return $page_array;
|
||||
|
||||
@@ -105,7 +105,7 @@ function deregister_globals()
|
||||
function phpbb_has_trailing_path($phpEx)
|
||||
{
|
||||
// Check if path_info is being used
|
||||
if (!empty($_SERVER['PATH_INFO']) || (!empty($_SERVER['ORIG_PATH_INFO']) && $_SERVER['SCRIPT_NAME'] != $_SERVER['ORIG_PATH_INFO']))
|
||||
if (!empty($_SERVER['PATH_INFO']) || !empty($_SERVER['ORIG_PATH_INFO']))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ if (phpbb_has_trailing_path($phpEx))
|
||||
{
|
||||
$prefix = 'Status:';
|
||||
}
|
||||
else if (!empty($_SERVER['SERVER_PROTOCOL']) && is_string($_SERVER['SERVER_PROTOCOL']) && preg_match('#^HTTP/[0-9]\.[0-9]$#', $_SERVER['SERVER_PROTOCOL']))
|
||||
else if (!empty($_SERVER['SERVER_PROTOCOL']))
|
||||
{
|
||||
$prefix = $_SERVER['SERVER_PROTOCOL'];
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ unset($dbpasswd);
|
||||
$convertor_data = array(
|
||||
'forum_name' => 'phpBB 2.0.x',
|
||||
'version' => '1.0.3',
|
||||
'phpbb_version' => '3.0.14',
|
||||
'phpbb_version' => '3.0.13',
|
||||
'author' => '<a href="https://www.phpbb.com/">phpBB Group</a>',
|
||||
'dbms' => $dbms,
|
||||
'dbhost' => $dbhost,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
define('UPDATES_TO_VERSION', '3.0.14');
|
||||
define('UPDATES_TO_VERSION', '3.0.13');
|
||||
|
||||
// Enter any version to update from to test updates. The version within the db will not be updated.
|
||||
define('DEBUG_FROM_VERSION', false);
|
||||
@@ -949,7 +949,7 @@ function database_update_info()
|
||||
// this column was removed from the database updater
|
||||
// after 3.0.9-RC3 was released. It might still exist
|
||||
// in 3.0.9-RCX installations and has to be dropped in
|
||||
// 3.0.15 after the db_tools class is capable of properly
|
||||
// 3.0.14 after the db_tools class is capable of properly
|
||||
// removing a primary key.
|
||||
// 'attempt_id' => array('UINT', NULL, 'auto_increment'),
|
||||
'attempt_ip' => array('VCHAR:40', ''),
|
||||
@@ -1014,15 +1014,9 @@ function database_update_info()
|
||||
// No changes from 3.0.12 to 3.0.13-RC1
|
||||
'3.0.12' => array(),
|
||||
// No changes from 3.0.13-RC1 to 3.0.13
|
||||
'3.0.13-RC1' => array(),
|
||||
// No changes from 3.0.13 to 3.0.13-PL1
|
||||
'3.0.13' => array(),
|
||||
// No changes from 3.0.13-PL1 to 3.0.14-RC1
|
||||
'3.0.13-PL1' => array(),
|
||||
// No changes from 3.0.14-RC1 to 3.0.14
|
||||
'3.0.14-RC1' => array(),
|
||||
'3.0.13-RC1' => array(),
|
||||
|
||||
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.15-RC1 */
|
||||
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.14-RC1 */
|
||||
);
|
||||
}
|
||||
|
||||
@@ -2272,18 +2266,6 @@ function change_database_data(&$no_updates, $version)
|
||||
// No changes from 3.0.13-RC1 to 3.0.13
|
||||
case '3.0.13-RC1':
|
||||
break;
|
||||
|
||||
// No changes from 3.0.13 to 3.0.13-PL1
|
||||
case '3.0.13':
|
||||
break;
|
||||
|
||||
// No changes from 3.0.13-PL1 to 3.0.14-RC1
|
||||
case '3.0.13-PL1':
|
||||
break;
|
||||
|
||||
// No changes from 3.0.14-RC1 to 3.0.14
|
||||
case '3.0.14-RC1':
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.14');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
||||
|
||||
|
||||
@@ -1222,13 +1222,9 @@ if (!sizeof($error) && $preview)
|
||||
'L_MAX_VOTES' => ($post_data['poll_max_options'] == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $post_data['poll_max_options']))
|
||||
);
|
||||
|
||||
$preview_poll_options = array();
|
||||
foreach ($post_data['poll_options'] as $poll_option)
|
||||
{
|
||||
$parse_poll->message = $poll_option;
|
||||
$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']);
|
||||
$preview_poll_options[] = $parse_poll->message;
|
||||
}
|
||||
$parse_poll->message = implode("\n", $post_data['poll_options']);
|
||||
$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']);
|
||||
$preview_poll_options = explode('<br />', $parse_poll->message);
|
||||
unset($parse_poll);
|
||||
|
||||
foreach ($preview_poll_options as $key => $option)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# General Information about this style
|
||||
name = prosilver
|
||||
copyright = © phpBB Group, 2007
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
# Images
|
||||
img_site_logo = site_logo.gif*52*139
|
||||
|
||||
@@ -19,4 +19,4 @@
|
||||
# General Information about this style
|
||||
name = prosilver
|
||||
copyright = © phpBB Group, 2007
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# General Information about this template
|
||||
name = prosilver
|
||||
copyright = © phpBB Group, 2007
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
# Defining a different template bitfield
|
||||
template_bitfield = lNg=
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
# General Information about this theme
|
||||
name = prosilver
|
||||
copyright = © phpBB Group, 2007
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
# Some configuration options
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# General Information about this style
|
||||
name = subsilver2
|
||||
copyright = © phpBB Group, 2003
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
# Images
|
||||
img_site_logo = site_logo.gif*94*170
|
||||
|
||||
@@ -19,4 +19,4 @@
|
||||
# General Information about this style
|
||||
name = subsilver2
|
||||
copyright = © 2005 phpBB Group
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# General Information about this template
|
||||
name = subsilver2
|
||||
copyright = © phpBB Group, 2003
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
# Template inheritance
|
||||
# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
# General Information about this theme
|
||||
name = subsilver2
|
||||
copyright = © phpBB Group, 2003
|
||||
version = 3.0.14
|
||||
version = 3.0.13
|
||||
|
||||
# Some configuration options
|
||||
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* This file is part of the phpBB Forum Software package.
|
||||
*
|
||||
* @copyright (c) phpBB Limited <https://www.phpbb.com>
|
||||
* @license GNU General Public License, version 2 (GPL-2.0)
|
||||
*
|
||||
* For full copyright and license information, please see
|
||||
* the docs/CREDITS.txt file.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @group functional
|
||||
*/
|
||||
class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case
|
||||
{
|
||||
public function data_imagick_path_linux()
|
||||
{
|
||||
return array(
|
||||
array('/usr/bin', 'Configuration updated successfully'),
|
||||
array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'),
|
||||
array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_imagick_path_linux
|
||||
*/
|
||||
public function test_imagick_path_linux($imagick_path, $expected)
|
||||
{
|
||||
if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
|
||||
{
|
||||
$this->markTestSkipped('Unable to test linux specific paths on other OS.');
|
||||
}
|
||||
|
||||
$this->login();
|
||||
$this->admin_login();
|
||||
|
||||
$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
|
||||
|
||||
$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path));
|
||||
|
||||
$crawler = self::submit($form);
|
||||
$this->assertContains($expected, $crawler->filter('#main')->text());
|
||||
}
|
||||
|
||||
public function data_imagick_path_windows()
|
||||
{
|
||||
return array(
|
||||
array('C:\Windows', 'Configuration updated successfully'),
|
||||
array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'),
|
||||
array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_imagick_path_windows
|
||||
*/
|
||||
public function test_imagick_path_windows($imagick_path, $expected)
|
||||
{
|
||||
if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
|
||||
{
|
||||
$this->markTestSkipped('Unable to test windows specific paths on other OS.');
|
||||
}
|
||||
|
||||
$this->login();
|
||||
$this->admin_login();
|
||||
|
||||
$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
|
||||
|
||||
$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path));
|
||||
|
||||
$crawler = self::submit($form);
|
||||
$this->assertContains($expected, $crawler->filter('#main')->text());
|
||||
}
|
||||
}
|
||||
@@ -18,17 +18,12 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
|
||||
{
|
||||
// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
|
||||
return array(
|
||||
array('data://x', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('data://x', false, 'http://localhost/phpBB'),
|
||||
array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('http://www.otherdomain.com/somescript.php', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'),
|
||||
array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false),
|
||||
array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'),
|
||||
array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('https://foobar.com\@http://localhost/phpBB', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('https://foobar.com\@localhost/troll/http://localhost/', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('http://localhost.foobar.com\@localhost/troll/http://localhost/', 'Tried to redirect to potentially insecure url.', false),
|
||||
array('http://localhost/phpBB', false, 'http://localhost/phpBB'),
|
||||
array('http://localhost/phpBB/', false, 'http://localhost/phpBB/'),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,24 +36,19 @@ class phpbb_security_trailing_path_test extends phpbb_test_case
|
||||
array(true, '', '', '/phpBB/index.php/?foo/a'),
|
||||
array(true, '', '', '/projects/php.bb/phpBB/index.php/?a=5'),
|
||||
array(false, '', '', '/projects/php.bb/phpBB/index.php?/a=5'),
|
||||
array(false, '', '/phpBB/index.php', '/phpBB/index.php', '/phpBB/index.php'),
|
||||
array(true, '', '/phpBB/index.php', '/phpBB/index.php'),
|
||||
array(true, '', '/phpBB/index.php/', '/phpBB/index.php/', '/phpBB/index.php'),
|
||||
array(true, '', '/phpBB/index.php/', '/phpBB/index.php/'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_has_trailing_path
|
||||
*/
|
||||
public function test_has_trailing_path($expected, $path_info, $orig_path_info, $request_uri, $script_name = '')
|
||||
public function test_has_trailing_path($expected, $path_info, $orig_path_info, $request_uri)
|
||||
{
|
||||
global $phpEx;
|
||||
|
||||
$_SERVER['PATH_INFO'] = $path_info;
|
||||
$_SERVER['ORIG_PATH_INFO'] = $orig_path_info;
|
||||
$_SERVER['REQUEST_URI'] = $request_uri;
|
||||
$_SERVER['SCRIPT_NAME'] = $script_name;
|
||||
|
||||
$this->assertSame($expected, phpbb_has_trailing_path($phpEx));
|
||||
}
|
||||
|
||||
@@ -601,7 +601,7 @@ class phpbb_functional_test_case extends phpbb_test_case
|
||||
*/
|
||||
static public function assert_response_status_code($status_code = 200)
|
||||
{
|
||||
self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match');
|
||||
self::assertEquals($status_code, self::$client->getResponse()->getStatus());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
22
travis/install-phpunit-5-2.sh
Executable file
22
travis/install-phpunit-5-2.sh
Executable file
@@ -0,0 +1,22 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# @copyright (c) 2015 phpBB Group
|
||||
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
#
|
||||
|
||||
# $1 - URL to .tar.gz
|
||||
download() {
|
||||
wget -q -O - "$1" | tar xzvf - --strip-components 1
|
||||
}
|
||||
|
||||
mkdir phpunit
|
||||
cd phpunit
|
||||
download https://github.com/sebastianbergmann/phpunit/archive/3.6.12.tar.gz
|
||||
download https://github.com/sebastianbergmann/php-file-iterator/archive/1.3.1.tar.gz
|
||||
download https://github.com/sebastianbergmann/php-code-coverage/archive/1.1.3.tar.gz
|
||||
download https://github.com/sebastianbergmann/php-token-stream/archive/1.1.3.tar.gz
|
||||
download https://github.com/sebastianbergmann/php-text-template/archive/1.1.2.tar.gz
|
||||
download https://github.com/sebastianbergmann/php-timer/archive/1.0.2.tar.gz
|
||||
download https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.1.1.tar.gz
|
||||
download https://github.com/sebastianbergmann/dbunit/archive/1.1.2.tar.gz
|
||||
cd ..
|
||||
44
travis/phpunit-mysql-5-2-travis.xml
Normal file
44
travis/phpunit-mysql-5-2-travis.xml
Normal file
@@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<phpunit backupGlobals="true"
|
||||
backupStaticAttributes="true"
|
||||
colors="true"
|
||||
convertErrorsToExceptions="true"
|
||||
convertNoticesToExceptions="true"
|
||||
convertWarningsToExceptions="true"
|
||||
processIsolation="false"
|
||||
stopOnFailure="false"
|
||||
syntaxCheck="true"
|
||||
strict="true"
|
||||
verbose="true"
|
||||
bootstrap="../tests/bootstrap.php">
|
||||
<testsuites>
|
||||
<testsuite name="phpBB Test Suite">
|
||||
<directory suffix="_test.php">../tests/</directory>
|
||||
<exclude>tests/functional</exclude>
|
||||
<exclude>tests/lint_test.php</exclude>
|
||||
</testsuite>
|
||||
<testsuite name="phpBB Lint Test">
|
||||
<file>tests/lint_test.php</file>
|
||||
</testsuite>
|
||||
<testsuite name="phpBB Functional Tests">
|
||||
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
|
||||
<groups>
|
||||
<exclude>
|
||||
<group>slow</group>
|
||||
</exclude>
|
||||
</groups>
|
||||
|
||||
<php>
|
||||
<server name="PHPBB_TEST_DBMS" value="mysqli" />
|
||||
<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
|
||||
<server name="PHPBB_TEST_DBPORT" value="3306" />
|
||||
<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
|
||||
<server name="PHPBB_TEST_DBUSER" value="root" />
|
||||
<server name="PHPBB_TEST_DBPASSWD" value="" />
|
||||
<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
|
||||
<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
|
||||
</php>
|
||||
</phpunit>
|
||||
Reference in New Issue
Block a user