1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 14:46:28 +02:00
Commit Graph

8831 Commits

Author SHA1 Message Date
ff56f0dcfe [ticket/11148] Remove unneeded variable mimetype and use type octet-stream
The variable $mimetype is not used in the method local_upload() afterwards
so it shouldn't be assigned. The correct default mimetype should be
application/octet-stream and not application/octetstream according to RFC 2046.

PHPBB3-11148
2014-06-23 21:39:24 +02:00
4eb7485b39 [ticket/11148] Always use the output of the mimetype guesser in get_mimetype
PHPBB3-11148
2014-06-23 21:39:24 +02:00
a402d619b4 [ticket/11148] Get rid of extra line in mimetype guesser setter doc block
PHPBB3-11148
2014-06-23 21:39:24 +02:00
ea5bc9c833 [ticket/11148] Add missing parts to docblock of get_mimetype() method
PHPBB3-11148
2014-06-23 21:39:24 +02:00
de404002c7 [ticket/11148] Default to application/octet-stream if no mimetype given
This should prevent us from having an empty mimetype while uploading a file
using local_upload().

PHPBB3-11148
2014-06-23 21:39:24 +02:00
94a81fa01d [ticket/11148] Pass mimetype guesser to upload_attachment() function
PHPBB3-11148
2014-06-23 21:37:47 +02:00
9bc6e641bf [ticket/11148] Add mimetype guesser to filespec and fileupload class
The mimetype guesser will be used to get the mimetype of uploaded files.
Until now, this was only used for files uploaded with plupload. If a file
doesn't have a mimetype supplied, we will now try to get the correct mimetype.

PHPBB3-11148
2014-06-23 21:37:47 +02:00
c740772d93 Merge pull request from lucifer4o/ticket/12690
[ticket/12690] Add core.submit_pm_after event

* lucifer4o/ticket/12690:
  [ticket/12690] Find a space
  [ticket/12690] Remove $msg_id and chmod
  [ticket/12690] Add other info to core.submit_pm_after
  [ticket/12690] Add core.submit_pm_after event
2014-06-23 19:46:50 +02:00
dfbe072d51 Merge pull request from Crizz0/ticket/12563
[ticket/12563] Changes 2 style specific language variables for better understanding
2014-06-23 22:04:20 +05:30
1f9e1fd177 Merge remote-tracking branch 'github-nickvergessen/ticket/12612-ascraeus' into develop-ascraeus
* github-nickvergessen/ticket/12612-ascraeus:
  [ticket/12612] Move functions from mcp.php to functions_mcp.php
  [ticket/12612] Move function from ucp.php to functions_user.php
  [ticket/12612] Move functions from memberlist.php to functions_display.php
  [ticket/12612] Move functions from posting.php to functions_posting.php
2014-06-23 11:19:15 -04:00
ec69a22899 [ticket/12761] Remove the execute bit from functions_user.php
PHPBB3-12761
2014-06-23 17:13:03 +03:00
4f2acbaed2 Merge pull request from nickvergessen/ticket/12747
[ticket/12747] Drop support for Firebird

* nickvergessen/ticket/12747:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird

Conflicts:
	phpBB/phpbb/db/driver/firebird.php
2014-06-22 23:41:14 +02:00
de04304e94 Merge pull request from rxu/ticket/12704
[ticket/12704] Improve the load time information in the footer when enabled

* rxu/ticket/12704:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:09:21 +02:00
bb8be29fd5 Merge pull request from lucifer4o/ticket/12691
[ticket/12691] Add core.delete_pm to funtion delete_pm

* lucifer4o/ticket/12691:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
2014-06-22 22:59:37 +02:00
1e97502d90 Merge pull request from lucifer4o/ticket/12701
[Ticket/12701] Add events to user_add function

* lucifer4o/ticket/12701:
  [ticket/12701] Add change
  [ticket/12701] Rmove before event and expand modify_data
  [ticket/12701] Add events to user_add function
2014-06-22 22:57:40 +02:00
2ee8b738e5 [ticket/12690] Find a space
Lost a spce there ... found it ...

PHPBB3-12690
2014-06-22 23:22:15 +03:00
c4e48ed0b9 [ticket/12563] Adds « and » to the links in acp_styles.php
PHPBB3-12563
2014-06-22 22:02:46 +02:00
152d5fc263 [ticket/12701] Add change
Change back to since
Add change

PHPBB3-12701
2014-06-22 22:07:04 +03:00
165c5f8f15 [ticket/12701] Rmove before event and expand modify_data
Removing core.user_add_before
Adding $user_row and $cp_data to core.user_add_modify_data

PHPBB3-12701
2014-06-22 22:07:04 +03:00
dd075e4bbc [ticket/12701] Add events to user_add function
Add two new events to user_add function
in ./includes/functions_user.php.

core.user_add_before - allow modification of
submitted to function data.
Returns:
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array

core.user_add_after - return user_id, user_row and
cp_data after user registration
Returns:
@var int $user_id - user_id of the new user
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array

Justification:
Allow extensions to parse data before and after
creation of the user.

PHPBB3-12701
2014-06-22 22:07:04 +03:00
992fb8e452 [ticket/12691] Comment change
Change a bit the core event comment

PHPBB3-12691
2014-06-22 22:03:01 +03:00
e8dd7904e9 [ticket/12691] Change event to core.delete_pm_before
Just a requested change by nickvergessen

PHPBB3-12691
2014-06-22 22:03:00 +03:00
cd31aea4be [ticket/12691] Add core.delete_pm to funtion delete_pm
Add core.delete_pm to funtion delete_pm.
Event will return:
int $user_id - ID of the user requested the message delete
array $msg_ids - array of all messages to be deleted
int $folder_id - ID of the user folder where the messages are stored
Justification:
Allow extensions to capture this event
and act as intended by ext author

