aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-104-5/+143
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10057] Fixes for a bunch of small problems. [ticket/10035] ACP template edit feature allows to read any files on webserver. [ticket/10057] Handle the case of missing interbase extension better. [ticket/10057] Fixed wrong usage of sql_error again, in firebird. [ticket/10057] Fixed usage of sql_error again. [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL. [ticket/10057] Fixed wrong usage of sql_error in postgres dbal. [ticket/10057] Skip ibase_service_attach if firebird connection failed. [ticket/10057] Check for interbase function existence. [ticket/10057] Split statements in firebird dbal for readability. [ticket/10057] Include error collector class file in postgres dbal. [ticket/10057] Moved error collector class into its own file. [ticket/10057] Use a class for error collection. [ticket/10057] More informative error messages in postgres dbal. [ticket/10057] No negative array indexing. [ticket/10057] Report postgres db connection errors.
| * Merge branch 'ticket/rxu/10035' into develop-olympusOleg Pudeyev2011-03-101-1/+1
| |\ | | | | | | | | | | | | * ticket/rxu/10035: [ticket/10035] ACP template edit feature allows to read any files on webserver.
| | * [ticket/10035] ACP template edit feature allows to read any files on webserver.rxu2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | ... and to upload/execute any script on it. Use preg_replace to filter filename PHPBB3-10035
| * | [ticket/10057] Fixes for a bunch of small problems.Oleg Pudeyev2011-03-083-2/+18
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Handle the case of missing interbase extension better.Oleg Pudeyev2011-03-071-1/+17
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Fixed wrong usage of sql_error again, in firebird.Oleg Pudeyev2011-03-071-2/+5
| | | | | | | | | | | | | | | | | | This necessitates adding connect_error property to firebird. PHPBB3-10057
| * | [ticket/10057] Fixed usage of sql_error again.Oleg Pudeyev2011-03-071-2/+4
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.Oleg Pudeyev2011-03-071-1/+1
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.Oleg Pudeyev2011-03-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | pg_last_error does not work if no connection was ever established. Therefore we must keep track of connection errors in postgres dbal ourselves. PHPBB3-10057
| * | [ticket/10057] Skip ibase_service_attach if firebird connection failed.Oleg Pudeyev2011-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | ibase_errmsg works for the most recent call. If the connection fails, any error message is clobbered by ibase_service_attach call. PHPBB3-10057
| * | [ticket/10057] Check for interbase function existence.Oleg Pudeyev2011-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Calling nonexistent functions with @ destroys the script with no feedback as to the cause of the error. Check whether interbase functions exist before calling them. PHPBB3-10057
| * | [ticket/10057] Split statements in firebird dbal for readability.Oleg Pudeyev2011-03-061-2/+16
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Include error collector class file in postgres dbal.Oleg Pudeyev2011-03-061-0/+5
| | | | | | | | | | | | | | | | | | This change is in its own commit because it will be reverted for 3.1. PHPBB3-10057
| * | [ticket/10057] Moved error collector class into its own file.Oleg Pudeyev2011-03-062-44/+45
| | | | | | | | | | | | | | | | | | | | | | | | This will make it autoloadable in 3.1. This commit breaks 3.0 since no code includes the error collector. Such include code will be in its own commit since it will need to be reverted in 3.1. PHPBB3-10057
| * | [ticket/10057] Use a class for error collection.Oleg Pudeyev2011-03-062-36/+38
| | | | | | | | | | | | | | | | | | | | | Replaced error collection functions with a class for a cleaner implementation. PHPBB3-10057
| * | [ticket/10057] More informative error messages in postgres dbal.Oleg Pudeyev2011-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | When pg_connect/pg_pconnect do not exist, mention that they come with pgsql extension. PHPBB3-10057
| * | [ticket/10057] No negative array indexing.Oleg Pudeyev2011-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHP manual does not say that negative array indices are allowed, so it's best to assume they are not guaranteed to work the way one would expect. PHPBB3-10057
| * | [ticket/10057] Report postgres db connection errors.Oleg Pudeyev2011-03-062-1/+58
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses two issues: 1. When pgsql extension is missing, @pg_connect would silently abort execution. Check for pg_connect existence before calling it, same with pg_pconnect. 2. When connection fails, the error reported by php is discarded. User is shown the failure message without the reason for failure, making debugging difficult. Collect the error (if any) via a temporarily installed error handler, and display it if connection failed. PHPBB3-10057
* | Merge branch 'ticket/igorw/9669' into developAndreas Fischer2011-03-071-30/+87
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9669: [ticket/9669] Replace spaces with tabs [ticket/9669] Switch if/else to make the if positive [ticket/9669] Make sure normalize_nfc returns string [ticket/9669] Add isNormalized checks for performance [ticket/9669] Add native Normalizer support
| * | [ticket/9669] Replace spaces with tabsIgor Wiedler2011-03-071-1/+1
| | | | | | | | | | | | PHPBB3-9669
| * | [ticket/9669] Switch if/else to make the if positiveIgor Wiedler2011-03-061-33/+33
| | | | | | | | | | | | PHPBB3-9669
| * | [ticket/9669] Make sure normalize_nfc returns stringIgor Wiedler2011-03-051-3/+3
| | | | | | | | | | | | | | | | | | Normalizer::normalize can return null, cast to a string. PHPBB3-9669
| * | [ticket/9669] Add isNormalized checks for performanceIgor Wiedler2011-03-051-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since isNormalized is less expensive than normalize[1] and normalization will be applied repeatedly in most cases[2], it's more efficient to check for isNormalized. [1] http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32718&p=208005#p208005 [2] phpBB 3.0 has a call to utf8_normalize_nfc wrapped around any multibyte request_var call. PHPBB3-9669
| * | [ticket/9669] Add native Normalizer supportIgor Wiedler2011-03-051-30/+75
| | | | | | | | | | | | | | | | | | | | | PHP 5.3 includes the previous pecl extension "intl" which has a native UTF-8 normalizer. PHPBB3-9669
* | | [ticket/10080] Allow resetting the request instance used by request_var.Nils Adermann2011-03-071-2/+16
|/ / | | | | | | PHPBB3-10080
* | 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