1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 02:59:29 +02:00

4327 Commits

Author SHA1 Message Date
Igor Wiedler
09ef1dc170 [ticket/9394] Fix comment in functions_upload
PHPBB3-9394
2010-09-02 17:46:50 +02:00
Andreas Fischer
ea4d204cf6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9662] Search flood interval no longer applies to non-keyword searches
  [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
2010-09-02 17:35:44 +02:00
Chris Smith
ebb4a50d9b Merge branch 'ticket/bantu/9615' into develop-olympus
* ticket/bantu/9615:
  [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
2010-08-30 14:55:50 +01:00
Andreas Fischer
5625df34a5 [ticket/9792] Move function definitions out of download/file.php
Move functions defined in download/file.php out to
includes/functions_download.php so they can be properly reused and unit tested.

PHPBB3-9792
2010-08-30 00:28:15 +02:00
Andreas Fischer
f9764c684f [ticket/9613] Slightly update language strings.
PHPBB3-9613
2010-08-29 16:50:57 +02:00
rxu
f1d5005797 [ticket/9613] Implement a load switch for unread posts search feature.
Since unread posts search can produce a high server load in certain
circumstances, we implement a switch for ACP "Load settings" to have an option
to disable this type of search.

PHPBB3-9613
2010-08-29 16:09:09 +02:00
Andreas Fischer
e4ff780c13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9117] Wrong redirection after login.
  [ticket/9772] Unify permissions for sending email when board_email_form is off
  [ticket/7369] CPF date should always render the users selection.
  [ticket/7296] Exporting styles to tar creates corrupted archives.
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:34:18 +02:00
Andreas Fischer
098ff47602 Merge branch 'ticket/cs278/7369' into develop-olympus
* ticket/cs278/7369:
  [ticket/7369] CPF date should always render the users selection.
2010-08-28 23:25:21 +02:00
Andreas Fischer
250c04c8d5 Merge branch 'ticket/nickvergessen/7296' into develop-olympus
* ticket/nickvergessen/7296:
  [ticket/7296] Exporting styles to tar creates corrupted archives.
2010-08-28 23:25:14 +02:00
Andreas Fischer
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:25:05 +02:00
Andreas Fischer
3c02a1cff7 Merge branch 'ticket/jellydoughnut/9772' into develop-olympus
* ticket/jellydoughnut/9772:
  [ticket/9772] Unify permissions for sending email when board_email_form is off
2010-08-28 23:24:55 +02:00
Josh Woody
2a59e6d486 [ticket/9772] Unify permissions for sending email when board_email_form is off
Sending email via memberlist.php was limited to users having u_sendemail. When
board_email_form is disabled, no such requirement was enforced.  This is now
changed.

PHPBB3-9772
2010-08-28 15:49:47 -05:00
Chris Smith
50c6af0216 [ticket/7369] CPF date should always render the users selection.
CPF render code was incorrectly adding the users timezone offset instead
of removing it to compensate for the addition made in user::format_date().

PHPBB3-7369
2010-08-23 06:24:13 +01:00
Andreas Fischer
c4a65a4697 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7260] Don't delete poll if one exists and editing user lacks permission
  [ticket/9646] Honor CSS comments in @import statements
2010-08-22 21:54:08 +02:00
Andreas Fischer
cd46b39967 Merge branch 'ticket/jellydoughnut/9646' into develop-olympus
* ticket/jellydoughnut/9646:
  [ticket/9646] Honor CSS comments in @import statements
