Commit graph

11078 commits

Author SHA1 Message Date
Andreas Fischer
6a32724400 [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
8032549a15 [ticket/9746] Adding new function phpbb_ip_normalise().
This adds a function that normalises internet protocol addresses.

While there should be no problem at all when handling IPv4 addresses, the many
different representations of the exact same IPv6 address and webservers mapping
IPv4-addresses into the IPv6 space made it necessary to add such a function.

PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
dc7e3550ab [ticket/9746] Adding tests for phpbb_ip_normalise().
PHPBB3-9746
2011-01-03 00:09:40 +01:00
Andreas Fischer
979158f0a2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
  [ticket/9953] Set focus to password on re-authentication
  [ticket/9905] Add SQLite to the DSN description
  [ticket/9859] Remove years from the credit line.
2010-12-29 23:01:19 +01:00
Andreas Fischer
541879dc5c Merge branch 'feature/igorw/update-session-api' into develop
* feature/igorw/update-session-api:
  [feature/update-session-api] Add update_session method
2010-12-29 13:38:22 +01:00
Igor Wiedler
d4a685abc1 [feature/update-session-api] Add update_session method
PHPBB3-9688
2010-12-29 13:32:37 +01:00
Andreas Fischer
6e51e52f0c Merge branch 'ticket/igorw/9574' into develop
* ticket/igorw/9574:
  [ticket/9574] Add pcre_utf8_support() function
  [ticket/9574] Remove conditional PHP<5.2 code
  [ticket/9574] Drop fallback implementations
2010-12-28 22:40:09 +01:00
Igor Wiedler
6b4d0a2542 [ticket/9574] Add pcre_utf8_support() function
Refactor the check for PCRE UTF-8 support into a new pcre_utf8_support()
function.

PHPBB3-9574
2010-12-28 22:37:33 +01:00
Igor Wiedler
eda9fbbb63 [ticket/9574] Remove conditional PHP<5.2 code
There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.

PHPBB3-9574
2010-12-28 22:36:25 +01:00
Igor Wiedler
1e59666ee3 [ticket/9574] Drop fallback implementations
phpBB 3.0 includes fallback implementations for following PHP5+
functions:

array_combine
str_split
stripos
htmlspecialchars_decode

Since phpBB 3.1 requires PHP 5.2+ these can be dropped.

PHPBB3-9574
2010-12-28 22:36:25 +01:00
Andreas Fischer
90ccdb4dad Merge branch 'ticket/VSE/9532' into develop
* ticket/VSE/9532:
  [ticket/9532] Simplified page titles by removing meaningless text.
2010-12-28 21:51:55 +01:00
Andreas Fischer
34a1b044a1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9937] Make sure feed icon only shows for FORUM_POST
  [ticket/9937] The feed icon displays on External links...which we don't want
  [ticket/9925] prosilver logo margin bug in IE 6-7-8
2010-12-21 22:52:28 +01:00
Andreas Fischer
442fc61be7 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Convert some remaining cookies
  [feature/request-class] Adjust misleading comment
  [feature/request-class] Remove direct access to _REQUEST in acp_search
  [feature/request-class] Special case of direct access to _REQUEST
2010-12-16 02:22:17 +01:00
Nils Adermann
8b9b1f1187 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9924] Pass template instance into $template->display hook
2010-12-13 17:22:05 +01:00
Nils Adermann
18f74a7e10 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9851] "Search new posts" should require login.
  [task/phpdoc] Added a phpdoc task to the build process
  [task/phpdoc] Added a configuration file for phpDocumentor.
  [feature/acm-wincache] Adding caching module for WinCache's User Cache.
  [ticket/9939] Fix JavaScript error in admin recaptcha template
  [ticket/9575] Also change 'administrate' to 'administer' in templates
  [ticket/8736] guest can have 255 chars long username
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
  [ticket/9575] Change 'administrate' to 'administer'
  [ticket/9921] Adding sample configuration file for the lighttpd webserver.
  [ticket/9932] Add the Bing bot when converting
  [ticket/9930] Redirect failes with open_basedir enabled.
  [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
2010-12-13 17:14:36 +01:00
Nils Adermann
adfa1656fb Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
2010-12-13 16:35:55 +01:00
Igor Wiedler
bd579c8374 Merge branch 'develop-olympus' into develop 2010-11-29 20:16:45 +01:00
Nils Adermann
67593824d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.
2010-11-20 17:56:17 +01:00
Andreas Fischer
635752fafc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
  [ticket/9509] Fix a typo and wrong period placement
  [develop-olympus] Revert accidental revert of db update lang fix and version
  [develop-olympus] Remove accidentally added trailing newlines.
  [develop-olympus] Incrementing the version number to 3.0.9-dev.
2010-11-18 14:05:56 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Nils Adermann
2e51e68ca1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.
  [ticket/9140] Check current board version in incremental update packages
  [ticket/9891] Updater drops language-selection after database-update
2010-11-10 19:02:35 +01:00
Nils Adermann
19155c7827 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1
2010-11-10 16:31:30 +01:00
Nils Adermann
42457719c2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
2010-11-10 16:17:40 +01:00
Nils Adermann
f977075b43 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
2010-11-10 15:58:12 +01:00
Andreas Fischer
336dc70047 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9888] Update fails when Bing [Bot] was already added to the users table
  [develop-olympus] Bumping version number for 3.0.8-RC1.
  [ticket/9885] Fix extension group name updater. Loop through all languages.
  [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
  [ticket/9883] Change an American English spelling to British English.
  [task/phing-build] Correct the path for update package patch files.
2010-11-08 23:42:23 +01:00
Andreas Fischer
f15446fe39 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9880] Change "antibot" to "anti-spambot".
  [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
  [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
  [task/phing-build] Automatically trigger build_diff
  [task/phing-build] Added a build.xml configuration for phing.
2010-11-07 15:00:02 +01:00
Nils Adermann
bcdca1152d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9752] Mark unused language variable as such.
  [ticket/9752] Change reference to 'confirmation code' to be more generic.
2010-11-07 03:27:55 +01:00
Nils Adermann
7b5c6dbedc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
  [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
  [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
2010-11-07 03:11:23 +01:00
Nils Adermann
7ca6377892 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
2010-11-07 00:04:14 +01:00
Andreas Fischer
b60892d200 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
  [ticket/9850] Display upgrade instructions for feature release in acp
  [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
2010-11-06 18:56:01 +01:00
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
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
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
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
Andreas Fischer
0f49e52940 [ticket/9627] Prefix function names with 'phpbb_'.
PHPBB3-9627
2010-10-23 18:06:46 +02:00
Andreas Fischer
afda5e2073 [ticket/9627] Adding unit tests for http_byte_range().
PHPBB3-9627
2010-10-23 18:04:17 +02:00
Andreas Fischer
5f034c0a0a [ticket/9627] Adding download unit tests.
PHPBB3-9627
2010-10-23 18:04:17 +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
9ed36e1e1b [ticket/9627] Do not increase download counter if file is requested partially.
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
Igor Wiedler
6bba279434 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9857] Remove visible $Id$ from phpBB/docs files.
2010-10-19 14:04:22 +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
Igor Wiedler
6213188280 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.
  [ticket/9855] Make tests run under PHPUnit 3.5.
2010-10-17 23:36:34 +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