aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
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
| * | Merge branch 'ticket/p/10057' into develop-olympusAndreas Fischer2011-03-093-4/+142
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10057: [ticket/10057] Fixes for a bunch of small problems. [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.
| | * | [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 'develop-olympus' into developAndreas Fischer2011-03-071-8/+25
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/10079] Add gallery avatars to .gitignore. [ticket/10069] Improvements to sample nginx configuration.
| * | [ticket/10069] Improvements to sample nginx configuration.Oleg Pudeyev2011-03-061-8/+25
| |/ | | | | | | | | | | | | | | Most of these were contributed by burningbunny: https://github.com/burningbunny PHPBB3-10069
* | 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 'develop-olympus' into developOleg Pudeyev2011-03-061-11/+12
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
| * | Merge branch 'ticket/bantu/10075' into develop-olympusOleg Pudeyev2011-03-061-11/+12
| |\ \ | | | | | | | | | | | | | | | | * ticket/bantu/10075: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
| | * | [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.Andreas Fischer2011-03-041-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove: - A_Jelly_Doughnut - dhn - TerraFrost Add: - nn- Move: - Brainy Rename: - Brainy -> ckwalsh PHPBB3-10075
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-062-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9824] Accept commit messages with less than perfect headings. [ticket/9824] Allow empty lines after ticket reference. [ticket/9824] Use printf instead of echo to render \n. [ticket/9824] Handle empty commit messages in commit-msg hook. [ticket/10059] Fix two misspellings of consistent. [ticket/9824] Add space after [ticket/12345] in prepared commit message. [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
| * | Merge branch 'ticket/p/10059' into develop-olympusAndreas Fischer2011-03-062-2/+2
| |\ \ | | |/ | |/| | | | | | | * ticket/p/10059: [ticket/10059] Fix two misspellings of consistent.
| | * [ticket/10059] Fix two misspellings of consistent.Oleg Pudeyev2011-03-012-2/+2
| | | | | | | | | | | | PHPBB3-10059
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-021-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
| * | Merge branch 'ticket/nickvergessen/9911' into develop-olympusOleg Pudeyev2011-03-021-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9911: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
| | * | [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.Joas Schilling2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works. PHPBB3-9911
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9915] "Length of ban:" is not displayed in ACP
| * | | Merge branch 'ticket/nickvergessen/9915' into develop-olympusOleg Pudeyev2011-03-021-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9915: [ticket/9915] "Length of ban:" is not displayed in ACP
| | * | | [ticket/9915] "Length of ban:" is not displayed in ACPJoas Schilling2011-03-011-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we need to go back to "value", which we had before. PHPBB3-9915
* | | | Merge branch 'develop-olympus' into developJoas Schilling2011-03-031-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10072] Added the POST_NUMBER template var
| * | | [ticket/10072] Added the POST_NUMBER template varSam Thompson2011-03-021-0/+1
| | |/ | |/| | | | | | | PHPBB3-10072
* | | 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-012-708/+708
|/ / / | | | | | | | | | PHPBB3-10070
* | | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-0123-237/+908
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Display users in their primary group instead of their first groupJoas Schilling2011-02-252-1/+6
| | | | | | | | | | | | | | | | PHPBB3-9549
| * | | [ticket/9549] Change default value of "sort legend by group name" to false.Joas Schilling2011-02-242-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9549
| * | | [ticket/9549] Fix displaying empty groupsJoas Schilling2011-02-241-15/+20
| | | | | | | | | | | | | | | | PHPBB3-9549
| * | | [ticket/9549] Fix language strings.Joas Schilling2011-02-181-4/+4
| | | | | | | | | | | | | | | | PHPBB3-9549