aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/system-cron] Private instance variable as cron idOleg Pudeyev2011-02-121-3/+5
| | | | | | Changed cron lock to use a private instance variable for cron id instead of a constant. PHPBB3-9596
* [feature/system-cron] WIP on making cron tasks runnable via system cronOleg Pudeyev2011-02-127-284/+418
| | | | PHPBB3-9596
* Merge branch 'develop-olympus' into developIgor Wiedler2011-02-121-1/+1
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/10038] Use request_var() in the avatar code path of download/file.php Conflicts: phpBB/download/file.php
| * [ticket/10038] Use request_var() in the avatar code path of download/file.phpAndreas Fischer2011-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | There is no reason not to use request_var() here because it is available anyway since 3afd2c6948e777fde2f43f00bff1659f2691f4d8. This change especially prevents submitting an array which might then throw an error in one of the string functions substr() or strpos() later on. PHPBB3-10038
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-121-1/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version. [ticket/9805] Setup security repository for developers. [ticket/9805] Move check lower down. [ticket/9805] Better support for already existing repositories. [ticket/9805] Add dry-run option. [ticket/9805] Use getopt(), add a few options, extend show_usage(). [ticket/9805] Script for easily cloning a whole github network.
| * Merge branch 'ticket/p/10029' into develop-olympusAndreas Fischer2011-02-101-1/+7
| |\ | | | | | | | | | | | | * ticket/p/10029: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
| | * [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.Oleg Pudeyev2011-02-091-1/+7
| | | | | | | | | | | | PHPBB3-10029
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-071-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| * | Merge branch 'ticket/nickvergessen/9949' into develop-olympusAndreas Fischer2011-02-071-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9949: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| | * | [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-041-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| * | | Merge branch 'ticket/nickvergessen/9966' into develop-olympusAndreas Fischer2011-02-041-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9966: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| | * | | [ticket/9966] Language download in ACP creates index.html and misses captcha_*Joas Schilling2011-01-291-6/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'ticket/nickvergessen/9823' into developAndreas Fischer2011-02-042-541/+551
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9823: [ticket/9823] Replace 0x80000000 with -2147483648 in tests. [ticket/9823] Move mock file into the mock/ folder. [ticket/9823] Update Unit tests to the new system and correct some minor issues [ticket/9823] Update copyright year and add newline at the end of the file. [ticket/9823] Correct unit-tests to use self:: instead of the class-name. [ticket/9823] Unit tests for validate_config_vars. [ticket/9823] Unit tests for build_cfg_template. [ticket/9823] Unit tests for validate_rang. [ticket/9823] Unit tests for h_radio. [ticket/9823] Moving the functions. Unit tests for build_select. Conflicts: phpBB/adm/index.php
| * | | | [ticket/9823] Unit tests for validate_config_vars.Joas Schilling2011-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some documentations and use the $max-var instead of the magic-number in validate_config_vars. PHPBB3-9823
| * | | | [ticket/9823] Moving the functions. Unit tests for build_select.Joas Schilling2011-02-012-537/+547
| | | | | | | | | | | | | | | | | | | | PHPBB3-9823
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-041-1/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10020] Fix 32-bit php braindamage around INT_MIN. [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
| * | | | [ticket/10020] Fix 32-bit php braindamage around INT_MIN.Oleg Pudeyev2011-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 32-bit php, -2147483648, despite fitting in the int type, is for some reason made into a floating-point value. Use an explicit cast to make it an integer. PHPBB3-10020
| * | | | [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.Oleg Pudeyev2011-02-041-1/+2
| | |_|/ | |/| | | | | | | | | | PHPBB3-10020
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-011-2/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * develop-olympus: [ticket/10014] Clearly indicate fatal errors in file acm.
| * | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/p/10014: [ticket/10014] Clearly indicate fatal errors in file acm.
| | * | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.Joas Schilling2011-01-301-0/+3
| | | | | | | | | | | | | | | | PHPBB3-8065
* | | | [ticket/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-302-0/+10
| | | | | | | | | | | | | | | | PHPBB3-8065
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-303-13/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 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.
| * | | Merge branch 'ticket/nickvergessen/9985' into develop-olympusAndreas Fischer2011-01-301-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9985: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
| | * | | [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-9985
| * | | Merge branch 'ticket/nickvergessen/9989' into develop-olympusAndreas Fischer2011-01-302-11/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * ticket/nickvergessen/9989: [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| | * | [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.Joas Schilling2011-01-292-11/+5
| | |/ | | | | | | | | | PHPBB3-9989
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-01-274-9/+33
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/9166] Fixed CSS element order in subsilver. [ticket/9166] Fixed CSS element order in prosilver.
| * | [ticket/9166] Fixed CSS element order in subsilver.Schnorrer422011-01-281-4/+10
| | | | | | | | | | | | PHPBB3-9166
| * | [ticket/9166] Fixed CSS element order in prosilver.Schnorrer422011-01-283-7/+25
| |/ | | | | | | PHPBB3-9166
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-01-261-0/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
| * [ticket/10007] Add directive 'internal' to blocked folders in nginx config.Andreas Fischer2011-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-231-2/+3
|\ \ | |/ | | | | | | * develop-olympus: [ticket/8779] Slow search for 'View unread posts'
| * [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
| | | | | | | | | | | | Adjust SQL query to speedup search for unread posts (thanks naderman). PHPBB3-8779
* | Merge branch 'ticket/bantu/9790' into developIgor Wiedler2011-01-183-20/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | * 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().
| * | [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.Andreas Fischer2011-01-182-15/+18
| | | | | | | | | | | | PHPBB3-9790
| * | [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.Andreas Fischer2011-01-172-0/+18
| | | | | | | | | | | | PHPBB3-9790
| * | [ticket/9790] Always call file_gc(false) before sending the file.Andreas Fischer2011-01-171-3/+4
| | | | | | | | | | | | | | | | | | This also unloads the cache before the file is send. PHPBB3-9790
| * | [ticket/9790] Add $exit parameter to file_gc().Andreas Fischer2011-01-171-2/+15
| | | | | | | | | | | | PHPBB3-9790
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-1628-150/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * 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.
| * | Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-1628-150/+31
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | * | [ticket/9859] Remove the years from the copyright statements in docs files.Andreas Fischer2011-01-168-8/+8
| | | | | | | | | | | | | | | | PHPBB3-9859
| | * | [ticket/9859] Remove the year from the copyright meta tag in docs/*.htmlAndreas Fischer2011-01-167-7/+7
| | | | | | | | | | | | | | | | PHPBB3-9859
| | * | [ticket/9859] Remove the meta copyright tag as well.Andreas Fischer2011-01-165-5/+0
| | | | | | | | | | | | | | | | PHPBB3-9859
| | * | [ticket/9859] Remove the credit line comment from all html files.Andreas Fischer2011-01-1611-116/+2
| | | | | | | | | | | | | | | | PHPBB3-9859
| | * | [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-1614-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-161-19/+11
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | [ticket/9933] Remove empty word check.rxu2011-01-161-5/+0
| | | | | | | | | | | | PHPBB3-9933