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

9959 Commits

Author SHA1 Message Date
Igor Wiedler
c0d645c319 Merge branch 'ticket/bantu/7252' into develop
* ticket/bantu/7252:
  [ticket/7252] Align array keys and values to "=>".
  [ticket/7252] Replace magic values with PHP constants.
  [ticket/7252] Replace magic values with PHP constants.
2010-09-12 14:48:09 +02:00
Andreas Fischer
0edcf575a0 [ticket/7252] Align array keys and values to "=>".
PHPBB3-7252
2010-09-12 13:26:17 +02:00
Andreas Fischer
26c31704cc Merge branch 'ticket/evil3/9394' into develop
* ticket/evil3/9394:
  [ticket/9394] Fix comment in functions_upload
2010-09-12 13:00:06 +02:00
Chris Smith
0a50a02b66 [ticket/7252] Replace magic values with PHP constants.
get_supported_image_types() in includes/functions_posting.php contained
the values of PHP constants hardcoded instead of using the constants.

PHPBB3-7252
2010-09-10 21:26:20 +01:00
Chris Smith
818955062a [ticket/7252] Replace magic values with PHP constants.
fileupload::image_types() contained hardcoded references to values of built
in PHP constants, these have been replaced with the constants instead now.

PHPBB3-7252
2010-09-10 21:26:08 +01:00
Igor Wiedler
b89a4cd8d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
2010-09-10 10:31:15 +02:00
Chris Smith
264ef66c5c [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
This change actually applies to any configruation setting that is a pair
of values one representing the maximum and one minimum. This change enforces
that the maximum value cannot be less than the minimum value.

PHPBB3-8935
2010-09-09 23:42:20 +01:00
Igor Wiedler
2baa8c61d1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/git-tools] Change the GNU --lines argument to the POSIX -l
  [task/git-tools] Solve dependency on the GNU wc --max-line-length option
  [ticket/8944] Patch db_tools to support index length for MySQL4
  [ticket/9039] Make mssqlnative.php non-executable
  [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
  [ticket/9800] Update tracker URL in docs/README.html
2010-09-09 00:23:33 +02:00
Chris Smith
1b3b79b694 Merge branch 'ticket/evil3/8944' into develop-olympus
* ticket/evil3/8944:
  [ticket/8944] Patch db_tools to support index length for MySQL4
  [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
2010-09-05 02:41:34 +01:00
Chris Smith
7de1fc40b3 Merge branch 'ticket/evil3/9800' into develop-olympus
* ticket/evil3/9800:
  [ticket/9800] Update tracker URL in docs/README.html
2010-09-05 02:14:46 +01:00
Igor Wiedler
e7b86871f0 [ticket/8944] Patch db_tools to support index length for MySQL4 2010-09-05 03:14:27 +02:00
Igor Wiedler
58bdd91d61 [ticket/9039] Make mssqlnative.php non-executable
PHPBB3-9039
2010-09-03 22:43:29 +02:00
Igor Wiedler
bb191a1d69 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
Fixes following SQL error when updating the database to 3.0.6.

BLOB column 'post_username' used in key specification without a key length

PHPBB3-8944
2010-09-03 22:26:06 +02:00
Igor Wiedler
fdd04eef49 [ticket/9800] Update tracker URL in docs/README.html
PHPBB3-9800
2010-09-02 20:15:33 +02:00
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
Andreas Fischer
ba0072080d Merge branch 'ticket/jellydoughnut/9662' into develop-olympus
* ticket/jellydoughnut/9662:
  [ticket/9662] Search flood interval no longer applies to non-keyword searches
2010-09-02 17:32:15 +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
Nils Adermann
0245ac581e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
2010-08-30 00:20:21 +02:00
Nils Adermann
bb4eb41088 Merge branch 'ticket/bantu/9793' into develop-olympus
* ticket/bantu/9793:
  [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
2010-08-30 00:19:31 +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
dbe8fb6488 Merge branch 'ticket/rxu/9117' into develop-olympus
* ticket/rxu/9117:
  [ticket/9117] Wrong redirection after login.
2010-08-28 23:25:30 +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
rxu
c71236ff4d [ticket/9117] Wrong redirection after login.
Go easy way for now - just place S_LOGIN_REDIRECT before S_HIDDEN_FIELDS so
the last value override the previous one.

PHPBB3-9117
2010-08-28 23:16:00 +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
Andreas Fischer
3afd2c6948 [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
When download/file.php is in avatar mode set_modified_headers() can be called,
which then calls send_status_line() which is not available because
includes/functions.php is not included in avatar mode.

We also load includes/functions.php in the bootstrap now to solve this problem.

Regression from c1a4cb1d01dc19650219566b60671abc767af662.

PHPBB3-9793
PHPBB3-7782
2010-08-27 15:36:26 +02: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
Chris Smith
e4a1f08364 Merge branch 'ticket/nickvergessen/7260' into develop-olympus
* ticket/nickvergessen/7260:
  [ticket/7260] Don't delete poll if one exists and editing user lacks permission
2010-08-22 19:39:46 +01:00
Joas Schilling
aa4519fb44 [ticket/7260] Don't delete poll if one exists and editing user lacks permission
PHPBB3-7260
2010-08-22 19:30:43 +01: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
81db8a8644 Merge branch 'ticket/nickvergessen/9104' into develop-olympus
* ticket/nickvergessen/9104:
  [ticket/9104] Safari does not display box headers correctly in the ACP.
2010-08-21 20:32:45 +02: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
Joas Schilling
6dc00b67c7 [task/restore-subsilver2] Reapply commit 5d9948e
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"

When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables.

PHPBB3-9531
PHPBB3-9783
2010-08-20 23:49:22 +02:00
Joas Schilling
f667407494 [task/restore-subsilver2] Reapply commit df99bdb
[ticket/9678] Flash attachments are not displayed in subsilver2.

PHPBB3-9678
PHPBB3-9783
2010-08-20 23:48:16 +02:00
Joas Schilling
093debdebc [task/restore-subsilver2] Reapply commit fc89d5d
[ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.

PHPBB3-9677
PHPBB3-9783
2010-08-20 23:48:10 +02:00
Andreas Fischer
2315a354d2 [task/restore-subsilver2] Reapply commit ac45f07
[ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures

PHPBB3-9653
PHPBB3-9783
2010-08-20 23:47:06 +02:00
Andreas Fischer
ec002955d5 [task/restore-subsilver2] Reapply commit 6221ba4
[ticket/9665] Allow preview of signature when it is the string "0".

Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates
<!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0".
<!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0".

PHPBB3-9665
PHPBB3-9783
2010-08-20 23:46:32 +02:00
Joas Schilling
e0066ef28e [task/restore-subsilver2] Reapply commit 9e24993
[ticket/9135] Fix report-icon for moderators in PM folders.

There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users.

PHPBB3-9135
PHPBB3-9783
2010-08-20 23:44:23 +02:00
Joas Schilling
04503c69fb [task/restore-subsilver2] Reapply commit b6df5bd
[ticket/8936] Subsilver2 missing reply-to-all feature.

PHPBB3-8936
PHPBB3-9783
2010-08-20 23:44:04 +02:00