aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/rxu/10115' into develop-olympusOleg Pudeyev2011-04-171-13/+13
|\ | | | | | | | | | | * ticket/rxu/10115: [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
| * [ticket/10115] Switch UTF-8 mode on for the rest of BBCodesrxu2011-04-031-6/+6
| | | | | | | | PHPBB3-10115
| * [ticket/10115] Make some text oriented BBCodes to properly handle unicode.rxu2011-04-021-7/+7
| | | | | | | | | | | | [quote], [b], [i], [size], [color], [u], [list] are affected. PHPBB3-10115
* | 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 'ticket/bantu/10123' into develop-olympusOleg Pudeyev2011-04-101-3/+3
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/10123: [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| * | | [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.Andreas Fischer2011-04-081-3/+3
| |/ / | | | | | | | | | PHPBB3-10123
* | | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-103-12/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * 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-043-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/10084] Add smilie/icon errors out when file is missingJoas Schilling2011-04-072-1/+6
| | | | | | | | | | | | PHPBB3-10084
* | | [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.phpJoas Schilling2011-04-031-1/+1
| | | | | | | | | | | | PHPBB3-10121
* | | [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-033-3/+3
| |/ |/| | | | | PHPBB3-10121
* | 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 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-312-0/+160
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | * 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-312-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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-312-0/+146
| | | | | | | | | | | | | | | | PHPBB3-10110
* | | | 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 'ticket/igorw/10107' into develop-olympusOleg Pudeyev2011-03-231-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/10107: [ticket/10107] Add cache to the enumeration, make statement more generic [ticket/10107] Make it clear that provided httpd samples are not perfect [ticket/10107] Add a webserver section to docs/INSTALL.html
| * | | | [ticket/10107] Add cache to the enumeration, make statement more genericIgor Wiedler2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10107
| * | | | [ticket/10107] Make it clear that provided httpd samples are not perfectIgor Wiedler2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10107
| * | | | [ticket/10107] Add a webserver section to docs/INSTALL.htmlIgor Wiedler2011-03-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain what to do with lighttpd and nginx after installing phpBB on one of those webservers. PHPBB3-10107
* | | | | [ticket/10033] "Disallow usernames" does not check already disallowed names.Joas Schilling2011-03-232-2/+14
|/ / / / | | | | | | | | | | | | PHPBB3-10033
* | | | 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 remote branch 'bantu/ticket/10021' into develop-olympusIgor Wiedler2011-03-201-2/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10021: [ticket/10021] Add comment explaining why we can check -1 as an error value. [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
| * | | | | [ticket/10021] Add comment explaining why we can check -1 as an error value.Andreas Fischer2011-03-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10021
| * | | | | [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.Andreas Fischer2011-03-071-2/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This prevents SQL errors when large dates are entered. PHPBB3-10021
* | | | | [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.Andreas Fischer2011-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no member.S_PENDING_SET variable. This fixes an XHTML error when managing groups with both approved and pending users from the UCP. PHPBB3-10102
* | | | | [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 '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
* | | | | [ticket/10096] Fixed whitespace in functions.php.Oleg Pudeyev2011-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10096
* | | | | Merge branch 'ticket/bantu/8802' into develop-olympusOleg Pudeyev2011-03-122-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/8802: [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums. [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
| * | | | | [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.Andreas Fischer2011-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8802
| * | | | | [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.Andreas Fischer2011-03-102-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking "Mark forums read" when not browsing on the index page only marks all subforums (and sub-sub forums etc.) read, topics in the current forum have to marked seperately by clicking the "Mark topics read" link. Let's indicate this circumstance by using the word "subforums". PHPBB3-8802
* | | | | | Merge branch 'ticket/erikfrerejean/9948' into develop-olympusOleg Pudeyev2011-03-122-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/9948: [ticket/9948] Inline quicktime files won't show
| * | | | | | [ticket/9948] Inline quicktime files won't showErik Frèrejean2010-12-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attaching a quicktime file and placing it inline the movie won't be shown due to the size the movie box is being given. PHPBB3-9948
* | | | | | | [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