Commit graph

10458 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Igor Wiedler
3bc64deaec [task/acm-refactor] Remove includes/cache.php from coding guidelines
It has been refactored to includes/cache/service.php.

PHPBB3-9983
2011-01-13 12:56:54 +01:00
Andreas Fischer
a367378940 Merge branch 'task/naderman/config-class' into develop
* task/naderman/config-class:
  [task/config-class] Do not create multiple cache driver instances.
  [task/config-class] Add an attribute for the table name in phpbb_config_db.
  [task/config-class] Correctly merge cached config with dynamically loaded data.
  [task/config-class] Always specify the config table to use.
  [task/config-class] Fix db config constructor param order
  [task/config-class] Implemented a config class to replace the global array.
2011-01-12 01:49:44 +01:00
Nils Adermann
f11579549d [task/config-class] Do not create multiple cache driver instances.
Retrieve the driver from the service instead of creating new ones
over and over from the factory.

PHPBB3-9988
2011-01-12 01:47:51 +01:00
Nils Adermann
8e26f14eb6 [task/config-class] Add an attribute for the table name in phpbb_config_db.
PHPBB3-9988
2011-01-12 01:47:41 +01:00
Nils Adermann
129d3c53bc [task/config-class] Correctly merge cached config with dynamically loaded data.
PHPBB3-9988
2011-01-12 00:21:12 +01:00
Nils Adermann
6b1e343d8d [task/config-class] Always specify the config table to use.
PHPBB3-9988
2011-01-12 00:21:04 +01:00
Igor Wiedler
106f6800d4 [task/config-class] Fix db config constructor param order
PHPBB3-9988
2011-01-11 19:38:10 +01:00
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
fb2642bbc6 [task/config-class] Implemented a config class to replace the global array.
There is a phpbb_config class which simply holds an array and does not persist
any data. It implements ArrayAccess, Countable and IteratorAggregate to allow
regular use of configuration as if it was still an array. The phpbb_config_db
class depends on an instance of the dbal and a cache driver. It obtains the
configuration data from cache and database as necessary and persists data to
the database.

The functions set_config and set_config_count remain for backward compatability
but they only call methods on the new config class now instead of directly
manipulating the database and cache.

PHPBB3-9988
2011-01-10 04:05:23 +01:00
Joas Schilling
6f9e3d3b96 [ticket/6109] WLM subsilver2 button in the english language package.
PHPBB3-6109
2011-01-10 01:45:28 +01:00
Joas Schilling
efedc973eb [ticket/6109] MSN is now called Windows Live Messenger (WLM)
Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
2011-01-10 01:44:54 +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