1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

4120 Commits

Author SHA1 Message Date
Josh Woody
ed0a26ab16 [ticket/9510] Unable to copy permissions from and to forums you cannot see
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
2010-05-16 18:19:28 +02:00
Nils Adermann
2a806ddbaf Merge branch 'ticket/nickvergessen/9546' into develop-olympus
* ticket/nickvergessen/9546:
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
2010-05-16 17:47:38 +02:00
Joas Schilling
d8b4c0db0c [ticket/9546] Also delete bookmarks, when a topic is deleted.
PHPBB3-9546
2010-05-16 17:47:05 +02:00
Nils Adermann
a625e4b48a Merge branch 'ticket/nickvergessen/9529' into develop-olympus
* ticket/nickvergessen/9529:
  [ticket/9529] Topic review is not showing all selected posts.
2010-05-16 17:11:47 +02:00
Joas Schilling
a3874c2cd6 [ticket/9529] Topic review is not showing all selected posts.
PHPBB3-9529
2010-05-16 17:09:25 +02:00
Nils Adermann
e477b3acc8 Merge branch 'ticket/nickvergessen/8894' into develop-olympus
* ticket/nickvergessen/8894:
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
2010-05-16 16:49:39 +02:00
Joas Schilling
e3ba934cd7 [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
PHPBB3-8894
2010-05-16 16:49:00 +02:00
Nils Adermann
478708346e Merge branch 'ticket/bantu/9174' into develop-olympus
* ticket/bantu/9174:
  [ticket/9173] No longer limit scope of numbers we store in the config table on
2010-05-14 02:46:56 +02:00
Nils Adermann
fa5845e8c5 Merge branch 'ticket/nickvergessen/7717' into develop-olympus
* ticket/nickvergessen/7717:
  [ticket/7717] Localise default extension groups for attachments
2010-05-14 02:44:19 +02:00
Joas Schilling
58dc5a191c [ticket/7717] Localise default extension groups for attachments
PHPBB3-7717
2010-05-14 02:42:21 +02:00
Nils Adermann
be1c550344 Merge branch 'ticket/bantu/9598' into develop-olympus
* 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.
2010-05-14 02:39:17 +02:00
Andreas Fischer
99482e9555 [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.
PHPBB3-9598
2010-05-14 02:39:04 +02:00
Nils Adermann
39770de921 Merge branch 'ticket/bantu/9536' into develop-olympus
* ticket/bantu/9536:
  [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
2010-05-14 02:33:52 +02:00
Andreas Fischer
032a9f58f9 [ticket/9173] No longer limit scope of numbers we store in the config table on
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
2010-05-14 02:33:31 +02:00
Andreas Fischer
823f2571f5 [ticket/9536] Small improvement for query against user/session tables when 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
2010-05-14 02:31:44 +02:00
Nils Adermann
928fbb0126 Merge branch 'ticket/bantu/9526' into develop-olympus
* 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.
2010-05-14 02:28:59 +02:00
Andreas Fischer
cb642cff11 [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.
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
2010-05-14 02:27:37 +02:00
Nils Adermann
c7e8e7e0bc Merge branch 'ticket/bantu/9518' into develop-olympus
* ticket/bantu/9518:
  [ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced.
2010-05-14 02:23:13 +02:00
Andreas Fischer
970848409d [ticket/9518] Correctly create new connection on PostgreSQL when new 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
2010-05-14 02:22:24 +02:00
Nils Adermann
8196d7d711 Merge branch 'ticket/bantu/9514' into develop-olympus
* ticket/bantu/9514:
  [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
2010-05-14 02:17:45 +02:00
Nils Adermann
528816dcbd Merge branch 'ticket/bantu/9176' into develop-olympus
* ticket/bantu/9176:
  [ticket/9176] Take current board timezone settings into account when setting board date format.
2010-05-14 02:14:48 +02:00
Andreas Fischer
9ce0873bd1 [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
PHPBB3-9514
2010-05-14 02:10:50 +02:00
Nils Adermann
5fb945c220 Merge branch 'feature/bantu/remote_upload-filesize' into develop-olympus
* 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.
2010-05-14 01:19:49 +02:00
Andreas Fischer
e4398ef42e [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.
PHPBB3-9517
2010-05-14 01:19:34 +02:00
Andreas Fischer
d19565756a [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
PHPBB3-9517
2010-05-14 01:19:34 +02:00
Andreas Fischer
3e9d15a25d [ticket/9176] Take current board timezone settings into account when setting board date format.
PHPBB3-9176
2010-05-13 14:25:44 +02:00
Nils Adermann
ad93eaaaf3 Merge branch 'ticket/cs278/9582' into develop-olympus
* 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.
2010-05-03 19:41:04 +02:00
Chris Smith
11d097fc1a [ticket/9582] MSSQL native backups can now be restored.
PHPBB3-9583
PHPBB3-9582
2010-05-03 19:40:45 +02:00
Rob House
a20576fdd4 [ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native.
PHPBB3-9564
PHPBB3-9582
2010-05-03 19:40:33 +02:00
Rob House
5739426136 [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.
PHPBB3-9566
PHPBB3-9582
2010-05-03 19:40:26 +02:00
Rob House
171807213f [ticket/9582] Custom profile fields cannot be created under MSSQL native.
PHPBB3-9565
PHPBB3-9582
2010-05-03 19:38:42 +02:00
Andreas Fischer
abacc2d07d [ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
Since we htmlspecialchars() all input we have to htmlspecialchars_decode() before passing the URL along to getimagesize().

PHPBB3-9170
2010-05-02 23:43:32 +02:00
Nils Adermann
925a135613 Merge branch 'bug/cs278/59465' into develop-olympus
* bug/cs278/59465:
  [bug/59465] Remove start=0 from topic pagination links.
  [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
2010-04-04 15:32:36 +02:00
Nils Adermann
f97d0e0195 Merge branch 'bug/nickvergessen/59135' into develop-olympus
* bug/nickvergessen/59135:
  [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-01 18:55:16 +02:00
Nils Adermann
e35392cb4f Merge branch 'bug/kellanved/59425' into develop-olympus
* bug/kellanved/59425:
  [bug/59425] Correctly check for double inclusion in captcha garbage collection
2010-03-28 15:09:09 +02:00
U-H-PC\H
9be61f9e53 [bug/59425] Correctly check for double inclusion in captcha garbage collection
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!
2010-03-28 14:37:31 +02:00
U-H-PC\H
6cfb4c82dd [bug/58465] The redirect hidden field is now XHTML conform
The result of build_url was falsely un-entitized.
2010-03-28 14:17:42 +02:00
Nils Adermann
4515a45e0c Merge branch 'bug/jellydoughnut/56965' into develop-olympus
* bug/jellydoughnut/56965:
  [bug/56965] Redirect fails with directory traversal
2010-03-26 18:24:47 +01:00
Josh Woody
eca2db4afe [bug/56965] Redirect fails with directory traversal
Correct invalid r10536 with a boolean flag.  Note that this fix for the bug will not actually correct the redirects, it will only prevent phpBB from redirecting outside $phpbb_root_path when redirect()'s third argument is not provided.
2010-03-22 21:16:11 -05:00
Nils Adermann
b3ff3be0dc Merge branch 'bug/cs278/58685' into develop-olympus
* bug/cs278/58685:
  [bug/58685] Correct spelling errors in append_sid() comments.
2010-03-18 22:13:25 +01:00
Nils Adermann
c6870ac3fe Merge branch 'bug/cs278/58025' into develop-olympus
* bug/cs278/58025:
  [bug/58025] Search robots are now redirected if they send a SID in the request

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-03-18 22:10:31 +01:00
Chris Smith
b64686073a [bug/58685] Correct spelling errors in append_sid() comments. 2010-03-18 21:07:19 +00:00
Chris Smith
492063cec6 [bug/59465] Remove start=0 from topic pagination links.
Patch once again by nn-.
2010-03-18 20:28:59 +00:00
mrkurt
c57c1f3fc6 [feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
Host and ports are now represented like this in config:
host1/port1,host2/port2,host3/port3
2010-03-18 17:01:50 +01:00
mrkurt
559313eda6 [feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
You can define multiple memcache servers in your config using this format:

host::port,host::port,host::port

Example:
@define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
2010-03-18 17:01:21 +01:00
Nils Adermann
10f81ee79f Merge branch 'bug/jellydoughnut/58415' into develop-olympus
* bug/jellydoughnut/58415:
  Allow setting parent forums regardless of permission settings. (Bug #58415)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-03-17 18:05:17 +01:00
Josh Woody
144effd74c Allow setting parent forums regardless of permission settings. (Bug #58415) 2010-03-17 10:04:07 -05:00
Joas Schilling
4349bec316 [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)
introduced in r10496 and r10360/r10361
2010-03-13 11:37:06 +01:00
Chris Smith
d07e152ea7 [bug/58025] Search robots are now redirected if they send a SID in the request
Previously search robots could stumble upon a board link somewhere on the web
containing a SID they'd follow it and end up indexing that page with the SID
in the request URI, this fix prevents that by redirecting them to the same URI
just without the SID.
2010-03-13 02:15:39 +00:00
Nils Adermann
23141a2c51 Merge branch 'bug/dpward/58755' into develop-olympus 2010-03-07 21:56:48 +01:00