Commit graph

13165 commits

Author SHA1 Message Date
Joas Schilling
11e3804f97 [ticket/9823] Unit tests for build_cfg_template.
PHPBB3-9823
2011-02-01 13:38:43 +01:00
Joas Schilling
c80afb555e [ticket/9823] Unit tests for validate_rang.
PHPBB3-9823
2011-02-01 13:38:42 +01:00
Joas Schilling
d59327a9c4 [ticket/9823] Unit tests for h_radio.
PHPBB3-9823
2011-02-01 13:38:41 +01:00
Joas Schilling
eb2de91e7b [ticket/9823] Moving the functions. Unit tests for build_select.
PHPBB3-9823
2011-02-01 13:38:40 +01:00
Andreas Fischer
270a0020ab Merge branch 'ticket/erikfrerejean/10011' into develop
* ticket/erikfrerejean/10011:
  [ticket/10011] Tests can't be ran on PHP < 5.3
2011-02-01 07:54:27 +01:00
Andreas Fischer
8376bf2807 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10014] Clearly indicate fatal errors in file acm.
2011-02-01 07:42:51 +01: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
Erik Frèrejean
2e54212309 [ticket/10011] Tests can't be ran on PHP < 5.3
Apply the `__DIR__` fix to some remaining Ascraeus tests

PHPBB3-10011
2011-01-31 14:02:30 +01:00
Andreas Fischer
d06657c995 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10011] Tests don't work on PHP < 5.3

Conflicts:
	tests/security/redirect_test.php
2011-01-31 13:26:20 +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
7ff0cff4cd Merge branch 'ticket/nickvergessen/8065' into develop
* ticket/nickvergessen/8065:
  [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.
2011-01-30 13:31:34 +01:00
Joas Schilling
cfab695f3a [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.
PHPBB3-8065
2011-01-30 13:30:18 +01:00
Andreas Fischer
426139ae77 Merge branch 'ticket/nickvergessen/8065' into develop
* ticket/nickvergessen/8065:
  [ticket/8065] Add an option to lock topics while moving them.
2011-01-30 01:27:23 +01:00
Joas Schilling
b526fb9678 [ticket/8065] Add an option to lock topics while moving them.
PHPBB3-8065
2011-01-30 01:23:20 +01:00
Andreas Fischer
bafe3d9484 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
2011-01-30 01:17:06 +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
92f99c97f4 [ticket/9949] $user->lang() uses last int-value to get the key not first
The comment in the code says: "We now get the first number passed and will
select the key based upon this number". But the loop over the arguments is not
left and therefore it uses the last int-value not the first one.

PHPBB3-9949
2011-01-29 17:22:55 +01:00
Joas Schilling
72fbd4dffa [ticket/9966] Language download in ACP creates index.html and misses captcha_*
The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6.

PHPBB3-9966
2011-01-29 17:08:20 +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
56c202127c [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.
PHPBB3-10016
2011-01-28 21:06:49 -05: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
85e0ae7eae Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9166] Fixed CSS element order in subsilver.
  [ticket/9166] Fixed CSS element order in prosilver.
2011-01-27 22:27:49 -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
Joas Schilling
4890006cbb [ticket/9944] Extension groups naming don't use users' language in ACP
Only happens on boards which were installed with 3.0.8

PHPBB3-9944
2011-01-27 17:24:03 +01:00
Oleg Pudeyev
9716cceb1b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
2011-01-26 05:45:45 -05: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
10169d1c3e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.

Conflicts:
	tests/mock/cache.php
2011-01-23 18:44:03 +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
1196b96462 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8779] Slow search for 'View unread posts'
2011-01-23 18:35:10 +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
hanakin
39a26785bb [ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images
* Created the new styles within colours.css to handle the displaying of the forum & topic images

- NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server

PHPBB3-10001
2011-01-18 22:54:14 -05:00
hanakin
abc8384bf2 [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
* Created new Template variable to house class names based on $folder_img value in functions_display.php.
* Created new Template variable to house class names based on $folder_img value in mcp_forums.php.
* Created new Template variable to house class names based on $folder_img value in ucp_main.php.
* Created new Template variable to house class names based on $folder_img value in search.php.
* Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php.
* Created new Template variable to house class names based on $folder_img value in search.php.
* Created new Template variable to house class names based on $folder_img value in viewforum.php.
* Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable
* Created the new styles within colours.css to handle the displaying of the forum & topic images

- NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server

PHPBB3-10001
2011-01-18 22:39:50 -05:00
Igor Wiedler
40cf8b1c0a Merge branch 'ticket/bantu/9790' into develop
* ticket/bantu/9790:
  [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.
  [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.
  [ticket/9790] Always call file_gc(false) before sending the file.
  [ticket/9790] Add $exit parameter to file_gc().
2011-01-18 21:09:13 +01:00
Andreas Fischer
f6a14cbcef [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.
PHPBB3-9790
2011-01-18 21:04:49 +01:00
Andreas Fischer
6bbdc129c0 [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.
PHPBB3-9790
2011-01-17 22:37:53 +01:00
Andreas Fischer
19931713db [ticket/9790] Always call file_gc(false) before sending the file.
This also unloads the cache before the file is send.

PHPBB3-9790
2011-01-17 22:34:39 +01:00
Andreas Fischer
0f88b847fc [ticket/9790] Add $exit parameter to file_gc().
PHPBB3-9790
2011-01-17 00:01:35 +01:00
Nils Adermann
cde423591e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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:26:27 +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
656f18d3af Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.

Conflicts:
	phpBB/includes/functions.php

Also remove static $unicode_support.
2011-01-16 20:37:39 +01:00