aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'ticket/bantu/9702' into develop-olympusJosh Woody2010-08-191-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9702: [ticket/9702] Take user's timezone settings into account when banning Until ->
| * | | | | | [ticket/9702] Take user's timezone settings into account when banning Until ->Andreas Fischer2010-07-231-1/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-9702
* | | | | | Merge branch 'ticket/bantu/9599' into develop-olympusJosh Woody2010-08-191-17/+152
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9599: [ticket/9599] Reimplement phpbb_checkdnsrr() function. [ticket/9599] Adding tests for phpbb_checkdnsrr(). [ticket/9599] Adding network function tests.
| * | | | | | [ticket/9599] Reimplement phpbb_checkdnsrr() function.Andreas Fischer2010-08-031-17/+152
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gethostbyname(), checkdnsrr(), dns_get_record() or nslookup via exec(). PHPBB3-9599
* | | | | | Merge branch 'ticket/bantu/9534' into develop-olympusJosh Woody2010-08-191-9/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9534: [ticket/9534] Update function documentation for user_ipwhois(). [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
| * | | | | | [ticket/9534] Update function documentation for user_ipwhois().Andreas Fischer2010-07-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9534
| * | | | | | [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().Andreas Fischer2010-07-111-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whois.arin.net does currently not refer to other servers (using ReferralServer) when queried for an IPv6 address. whois.sixxs.net however works in this case. This also adds '.' to the hostname to make sure we're querying the dns root. PHPBB3-9534
* | | | | | | Merge branch 'ticket/bantu/9167' into develop-olympusJosh Woody2010-08-192-35/+50
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9167: [ticket/9167] Detect and remove any dead left over shadow topics on update. [ticket/9167] Remove shadow topics from remaining forums when deleting a forum Conflicts: phpBB/install/database_update.php
| * | | | | | [ticket/9167] Remove shadow topics from remaining forums when deleting a forumAndreas Fischer2010-06-112-35/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including posts. The function delete_topic_shadows() had to be reimplemented. It was there but it was completly broken and hasn't been used at all. PHPBB3-9167
* | | | | | | Merge branch 'ticket/bantu/9612' into develop-olympusJosh Woody2010-08-193-5/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9612: [ticket/9612] Introduce new function gen_rand_string_friendly().
| * | | | | | | [ticket/9612] Introduce new function gen_rand_string_friendly().Andreas Fischer2010-05-173-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new function gen_rand_string_friendly() for user friendly random strings like passwords and captcha codes. Strings generated by gen_rand_string_friendly() will not contain the characters 0 and O. By adding a new function we can increase the entropy of strings generated by gen_rand_string() by putting 0 and O back in. PHPBB3-9612
* | | | | | | | Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-194-14/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | * ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
| * | | | | | [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-174-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9611
* | | | | | | Merge branch 'ticket/cs278/9771' into develop-olympusAndreas Fischer2010-08-101-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9771: [ticket/9771] Remove query string parameters that have no name.
| * | | | | | | [ticket/9771] Remove query string parameters that have no name.Chris Smith2010-08-081-0/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-9771
* | | | | | | Merge branch 'ticket/cs278/9760' into develop-olympusAndreas Fischer2010-08-101-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9760: [ticket/9760] Remove unrestricted wildcards from search terms.
| * | | | | | | [ticket/9760] Remove unrestricted wildcards from search terms.Chris Smith2010-08-081-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wildcards without any further result restrictions will cause phpBB to search for everything, potentially allowing a DoS attack against the DB server by any user who can use the search system. PHPBB3-9760
* | | | | | | | Merge branch 'ticket/rxu/6747' into develop-olympusAndreas Fischer2010-08-101-1/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/6747: [ticket/9747] Improve word censor.
| * | | | | | | [ticket/9747] Improve word censor.rxu2010-07-251-1/+8
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better handling of the asterisk inside censor pattern like 'bad*word' etc. PHPBB3-9747
* | | | | | | Merge branch 'ticket/jellydoughnut/9757' into develop-olympusAndreas Fischer2010-07-311-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9757: [ticket/9757] Fix empty template variable {HISTORY_TITLE}
| * | | | | | | [ticket/9757] Fix empty template variable {HISTORY_TITLE}Josh Woody2010-07-291-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {HISTORY_TITLE} was always being set to the empty string. It is now filled with the title of the currently displayed message. It is not showed in prosilver or subsilver2 for aesthetic reasons (title is already prominent) PHPBB3-9757
* | | | | | | Merge branch 'ticket/kellanved/9521' into develop-olympusAndreas Fischer2010-07-311-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/kellanved/9521: [ticket/9521] Fix error reporting for the native SQL Server plugin.
| * | | | | | | [ticket/9521] Fix error reporting for the native SQL Server plugin.Henry Sudhof2010-07-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native SQL Server plugin used to return an error string when calling sql_error. However, some error condition checks are done using is_array. This patch wraps the error into an array to follow the error logic used elsewhere. PHPBB3-9521
* | | | | | | | Merge branch 'ticket/jellydoughnut/9679' into develop-olympusAndreas Fischer2010-07-311-8/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9679: [ticket/9679] phpBB offers to notify poster even if notification is disabled
| * | | | | | | | [ticket/9679] phpBB offers to notify poster even if notification is disabledJosh Woody2010-07-291-8/+11
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "notify user" check box would not do anything if checked in this case, but it was still presented. The checkbox is now only shown if there are notification options enabled. PHPBB3-9679
* | | | | | | | Merge branch 'ticket/jellydoughnut/9749' into develop-olympusAndreas Fischer2010-07-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9749: [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
| * | | | | | | | [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in queryJosh Woody2010-07-291-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fulltext_mysql class had different behavior when a dash was entered in the search query than the fulltext_native class. Specifically, a dash was automatically turned into boolean NOT even when the user wanted to search for legitimate hyphenated words like farty-pants PHPBB3-9749
* | | | | | | | Merge branch 'ticket/jellydoughnut/9559' into develop-olympusAndreas Fischer2010-07-311-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9559: [ticket/9559] Do not override queue package size in the case of an overflow
| * | | | | | | [ticket/9559] Do not override queue package size in the case of an overflowJosh Woody2010-07-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts r8025 to includes/functions_messenger.php. That code caused problems on hosters with email limits less than package_size*2.5. And it isn't desirable in general to over-ride the admin's configuration options. PHPBB3-9559
* | | | | | | | Merge branch 'ticket/kellanved/9504' into develop-olympusAndreas Fischer2010-07-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/kellanved/9504: [ticket/9504] Allow whitespaces in gallery avatars
| * | | | | | | | [ticket/9504] Allow whitespaces in gallery avatarsHenry Sudhof2010-07-151-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gallery avatars are discovered on the server filesystem; to allow linking to the images, the filenames are urlencoded before being written to the database. However, getimagesize needs the decoded filename as input. PHPBB3-9504
* | | | | | | | [ticket/9658] Optimize topic splitting.rxu2010-07-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split topics takes too long in some cases because of wrong variables or arrays values types adjustment. Cast values representing topic and forum ids as int. PHPBB3-9658
* | | | | | | | Merge branch 'ticket/nickvergessen/7720' into develop-olympusAndreas Fischer2010-07-146-9/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7720: [ticket/7720] Fix alternative image-description for unread posts.
| * | | | | | | [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-146-9/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* | | | | | | [ticket/9715] Better email regexCullen Walsh2010-07-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using email regex created by James Watts and Francisco Jose Martin Moreno. This passes many more tests for RFC valid emails. PHPBB3-9715
* | | | | | | Merge branch 'ticket/jellydoughnut/9637' into develop-olympusAndreas Fischer2010-07-119-24/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9637: [ticket/9637] Do not cache SQL server version in all cases
| * | | | | | | [ticket/9637] Do not cache SQL server version in all casesJosh Woody2010-07-119-24/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the existing cache is global, there is no way to differentiate between each of two databases which may be two different DBAL objects pointing to servers with wildly different versions of an RDBMS. phpBB only has this situation in the UCF, thus only one file changed outside the DBAL. I have added a second optional parameter, $use_cache to each of the implementations of dbal::sql_server_info() PHPBB3-9637
* | | | | | | | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-111-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style.php takes a session ID to ensure it gets the right language for a user, but that session ID is always passed in GET. This allows change allows the SID to be read from the cookie, and theoretically makes it friendlier for caching engines like Varnish. PHPBB3-9629
* | | | | | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-102-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9650: [ticket/9650] Do not allow banning the anonymous user by username
| * | | | | | | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-082-3/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Banning anonymous can result in bad things, like not being able to log in. However, it was possible until now. PHPBB3-9650
* | | | | | | Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| * | | | | | | [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-061-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9570
* | | | | | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| * | | | | | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | | | | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | | | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-281-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-9578
* | | | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-081-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| * | | | | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-011-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* | | | | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
| * | | | | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9697