PHPBB3-12691
2014-06-22 22:03:00 +03:00
85b37a5f4d [ticket/12690] Remove $msg_id and chmod
Remove inneded $msg_id
Chmod file to 644

PHPBB3-12690
2014-06-22 21:54:51 +03:00
9c6f74daff [ticket/12690] Add other info to core.submit_pm_after
Added $mode
Added $subject
Added $data
Added $pm_data

PHPBB3-12690
2014-06-22 21:54:51 +03:00
e05df3bf3d [ticket/12690] Add core.submit_pm_after event
Add core.submit_pm_after to funtion submit_pm.
Event will return just submited msg_id. It should be plased
just before return $data['msg_id'];

Justification:
Using only core.submit_pm_before does not allow to
follow up after message submission.
The message ID is recieved at DB submission.
Some times we need the MSG_ID as identifier

PHPBB3-12690
2014-06-22 21:54:51 +03:00
80ac276971 Merge pull request from PayBas/ticket/12646
[ticket/12646] Add data-# attribute to breadcrumb links

* PayBas/ticket/12646:
  [ticket/12646] Changed to navlinks.MICRODATA
  [ticket/12646] Add check for navlinks.FORUM_ID
  [ticket/12646] Changed index/home data attr & updated subsilver
  [ticket/12646] Add data-f attribute to breadcrumb links
2014-06-22 20:50:23 +02:00
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
rxu
f850d5fa90 [ticket/12704] Improve the load time information in the footer when enabled
PR  has added new constant to display load time information without
debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687).
This patch expands the total load time info with SQL/PHP load times,
while hiding the additional info with <abbr> element.

PHPBB3-12704
2014-06-20 20:57:32 +08:00
04164affe6 [ticket/12747] Drop support for Firebird
PHPBB3-12747
2014-06-20 12:35:42 +02:00
b855f5fc6a Merge pull request from marc1706/ticket/11711
[ticket/11711] Inform user of unsupported characters while posting

* marc1706/ticket/11711:
  [ticket/11711] Improve coding and comments of character check
  [ticket/11711] Reduce size of tests and also test topic titles
  [ticket/11711] Improve checks for unsupported characters and check subject
  [ticket/11711] Inform user of unsupported characters while posting
2014-06-20 10:51:58 +02:00
729c353f27 [ticket/12612] Move functions from mcp.php to functions_mcp.php
PHPBB3-12612
2014-06-18 16:57:32 +02:00
de103f60e3 [ticket/12612] Move function from ucp.php to functions_user.php
PHPBB3-12612
2014-06-18 16:57:13 +02:00
7e66fa0f8d [ticket/12612] Move functions from memberlist.php to functions_display.php
PHPBB3-12612
2014-06-18 16:56:44 +02:00
73c69cc653 [ticket/12612] Move functions from posting.php to functions_posting.php
PHPBB3-12612
2014-06-18 16:56:29 +02:00
7ee3e3f73f Merge pull request from nickvergessen/ticket/12705
Ticket/12705 Fix make_clickable when called with different server_urls
2014-06-17 14:56:55 +05:30
afcca62784 [ticket/12721] Update rules descriptions
PHPBB3-12721
2014-06-16 23:07:28 +02:00
a94581e7ca [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
PHPBB3-12721
2014-06-16 22:35:44 +02:00
09fc008e62 [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
PHPBB3-12721
2014-06-16 22:35:41 +02:00
34a4ba36cd [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
PHPBB3-12721
2014-06-16 22:35:12 +02:00
ca3cdadd08 [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
PHPBB3-12722
2014-06-16 19:05:09 +02:00
5a320adc75 [ticket/12724] Add Squiz.PHP.Eval in the legacy ruleset
PHPBB3-12724
2014-06-16 01:26:59 +02:00
587759bd6a Merge pull request from Nicofuma/ticket/12109
[ticket/12109] Bug when setting permissions with "Select all users"
2014-06-15 13:04:35 +05:30
0260c0ccaf [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.
PHPBB3-12707
2014-06-14 12:28:47 +02:00
f1adf82aea [ticket/12705] Store the regular expression matches based on server_url
PHPBB3-12705
2014-06-14 11:35:27 +02:00
a262bfc78f Merge pull request from Nicofuma/ticket/12687
[ticket/12687] Add a constant to display the load time without DEBUG

* Nicofuma/ticket/12687:
  [ticket/12687] Remove french spaces
  [ticket/12687] Display the number of cached queries
  [ticket/12687] Don't check if memory_get_peak_usage() exists
  [ticket/12687] Wrap $GLOBALS['starttime'] in a if
  [ticket/12687] Fix the namespace of $request
  [ticket/12687] Update doc block
  [ticket/12687] Use microtime(true)
  [ticket/12687] Remove globals
  [ticket/12687] Return a string and move the displaying of the sql report
  [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME
  [ticket/12687] Display the explain link only when DEBUG is set
  [ticket/12687] Add a constant to display the load time without DEBUG
2014-06-13 16:28:19 +02:00
8e9b27314b [ticket/12687] Remove french spaces
PHPBB3-12687
2014-06-13 14:56:55 +02:00
bbc63456f9 [ticket/12687] Display the number of cached queries
PHPBB3-12687
2014-06-13 14:55:29 +02:00
c605e8f423 [ticket/12687] Don't check if memory_get_peak_usage() exists
PHPBB3-12687
2014-06-13 14:54:13 +02:00
dc4132a494 [ticket/12687] Wrap $GLOBALS['starttime'] in a if
PHPBB3-12687
2014-06-13 14:53:30 +02:00