1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-18 05:19:43 +02:00

4348 Commits

Author SHA1 Message Date
Andreas Fischer
f164906d77 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.

Conflicts:
	tests/template/template.php
2010-11-03 11:58:48 +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
Andreas Fischer
36820a4f4f Merge branch 'ticket/rxu/9867' into develop
* ticket/rxu/9867:
  [ticket/9867] Adjust the implementation of error messages localization.
2010-10-30 12:43:08 +02:00
Andreas Fischer
8943cab3c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9061] Simplify conditional statements by reworking the logic.
  [ticket/9061] Fixed a race condition in queue locking.
2010-10-30 12:42:52 +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
1d81671b7e Merge branch 'ticket/bantu/9627' into develop
* ticket/bantu/9627:
  [ticket/9627] Prefix function names with 'phpbb_'.
  [ticket/9627] Adding unit tests for http_byte_range().
  [ticket/9627] Adding download unit tests.
  [ticket/9627] Split http_range_request() into several functions.
  [ticket/9627] Make sure range request reads till the end of the file.
  [ticket/9627] Make use of 'static' since the function is called more than once
  [ticket/9627] Make sure the database record for the filesize is correct.
  [ticket/9627] Do not increase download counter if file is requested partially.
  [ticket/9627] Support for HTTP range requests in download/file.php
2010-10-25 22:12:24 +02:00
Igor Wiedler
265da3455d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9478] Validate maximum number of allowed recipients per PM value.
  [ticket/9686] Fix mssqlnative database data export
  [ticket/9595] List min/max characters indexed by search for mysql_fulltext.
  [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
  [ticket/9853] Change recaptcha theme from default to 'clean'.
2010-10-25 22:08:51 +02: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
rxu
67b243cfc5 [ticket/9867] Adjust the implementation of error messages localization.
Use array_map instead of preg_replace.

PHPBB3-9867
2010-10-26 01:38:09 +08: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
Andreas Fischer
0f49e52940 [ticket/9627] Prefix function names with 'phpbb_'.
PHPBB3-9627
2010-10-23 18:06:46 +02:00
Andreas Fischer
3c61831010 [ticket/9627] Split http_range_request() into several functions.
Split http_range_request() into several functions for better reusability and
to allow some unit testing.

PHPBB3-9627
2010-10-23 18:04:17 +02:00
Andreas Fischer
7463a988ea [ticket/9627] Make sure range request reads till the end of the file.
PHPBB3-9627
2010-10-23 18:04:17 +02:00
Andreas Fischer
18e5570851 [ticket/9627] Make use of 'static' since the function is called more than once
PHPBB3-9627
2010-10-23 18:04:16 +02:00
Andreas Fischer
56b0268d1d [ticket/9627] Make sure the database record for the filesize is correct.
PHPBB3-9627
2010-10-23 18:04:16 +02:00
Andreas Fischer
17715388c6 [ticket/9627] Support for HTTP range requests in download/file.php
Initial draft of "resume support" for attachments.
This should allow users to resume partially downloaded attachments.

PHPBB3-9627
2010-10-23 18:04:16 +02:00
Nils Adermann
ecd648c996 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9807] Update existing module permissions in database
  [ticket/9807] Hide avatar tab in UCP when avatars are disabled
2010-10-23 14:10:19 +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
Igor Wiedler
2264f88d82 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9509] Remove section 8 from index
  [ticket/9509] Close anchor tag in coding guidelines
  [ticket/9854] Revise docs/auth_api.html to add more methods
  [ticket/9509] The VCS is now git
  [ticket/9840] Display view unread posts link for guests.

Conflicts:
	phpBB/docs/coding-guidelines.html
