aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10965] Make sure all profile fields are always grabbed on viewtopicNils Adermann2012-07-231-0/+8
| | | | PHPBB3-10965
* [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-232-13/+24
| | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into ↵Nils Adermann2012-07-211-83/+122
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * github-nickvergessen/ticket/10950: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| * [ticket/10950] Fix grammar in commentsJoas Schilling2012-07-201-3/+3
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-201-32/+44
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each userJoas Schilling2012-07-161-5/+18
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Use database count() and group by instead of doing that in phpJoas Schilling2012-07-111-11/+5
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Check $delete_ids to be not emptyJoas Schilling2012-07-041-19/+22
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()Joas Schilling2012-07-041-58/+74
| | | | | | | | | | | | | | | | | | | | | | - Get delete_ids, pms of the user as receipt - Get undelivered_msg, pms of the user as sender - Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links - Correct the _new and _unread user values for the receipts - Delete delete_ids, if there are no links to them anymore - Reset _new and _unread values for the user we delete PHPBB3-10950
| * [ticket/10950] Correct comment for the second query.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | Only undelivered messages are handled. PHPBB3-10950
| * [ticket/10950] Add empty line to make unset() call more visible.Andreas Fischer2012-06-231-0/+1
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Select the correct columns in SQL queries.Andreas Fischer2012-06-231-2/+2
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Use a variable for the private message id.Andreas Fischer2012-06-231-6/+8
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Move array initialisation to the front.Andreas Fischer2012-06-231-1/+2
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Remove redundant if statement.Andreas Fischer2012-06-231-12/+9
| | | | | | | | | | | | We already know author_id and folder_id. PHPBB3-10950
| * [ticket/10950] Fix SQL coding style (indentation) in second SQL query.Andreas Fischer2012-06-231-1/+1
| | | | | | | | PHPBB3-10950
| * [ticket/10950] Use proper ' in order to fix comment.Andreas Fischer2012-06-231-1/+1
| | | | | | | | PHPBB3-10950
* | Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11Oleg Pudeyev2012-07-072-5/+52
|\ \ | |/ |/| | | | | | | * bantu/ticket/10937: [ticket/10937] Update documentation to say which comment styles are removed. [ticket/10937] Comment removal functions: Restore backward compatibility
| * [ticket/10937] Update documentation to say which comment styles are removed.Andreas Fischer2012-07-031-1/+1
| | | | | | | | PHPBB3-10937
| * [ticket/10937] Comment removal functions: Restore backward compatibilityAndreas Fischer2012-07-032-5/+52
| | | | | | | | PHPBB3-10937
* | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-2/+15
|/ | | | PHPBB3-10935
* [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-311-1/+1
|
* Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympusNils Adermann2012-05-311-6/+0
|\ | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
| * [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of $user->data['user_id'] is (almost) guranteed to be integer since session::session_create() casts it to integer. The type of $row['user_id'] is only an integer if the DB driver adjusts the PHP type according to the DB type. This is only done by some of our not-so-popular DB drivers and is not the case for MySQL. As such this comparison is (almost) never true and a PM is also sent to the author itself when it is sent to a group the author is also a member of. Since this behaviour seems to have been accepted by the communty, the dead code is removed and current behaviour is kept. Also, checking this in the loop seems to be a rather bad idea. Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68. PHPBB3-10790
* | Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympusNils Adermann2012-05-311-1/+5
|\ \ | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10550: [ticket/10550] Sort not installed styles list in the styles section of the ACP.
| * | [ticket/10550] Sort not installed styles list in the styles section of the ACP.Andreas Fischer2012-05-291-1/+5
| | | | | | | | | | | | PHPBB3-10550
* | | Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympusNils Adermann2012-05-311-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | [ticket/10611] Filter out not existing database tables when making a backup.Andreas Fischer2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using $this->db_tools->sql_list_tables() as the first argument gives us table names as array keys as a by-product which might be useful at some point. PHPBB3-10611
| * | | [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().Andreas Fischer2012-05-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_tables() was deprecated by phpbb_db_tools::sql_list_tables() This prevents unnecessarily loading functions_install.php PHPBB3-10611
| * | | [ticket/10611] Generate db_tools instance in acp_database module.Andreas Fischer2012-05-301-0/+7
| | | | | | | | | | | | | | | | PHPBB3-10611
* | | | Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympusNils Adermann2012-05-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | [ticket/10162] Increase maximum length of email address TLD from 6 to 63.Andreas Fischer2012-05-301-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Increase maximum length of email address top level domains from 6 to 63. PHPBB3-10162
* | | | Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympusNils Adermann2012-05-315-1/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.Andreas Fischer2012-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10751
| * | | | [ticket/10751] Add sql_lower_text() to database abstraction layer.Andreas Fischer2012-05-314-0/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char). So, in order to use it on a text column, we have to convert it to an appropriate type. We do so using the SUBSTRING function. PHPBB3-10751
* | | | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-311-4/+29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * naderman/ticket/10908: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * | | [ticket/10908] Download files only up to max_upload_filesize if limit is 0Nils Adermann2012-05-291-4/+29
| |/ / | | | | | | | | | PHPBB3-10908
* | | Merge branch 'naderman/ticket/10913' into develop-olympusDavid King2012-05-291-2/+9
|\ \ \
| * | | [ticket/10913] Redirect to index if session id is required but was not sentNils Adermann2012-05-291-2/+9
| |/ / | | | | | | | | | PHPBB3-10913
* | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympusNils Adermann2012-05-291-0/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| * | [ticket/10308] makes variable booleanDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | makes user_row['user_has_posts'] boolean instead of 1 or 0. PHPBB3-10308
| * | [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | instead of fetching all posts by user we limit the query to 1 to check if a user has posts or not PHPBB3-10308
| * | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-101-0/+8
| | | | | | | | | | | | | | | | | | | | | language modified to be clear and select box disappears in case no posts by user. user's total posts are fetched using a new query. PHPBB3-10308
* | | Merge PR #813 branch 'bantu/ticket/10401' into develop-olympusOleg Pudeyev2012-05-211-1/+5
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/10401: [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
| * | | [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().Andreas Fischer2012-05-221-1/+5
| | |/ | |/| | | | | | | | | | | | | ldap_login() is supposed to return an array. PHPBB3-10401
* | | Merge PR #812 branch 'bantu/ticket/10565' into develop-olympusOleg Pudeyev2012-05-211-4/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10565: [ticket/10565] Add line breaks to query in order to follow coding guidelines. [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
| * | | [ticket/10565] Add line breaks to query in order to follow coding guidelines.Andreas Fischer2012-05-221-3/+7
| | | | | | | | | | | | | | | | PHPBB3-10565
| * | | [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clauseAndreas Fischer2012-05-221-2/+1
| |/ / | | | | | | | | | PHPBB3-10565
* | | [ticket/10898] Do not write ?> into config.php to avoid whitespace output.Andreas Fischer2012-05-181-2/+0
|/ / | | | | | | PHPBB3-10898
* | Merge branch 'ticket/10605' into develop-olympusAndreas Fischer2012-05-142-54/+164
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10605: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user Conflicts: phpBB/install/database_update.php