2010-08-22 21:50:17 +02:00
Andreas Fischer
dfa53bfe9a Merge branch 'ticket/p/6855' into develop
* ticket/p/6855:
  [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
2010-08-22 17:48:44 +02:00
Joas Schilling
3cbcff56b2 [ticket/7296] Exporting styles to tar creates corrupted archives.
Add the folders to the archive before putting the files inside, seems to break
the tar-archives.

PHPBB3-7296
2010-08-22 11:16:19 -04:00
Nils Adermann
2e787fa836 Merge branch 'develop-olympus' into develop
* develop-olympus: (57 commits)
  Revert "[ticket/7716] Data too long for column 'message_subject'"
  [ticket/7716] Data too long for column 'message_subject'
  [ticket/9780] Adding unit tests for gen_rand_string().
  [ticket/9780] Add length check back to gen_rand_string().
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
  [ticket/9782] Board disable radio set on when server load high
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
  [ticket/9104] Safari does not display box headers correctly in the ACP.
  [ticket/9777] Print error message in pre-commit hook when php is not installed.
  [ticket/7716] Data too long for column 'message_subject'
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
  [ticket/9771] Remove query string parameters that have no name.
  [ticket/9760] Remove unrestricted wildcards from search terms.
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  ...

Conflicts:
	tests/template/template.php
2010-08-21 23:35:43 +02:00
Andreas Fischer
9731f2492f Merge branch 'ticket/nickvergessen/7716' into develop-olympus
* ticket/nickvergessen/7716:
  [ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:27:07 +02:00
Andreas Fischer
32bffe1a32 Revert "[ticket/7716] Data too long for column 'message_subject'"
This reverts commit 91a60aa878e703ff9af714e0316828216d3dcfa3.
2010-08-21 21:25:34 +02:00
Andreas Fischer
7474b69175 Merge branch 'ticket/nickvergessen/7716' into develop-olympus
* ticket/nickvergessen/7716:
  [ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:19:12 +02:00
Joas Schilling
2455a744e6 [ticket/7716] Data too long for column 'message_subject'
PHPBB3-7716
2010-08-21 15:14:16 -04:00
Andreas Fischer
4222510e9c Merge branch 'ticket/cs278/7332' into develop-olympus
* ticket/cs278/7332:
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
2010-08-21 20:30:33 +02:00
Josh Woody
c3a5fd30ee [ticket/9646] Honor CSS comments in @import statements
Add a basic CSS comment parser that allows comments to prevent loading an
@import statement. For simplicity, only whitespace is allowed between /* and
the @import. Also adjust regex to not parse improper quotation marks.

PHPBB3-9646
PHPBB3-8169
2010-08-20 16:02:58 -05:00
Andreas Fischer
bcf4f4fbdf Merge branch 'ticket/cs278/7972' into develop-olympus
* ticket/cs278/7972:
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
2010-08-20 22:25:20 +02:00
Andreas Fischer
34c3732856 Merge branch 'ticket/nickvergessen/9635' into develop-olympus
* ticket/nickvergessen/9635:
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
2010-08-20 22:15:15 +02:00
Andreas Fischer
31144ed4c5 Merge branch 'ticket/nickvergessen/9782' into develop-olympus
* ticket/nickvergessen/9782:
  [ticket/9782] Board disable radio set on when server load high
2010-08-20 22:11:04 +02:00
Andreas Fischer
df111373a6 Merge branch 'feature/naderman/auto-loading' into develop
* feature/naderman/auto-loading:
  [feature/auto-loading] Only check subdir if there is another name part.
2010-08-20 22:05:05 +02:00
Joas Schilling
d533121741 [ticket/9780] Add length check back to gen_rand_string().
PHPBB3-9780
2010-08-20 20:11:36 +02:00
Chris Smith
b73d45ffc8 [ticket/7972] Copying topics in the MCP now indexes the new topic.
PHPBB3-7972
2010-08-20 13:59:21 -04:00
Joas Schilling
932b35ab7a [ticket/9782] Board disable radio set on when server load high
PHPBB3-9782
2010-08-20 13:41:06 -04:00
Joas Schilling
cc9a1952d9 [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
PHPBB3-9635
2010-08-19 23:48:25 -04:00
Nils Adermann
f870434222 [feature/auto-loading] Only check subdir if there is another name part.
PHPBB3-9682
2010-08-19 22:06:19 +02:00
Joas Schilling
5e330044b8 [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
In the ACM-Modules we need to check whether the function is loaded, before we
use it, as this is not the case from download/file.php in avatar-mode.

PHPBB3-9519
2010-08-19 12:30:24 -04:00
Josh Woody
3eb01d50cb Merge branch 'ticket/bantu/9702' into develop-olympus
* ticket/bantu/9702:
  [ticket/9702] Take user's timezone settings into account when banning Until ->
2010-08-19 10:56:34 -05:00
Josh Woody
f0aaecd6cc Merge branch 'ticket/bantu/9599' into develop-olympus
* ticket/bantu/9599:
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  [ticket/9599] Adding tests for phpbb_checkdnsrr().
  [ticket/9599] Adding network function tests.
2010-08-19 10:53:10 -05:00
Josh Woody
6343e67fab Merge branch 'ticket/bantu/9534' into develop-olympus
* ticket/bantu/9534:
  [ticket/9534] Update function documentation for user_ipwhois().
  [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
2010-08-19 10:48:41 -05:00
Josh Woody
68744484c8 Merge branch 'ticket/bantu/9167' into develop-olympus
* 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
2010-08-19 10:09:32 -05:00
Joas Schilling
91a60aa878 [ticket/7716] Data too long for column 'message_subject'
PHPBB3-7716
2010-08-19 11:00:42 -04:00
Josh Woody
25c579c00d Merge branch 'ticket/bantu/9612' into develop-olympus
* ticket/bantu/9612:
  [ticket/9612] Introduce new function gen_rand_string_friendly().
2010-08-19 09:11:36 -05:00
Josh Woody
46d2d97a37 Merge branch 'ticket/bantu/9611' into develop-olympus
* ticket/bantu/9611:
  [ticket/9611] Make length of activation keys variable between 6 and 10.
2010-08-19 09:03:45 -05:00
Joas Schilling
89b35f7ab9 [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
PHPBB3-9519
2010-08-13 17:10:35 +02:00
Joas Schilling
884cc2ac9b [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
includes/functions_convert.php and install/install_convert.php tested by Dicky.

PHPBB3-9519
2010-08-13 16:40:56 +02:00
Joas Schilling
4c95ed0eeb [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.

PHPBB3-9519
2010-08-10 16:11:39 +02:00
Andreas Fischer
64e6faa877 Merge branch 'ticket/cs278/9771' into develop-olympus
* ticket/cs278/9771:
  [ticket/9771] Remove query string parameters that have no name.
2010-08-10 16:05:45 +02:00
Andreas Fischer
d66aadc33f Merge branch 'ticket/cs278/9760' into develop-olympus
* ticket/cs278/9760:
  [ticket/9760] Remove unrestricted wildcards from search terms.
2010-08-10 16:04:49 +02:00
Andreas Fischer
19d9d12339 Merge branch 'ticket/rxu/6747' into develop-olympus
* ticket/rxu/6747:
  [ticket/9747] Improve word censor.
2010-08-10 16:00:28 +02:00
Chris Smith
b7a1add009 [ticket/7332] Redirect users back to post details when performing actions.
Moderators are redirected to the index page of the MCP after locking a post,
a better location would be to direct them back to the post details.

PHPBB3-7332
2010-08-08 22:54:21 +01:00
Chris Smith
013f0b62b8 [ticket/9771] Remove query string parameters that have no name.
PHPBB3-9771
2010-08-08 16:14:05 +01:00
Chris Smith
76348ce43f [ticket/9760] Remove unrestricted wildcards from search terms.
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
2010-08-08 14:02:34 +01:00