2010-10-19 13:57:43 +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
d753a02ec0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7332] Fix post details expand link rendering on Webkit.
  [ticket/9162] Prevent notice on unset poll title
  [ticket/7417] Also focus search keywords and username in subsilver2.
  [ticket/7417] Focus username field when prosilver login page is loaded.
  [ticket/7417] Focus search keywords field when prosilver search page is loaded.
  [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
  [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
  [ticket/7538] Limit user_login_attempts to prevent SQL errors.
  [ticket/9848] Add avatars, attachments and store files to .gitignore.
  [ticket/9822] Correct some style related ACP explain statements.
  [ticket/9698] Add .htaccess to the includes subdirectory.
  [ticket/9830] Redirect to install directly when config.php does not exist.
  [ticket/9816] Remove config.php from repository
  [ticket/9810] Hide "Select All" of code bbcode on print page
2010-10-17 21:47:04 +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
Andreas Fischer
186bc82480 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Check for existence of $request
2010-10-13 13:19:43 +02:00
Igor Wiedler
2092a8aaca [feature/request-class] Check for existence of $request
PHPBB3-9716
2010-10-12 16:14:01 +02:00
Igor Wiedler
a885095897 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class: (21 commits)
  [feature/request-class] Fix mcp.php mode parameter
  [feature/request-class] Fix remember and session hide on login
  [feature/request-class] Fix missing include in database_update
  [feature/request-class] Make additional request test cases run
  [feature/request-class] Adjust some trailing newlines
  [feature/request-class] Remove tricky $_* is_array from acp_profile
  [feature/request-class] Convert any direct access to $_* to use $request
  [feature/request-class] Add $request to style.php, minor change
  [feature/request-class] Prevent recursive_set_var from applying htmlspecialchars twice
  [feature/request-class] Removal of direct access to some superglobals
  [feature/request-class] Refactor request classes to use autoloading
  [feature/request-class] Automatically normalize multibyte data in request_var
  [feature/request-class] Request class test now uses a type cast helper mock.
  [feature/request-class] Refactored request class and wrapper functions.
  [feature/request-class] Extracted type casting helpers from the request class.
  [feature/request-class] Replace direct use of GET/REQUEST with request_var.
  [feature/request-class] Use the request class in the installer & updater.
  [feature/request-class] request_var should return after setting the request object.
  [feature/request-class] Instantiate a global request class instance.
  [feature/request-class] New request class supports recursive arrays.
  ...
2010-10-10 18:39:44 +02:00
Igor Wiedler
c62aa52234 [feature/request-class] Fix remember and session hide on login
Thanks to SA007.

PHPBB3-9716
2010-10-05 23:20:39 +02:00
Igor Wiedler
9a39f55c24 Merge branch 'ticket/bantu/9792' into develop
* ticket/bantu/9792:
  [ticket/9792] Move function definitions out of download/file.php

Conflicts:
	phpBB/download/file.php
2010-10-04 17:26:00 +02:00
Igor Wiedler
798e62b7b0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
  [ticket/9829] Fix error in recaptcha validation.
2010-10-04 17:25:00 +02:00
Igor Wiedler
986935c474 [feature/request-class] Adjust some trailing newlines
PHPBB3-9716
2010-09-27 22:50:25 +02:00
Igor Wiedler
c09bdb6c55 [feature/request-class] Remove tricky $_* is_array from acp_profile
PHPBB3-9716
2010-09-25 20:35:07 +02:00
Igor Wiedler
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
2010-09-25 20:32:15 +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
Igor Wiedler
55808e11c9 [feature/request-class] Prevent recursive_set_var from applying htmlspecialchars twice
PHPBB3-9716
2010-09-19 15:31:00 +02:00
Igor Wiedler
204ee4714b [feature/request-class] Removal of direct access to some superglobals
PHPBB3-9716
2010-09-17 14:08:41 +02:00
Igor Wiedler
456de63912 [feature/request-class] Refactor request classes to use autoloading
All class names have been adjusted to use a phpbb_request prefix,
allowing them to be autoloaded.

Also introduces some improvements to autoloading in general.

PHPBB3-9716
2010-09-17 14:08:14 +02:00
Igor Wiedler
b3558b5078 [feature/request-class] Automatically normalize multibyte data in request_var
To save users from having to run everything through
utf8_normalize_nfc(), a call is done automatically from within set_var,
which is called by request_var.

PHPBB3-9716
2010-09-17 14:03:57 +02:00
Nils Adermann
ea919ad8b2 [feature/request-class] Refactored request class and wrapper functions.
The request class
- now makes use of the new type cast helper (dependency injection)
- has no static methods anymore.
- now has a constructor argument to leave super globals turned on

Brought back the set_var function in functions.php. It is now a wrapper
around the type cast helper. It creates an instance on the fly.

The request_var wrapper function now has an optional last argument to
inject the request class instance, rather than abusing the $var_name.

PHPBB3-9716
2010-09-17 14:00:01 +02:00
Nils Adermann
85b6d3b9a1 [feature/request-class] Extracted type casting helpers from the request class.
These methods should be available without having to instantiate a request class
object, better separation of concerns. A set_var wrapper around this class no
longer requires a request object at all.

PHPBB3-9716
2010-09-17 14:00:01 +02:00
Nils Adermann
6beeda79eb [feature/request-class] Replace direct use of GET/REQUEST with request_var.
Now with $_VARs causing fatal errors we should really be able to find and
delete all of these occurances.

PHPBB3-9716
2010-09-17 14:00:01 +02:00