1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00

5004 Commits

Author SHA1 Message Date
Nils Adermann
ef544ee095 [ticket/9892] Table prefix lengths influence index lengths in db_tools
PHPBB3-9892
2011-06-12 04:10:51 +02:00
Nils Adermann
8a5e3781d5 [ticket/9892] Shorten the index names on the q&a captcha
PHPBB3-9892
2011-06-12 01:28:06 +02:00
Nils Adermann
418c3d546a [ticket/9892] column & index name limits, firebird auto increment in db_tools
- Column names are limited to 30 characters
- Index names are limited to 31 characters.
  On some dbms the index name contains both table name and actual index name
  so the limit applies to the sum of the lenghts of table name and index name.
- Auto incremented column names are limited to 26 characters to provide an
  additional 4 characters for sequence names

The code for firebird auto increment support using generators/sequences with
triggers was copied from create_schema_files.php

PHPBB3-9892
2011-06-12 01:28:01 +02:00
Andreas Fischer
fe5d616349 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9992] Clarify explanations of ip and account limits on login
  [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
  [ticket/9992] Use sql_fetchfield for single row and single column result
  [ticket/9992] Adding a limit on login attempts per IP.
  [ticket/9992] Make sql_create_table and sql_table_exists available in updater
2011-06-11 19:42:04 +02:00
Andreas Fischer
bf2125f0f7 Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympus
* naderman/ticket/9992:
  [ticket/9992] Clarify explanations of ip and account limits on login
  [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
  [ticket/9992] Use sql_fetchfield for single row and single column result
  [ticket/9992] Adding a limit on login attempts per IP.
  [ticket/9992] Make sql_create_table and sql_table_exists available in updater
2011-06-11 19:40:03 +02:00
Igor Wiedler
0cad4ed49f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10110] Remove multi-server syntax from Redis ACM.

Conflicts:
	phpBB/includes/cache/driver/redis.php
2011-06-11 12:06:29 +02:00
Andreas Fischer
b9f4240c10 [ticket/10110] Remove multi-server syntax from Redis ACM.
PHPBB3-10110
2011-06-11 01:47:50 +02:00
Nils Adermann
7f7a94e5dc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9908] Send 301 before stripping SID so bots do (hopefully) not revisit.
2011-06-11 01:26:19 +02:00
Andreas Fischer
b5cefc400e [ticket/9908] Send 301 before stripping SID so bots do (hopefully) not revisit.
PHPBB3-9908
2011-06-10 20:08:10 +02:00
Nils Adermann
c8828473a8 [ticket/9992] Use sql_fetchfield for single row and single column result
PHPBB3-9992
2011-06-10 18:37:29 +02:00
Nils Adermann
2dee57fd43 [ticket/9992] Adding a limit on login attempts per IP.
A new table was created to save all failed login attempts with
corresponding information on username, ip and useragent. By default
the limit is 50 login attempts within 6 hours per IP. The limit is
relatively high to avoid big problems on sites behind a reverse
proxy that don't receive the forwarded-for value as REMOTE_ADDR but
see all users as coming from the same IP address. But if these
users run into problems a special forwarded-for option is available
to limit logins by forwarded-for value instead of ip.

PHPBB3-9992
2011-06-10 12:18:19 +02:00
Andreas Fischer
df52801989 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10198] range validation for strings should limit characters not bytes
  [ticket/10198] validate_config_vars() improperly validates multibyte strings

Conflicts:
	phpBB/adm/index.php
