1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-23 20:56:08 +02:00
Commit Graph

5670 Commits

Author SHA1 Message Date
Nathan
b25efd744d [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)

PHPBB3-8323
2012-07-10 17:41:27 -05:00
Nathan
08bdebb0b5 [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
PHPBB3-8323
2012-07-10 16:38:07 -05:00
Nathan
33852e6251 [ticket/8323] Correct PM notification settings (only notify those who can receive them)
Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense)

PHPBB3-8323
2012-07-10 16:07:12 -05:00
Nathan
362ba43f18 [ticket/8323] Allow sending PMs to temporarily banned users
Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time)

PHPBB3-8323
2012-07-10 12:34:40 -05:00
Nathan
0f4956b280 [ticket/8323] Do not allow sending PMs to Inactive users
PHPBB3-8323
2012-07-10 12:34:39 -05:00
Nathan
e6d4e9bbb9 [ticket/8323] Correcting the comment
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c38bb4254a [ticket/8323] Do not allow sending of Private Messages to users who are banned
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
c53d7f0b62 [ticket/8323] Remove code used for testing
PHPBB3-8323
2012-07-10 12:34:38 -05:00
Nathan
05452b9ec0 [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
PHPBB3-8323
2012-07-10 12:34:37 -05:00
Andreas Fischer
85ea062a05 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:31:08 +02:00
Andreas Fischer
80180a6a20 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:30:56 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000
PHPBB3-10935
2012-06-20 14:29:48 +02:00
Oleg Pudeyev
820ad818dd Merge PR #844 branch 'dhruvgoel92/ticket/10936' into develop
* dhruvgoel92/ticket/10936:
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
2012-06-19 19:51:39 -04:00
Nils Adermann
419d6cd035 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9551] uncomment line and change length to 255
2012-06-19 20:09:31 +02:00
Nils Adermann
08763ac99e Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-olympus
* github-dhruvgoel92/ticket/9551:
  [ticket/9551] uncomment line and change length to 255
2012-06-19 20:09:23 +02:00
Dhruv Goel
bbd3204a9c [ticket/9551] uncomment line and change length to 255
incase of partial collation change post_subject field will be changed back
to the default collation and length 255.

PHPBB3-9551
2012-06-19 20:03:57 +05:30
Oleg Pudeyev
e7da931d3a Merge PR #571 branch 'unknownbliss/ticket/10640' into develop
* unknownbliss/ticket/10640:
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
2012-06-18 20:55:01 -04:00
Joas Schilling
a259db7105 [ticket/10640] Do not change default value of truncate_string()
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.

PHPBB3-10640
2012-06-17 19:07:17 +01:00
Michael Cullum
53d8464776 [ticket/10640] Change maximum subject length
PHPBB3-10640
2012-06-17 19:07:09 +01:00
Dhruv Goel
96cb75dedb [ticket/10936] remove PCRE and mbstring support check
Since PCRE UTF8 support already has a global check no need for mbstring
or PCRE check here.

PHPBB3-10936
2012-06-13 01:43:32 +05:30
Dhruv Goel
e127ba17ea [ticket/10936] fix language key
Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to
make it more meaningfull.

