aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'ticket/nickvergessen/9684' into developOleg Pudeyev2011-04-1111-572/+125
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9684: [ticket/9684] Also display forum-name in subsilver2 template [ticket/9684] Move currently existing GAs to a selectable forum while updating. [ticket/9684] View origin-forumname for GAs in topic-list [ticket/9684] Fix Forum/Topic-Tracking for global announcements [ticket/9684] Fix a SQL-Error in the posting.php [ticket/9684] Remove code in some more files especially includes/ [ticket/9684] Remove code for global announcement in root-files
| * | | | | | | | | | [ticket/9684] Fix Forum/Topic-Tracking for global announcementsJoas Schilling2011-04-073-69/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be ready for intensive testing now. PHPBB3-9684
| * | | | | | | | | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-0710-347/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
| * | | | | | | | | | [ticket/9684] Remove code for global announcement in root-filesJoas Schilling2011-04-071-156/+13
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9684
* | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-6/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban(). [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| * | | | | | | | Merge branch 'ticket/bantu/10128' into develop-olympusOleg Pudeyev2011-04-101-6/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10128: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
| | * | | | | | | | [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().Andreas Fischer2011-04-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user_ban() function is shared by the MCP and the ACP. Mark trigger_error() calls as errors by passing E_USER_WARNING to make the error message appear on red background (instead of green background) in the ACP. PHPBB3-10128
* | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-10/+35
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| * | | | | | | | | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-101-10/+35
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/9581: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| | * | | | | | | | [ticket/9581] Fix missing indexErik Frèrejean2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `u.user_lang` to the select statement to prevent "undefined index" errors. PHPBB3-9581
| | * | | | | | | | [ticket/9581] Slightly tweaked queriesErik Frèrejean2011-03-041-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the queries based upon comments by Oleg and Nick, this should return the expected result in every case. PHPBB3-9581
| | * | | | | | | | [ticket/9581] Make banlist table select optionalErik Frèrejean2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per Nick, only set the `BANLIST_TABLE` in the select statement if the `$sql_ban_where` variable is set. PHPBB3-9581
| | * | | | | | | | [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-041-8/+12
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the suggestion made by Adam in the ticket, this will add an additional checkbox to the mass e-mail page. By checking this the mass e-mail shall also be send to banned users. By default banned users however are excluded from the mass e-mail. PHPBB3-9581
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-081-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | * develop-olympus: [ticket/10084] Add smilie/icon errors out when file is missing
| * | | | | | | [ticket/10084] Add smilie/icon errors out when file is missingJoas Schilling2011-04-071-0/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-10084
* | | | | | | 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