aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/bantu/9766' into developOleg Pudeyev2011-03-012-27/+0
|\ | | | | | | | | * ticket/bantu/9766: [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
| * [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.Andreas Fischer2011-03-012-27/+0
| | | | | | | | | | | | | | Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code() methods. We never call it and it has a bogus body. PHPBB3-9766
* | [ticket/10070] Fixed line endings after ticket/9549.Oleg Pudeyev2011-03-011-550/+550
|/ | | | PHPBB3-10070
* Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-014-0/+460
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [ticket/9549] Only add group to legend/teampage when the checkbox is checked.Joas Schilling2011-02-171-2/+2
| | | | | | | | | | | | The checkbox for the teampage was also missing from the template file. PHPBB3-9549
| * [ticket/9549] New method move() to move a group more than 1 up/down.Joas Schilling2011-02-161-24/+35
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.Joas Schilling2011-02-161-6/+5
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Throw an error when the given field-name is invalid.Joas Schilling2011-02-162-5/+21
| | | | | | | | | | | | Also the code now only appends an adm_back_link, when we are in the ACP. PHPBB3-9549
| * [ticket/9549] Make the class non static and extend delete_group function.Joas Schilling2011-02-163-99/+121
| | | | | | | | | | | | | | delete_group() can now be used, so it does not update the actual group. This can save a query, when you update the group anyway. PHPBB3-9549
| * [ticket/9549] Add the module and files for the ACP.Joas Schilling2011-02-163-0/+192
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Enhance teampage functionality with a new class, group_positions.Joas Schilling2011-02-161-0/+220
| | | | | | | | PHPBB3-9549
* | [feature/request-class] Fix the error message when accessing superglobalIgor Wiedler2011-02-281-1/+1
| | | | | | | | | | | | Adjust the misleading "This error message was generated" text. PHPBB3-9716
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-281-0/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/10024] Populate unread information to template for styling issues.
| * \ Merge branch 'ticket/nickvergessen/10024' into develop-olympusIgor Wiedler2011-02-281-0/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/10024: [ticket/10024] Populate unread information to template for styling issues.
| | * | [ticket/10024] Populate unread information to template for styling issues.Philippe Chevrier2011-02-281-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10024
* | | | Merge branch 'ticket/hanakin/10001' into developIgor Wiedler2011-02-284-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/hanakin/10001: [ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
| * | | | [ticket/10001] Created new Template variable to house class names based on ↵hanakin2011-01-184-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images * Created new Template variable to house class names based on $folder_img value in functions_display.php. * Created new Template variable to house class names based on $folder_img value in mcp_forums.php. * Created new Template variable to house class names based on $folder_img value in ucp_main.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in viewforum.php. * Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Created the new styles within colours.css to handle the displaying of the forum & topic images - NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server PHPBB3-10001
* | | | | [ticket/8641] Added/removed several commas for consistency in acp_board.php.mtrs2011-02-261-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-8641
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-261-6/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
| * | | | [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.Andreas Fischer2011-02-251-6/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This also moves the code up to the point where we know that the user is a bot. Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314 PHPBB3-9912
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-246-54/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9874] view_log() performs unneeded count query over all log entries. [ticket/7834] Topic time didn't update when first post was deleted [ticket/9997] Fixed an inconsistency in the Moderator Control Panel [ticket/9872] Removed some useless code that broke delete_posts
| * | | Merge branch 'ticket/callumacrae/7834' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/callumacrae/7834: [ticket/7834] Topic time didn't update when first post was deleted
| | * | | [ticket/7834] Topic time didn't update when first post was deletedCallum Macrae2011-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the first post of a topic was deleted, the topic time didn't update - it should have changed to the time of the next post. This commit simply applies lefty74's patch posted in the ticket. It gets the post time of the next post from the database, and updates the thread accordingly. This patch is not my work at all and all credits go to lefty74, I just transferred it onto GitHub PHPBB3-7834
| * | | | Merge branch 'ticket/callumacrae/9872' into develop-olympusOleg Pudeyev2011-02-241-38/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/callumacrae/9872: [ticket/9872] Removed some useless code that broke delete_posts
| | * | | | [ticket/9872] Removed some useless code that broke delete_postsCallum Macrae2011-02-241-38/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in the ACP, there is the option to delete a user and all their posts. This would then call the user_delete function and define $mode as 'remove'. On lines 485-521 was some code that would delete their topics, then after that there would be a call to delete_posts - which would also delete their topics. It would not update the board statistics, and the thread count would remain the same, even though several had been deleted. It stopped delete_topics functioning correctly, so delete_topics would not update the board statistics either. My solution to this is to delete lines 485-521 and allow delete_posts to call delete_topics, thus updating the thread count in the statistics. PHPBB3-9872
| * | | | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-254-14/+18
| |/ / / | | | | | | | | | | | | PHPBB3-9874
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-241-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10056] Corrected a typo in Firebird name. [ticket/10041] Use send_status_line more in download/file.php Conflicts: phpBB/download/file.php
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-232-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [ticket/7778] BBCode single limitErik Frèrejean2011-02-232-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-211-42/+216
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | * develop-olympus: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| * | Merge branch 'ticket/nickvergessen/9675' into develop-olympusOleg Pudeyev2011-02-211-42/+216
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9675: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| | * | [ticket/9675] Correctly check whether the style/component is still in use.Joas Schilling2011-02-081-28/+64
| | | | | | | | | | | | | | | | | | | | | | | | And don't allow to delete it in that case. PHPBB3-9675
| | * | [ticket/9675] Put the code into methods to avoid code duplication.Joas Schilling2011-02-081-118/+154
| | | | | | | | | | | | | | | | PHPBB3-9675
| | * | [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-081-1/+103
| | | | | | | | | | | | | | | | PHPBB3-9675
* | | | [ticket/10045] Update version in some more files.Joas Schilling2011-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...) PHPBB3-10045
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-131-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/8904] Show default value for numeric custom profile fields when editing
| * | | [ticket/8904] Show default value for numeric custom profile fields when editingNiklas Schmidtmer2011-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying the default value for a numeric custom profile field, only use request_var to obtain the value on creation. When editing, it will always override the actual value with an empty string, as this is request_var's default return value. PHPBB3-8904
* | | | [feature/system-cron] Added documentation for cron manager constructor.Oleg Pudeyev2011-02-121-1/+15
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Remove an unecessary assignment and an unecessary commentNils Adermann2011-02-121-3/+1
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] preg_match returns int so cast to bool, fix commentNils Adermann2011-02-122-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Rename lock() to acquire and unlock() to release.Nils Adermann2011-02-121-5/+5
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Cache cron's task names.Nils Adermann2011-02-121-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a path relative to phpbb_root_path the path to the task directory is directly passed to the cron manager. Dummy tasks are now in the tests directory directly. PHPBB3-9596
* | | | [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.Nils Adermann2011-02-121-18/+11
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Add array type hints if appropriate and remove globals.Nils Adermann2011-02-121-11/+22
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Make use of the new config class in locks.Nils Adermann2011-02-121-32/+12
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Abstract the database locking mechanism out of cron.Nils Adermann2011-02-122-104/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a number of tests for the locking mechanism which can now lock arbitrary config variables. PHPBB3-9596
* | | | [feature/system-cron] Added @param/@return documentationOleg Pudeyev2011-02-1214-11/+98
| | | | | | | | | | | | | | | | | | | | | | | | Also adjusted some function descriptions for greater informativity. PHPBB3-9596
* | | | [feature/system-cron] Add phpDoc documentation for everything else.Andreas Fischer2011-02-1212-1/+80
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Cast result in cron_manager::is_valid_name() to bool.Andreas Fischer2011-02-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [feature/system-cron] Add phpDoc documentation for phpbb_cron_manager class.Andreas Fischer2011-02-121-6/+38
| | | | | | | | | | | | | | | | PHPBB3-9596
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 04:39:20 +0000