1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

4357 Commits

Author SHA1 Message Date
Nils Adermann
ba5c7d8e63 Merge branch 'ticket/bantu/9859' into develop-olympus
* ticket/bantu/9859:
  [ticket/9859] Remove the years from the copyright statements in docs files.
  [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
  [ticket/9859] Remove the meta copyright tag as well.
  [ticket/9859] Remove the credit line comment from all html files.
  [ticket/9859] Remove years in credit line from some more files.
2011-01-16 22:25:49 +01:00
rxu
2b37a4fe56 [ticket/9933] Remove empty word check.
PHPBB3-9933
2011-01-16 20:14:35 +01:00
Andreas Fischer
97be6e7946 [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true.

In unit tests we can now pass in $use_unicode as false and also test the code
path that is taken when PCRE does not support unicode.

PHPBB3-9933
2011-01-16 20:13:05 +01:00
rxu
8c1866bc0c [ticket/9933] Adjust word censor regex for non-unicode mode.
PHPBB3-9933
2011-01-16 19:55:10 +01:00
Andreas Fischer
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
Igor Wiedler
c9b9016ca8 Merge branch 'ticket/bantu/9764' into develop-olympus 2011-01-10 23:42:41 +01:00
rxu
951b7b22e0 [ticket/9933] Move word censor regex into separate function in functions.php
PHPBB3-9933
2011-01-07 15:32:34 +01:00
rxu
9a25e4ad89 [ticket/9933] Wrong handling consecutive multiple asterisks in word censor
Fix consecutive asterisks issue in word censor.

PHPBB3-9933
2011-01-07 20:51:43 +07:00
Igor Wiedler
cdbb609c20 [ticket/9937] Make sure feed icon only shows for FORUM_POST
This is cleaner, since feed.php only supports FORUM_POST.

PHPBB3-9937
2010-12-21 22:44:10 +01:00
Igor Wiedler
ea3d755962 Merge branch 'ticket/rmcgirr83/9937' into develop-olympus
* ticket/rmcgirr83/9937:
  [ticket/9937] The feed icon displays on External links...which we don't want
2010-12-21 20:59:52 +01:00
RMcGirr83
3f27cb2ea7 [ticket/9937] The feed icon displays on External links...which we don't want
PHPBB3-9937
2010-12-21 20:44:20 +01:00
Nils Adermann
5e258a0a90 Merge branch 'ticket/igorw/9924' into develop-olympus
* ticket/igorw/9924:
  [ticket/9924] Pass template instance into $template->display hook
2010-12-13 17:21:57 +01:00
ChrisTX
d7287ec633 [feature/acm-wincache] Adding caching module for WinCache's User Cache.
PHPBB3-9942
2010-12-13 00:14:57 +01:00
Andreas Fischer
e80253209f Merge branch 'ticket/nickvergessen/9930' into develop-olympus
* ticket/nickvergessen/9930:
  [ticket/9930] Redirect failes with open_basedir enabled.
2010-12-03 01:41:43 +01:00
Andreas Fischer
b86289fdd3 Merge branch 'ticket/igorw/9910' into develop-olympus
* ticket/igorw/9910:
  [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
2010-12-03 01:40:38 +01:00
Richard Foote
23765fa668 [ticket/9932] Add the Bing bot when converting
PHPBB3-9932
2010-11-29 08:33:10 +01:00
Joas Schilling
5ec1c88795 [ticket/9930] Redirect failes with open_basedir enabled.
Open_basedir does not allow file_exists() for "." and directories without a
trayling-slash. Therefor we must append it on the check.

PHPBB3-9930
2010-11-25 23:29:12 +01:00
Igor Wiedler
053cf790a9 [ticket/9924] Pass template instance into $template->display hook
PHPBB3-9924
2010-11-23 16:09:09 +01:00
Igor Wiedler
217e77d16b [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
PHPBB3-9910
2010-11-21 23:18:09 +01:00
Nils Adermann
d2778e67ea Merge branch 'prep-release-3.0.8' into develop-olympus
* prep-release-3.0.8:
  [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2010-11-20 17:55:56 +01:00
Nils Adermann
af4c2a3eb1 [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog 2010-11-19 13:22:36 +01:00
Ruslan Uzdenov
291a1fff1f [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
Fix XSS in Flash-BBcode by validating that the supplied argument is a URL.

PHPBB3-9903
2010-11-18 13:37:56 +01:00
Nils Adermann
396af3853f [develop-olympus] Remove accidentally added trailing newlines. 2010-11-11 12:07:45 +01:00
Nils Adermann
87aa611a8e [develop-olympus] Incrementing the version number to 3.0.9-dev. 2010-11-11 11:49:17 +01:00
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
Paul Sohier
5cdf27edef [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
PHPBB3-9696
2010-11-07 12:50:32 +01:00
Nils Adermann
f7180f4430 Merge branch 'ticket/bantu/9075' into develop-olympus
* ticket/bantu/9075:
  [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
2010-11-07 00:03:15 +01:00
Andreas Fischer
46dbdfdef4 Merge branch 'ticket/igorw/9850' into develop-olympus
* ticket/igorw/9850:
  [ticket/9850] Display upgrade instructions for feature release in acp
2010-11-06 18:47:19 +01:00
Andreas Fischer
e3b460a518 Merge branch 'task/naderman/mssql-db-tests' into develop-olympus
* task/naderman/mssql-db-tests:
  [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
  [task/mssql-db-tests] Split up database tests into SELECT and write operations
  [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
  [task/mssql-db-tests] sql_query_limit must return all results when total = 0
  [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
  [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
  [task/mssql-db-tests] Allow test configuration with environment variables.
  [task/mssql-db-tests] No longer display an error when skipping db tests.
  [task/mssql-db-tests] Use a simple getter for test case helpers.
2010-11-03 11:32:13 +01:00
Igor Wiedler
857271ebbd [ticket/9850] Display upgrade instructions for feature release in acp
PHPBB3-9850
2010-11-02 23:53:14 +01:00
Andreas Fischer
ec3dac0595 [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
When an administrator set a numbers field to default to 'not specified', a SQL
error was caused on the registration page because it was tried to insert an
empty string into an integer column.
Because the column already supports NULL values, empty strings are now
converted to NULL for custom profile fields of the type 'Numbers' before
insertion into the data table.

PHPBB3-9075
2010-10-30 12:42:23 +02:00
Andreas Fischer
ac26bb458f [ticket/9764] Allow $config['mime_triggers'] to be an empty string.
explode('|', '') and explode('|', NULL) both return array(0 => '') which can
cause filespec::check_content() to reject everything starting with a '<'
character in case $config['mime_triggers'] is an empty string or not set.

fileupload::set_disallowed_content() now filters out empty strings by calling
array_diff() on the passed array, so setting $config['mime_triggers'] to an
empty string will turn off mime checking completely.

On the other side we want to fail safe if $config['mime_triggers'] is not set
at all. To do this, the array fileupload::$disallowed_content now contains some
default strings to be filtered out.

PHPBB3-9764
2010-10-28 22:00:04 +02:00
Andreas Fischer
6ff403c9f8 Merge branch 'ticket/cs278/9061' into develop-olympus
* ticket/cs278/9061:
  [ticket/9061] Simplify conditional statements by reworking the logic.
  [ticket/9061] Fixed a race condition in queue locking.
2010-10-27 13:06:21 +02:00
Chris Smith
9819700247 [ticket/9061] Simplify conditional statements by reworking the logic.
PHPBB3-9061
2010-10-27 11:31:42 +01:00
Oleg Pudeyev
01ef46a510 [ticket/9061] Fixed a race condition in queue locking.
Changed queue locking to cover all queue file operations,
in particular the check for queue file existince and
inclusion of queue file must be done under one lock.

Also refactored queue locking and unlocking into separate
methods.

PHPBB3-9061
2010-10-27 11:31:27 +01:00
Igor Wiedler
832b09d60d Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and 'ticket/bantu/9853' into develop-olympus
* ticket/bantu/9101:
  [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.

* ticket/bantu/9595:
  [ticket/9595] List min/max characters indexed by search for mysql_fulltext.

* ticket/bantu/9853:
  [ticket/9853] Change recaptcha theme from default to 'clean'.
2010-10-25 22:08:37 +02:00
Andreas Fischer
52546e8d15 Merge branch 'ticket/naderman/9686' into develop-olympus
* ticket/naderman/9686:
  [ticket/9686] Fix mssqlnative database data export
2010-10-25 21:54:49 +02:00
Andreas Fischer
a5bc7c90f5 Merge branch 'ticket/rxu/9478' into develop-olympus
* ticket/rxu/9478:
  [ticket/9478] Validate maximum number of allowed recipients per PM value.
2010-10-25 21:52:50 +02:00
rxu
257e264af7 [ticket/9478] Validate maximum number of allowed recipients per PM value.
Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8).

PHPBB3-9478
2010-10-25 21:47:13 +02:00
Nils Adermann
76e8a9466e [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
ee0993a8a6 [task/mssql-db-tests] sql_query_limit must return all results when total = 0
PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
5c5b0fc4be [ticket/9686] Fix mssqlnative database data export
We require version 1.1 of the sqlsrv extension anyway so the regular
sqlsrv_num_rows can be used instead of buffering the result. The result
buffer (class result_mssqlnative) should never automatically free the
resource it receives - we consistently close resources using sql_freeresult().

PHPBB3-9686
2010-10-25 03:33:37 +02:00
Nils Adermann
e87a8ef02c Merge branch 'ticket/igorw/9807' into develop-olympus
* ticket/igorw/9807:
  [ticket/9807] Update existing module permissions in database
  [ticket/9807] Hide avatar tab in UCP when avatars are disabled
2010-10-23 14:08:38 +02:00
Andreas Fischer
294c2c63c0 [ticket/9595] List min/max characters indexed by search for mysql_fulltext.
PHPBB3-9595
2010-10-21 20:31:00 +02:00
Andreas Fischer
acabe5a013 Merge branch 'ticket/rxu/9840' into develop-olympus
* ticket/rxu/9840:
  [ticket/9840] Display view unread posts link for guests.
2010-10-18 11:50:51 +02:00
Igor Wiedler
8ac0efce65 Merge branch 'ticket/bantu/9698' into develop-olympus
* ticket/bantu/9698:
  [ticket/9698] Add .htaccess to the includes subdirectory.
2010-10-17 21:34:31 +02:00
rxu
880bace355 [ticket/9840] Display view unread posts link for guests.
Display view unread posts link for guests if applicable.

PHPBB3-9840
2010-10-16 20:46:38 +08:00
Andreas Fischer
0452da2bf1 [ticket/7538] Limit user_login_attempts to prevent SQL errors.
PHPBB3-7538
2010-10-15 19:00:14 +02:00
Andreas Fischer
d485664404 [ticket/9698] Add .htaccess to the includes subdirectory.
Add .htaccess to the includes folder to prevent full path disclosure when
running PHP 5.3. When the error_reporting setting in php.ini contains the
E_DEPRECATED error level, the PHP parser throws an error message containing
the local filesystem path when accessing one of the captcha plugins directly.
This is because the captcha plugins return explicit references for PHP 4
compatibility.

PHPBB3-9698
2010-10-15 16:47:21 +02:00
Cristian Rodriguez
68b35b5845 [ticket/9829] Fix error in recaptcha validation.
The recaptcha plugin falsely accepted error responses by recaptcha as valid
solutions.

PHPBB3-9829
2010-09-19 16:29:12 +02:00