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

9985 Commits

Author SHA1 Message Date
Oleg Pudeyev
0e861ac3ab [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
PHPBB3-10029
2011-02-09 02:19:50 -05:00
Andreas Fischer
b414a4d107 Merge branch 'ticket/p/10014' into develop-olympus
* ticket/p/10014:
  [ticket/10014] Clearly indicate fatal errors in file acm.
2011-02-01 07:41:21 +01:00
Andreas Fischer
e685c1c005 Merge branch 'ticket/erikfrerejean/10011' into develop-olympus
* ticket/erikfrerejean/10011:
  [ticket/10011] Tests don't work on PHP < 5.3
2011-01-31 13:18:37 +01:00
Erik Frèrejean
14891cdf4e [ticket/10011] Tests don't work on PHP < 5.3
Due to the usage of `__DIR__` for the file includes the tests can't
be ran on systems with PHP < 5.3. Replace all occurances of
`__DIR__` with `dirname(__FILE__)`.

PHPBB3-10011
2011-01-31 12:58:18 +01:00
Andreas Fischer
c3a4312650 Merge branch 'ticket/nickvergessen/9985' into develop-olympus
* ticket/nickvergessen/9985:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
2011-01-30 00:55:07 +01:00
Joas Schilling
b32bf5aa35 [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
PHPBB3-9985
2011-01-30 00:49:53 +01:00
Andreas Fischer
01fb5532cf Merge branch 'ticket/nickvergessen/9989' into develop-olympus
* ticket/nickvergessen/9989:
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
2011-01-30 00:12:52 +01:00
Joas Schilling
90f5e4e2b1 [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
PHPBB3-9989
2011-01-29 16:13:36 +01:00
Oleg Pudeyev
5e97dd74c7 [ticket/10014] Clearly indicate fatal errors in file acm.
If acm_file cannot open the cache file for writing, it prints a message
to that effect and calls die(). The message itself does not indicate that
it is a fatal error, and someone seeing the message might expect that
inability to write to cache is not fatal.

Make it clear that the error is fatal by printing the word "Fatal" before
the message.

PHPBB3-10014
2011-01-28 15:31:41 -05:00
Oleg Pudeyev
9dfb059e2e Merge branch 'ticket/bantu/9166' into develop-olympus
* ticket/bantu/9166:
  [ticket/9166] Fixed CSS element order in subsilver.
  [ticket/9166] Fixed CSS element order in prosilver.
2011-01-27 22:26:12 -05:00
Schnorrer42
ee478ec4f4 [ticket/9166] Fixed CSS element order in subsilver.
PHPBB3-9166
2011-01-28 03:21:54 +01:00
Schnorrer42
03f117ea30 [ticket/9166] Fixed CSS element order in prosilver.
PHPBB3-9166
2011-01-28 03:21:35 +01:00
Oleg Pudeyev
afc856417f Merge branch 'ticket/bantu/10007' into develop-olympus
* ticket/bantu/10007:
  [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
2011-01-26 05:45:16 -05:00
Andreas Fischer
a970219d61 [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
The "deny" and "access" directives are IP-based in general. Both directives
only support IPv6 from nginx 0.8.22 onwards, on older versions of nginx those
directives have no effect on IPv6 requests. Thus they do not block access for
IPv6 requests.

Adding the "internal" directive blocks external access in general (both IPv4
and IPv6) and makes the web server return a status code 404 (Not Found)
response.

See:
http://nginx.org/en/CHANGES
http://wiki.nginx.org/HttpCoreModule#internal

PHPBB3-10007
2011-01-24 17:35:10 +01:00
Nils Adermann
e1e84f9bd0 Merge branch 'task/naderman/session-tests' into develop-olympus
* task/naderman/session-tests:
  [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
  [task/session-tests] Test additional combinations of session_begin.
  [task/session-tests] Added tests for the session class.
2011-01-23 18:39:47 +01:00
Nils Adermann
4229490725 Merge branch 'ticket/rxu/8779' into develop-olympus
* ticket/rxu/8779:
  [ticket/8779] Slow search for 'View unread posts'
2011-01-23 18:34:50 +01:00
rxu
ab9d4b3b63 [ticket/8779] Slow search for 'View unread posts'
Adjust SQL query to speedup search for unread posts (thanks naderman).

PHPBB3-8779
2011-01-24 00:01:18 +07:00
Nils Adermann
cd694e9b9d [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
PHPBB3-9732
2011-01-21 21:32:31 +01:00
Nils Adermann
8538561b31 [task/session-tests] Test additional combinations of session_begin.
PHPBB3-9732
2011-01-20 22:49:38 +01:00
Nils Adermann
74f537e89d [task/session-tests] Added tests for the session class.
Two first simple tests to check functionality of session_begin and
session_create.

Added a mock class for the cache as well as a subclass of session
which has its cookie handling function mocked out to avoid header
sending problems.

PHPBB3-9732
2011-01-20 22:47:48 +01:00
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
Igor Wiedler
e9c584af6a Merge branch 'ticket/bantu/9933' into develop-olympus
* ticket/bantu/9933:
  [ticket/9933] Remove empty word check.
  [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
  [ticket/9933] Adjust word censor regex for non-unicode mode.
2011-01-16 20:25:06 +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
60eff4e59a [ticket/9859] Remove the years from the copyright statements in docs files.
PHPBB3-9859
2011-01-16 18:50:53 +01:00
Andreas Fischer
180e97abdc [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
PHPBB3-9859
2011-01-16 18:50:11 +01:00
Andreas Fischer
732fd5980e [ticket/9859] Remove the meta copyright tag as well.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
c617400f95 [ticket/9859] Remove the credit line comment from all html files.
PHPBB3-9859
2011-01-16 17:53:30 +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
Nils Adermann
1359cf6547 Merge branch 'ticket/igorw/9990' into develop-olympus
* ticket/igorw/9990:
  [ticket/9990] Add docs for running slow tests
  [ticket/9990] Integrate utf normalizer tests into test suite
2011-01-12 02:59:32 +01:00
Igor Wiedler
42cf9a9895 [ticket/9990] Add docs for running slow tests
PHPBB3-9990
2011-01-12 02:22:37 +01:00
Igor Wiedler
e00c5544d2 [ticket/9990] Integrate utf normalizer tests into test suite
PHPBB3-9990
2011-01-11 01:06:01 +01:00
Igor Wiedler
c9b9016ca8 Merge branch 'ticket/bantu/9764' into develop-olympus 2011-01-10 23:42:41 +01:00
Igor Wiedler
d7299f5071 Merge branch 'ticket/igorw/9987' into develop-olympus 2011-01-10 00:26:39 +01:00
Igor Wiedler
01fe91c5c4 [ticket/9987] Rename test files to include a _test suffix
PHPBB3-9987
2011-01-10 00:18:37 +01:00
Igor Wiedler
0a945100fd Merge branch 'ticket/igorw/9981' into develop-olympus
* ticket/igorw/9981:
  [ticket/9981] Fix unit test dependencies
2011-01-09 23:11:47 +01:00
Igor Wiedler
69616db1ed [ticket/9981] Fix unit test dependencies
PHPBB3-9981
2011-01-07 22:45:39 +01:00
Andreas Fischer
a469e80493 Merge branch 'ticket/rxu/9933' into develop-olympus
* ticket/rxu/9933:
  [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
2011-01-07 15:41:12 +01:00
rxu
95cf47c4ef [ticket/9933] Create unit test for word censor regular expression.
PHPBB3-9933
2011-01-07 15:32:42 +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
Nils Adermann
7a2348bf7f Merge branch 'task/naderman/phpdoc' into develop-olympus
* task/naderman/phpdoc:
  [task/phpdoc] Make phpdoctor output quiet instead of verbose.
2011-01-07 14:22:15 +01:00
Nils Adermann
c3fe0d99f9 [task/phpdoc] Make phpdoctor output quiet instead of verbose.
PHPBB3-9943
2011-01-07 14:15:45 +01:00
Nils Adermann
480978db41 Merge branch 'task/naderman/phpdoc' into develop-olympus
* task/naderman/phpdoc:
  [task/phpdoc] Switching from phpDocumentor to phpdoctor.
2011-01-07 02:27:57 +01:00
Nils Adermann
a1731d5e6e [task/phpdoc] Switching from phpDocumentor to phpdoctor.
You can get phpdoctor from https://github.com/peej/phpdoctor

PHPBB3-9943
2011-01-07 02:25:06 +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