aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/notify_status] Define'd constants for notify_statusMark2010-05-163-11/+16
| | | | | | | define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in forums_watch table and topics_watch table PHPBB3-9179
* Merge branch 'ticket/p/7782' into develop-olympusNils Adermann2010-05-161-0/+5
|\ | | | | | | | | * ticket/p/7782: [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
| * [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is ↵Oleg Pudeyev2010-05-161-0/+5
| | | | | | | | | | | | requested. PHPBB3-7782
* | Merge branch 'ticket/bantu/9547' into develop-olympusNils Adermann2010-05-161-2/+3
|\ \ | | | | | | | | | | | | * ticket/bantu/9547: [ticket/9547] Use separate constants for display/enable active topics.
| * | [ticket/9547] Use separate constants for display/enable active topics.Andreas Fischer2010-05-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the forum type. PHPBB3-9547
* | | Merge branch 'ticket/nickvergessen/9548' into develop-olympusNils Adermann2010-05-161-13/+20
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9548: [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
| * | | [ticket/9548] Delete user quicktool drop down should have an empty or ↵Joas Schilling2010-04-181-13/+20
| | |/ | |/| | | | | | | | | | | | | invalid selection as the default PHPBB3-9548
* | | Merge branch 'ticket/aptx/9525' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/aptx/9525: [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
| * | | [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting ↵Marek A. Ruszczyński2010-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with :: :: can replace 1 or more groups (not 2 or more) PHPBB3-9524
* | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | | | Merge branch 'ticket/nickvergessen/9546' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9546: [ticket/9546] Also delete bookmarks, when a topic is deleted.
| * | | | [ticket/9546] Also delete bookmarks, when a topic is deleted.Joas Schilling2010-05-161-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-9546
* | | | Merge branch 'ticket/nickvergessen/9529' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9529: [ticket/9529] Topic review is not showing all selected posts.
| * | | | [ticket/9529] Topic review is not showing all selected posts.Joas Schilling2010-05-161-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9529
* | | | Merge branch 'ticket/nickvergessen/8894' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * ticket/nickvergessen/8894: [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
| * | | [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if ↵Joas Schilling2010-05-161-1/+1
| |/ / | | | | | | | | | | | | | | | BBCodes are not allowed. PHPBB3-8894
* | | Merge branch 'ticket/bantu/9174' into develop-olympusNils Adermann2010-05-141-4/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9174: [ticket/9173] No longer limit scope of numbers we store in the config table on
| * | | [ticket/9173] No longer limit scope of numbers we store in the config table onAndreas Fischer2010-05-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL and Firebird when using set_config_count(). Since we're using a VARCHAR(255) column to store the numbers we have to CAST the varchar string to a type we can do maths on. Using int4 or integer as the type however limits the scope to 4-byte-integer = 32-bit. Using DECIMAL(255, 0) allows the 'full' scope of decimals in varchar(255). PHPBB3-9173
* | | | Merge branch 'ticket/nickvergessen/7717' into develop-olympusNils Adermann2010-05-141-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7717: [ticket/7717] Localise default extension groups for attachments
| * | | | [ticket/7717] Localise default extension groups for attachmentsJoas Schilling2010-05-141-1/+8
| | |/ / | |/| | | | | | | | | | PHPBB3-7717
* | | | Merge branch 'ticket/bantu/9598' into develop-olympusNils Adermann2010-05-141-11/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9598: [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available.
| * | | | [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or ↵Andreas Fischer2010-05-141-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | later. Change if block order to always call checkdnsrr() if the function is available. PHPBB3-9598
* | | | | Merge branch 'ticket/bantu/9536' into develop-olympusNils Adermann2010-05-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9536: [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
| * | | | | [ticket/9536] Small improvement for query against user/session tables when ↵Andreas Fischer2010-05-141-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | managing users from the ACP. There can be multiple entries in the session table for one user_id. We only need and also only fetch one. Using LIMIT 1 should therefore increase performance slightly. This is especially true when editing the anonymous user account because the session table can have many entries for the user_id ANONYMOUS. PHPBB3-9536
* | | | | Merge branch 'ticket/bantu/9526' into develop-olympusNils Adermann2010-05-141-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9526: [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
| * | | | | [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to ↵Andreas Fischer2010-05-141-0/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists. In the UCP this is not necessary, because there is code in $user->setup() that updates the session table on the next page reload. Since we cannot tell if the user generally wants to be hidden or the user only wants to be hidden for one session, we only update the session table when setting the flag to 'hide me', but not 'show me' - equivalent to how it works in the UCP. If the user is a bot we however also update the session when setting the flag to 'show me' because bots cannot login at all. PHPBB3-9526
* | | | | Merge branch 'ticket/bantu/9518' into develop-olympusNils Adermann2010-05-141-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9518: [ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced.
| * | | | | [ticket/9518] Correctly create new connection on PostgreSQL when new ↵Andreas Fischer2010-05-141-1/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection is forced. pg_connect() takes an integer as the second parameter, but we were passing a boolean parameter. The function especially requires passing the PGSQL_CONNECT_FORCE_NEW constant if a new connection is to be forced. Passing 0 as the second parameter for 'do not force a new connection' doesn't work as expected, hence we're calling the function without a second parameter in this case. PHPBB3-9518
* | | | | Merge branch 'ticket/bantu/9514' into develop-olympusNils Adermann2010-05-141-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9514: [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
| * | | | | [ticket/9514] Correctly delete big datasets when deleting a forum including ↵Andreas Fischer2010-05-141-2/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | topics/posts on non-MySQL databases. PHPBB3-9514
* | | | | Merge branch 'ticket/bantu/9176' into develop-olympusNils Adermann2010-05-141-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * ticket/bantu/9176: [ticket/9176] Take current board timezone settings into account when setting board date format.
| * | | | [ticket/9176] Take current board timezone settings into account when setting ↵Andreas Fischer2010-05-131-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | board date format. PHPBB3-9176
* | | | Merge branch 'feature/bantu/remote_upload-filesize' into develop-olympusNils Adermann2010-05-141-1/+24
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * feature/bantu/remote_upload-filesize: [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer. [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
| * | | [feature/remote_upload-filesize] Also check HTTP content-length before ↵Andreas Fischer2010-05-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | actually starting the file transfer. PHPBB3-9517
| * | | [feature/remote_upload-filesize] When transferring files from a remote ↵Andreas Fischer2010-05-141-1/+12
| |/ / | | | | | | | | | | | | | | | webserver, abort the transfer as soon as the allowed filesize has been exceeded. PHPBB3-9517
* | | Merge branch 'ticket/cs278/9582' into develop-olympusNils Adermann2010-05-034-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9582: [ticket/9582] MSSQL native backups can now be restored. [ticket/9582] Advanced search cannot be accessed using MSSQL native. [ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native. [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver. [ticket/9582] Custom profile fields cannot be created under MSSQL native.
| * | | [ticket/9582] MSSQL native backups can now be restored.Chris Smith2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9583 PHPBB3-9582
| * | | [ticket/9582] Removing a report reason leaves reports with an unknown reason ↵Rob House2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | under MSSQL native. PHPBB3-9564 PHPBB3-9582
| * | | [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.Rob House2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9566 PHPBB3-9582
| * | | [ticket/9582] Custom profile fields cannot be created under MSSQL native.Rob House2010-05-031-0/+1
| |/ / | | | | | | | | | | | | PHPBB3-9565 PHPBB3-9582
* | | [ticket/9170] Unable to get image size in img bbcode when URL has multiple ↵Andreas Fischer2010-05-021-1/+1
|/ / | | | | | | | | | | | | | | parameters. Since we htmlspecialchars() all input we have to htmlspecialchars_decode() before passing the URL along to getimagesize(). PHPBB3-9170
* | Merge branch 'bug/cs278/59465' into develop-olympusNils Adermann2010-04-041-1/+1
|\ \ | | | | | | | | | | | | | | | * bug/cs278/59465: [bug/59465] Remove start=0 from topic pagination links. [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
| * | [bug/59465] Remove start=0 from topic pagination links.Chris Smith2010-03-181-1/+1
| | | | | | | | | | | | Patch once again by nn-.
* | | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-012-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/59135: [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) Conflicts: phpBB/docs/CHANGELOG.html
| * | | [bug/59135] Fix open_basedir issues when accessing styles- and ↵Joas Schilling2010-03-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bug/kellanved/59425: [bug/59425] Correctly check for double inclusion in captcha garbage collection
| * | | | [bug/59425] Correctly check for double inclusion in captcha garbage collectionU-H-PC\H2010-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check to avoid the double inclusion of the captcha factory class in the garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory". TerryE pointed the problem out, thanks!
* | | | | [bug/58465] The redirect hidden field is now XHTML conformU-H-PC\H2010-03-281-1/+1
|/ / / / | | | | | | | | | | | | The result of build_url was falsely un-entitized.
* | | | Merge branch 'bug/jellydoughnut/56965' into develop-olympusNils Adermann2010-03-261-42/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bug/jellydoughnut/56965: [bug/56965] Redirect fails with directory traversal