8ac0efce65
Merge branch 'ticket/bantu/9698' into develop-olympus
...
* ticket/bantu/9698:
[ticket/9698] Add .htaccess to the includes subdirectory.
2010-10-17 21:34:31 +02:00
0452da2bf1
[ticket/7538] Limit user_login_attempts to prevent SQL errors.
...
PHPBB3-7538
2010-10-15 19:00:14 +02:00
d485664404
[ticket/9698] Add .htaccess to the includes subdirectory.
...
Add .htaccess to the includes folder to prevent full path disclosure when
running PHP 5.3. When the error_reporting setting in php.ini contains the
E_DEPRECATED error level, the PHP parser throws an error message containing
the local filesystem path when accessing one of the captcha plugins directly.
This is because the captcha plugins return explicit references for PHP 4
compatibility.
PHPBB3-9698
2010-10-15 16:47:21 +02:00
68b35b5845
[ticket/9829] Fix error in recaptcha validation.
...
The recaptcha plugin falsely accepted error responses by recaptcha as valid
solutions.
PHPBB3-9829
2010-09-19 16:29:12 +02:00
41245f9f7a
Merge branch 'ticket/bantu/9091' into develop-olympus
...
* ticket/bantu/9091:
[ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
2010-09-16 23:38:50 +02:00
46810f8747
Merge branch 'ticket/bantu/9644' into develop-olympus
...
* ticket/bantu/9644:
[ticket/9644] Check $mode before calling user_notification() from submit_post()
2010-09-16 22:42:07 +02:00
9015e03d05
Merge branch 'ticket/bantu/9613' into develop-olympus
...
* ticket/bantu/9613:
[ticket/9613] Slightly update language strings.
[ticket/9613] Fix missing database part for unread posts search load switch.
[ticket/9613] Implement a load switch for unread posts search feature.
2010-09-16 22:34:48 +02:00
6b5d5e1f63
Merge branch 'ticket/bantu/9609' into develop-olympus
...
* ticket/bantu/9609:
[ticket/9609] Change header() calls setting HTTP status to send_status_line().
2010-09-16 22:24:49 +02:00
e08395745b
Merge branch 'ticket/bantu/9503' into develop-olympus
...
* ticket/bantu/9503:
[ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
2010-09-12 13:40:02 +02:00
bef108a5cc
[ticket/9609] Change header() calls setting HTTP status to send_status_line().
...
PHPBB3-9609
2010-09-11 22:01:31 +02:00
1b3b79b694
Merge branch 'ticket/evil3/8944' into develop-olympus
...
* ticket/evil3/8944:
[ticket/8944] Patch db_tools to support index length for MySQL4
[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
2010-09-05 02:41:34 +01:00
e7b86871f0
[ticket/8944] Patch db_tools to support index length for MySQL4
2010-09-05 03:14:27 +02:00
58bdd91d61
[ticket/9039] Make mssqlnative.php non-executable
...
PHPBB3-9039
2010-09-03 22:43:29 +02:00
ebb4a50d9b
Merge branch 'ticket/bantu/9615' into develop-olympus
...
* ticket/bantu/9615:
[ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
2010-08-30 14:55:50 +01:00
f9764c684f
[ticket/9613] Slightly update language strings.
...
PHPBB3-9613
2010-08-29 16:50:57 +02:00
f1d5005797
[ticket/9613] Implement a load switch for unread posts search feature.
...
Since unread posts search can produce a high server load in certain
circumstances, we implement a switch for ACP "Load settings" to have an option
to disable this type of search.
PHPBB3-9613
2010-08-29 16:09:09 +02:00
098ff47602
Merge branch 'ticket/cs278/7369' into develop-olympus
...
* ticket/cs278/7369:
[ticket/7369] CPF date should always render the users selection.
2010-08-28 23:25:21 +02:00
250c04c8d5
Merge branch 'ticket/nickvergessen/7296' into develop-olympus
...
* ticket/nickvergessen/7296:
[ticket/7296] Exporting styles to tar creates corrupted archives.
2010-08-28 23:25:14 +02:00
dfd3c4a5df
Merge branch 'ticket/nickvergessen/9519' into develop-olympus
...
* ticket/nickvergessen/9519:
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:25:05 +02:00
3c02a1cff7
Merge branch 'ticket/jellydoughnut/9772' into develop-olympus
...
* ticket/jellydoughnut/9772:
[ticket/9772] Unify permissions for sending email when board_email_form is off
2010-08-28 23:24:55 +02:00
2a59e6d486
[ticket/9772] Unify permissions for sending email when board_email_form is off
...
Sending email via memberlist.php was limited to users having u_sendemail. When
board_email_form is disabled, no such requirement was enforced. This is now
changed.
PHPBB3-9772
2010-08-28 15:49:47 -05:00
50c6af0216
[ticket/7369] CPF date should always render the users selection.
...
CPF render code was incorrectly adding the users timezone offset instead
of removing it to compensate for the addition made in user::format_date().
PHPBB3-7369
2010-08-23 06:24:13 +01:00
cd46b39967
Merge branch 'ticket/jellydoughnut/9646' into develop-olympus
...
* ticket/jellydoughnut/9646:
[ticket/9646] Honor CSS comments in @import statements
2010-08-22 21:50:17 +02:00
3cbcff56b2
[ticket/7296] Exporting styles to tar creates corrupted archives.
...
Add the folders to the archive before putting the files inside, seems to break
the tar-archives.
PHPBB3-7296
2010-08-22 11:16:19 -04:00
9731f2492f
Merge branch 'ticket/nickvergessen/7716' into develop-olympus
...
* ticket/nickvergessen/7716:
[ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:27:07 +02:00
32bffe1a32
Revert "[ticket/7716] Data too long for column 'message_subject'"
...
This reverts commit 91a60aa878
.
2010-08-21 21:25:34 +02:00
7474b69175
Merge branch 'ticket/nickvergessen/7716' into develop-olympus
...
* ticket/nickvergessen/7716:
[ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:19:12 +02:00
2455a744e6
[ticket/7716] Data too long for column 'message_subject'
...
PHPBB3-7716
2010-08-21 15:14:16 -04:00
4222510e9c
Merge branch 'ticket/cs278/7332' into develop-olympus
...
* ticket/cs278/7332:
[ticket/7332] Redirect users back to post details when performing actions.
[ticket/7332] Collapse post details content down to a maximum of 300px heigh
2010-08-21 20:30:33 +02:00
c3a5fd30ee
[ticket/9646] Honor CSS comments in @import statements
...
Add a basic CSS comment parser that allows comments to prevent loading an
@import statement. For simplicity, only whitespace is allowed between /* and
the @import. Also adjust regex to not parse improper quotation marks.
PHPBB3-9646
PHPBB3-8169
2010-08-20 16:02:58 -05:00
bcf4f4fbdf
Merge branch 'ticket/cs278/7972' into develop-olympus
...
* ticket/cs278/7972:
[ticket/7972] Copying topics in the MCP now indexes the new topic.
2010-08-20 22:25:20 +02:00
34c3732856
Merge branch 'ticket/nickvergessen/9635' into develop-olympus
...
* ticket/nickvergessen/9635:
[ticket/9635] Useless parameter $data['post_time'] in function submit_post.
2010-08-20 22:15:15 +02:00
31144ed4c5
Merge branch 'ticket/nickvergessen/9782' into develop-olympus
...
* ticket/nickvergessen/9782:
[ticket/9782] Board disable radio set on when server load high
2010-08-20 22:11:04 +02:00
d533121741
[ticket/9780] Add length check back to gen_rand_string().
...
PHPBB3-9780
2010-08-20 20:11:36 +02:00
b73d45ffc8
[ticket/7972] Copying topics in the MCP now indexes the new topic.
...
PHPBB3-7972
2010-08-20 13:59:21 -04:00
932b35ab7a
[ticket/9782] Board disable radio set on when server load high
...
PHPBB3-9782
2010-08-20 13:41:06 -04:00
cc9a1952d9
[ticket/9635] Useless parameter $data['post_time'] in function submit_post.
...
PHPBB3-9635
2010-08-19 23:48:25 -04:00
5e330044b8
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
In the ACM-Modules we need to check whether the function is loaded, before we
use it, as this is not the case from download/file.php in avatar-mode.
PHPBB3-9519
2010-08-19 12:30:24 -04:00
3eb01d50cb
Merge branch 'ticket/bantu/9702' into develop-olympus
...
* ticket/bantu/9702:
[ticket/9702] Take user's timezone settings into account when banning Until ->
2010-08-19 10:56:34 -05:00
f0aaecd6cc
Merge branch 'ticket/bantu/9599' into develop-olympus
...
* ticket/bantu/9599:
[ticket/9599] Reimplement phpbb_checkdnsrr() function.
[ticket/9599] Adding tests for phpbb_checkdnsrr().
[ticket/9599] Adding network function tests.
2010-08-19 10:53:10 -05:00
6343e67fab
Merge branch 'ticket/bantu/9534' into develop-olympus
...
* ticket/bantu/9534:
[ticket/9534] Update function documentation for user_ipwhois().
[ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
2010-08-19 10:48:41 -05:00
68744484c8
Merge branch 'ticket/bantu/9167' into develop-olympus
...
* ticket/bantu/9167:
[ticket/9167] Detect and remove any dead left over shadow topics on update.
[ticket/9167] Remove shadow topics from remaining forums when deleting a forum
Conflicts:
phpBB/install/database_update.php
2010-08-19 10:09:32 -05:00
91a60aa878
[ticket/7716] Data too long for column 'message_subject'
...
PHPBB3-7716
2010-08-19 11:00:42 -04:00
25c579c00d
Merge branch 'ticket/bantu/9612' into develop-olympus
...
* ticket/bantu/9612:
[ticket/9612] Introduce new function gen_rand_string_friendly().
2010-08-19 09:11:36 -05:00
46d2d97a37
Merge branch 'ticket/bantu/9611' into develop-olympus
...
* ticket/bantu/9611:
[ticket/9611] Make length of activation keys variable between 6 and 10.
2010-08-19 09:03:45 -05:00
89b35f7ab9
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
PHPBB3-9519
2010-08-13 17:10:35 +02:00
884cc2ac9b
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
includes/functions_convert.php and install/install_convert.php tested by Dicky.
PHPBB3-9519
2010-08-13 16:40:56 +02:00
4c95ed0eeb
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.
PHPBB3-9519
2010-08-10 16:11:39 +02:00
64e6faa877
Merge branch 'ticket/cs278/9771' into develop-olympus
...
* ticket/cs278/9771:
[ticket/9771] Remove query string parameters that have no name.
2010-08-10 16:05:45 +02:00
d66aadc33f
Merge branch 'ticket/cs278/9760' into develop-olympus
...
* ticket/cs278/9760:
[ticket/9760] Remove unrestricted wildcards from search terms.
2010-08-10 16:04:49 +02:00