1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

10554 Commits

Author SHA1 Message Date
Igor Wiedler
14a84cf89c Merge branch 'develop-olympus' into develop
This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html
2011-01-07 01:39:59 +01:00
Igor Wiedler
5b752a2fed Merge branch 'task/phpunit-xml' into develop-olympus 2011-01-07 01:15:06 +01:00
Nils Adermann
b48b909773 [task/phpunit-xml] Manually blacklisting a few PHPUnit classes from backups.
The blacklisting of these static variables is necessary because code coverage
will otherwise consume too much memory. The problem did not exist in earlier
PHPUnit versions because all classes beginning with PHPUnit are automatically
blacklisted, and code coverage as well as a few other internal classes were
still internal parts of PHPunit. These were now moved to PHP_ namespace,
causing the problem with backupStaticAttributes.

PHPBB3-9967
2011-01-07 01:07:30 +01:00
Nils Adermann
b4f95deefc [task/phpunit-xml] Only blacklist the tests directory and do not whitelist.
It would be ideal if we could whitelist the entire phpBB directory or at least
includes, but at present that still breaks because of classes with the same
name.

PHPBB3-9967
2011-01-07 00:30:38 +01:00
Nils Adermann
b720edb05b [task/phpunit-xml] Force error reporting level E_ALL | ~E_DEPRECATED.
PHPBB3-9967
2011-01-07 00:19:00 +01:00
Andreas Fischer
d968d35271 Merge branch 'ticket/bantu/9589' into develop-olympus
* ticket/bantu/9589:
  [ticket/9589] nginx.conf.sample -> nginx.sample.conf
2011-01-05 00:41:37 +01:00
Andreas Fischer
cdeffdd59f [ticket/9589] nginx.conf.sample -> nginx.sample.conf
PHPBB3-9589
2011-01-05 00:40:07 +01:00
Igor Wiedler
9a52bd0301 [task/phpunit-xml] Use phpunit.xml for test suite
PHPBB3-9967
2011-01-04 22:54:01 +01:00
Igor Wiedler
da4617b14b Merge branch 'ticket/bantu/9746' into develop 2011-01-03 00:24:55 +01: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
fdb5c2c990 [ticket/9746] Adding unit tests 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
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
c54683be8c Merge branch 'ticket/bantu/9859' into develop-olympus
* ticket/bantu/9859:
  [ticket/9859] Remove years from the credit line.
2010-12-29 22:56:55 +01:00
Andreas Fischer
54ef781d72 Merge branch 'ticket/bantu/9348' into develop-olympus
* ticket/bantu/9348:
  [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
2010-12-29 22:56:48 +01:00
Andreas Fischer
410f1fdbc0 Merge branch 'ticket/noxwizard/9953' into develop-olympus
* ticket/noxwizard/9953:
  [ticket/9953] Set focus to password on re-authentication
2010-12-29 22:56:40 +01:00
Andreas Fischer
7442cd214c Merge branch 'ticket/noxwizard/9905' into develop-olympus
* ticket/noxwizard/9905:
  [ticket/9905] Add SQLite to the DSN description
2010-12-29 22:56:30 +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
Richard Foote
90c8803d59 [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode
non-ascii characters that might be in default_dateformat.

E.g. "d M Y à H:i"

PHPBB3-9348
2010-12-28 21:33:34 +01:00
Patrick Webster
7f0f08bcc4 [ticket/9953] Set focus to password on re-authentication
Sets the login focus to the password field when prompting for admin
re-authentication, rather than the username field.

PHPBB3-9953
2010-12-28 21:26:55 +01:00
Patrick Webster
4c076bfdc1 [ticket/9905] Add SQLite to the DSN description
The installer's DSN field has additional meanings for ODBC, PostgreSQL, and
SQLite, but only the first two are mentioned. SQLite uses it for the file path.

PHPBB3-9905
2010-12-28 21:21:16 +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
c298c9d6d0 Merge branch 'ticket/igorw/9937' into develop-olympus
* ticket/igorw/9937:
  [ticket/9937] Make sure feed icon only shows for FORUM_POST
2010-12-21 22:50:39 +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
Igor Wiedler
c1d6aceb03 Merge branch 'ticket/marc1706/9925' into develop-olympus
* ticket/marc1706/9925:
  [ticket/9925] prosilver logo margin bug in IE 6-7-8
2010-12-21 20:30:24 +01:00
Marc Alexander
d1cf7ff24a [ticket/9925] prosilver logo margin bug in IE 6-7-8
PHPBB3-9925
2010-12-19 17:31:02 +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
Andreas Fischer
fc9516a2e3 [ticket/9859] Remove years from the credit line.
PHPBB3-9859
2010-12-16 01:19:40 +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
5d8ddc7480 Merge branch 'ticket/adamreyher/9928' into develop-olympus
* ticket/adamreyher/9928:
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
2010-12-13 17:09:56 +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
Andreas Fischer
b1c594229e Merge branch 'task/naderman/phpdoc' into develop-olympus
* task/naderman/phpdoc:
  [task/phpdoc] Added a phpdoc task to the build process
  [task/phpdoc] Added a configuration file for phpDocumentor.
2010-12-13 15:08:24 +01:00
Andreas Fischer
7c9002398a Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympus
* feature/ChrisTX/acm-wincache:
  [feature/acm-wincache] Adding caching module for WinCache's User Cache.
2010-12-13 15:05:22 +01:00
Andreas Fischer
2c25a4bbb2 Merge branch 'ticket/rxu/9851' into develop-olympus
* ticket/rxu/9851:
  [ticket/9851] "Search new posts" should require login.
2010-12-13 15:03:54 +01:00