2011-06-10 01:24:16 +02:00
Nils Adermann
ca1944ebe2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.
  [ticket/9802] Only check for IPv4-mapped address when address is IPv6.
  [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
  [ticket/9802] Remove redundant character class definition from preg_replace.
  [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.

Conflicts:
	phpBB/includes/session.php
2011-06-10 00:53:38 +02:00
Nils Adermann
cdfbd82504 Merge branch 'ticket/bantu/9802' into develop-olympus
* ticket/bantu/9802:
  [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.
  [ticket/9802] Only check for IPv4-mapped address when address is IPv6.
  [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
  [ticket/9802] Remove redundant character class definition from preg_replace.
  [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.
2011-06-10 00:47:40 +02:00
Nils Adermann
735cae076a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.

Conflicts:
	phpBB/includes/functions_posting.php
2011-06-10 00:26:41 +02:00
Nils Adermann
5b701dc3ed Merge branch 'ticket/rxu/6712' into develop-olympus
* ticket/rxu/6712:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.
2011-06-10 00:24:43 +02:00
Nils Adermann
d02d00e951 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/217] Use positive assertions in tests.
  [ticket/217] Silence errors in tests, not code.
  [ticket/217] Use positive parameter statement for bbcode_init()
  [ticket/217] Adjust patch, add tests
  [ticket/217] Multiline [url] not converted
2011-06-09 22:40:26 +02:00
Nils Adermann
928ee43881 Merge branch 'ticket/rxu/217' into develop-olympus
* ticket/rxu/217:
  [ticket/217] Use positive assertions in tests.
  [ticket/217] Silence errors in tests, not code.
  [ticket/217] Use positive parameter statement for bbcode_init()
  [ticket/217] Adjust patch, add tests
  [ticket/217] Multiline [url] not converted
2011-06-09 22:39:28 +02:00
Andreas Fischer
b64159c001 Merge remote-tracking branch 'naderman/ticket/7057' into develop-olympus
* naderman/ticket/7057:
  [ticket/7057] Use GET for quicksearch and add session id to hidden fields
  [ticket/7057] Remove trailing whitespace in functions.php
2011-06-09 13:10:48 +02:00
Andreas Fischer
19439b86b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7057] Use GET for quicksearch and add session id to hidden fields
  [ticket/7057] Remove trailing whitespace in functions.php
2011-06-09 13:10:48 +02:00
Andreas Fischer
7d5438eb03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.

Conflicts:
	phpBB/adm/index.php
2011-06-09 13:00:39 +02:00
Andreas Fischer
c6e946c65f Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympus
* naderman/ticket/8138:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.
2011-06-09 12:55:04 +02:00
Andreas Fischer
c49dce2be3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
2011-06-09 12:47:27 +02:00
Andreas Fischer
f7578e29b3 Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympus
* naderman/ticket/10005:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
2011-06-09 12:47:26 +02:00
Oleg Pudeyev
2d1e426ba7 [ticket/217] Silence errors in tests, not code.
Use a mock user object for testing bbcode.

PHPBB3-217
2011-06-06 21:14:10 +08:00
Andreas Fischer
ad90f262ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php
2011-06-06 11:06:01 +02:00
Andreas Fischer
759f8d5c2c Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympus
* naderman/ticket/10067:
  [ticket/10067] Add separator to h_radio to place options on individual lines
2011-06-06 10:58:05 +02:00
rxu
d44b6ba5ca [ticket/217] Use positive parameter statement for bbcode_init()
PHPBB3-217
2011-06-06 00:53:54 +08:00
rxu
6585d938d2 [ticket/217] Adjust patch, add tests
PHPBB3-217
2011-06-06 00:53:53 +08:00
rxu
16ab0d8c26 [ticket/217] Multiline [url] not converted
This is the second attempt parse multiline URL text, see the ticket comments.

PHPBB3-217
2011-06-06 00:53:11 +08:00
Nils Adermann
26e052bb26 [ticket/10067] Add separator to h_radio to place options on individual lines
The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
2011-06-05 09:52:17 +02:00
Nils Adermann
b55bfb459e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.
  [ticket/10042] GD CAPTCHA: Round offset to the next pixel.
  [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
2011-06-05 03:22:40 +02:00
Nils Adermann
893d0ae96f Merge branch 'ticket/bantu/10042' into develop-olympus
* ticket/bantu/10042:
  [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.
  [ticket/10042] GD CAPTCHA: Round offset to the next pixel.
  [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
2011-06-05 03:22:09 +02:00
Nils Adermann
cc14f4b9e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:50:17 +02:00
Nils Adermann
a9f4e00234 Merge branch 'ticket/p/10067' into develop-olympus
* ticket/p/10067:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:49:35 +02:00
Nils Adermann
a30ec6e052 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
2011-06-05 01:58:52 +02:00
Nils Adermann
27e1f1319f Merge branch 'ticket/nickvergessen/10158' into develop-olympus
* ticket/nickvergessen/10158:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
2011-06-05 01:58:37 +02:00
Nils Adermann
6b6705b852 [ticket/10158] Remove some code duplication from generating the message.
PHPBB3-10158
2011-06-05 01:58:03 +02:00
Nils Adermann
b1ae6f6407 Merge branch 'ticket/bantu/10195' into develop-olympus
* ticket/bantu/10195:
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
2011-06-05 01:30:26 +02:00
Nils Adermann
f11ef89c65 [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
PHPBB3-8138
2011-06-03 19:06:12 +02:00
Andreas Fischer
ab366a18ba Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9950] Use actual language instead of user's language in overall header
2011-06-03 11:00:26 +02:00
Andreas Fischer
7a2fb9f123 Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympus
* naderman/ticket/9950:
  [ticket/9950] Use actual language instead of user's language in overall header
2011-06-03 10:58:18 +02:00
Andreas Fischer
672c333ace Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9685] Test for databases that are able to nest transactions
  [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
2011-06-02 23:32:12 +02:00
Nils Adermann
6e8b59dce3 [ticket/7057] Use GET for quicksearch and add session id to hidden fields
Without sid a GET form logs a user out if they have cookies disabled.

PHPBB3-7057
2011-06-02 10:10:42 +02:00
Nils Adermann
d270f736e3 [ticket/7057] Remove trailing whitespace in functions.php
PHPBB3-7057
2011-06-02 10:09:40 +02:00
Nils Adermann
7b10f859de [ticket/10005] Add validation of dropdown custom profile field values
PHPBB3-10005
2011-06-02 08:49:59 +02:00
Nils Adermann
324c913ac9 [ticket/9950] Use actual language instead of user's language in overall header
PHPBB3-9950
2011-06-02 06:24:28 +02:00
Nils Adermann
ebe83769e6 [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
PHPBB3-9685
2011-06-02 01:52:25 +02:00
Andreas Fischer
83dfe0d22c [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
There is no support for IPv6 addresses in the blacklists we check right now.

PHPBB3-10195
2011-05-26 10:56:46 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00