1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

4405 Commits

Author SHA1 Message Date
Igor Wiedler
d97181f5a3 [task/acm-refactor] Refactor WinCache ACM module
PHPBB3-9983
2011-01-11 00:31:07 +01:00
Igor Wiedler
eff1d378cc Merge branch 'develop-olympus' into develop 2011-01-10 23:43:04 +01:00
Igor Wiedler
c9b9016ca8 Merge branch 'ticket/bantu/9764' into develop-olympus 2011-01-10 23:42:41 +01:00
Nils Adermann
1aef7eb20e [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.
PHPBB3-9983
2011-01-09 23:49:44 +01:00
Igor Wiedler
9329b16ab1 [task/acm-refactor] Refactor the ACM classes to have a common interface.
They are now refered to as cache drivers rather than ACM classes. The
additional utility functions from the original cache class have been
moved to the cache_service. The class loader is now instantiated without
a cache instance and passed one as soon as it is constructed to allow
autoloading the cache classes.

PHPBB3-9983
2011-01-09 23:49:35 +01:00
Andreas Fischer
1c95101284 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9933] Create unit test for word censor regular expression.
  [ticket/9933] Move word censor regex into separate function in functions.php
  [ticket/9933] Wrong handling consecutive multiple asterisks in word censor

Conflicts:
	phpBB/includes/cache.php
2011-01-07 15:58:10 +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
Andreas Fischer
3c713b5e7d [ticket/9746] Adding some more calls to phpbb_ip_normalise().
PHPBB3-9746
2011-01-03 00:09:52 +01:00
Andreas Fischer
5d01c58b77 [ticket/9746] Update documentation of phpbb_inet_pton().
PHPBB3-9746
2011-01-03 00:09:52 +01:00
Andreas Fischer
985151913c [ticket/9746] Ease up phpbb_ip_normalise() function.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Marek A. Ruszczyński
2aa54bb156 [ticket/9746] Added PHP implementation of inet_pton and inet_ntop.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
ae43221399 [ticket/9746] Adding wrapper functions for inet_ntop() and inet_pton().
PHPBB3-9746
2011-01-03 00:09:51 +01:00
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
Igor Wiedler
d4a685abc1 [feature/update-session-api] Add update_session method
PHPBB3-9688
2010-12-29 13:32:37 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +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
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
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
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
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