Commit graph

10537 commits

Author SHA1 Message Date
Crizzo
453f2904c2 [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
PHPBB3-12680
2014-06-23 19:38:44 +02:00
Dhruv
6be8c98296 Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12563] Adds « and » to the links in acp_styles.php
  [ticket/12563] Removes ending . from <a>
  [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
  [ticket/12563] Changes 2 language variables to better understandable names
2014-06-23 22:07:15 +05:30
Dhruv Goel
dfbe072d51 Merge pull request #2571 from Crizz0/ticket/12563
[ticket/12563] Changes 2 style specific language variables for better understanding
2014-06-23 22:04:20 +05:30
Nils Adermann
9f91e8e9bd Merge branch 'develop-ascraeus' into develop
* develop-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:39 -04:00
Nils Adermann
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
Andreas Fischer
b79aa2bf78 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12761] Remove the execute bit from functions_user.php
2014-06-23 16:17:14 +02:00
n-aleha
ec69a22899 [ticket/12761] Remove the execute bit from functions_user.php
PHPBB3-12761
2014-06-23 17:13:03 +03:00
Andreas Fischer
80e0851189 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird
2014-06-22 23:41:26 +02:00
Andreas Fischer
4f2acbaed2 Merge pull request #2629 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
Joas Schilling
d18d3b30c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:13:14 +02:00
Joas Schilling
de04304e94 Merge pull request #2591 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
Joas Schilling
d37eb036aa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:42 +02:00
Joas Schilling
bb8be29fd5 Merge pull request #2575 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
Joas Schilling
a73fda8b42 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:47 +02:00
Joas Schilling
1e97502d90 Merge pull request #2586 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
Stanislav Atanasov
2ee8b738e5 [ticket/12690] Find a space
Lost a spce there ... found it ...

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

PHPBB3-12701
2014-06-22 22:07:04 +03:00
Stanislav Atanasov
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
Stanislav Atanasov
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
Stanislav Atanasov
992fb8e452 [ticket/12691] Comment change
Change a bit the core event comment

PHPBB3-12691
2014-06-22 22:03:01 +03:00
Stanislav Atanasov
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
Stanislav Atanasov
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
Stanislav Atanasov
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
Stanislav Atanasov
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
Stanislav Atanasov
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
Joas Schilling
0d57cb37fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:48 +02:00
Joas Schilling
80ac276971 Merge pull request #2530 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
Andreas Fischer
0b52d60e28 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12723] Do not mention too many details on documentation.
  [ticket/12723] Do not reference the coding guidelines section.
  [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
  [ticket/12723] Properly describe new Code Sniffer rulsets.
  [ticket/12723] Use core suffix in filename instead of phpbb in the middle.
  [ticket/12723] Add Sniff ensuring PHP files use the correct file header
2014-06-22 11:35:13 +02:00
Tristan Darricau
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
Marc Alexander
0499655ba4 [ticket/12755] Add timeout to remote upload to prevent infinite loop
PHPBB3-12755
2014-06-21 11:55:54 +02:00
rxu
f850d5fa90 [ticket/12704] Improve the load time information in the footer when enabled
PR #2570 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
Joas Schilling
04164affe6 [ticket/12747] Drop support for Firebird
PHPBB3-12747
2014-06-20 12:35:42 +02:00
Joas Schilling
7bc2d1f2df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:53:31 +02:00
Joas Schilling
b855f5fc6a Merge pull request #2566 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
Dhruv
517273fa0b [ticket/11528] Move related code from functions_posting to function
Move related code from functions_posting to
remove_post_from_statistic() in content_visibility.php

PHPBB3-11528
2014-06-19 23:04:03 +05:30
Joas Schilling
729c353f27 [ticket/12612] Move functions from mcp.php to functions_mcp.php
PHPBB3-12612
2014-06-18 16:57:32 +02:00
Joas Schilling
de103f60e3 [ticket/12612] Move function from ucp.php to functions_user.php
PHPBB3-12612
2014-06-18 16:57:13 +02:00
Joas Schilling
7e66fa0f8d [ticket/12612] Move functions from memberlist.php to functions_display.php
PHPBB3-12612
2014-06-18 16:56:44 +02:00
Joas Schilling
73c69cc653 [ticket/12612] Move functions from posting.php to functions_posting.php
PHPBB3-12612
2014-06-18 16:56:29 +02:00
Dhruv
05d63e35ef Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12705] Store the regular expression matches based on server_url
  [ticket/12705] Break calling make_clickable with a different server_url
2014-06-17 14:58:17 +05:30
Dhruv Goel
7ee3e3f73f Merge pull request #2588 from nickvergessen/ticket/12705
Ticket/12705 Fix make_clickable when called with different server_urls
2014-06-17 14:56:55 +05:30
Andreas Fischer
c9da435d3c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12721] Update rules descriptions
  [ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
  [ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
  [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
  [ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
  [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
  [ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
2014-06-17 00:42:40 +02:00
Tristan Darricau
afcca62784 [ticket/12721] Update rules descriptions
PHPBB3-12721
2014-06-16 23:07:28 +02:00
Tristan Darricau
a94581e7ca [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
PHPBB3-12721
2014-06-16 22:35:44 +02:00
Tristan Darricau
09fc008e62 [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
PHPBB3-12721
2014-06-16 22:35:41 +02:00
Tristan Darricau
34a4ba36cd [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
PHPBB3-12721
2014-06-16 22:35:12 +02:00
Andreas Fischer
7f5aeeef01 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
2014-06-16 22:24:59 +02:00
Tristan Darricau
ca3cdadd08 [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
PHPBB3-12722
2014-06-16 19:05:09 +02:00
Andreas Fischer
6299dcd578 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12724] Add Squiz.PHP.Eval in the legacy ruleset
2014-06-16 01:37:21 +02:00