aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/attachment-management-no-reassignment] Fix minor flaws in the code.rxu2011-04-101-5/+4
| | | | | | Thanks to Oleg for inspection. PHPBB3-9721
* [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-102-0/+155
| | | | | | This feature allows to manage attachments in posts and PMs via ACP. PHPBB3-9721
* Merge branch 'develop-olympus' into developAndreas Fischer2011-04-051-1/+1
|\ | | | | | | | | | | * develop-olympus: [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
| * [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-031-1/+1
| | | | | | | | PHPBB3-10121
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-011-14/+12
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. [ticket/9751] Compare $password with empty string instead of casting it to bool [ticket/9751] Use a switch/case block without break for password complexity. [ticket/9751] Password requirement "Must contain letters and numbers" fails
| * Merge branch 'ticket/bantu/9751' into develop-olympusAndreas Fischer2011-04-011-14/+12
| |\ | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9751: [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. [ticket/9751] Compare $password with empty string instead of casting it to bool [ticket/9751] Use a switch/case block without break for password complexity. [ticket/9751] Password requirement "Must contain letters and numbers" fails
| | * [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.Andreas Fischer2011-04-011-4/+2
| | | | | | | | | | | | | | | | | | | | | Add shortcut logic for pass_complex because this is the default value phpBB ships with and there is nothing to do in that function in that case. PHPBB3-9751
| | * [ticket/9751] Compare $password with empty string instead of casting it to boolAndreas Fischer2011-04-011-1/+1
| | | | | | | | | | | | PHPBB3-9751
| | * [ticket/9751] Use a switch/case block without break for password complexity.Andreas Fischer2011-04-011-11/+13
| | | | | | | | | | | | PHPBB3-9751
| | * [ticket/9751] Password requirement "Must contain letters and numbers" failsrxu2011-04-011-4/+2
| | | | | | | | | | | | PHPBB3-9751
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-312-28/+28
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| * | Merge remote branch 'callumacrae/ticket/10112' into develop-olympusIgor Wiedler2011-03-312-28/+28
| |\ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/10112: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| | * | [ticket/10112] Replaced a couple occurrences of count() with sizeof()Callum Macrae2011-03-302-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | As per the coding guidlines, sizeof() should be used instead of count(). PHPBB3-10112
| * | | Merge branch 'ticket/haklop/10110' into develop-olympusIgor Wiedler2011-03-311-0/+155
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/haklop/10110: [ticket/10110] Remove tab from empty lines [ticket/10110] Enable the serialization and add a constant for defined the database [ticket/10110] Update comments with a link to the phpredis extension [ticket/10110] Add Redis ACM backend
| | * | [ticket/10110] Remove tab from empty linesEric2011-03-311-6/+6
| | | | | | | | | | | | | | | | PHPBB3-10110
| | * | [ticket/10110] Enable the serialization and add a constant forEric2011-03-311-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | defined the database PHPBB3-10110
| | * | [ticket/10110] Update comments with a link to the phpredis extensionEric2011-03-311-2/+5
| | | | | | | | | | | | | | | | PHPBB3-10110
| | * | [ticket/10110] Add Redis ACM backendEric2011-03-311-0/+142
| | | | | | | | | | | | | | | | PHPBB3-10110
* | | | [feature/redis] Add Redis cache driver using phpredis extensionEric2011-03-301-0/+150
| | | | | | | | | | | | | | | | PHPBB3-10110
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-241-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9946] Allow storage of data >4kB on Oracle again
| * | | Merge branch 'ticket/jellydoughnut/9946' into develop-olympusAndreas Fischer2011-03-241-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | * ticket/jellydoughnut/9946: [ticket/9946] Allow storage of data >4kB on Oracle again
| | * | [ticket/9946] Allow storage of data >4kB on Oracle againJosh Woody2011-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the fix to PHPBB3-9132, which introduced a fatal error on Oracle. PHPBB3-9946
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-231-0/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10033] "Disallow usernames" does not check already disallowed names.
| * | | [ticket/10033] "Disallow usernames" does not check already disallowed names.Joas Schilling2011-03-231-0/+12
| | | | | | | | | | | | | | | | PHPBB3-10033
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10101] Add test case for native phpass hashes [ticket/10101] Add support for native phpass hashes
| * | | Merge branch 'ticket/igorw/10101' into develop-olympusOleg Pudeyev2011-03-221-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/10101: [ticket/10101] Add test case for native phpass hashes [ticket/10101] Add support for native phpass hashes
| | * | | [ticket/10101] Add support for native phpass hashesIgor Wiedler2011-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpass (the hashing library we use) adds a hash identifier to every hash. By default this identifier is '$P$'. For some reason we have changed it to '$H$'. This patch allows both of them to be used for authentication, so that a third party system could create users with '$P$' hashes. PHPBB3-10101
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
| * | | | [ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().Andreas Fischer2011-03-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update $config['rand_seed_last_update'] before updating $config['rand_seed'] in unique_id() to mitigate a race condition and unnecessary updates on heavily busy boards. PHPBB3-10100
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-153-3/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9685] Buffer posts for search indexing when using mssqlnative.
| * | | Merge branch 'ticket/naderman/9685' into develop-olympusAndreas Fischer2011-03-153-3/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/naderman/9685: [ticket/9685] Buffer posts for search indexing when using mssqlnative.
| | * | | [ticket/9685] Buffer posts for search indexing when using mssqlnative.Nils Adermann2011-03-153-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To have a generic solution there is now a sql_buffer_nested_transaction() which indicates that the given SQL driver requires buffering to run a transaction while iterating over another result set. PHPBB3-9685
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10096] Fixed whitespace in functions.php. [ticket/10078] Avoid \n in strings given to echo for portability. [ticket/10092] Ignore overlength comment lines in commit-msg hook.
| * | | | [ticket/10096] Fixed whitespace in functions.php.Oleg Pudeyev2011-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10096
* | | | | Merge branch 'ticket/bantu/10046-develop' into developIgor Wiedler2011-03-123-52/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10046-develop: [ticket/10046] Remove register_shutdown_function() in cron.php from develop.
| * | | | | [ticket/10046] Remove register_shutdown_function() in cron.php from develop.Andreas Fischer2011-03-123-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10046
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-121-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10046] Do not link bots to cron.php. [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron. [ticket/10046] Call flush() in cron.php [ticket/10046] Remove calls to register_shutdown_function() in cron.php Conflicts: phpBB/cron.php phpBB/includes/functions.php
| * | | | [ticket/10046] Do not link bots to cron.php.Oleg Pudeyev2011-03-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bots, generally speaking, will not request cron.php immediately, thus telling them to request it is pointless. PHPBB3-10046
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-113-3/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9970] Rename validate_language() to validate_language_iso_name(). [ticket/9970] Do not allow switching to languages not installed on reg. page. [ticket/9970] Check whether language pack is installed. [ticket/9970] User language input is checked for existance
| * | | Merge branch 'ticket/bantu/9970' into develop-olympusOleg Pudeyev2011-03-113-3/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9970: [ticket/9970] Rename validate_language() to validate_language_iso_name(). [ticket/9970] Do not allow switching to languages not installed on reg. page. [ticket/9970] Check whether language pack is installed. [ticket/9970] User language input is checked for existance
| | * | | [ticket/9970] Rename validate_language() to validate_language_iso_name().Andreas Fischer2011-03-073-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9970
| | * | | [ticket/9970] Do not allow switching to languages not installed on reg. page.Andreas Fischer2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9970
| | * | | [ticket/9970] Check whether language pack is installed.Andreas Fischer2011-03-071-19/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-9970
| | * | | [ticket/9970] User language input is checked for existanceJosh Woody2011-03-073-2/+32
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Users could select a language which did not exist in the database by altering form fields because there was no back-end verification. PHPBB3-9970
| * | | Merge branch 'ticket/p/10016' into develop-olympusAndreas Fischer2011-03-111-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10016: [ticket/10016] Add comment for text casting (for PostgreSQL 7.x) [ticket/10016] Leave Firebird unchanged. [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.
| | * | | [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)Andreas Fischer2011-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10016
| | * | | [ticket/10016] Leave Firebird unchanged.Andreas Fischer2011-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10016
| | * | | [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.Oleg Pudeyev2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10016
* | | | | 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.