aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.Oleg Pudeyev2011-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in PHPBB3-7834. PHPBB3-9622
| * | | | | | | | | Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '441755bf170e49799e311c71b2123ff263970d62': [ticket/9874] view_log() performs unneeded count query over all log entries.
| * | | | | | | | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-081-27/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622
| * | | | | | | | | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in PHPBB3-9872. PHPBB3-9622
| * | | | | | | | | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_delete now uses fewer queries to delete a set of users of size > 1 by accepting an array of users rather than a single user at a time. This required changing the third parameter, however the function retains its former behavior with the old-style parameters. PHPBB3-9622
* | | | | | | | | | | Merge remote-tracking branch 'p/ticket/11159' into developAndreas Fischer2012-11-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11159: [ticket/11159] Static public is the currently approved order.
| * | | | | | | | | | [ticket/11159] Static public is the currently approved order.Oleg Pudeyev2012-11-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11159
* | | | | | | | | | | [ticket/11154] Do not try to load any extensions when installing.Oleg Pudeyev2012-11-071-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Might be the right fix, might be not. Works for me. PHPBB3-11154
* | | | | | | | | | | Merge PR #722 branch 'Senky/ticket/9918' into developOleg Pudeyev2012-11-062-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/9918: [ticket/9918] default values in request_var changed to one string [ticket/9918] $redirect variable used from now
| * | | | | | | | | | [ticket/9918] default values in request_var changed to one stringSenky2012-04-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per marc1706's note, all request_var functions now have only one string in default value PHPBB3-9918
| * | | | | | | | | | [ticket/9918] $redirect variable used from nowSenky2012-04-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to comment marc1706 added to tracker http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120 I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed. PHPBB3-9918
* | | | | | | | | | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-062-5/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| * | | | | | | | | | [ticket/10845] Remove censor from textBruno Ais2012-05-022-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove the censor, I added a new parameter to generate_text_for_display(), that new parameter is used to tell if the text should be censored or not. Defaults to true. PHPBB3-10845
| * | | | | | | | | | [ticket/10845] Now it shows the preview post parsedBruno Ais2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, the preview post in the report details now shows with the BBCode parsed. Note: Tested with all BBCodes I have including one personalised to write the <s> BBCode. PHPBB3-10845
* | | | | | | | | | | [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.Oleg Pudeyev2012-11-021-64/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | | | | | | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-023-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | | | | | | [ticket/10933] Expanded prose documentation for phpbb_extension_provider.Oleg Pudeyev2012-11-021-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | | | | | | [ticket/10933] Useful documentation for template locate functionOleg Pudeyev2012-11-021-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | | | | | | [ticket/10933] Typo fixesOleg Pudeyev2012-11-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | | | | | | [ticket/10933] Initialize template context when template is constructed.Oleg Pudeyev2012-11-022-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no apparent reason for either initializing or clearing the context in set_style/set_custom_style. Initially the initialization there was added in 0501640d5db158a010741e27803191ab469834c4, for reasons that presently I do not see. This permits making context property back private. PHPBB3-10933
* | | | | | | | | | | [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is called statically from mcp_ban. PHPBB3-11099
* | | | | | | | | | | Merge remote-tracking branch 'p/ticket/11157' into developAndreas Fischer2012-10-306-15/+16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11157: [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method.
| * | | | | | | | | | | [ticket/11157] static public is the currently approved order.Oleg Pudeyev2012-10-295-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11157
| * | | | | | | | | | | [ticket/11157] Fix remaining captcha spam.Oleg Pudeyev2012-10-295-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11157
| * | | | | | | | | | | [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is specific to a particular captcha factory implementation, instantiate a captcha factory to invoke it. PHPBB3-11157
* | | | | | | | | | | | Merge remote-tracking branch 'p/ticket/11159-develop' into developAndreas Fischer2012-10-305-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11159-develop: [ticket/11159] static public is the currently approved order.
| * | | | | | | | | | | | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-10-295-5/+5
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11159
* | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. Conflicts: phpBB/install/database_update.php phpBB/ucp.php
| * | | | | | | | | | [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11158
* | | | | | | | | | | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-2217-34/+71
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11018: [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination [ticket/11014] Fix text for previous/next links in Subsilver2 [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 [ticket/11018] Always display previous/next links if we can display one [ticket/11014] Restore template vars for next/previous links [ticket/11018] Swap prev/next links on pagination to the old order [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same [ticket/11018] Fix minor issues with CSS in prosilver [ticket/11018] Attempt to fix li.pagination alignment issue
| * | | | | | | | | | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-1717-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11023
| * | | | | | | | | | | [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were dropped while the function was refactored: If the block_var_name is a nested block, we will use the last (most inner) block as a prefix for the template variables. If the last block name is pagination, the prefix is empty. If the rest of the block_var_name is not empty, we will modify the last row of that block and add our pagination items. PHPBB3-11014
| * | | | | | | | | | | [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old pagination Prev was left of the pagination and Next right of the pagination. While moving these blocks, I also removed the whitespaces, which were introduced. PHPBB3-11023 PHPBB3-11018
* | | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-182-23/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8796: [ticket/8796] Prevent setting post_time greater than time() in markread [ticket/8796] Fix a few issues with the previous commits [ticket/8796] Mark read links updated to include time() in url [ticket/8796] Revert changes to $user->data['lastmark'] [ticket/8796] Make function markread obey the $post_time argument
| * | | | | | | | | | | | [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8796
| * | | | | | | | | | | | [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an SQL error and the redirect url generated PHPBB3-8796
| * | | | | | | | | | | | [ticket/8796] Mark read links updated to include time() in urlNathaniel Guse2012-09-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submitting the current time() allows us to mark only the topics and forums read up until a certain time (when the user loaded the page). This means that any new posts or topics posted between when the user opened the page and clicked the link are still shown as unread. PHPBB3-8796
| * | | | | | | | | | | | [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier change might change the way some things work (after looking at viewtopic) and I'd rather not risk introducing new bugs, so I'm going to revert those changes to be safe. PHPBB3-8796
| * | | | | | | | | | | | [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also do a little cleanup of the markread function PHPBB3-8796
* | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-181-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly. Conflicts: phpBB/includes/functions.php
| * | | | | | | | | | | | Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-181-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10848: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly.
| | * | | | | | | | | | | | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | * | | | | | | | | | | | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10848
* | | | | | | | | | | | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| * | | | | | | | | | | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | * | | | | | | | | | | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10568
* | | | | | | | | | | | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| * | | | | | | | | | | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| | * | | | | | | | | | | | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8743
* | | | | | | | | | | | | | Merge PR #917 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | * develop-olympus: [ticket/10967] adding $root_path to posting_get_topic_icons