PHPBB3-10936
2012-06-12 18:40:48 +05:30
Oleg Pudeyev
2a9698a13a [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
PHPBB3-10829
2012-06-11 21:03:12 -04:00
Oleg Pudeyev
699aab8e8e [ticket/10829] $style_name -> $style_path in style class.
Here the style path is taken and the variable name should be $style_path.

PHPBB3-10829
2012-06-11 21:00:22 -04:00
Oleg Pudeyev
436ade19fc Merge PR #839 branch 'p/ticket/10743' into develop
* p/ticket/10743:
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
2012-06-11 20:33:11 -04:00
Oleg Pudeyev
1564da616b Merge PR #787 branch 'cyberalien/ticket/10799' into develop
* cyberalien/ticket/10799:
  [ticket/10799] Removing global variable from includejs
2012-06-11 20:12:59 -04:00
Vjacheslav Trushkin
71ca9b4fe6 [ticket/10743] Renaming user->theme
Renaming user->theme to user->style

PHPBB3-10743
2012-06-11 19:56:50 -04:00
Vjacheslav Trushkin
33b72ec62b [ticket/10743] Changing obtain_cfg_items
Changing obtain_cfg_items to work only with style
because other components no longer exist

PHPBB3-10743
2012-06-11 19:56:49 -04:00
Nils Adermann
5acbf0980d Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' into develop
* github-dhruvgoel92/feature/delete-auto-logins:
  [feature-delete-auto-logins] adds module to database update
  [feature/delete-auto-logins] fixes style
  [feature/delete-auto-logins] improves styling
  [feature/delete-auto-logins] fixes language entry
  [feature/delete-auto-logins] fix language keys and styling
  [feature/delete-auto-logins] explain persistent keys in the ucp.
  [feature/delete-auto-logins] template added for subsilver2
  [feature/delete-auto-logins] improved styling and fixes language
  [feature/delete-auto-logins] using loop for errors
  [feature/delete-auto-logins] fixes css corners
  [feature/delete-auto-logins] Fixes language entries
  [feature/delete-auto-logins] checks form key
  [feature/delete-auto-logins] Fixes language entries and redirection.
  [feature/delete-auto-logins] User can view/delete auto logins.
2012-06-11 23:39:09 +02:00
Andreas Fischer
4468847107 [ticket/10931] Apply strtolower() correctly, i.e. not on false.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Andreas Fischer
cbff02db4f [ticket/10931] Make to_numeric function globally available.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Andreas Fischer
09fb9a9efe [ticket/10931] Make sure get_bytes() always returns either an int or a float.
PHPBB3-10931
2012-06-11 15:15:08 +02:00
Andreas Fischer
e9348b172a [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().
PHPBB3-10931
2012-06-11 15:06:52 +02:00
Andreas Fischer
80dfa53ee3 [ticket/10931] Correctly use GNU GPL version 2.
PHPBB3-10931
2012-06-11 14:24:30 +02:00
Andreas Fischer
7501ea825a [ticket/10931] Document that false is also returned if value is not well formed
PHPBB3-10931
2012-06-11 13:53:17 +02:00
Andreas Fischer
63b2e36492 [ticket/10931] Correct method description of get_string().
PHPBB3-10931
2012-06-11 13:45:39 +02:00
Andreas Fischer
5bea6ed946 [ticket/10931] Let us try ini_get() without error suppression.
PHPBB3-10931
2012-06-11 13:40:14 +02:00
Andreas Fischer
ca974e2f2a [ticket/10931] Add wrapper class for ini_get function.
Provides easier handling of the different interpretations of ini values.

PHPBB3-10931
2012-06-11 13:18:00 +02:00
Andreas Fischer
118c5d90da [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. 2012-05-31 22:07:34 +02:00
Andreas Fischer
2011085c29 [develop-olympus] Bump version numbers for 3.0.11-RC1 release. 2012-05-31 22:07:02 +02:00
Nils Adermann
edefd11087 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:32 +02:00
Nils Adermann
f616c4e7a0 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:19 +02:00
Nils Adermann
b16f3834a3 Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php
2012-05-31 15:46:23 +02:00
Nils Adermann
7eaedcc8de Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
bafaf3700c Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:58 +02:00
Nils Adermann
b10757ef14 Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10611:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:48 +02:00
Nils Adermann
4a5004781a Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
  [ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:30:05 +02:00
Nils Adermann
f6f300d3f9 Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10162:
  [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
  [ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:29:33 +02:00
Nils Adermann
1b73f82430 Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
  [ticket/10751] Add sql_lower_text() to database abstraction layer.

Conflicts:
	phpBB/includes/db/dbal.php
2012-05-31 15:28:08 +02:00
Nils Adermann
b789758f1b Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10751:
  [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
  [ticket/10751] Add sql_lower_text() to database abstraction layer.
2012-05-31 15:27:32 +02:00
Andreas Fischer
9ab5ad2986 [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
PHPBB3-10751
2012-05-31 12:15:46 +02:00