1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-15 03:55:23 +02:00

113 Commits

Author SHA1 Message Date
Andreas Fischer
9b469eb163 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9892] Correct copyright year
  [ticket/9892] Remove incorrect use of camel case
  [ticket/9892] Removing closing php tag from create_schema_files
  [ticket/9892] Transaction support for database update sql execution function
  [ticket/9892] count is a keyword in firebird, so renaming this alias
  [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
  [ticket/9892] Shorten login_attempt key names to avoid firebird length problems
  [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
  [ticket/9892] Adding a number of tests for db_tools
  [ticket/9892] Table prefix lengths influence index lengths in db_tools
  [ticket/9892] Shorten the index names on the q&a captcha
  [ticket/9892] column & index name limits, firebird auto increment in db_tools

Conflicts:
	phpBB/develop/create_schema_files.php
2011-06-12 19:27:01 +02:00
Nils Adermann
76cc7be4d2 [ticket/9892] Removing closing php tag from create_schema_files
PHPBB3-9892
2011-06-12 11:46:55 +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
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
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Oleg Pudeyev
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
Oleg Pudeyev
ba41e45f84 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit

Conflicts:
	phpBB/install/database_update.php
2011-02-23 22:03:42 -05:00
Erik Frèrejean
a7bc76d246 [ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Joas Schilling
023a102082 [ticket/9549] Update database with the new config values and columns
PHPBB3-9549
2011-02-16 18:21:47 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Nils Adermann
693a2dc99b Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
2010-03-03 23:32:09 +01:00
Nils Adermann
bba33ead30 Updating the create_schema_files.php file to reflect the minor mssql schema change introduced in r10489 (implementing mssql native driver support - Bug #57055)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10548 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 18:04:32 +00:00
Andreas Fischer
2906a24122 Bug #56545 - Speed up topic move operation by adding an index for topic_id on the topics track table.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 23:15:25 +00:00
Andreas Fischer
5306a586b1 Revert r9564, Fix #54445, Related to #44665.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:42:04 +00:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Andreas Fischer
fc5a21e16a Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 17:27:13 +00:00
Andreas Fischer
0fe74ebcea Add INDEX on user_regdate because this is the default ORDER BY in memberlist.php - thanks nickvergessen.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10106 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:44:10 +00:00
Meik Sievertsen
09ad10a734 ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 15:00:47 +00:00
Joas Schilling
ee65d2147b fix r9713 for #36565
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9931 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 15:28:46 +00:00
Henry Sudhof
1f871950d8 #48985
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-03 15:46:56 +00:00
Meik Sievertsen
4739c7ba39 [Feature] Added new functionality to inactive users module:
- Ability to set users per page.
- Ability to sort by posts/number of reminders/last reminded date.
- Show number of posts and ability to search posts.
- Show number of reminders sent to user.
- Show date of last reminder sent to user.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9845 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-24 11:13:32 +00:00
Nils Adermann
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
Ruslan Uzdenov
4bef644a94 Addition to r9696 - update develop/ scripts
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9697 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-27 09:34:55 +00:00
Meik Sievertsen
433de350c0 - [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.
- [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users.

As a coincidence also Bug #46535 got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 18:45:16 +00:00
Henry Sudhof
5d9cf2aa41 Make captchas stricter by oly having one entry per session; fix a bug in ucp_register that caused three captcha instances to be generated. Non-MySQL databases and garbage collecting needs extensive testing.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9626 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 12:31:28 +00:00
Meik Sievertsen
d7d96223e7 - Display coloured usernames in ACP groups management screens
- Changed behaviour of group_create() function to support specifying additional group columns
- New groups option to excempt group leaders from group permissions


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 09:51:50 +00:00
Andreas Fischer
9f21f1ab5e Fix bug #44665 - Add index on log_time to the log table to prevent slowdown on boards with many log entries.
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9564 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-08 12:36:26 +00:00
Meik Sievertsen
0f162568f2 Fix duplicate creation of acl options in acl_add_options() under certain conditions. (Bug #38385, #40225)
Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9400 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-20 13:22:19 +00:00
Meik Sievertsen
481e5c193f extend the style columns (style_id, template_id, imageset_id, image_id...)
No, not only because of possible style demos. :o

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9129 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-27 13:44:24 +00:00
Meik Sievertsen
fb77cdd051 Better handling and finer control for custom profile fields visibility options. (Patch by Highway of Life)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9127 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-26 19:58:35 +00:00
Meik Sievertsen
6a15c2a936 we no longer need them. Schema is in install now.
git-svn-id: file:///svn/phpbb/trunk@9043 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-02 11:34:50 +00:00
Meik Sievertsen
ce6b87ccec - Automatically add users/groups to the PM recipient list, if entered or selected.
- Reply to PM now includes all previous recipients and not only the original sender.
- Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.



git-svn-id: file:///svn/phpbb/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:11:34 +00:00
Meik Sievertsen
4a3db854b7 - Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:03:33 +00:00
Henry Sudhof
80c8b12577 weird - schemas later
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8730 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-29 23:09:32 +00:00
Henry Sudhof
612f7ebfc7 Schema changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8719 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-29 15:01:09 +00:00
Meik Sievertsen
ad739a358c merge? merge.
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-23 18:22:44 +00:00
Meik Sievertsen
b8647dc952 change subject/title column length
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8666 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-21 16:04:13 +00:00
Henry Sudhof
b7ef95ed09 This should get rid of the filesorts and temp tables on index (with topic read tracking as exception).
Updater still needs testing. Not yet merged to 3.1
#22715 - thanks HoL


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8436 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-17 16:25:07 +00:00
Nils Adermann
cc24876726 merging r8373 into 3.0 branch: adding a new option to hide the entire list of subforums on listforums
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8374 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-03 22:55:10 +00:00
David M
b9b46a8b45 - phpBB now uses a less ancient version of Oracle
git-svn-id: file:///svn/phpbb/trunk@8317 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-09 00:21:29 +00:00
David M
7193d91e40 so close to that perfect commit, yet so very far...
git-svn-id: file:///svn/phpbb/trunk@8316 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-08 06:46:08 +00:00
David M
370e189f15 - make viewforum work again
- remove the lower case functions, they were stupid anyway
- added some indexes
- added a group_name_clean column


git-svn-id: file:///svn/phpbb/trunk@8315 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-08 06:44:05 +00:00
David M
6dfa770986 I plan on getting a perfect commit one of these days... Today is not that day :P
git-svn-id: file:///svn/phpbb/trunk@8309 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-06 13:48:28 +00:00
David M
2f08a36062 - add DB2 support
/me takes a nap


git-svn-id: file:///svn/phpbb/trunk@8308 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-06 13:46:20 +00:00
David M
57645ad5bc the end of an era...
- MySQL < 4.1.3 support is removed
- renamed mysql4 to mysql, no need to cause confusion
- changed the cfg cacher, reduces file system lookups and include count by two on every page load


git-svn-id: file:///svn/phpbb/trunk@8307 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-06 02:21:44 +00:00
Meik Sievertsen
7f2d596c08 fix unread/new pm columns
git-svn-id: file:///svn/phpbb/trunk@8267 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-12-05 15:18:21 +00:00
Meik Sievertsen
1fb304c5f2 more fixes...
git-svn-id: file:///svn/phpbb/trunk@8183 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-14 15:46:44 +00:00
Meik Sievertsen
ea46faa8ff forum rules, forum descriptions and group description bbcode uid fixes
git-svn-id: file:///svn/phpbb/trunk@8178 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-14 12:12:32 +00:00
Meik Sievertsen
d282d0f8b7 i think david just forgot these. ;)
git-svn-id: file:///svn/phpbb/trunk@8151 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-06 11:20:42 +00:00