Commit graph

20403 commits

Author SHA1 Message Date
Marc Alexander
85f1e8afa5 [feature/passwords] Correct docblock of phpbb_hash() function
PHPBB3-11610
2013-12-29 20:52:25 +01:00
Marc Alexander
4b832cf2bd [feature/passwords] Intialize output array before usage in passwords helper
PHPBB3-11610
2013-12-29 17:57:17 +01:00
Marc Alexander
1465915830 [feature/passwords] Remove unneeded definitions of full namespace
PHPBB3-11610
2013-12-29 17:56:41 +01:00
Marc Alexander
8383d1f1d3 [feature/passwords] Add missing documentation to docblocks
Also contains some minor spacing changes.

PHPBB3-11610
2013-12-29 17:55:00 +01:00
Marc Alexander
141bef75cb [feature/passwords] Undo simplification to bcrypt driver
By simplifying, a needed part was removed that is actually required.

PHPBB3-11610
2013-12-29 17:04:38 +01:00
Marc Alexander
808c54fa89 [feature/passwords] Get rid of unneeded code complexity
Simplified a little bit of code as pointed out by imkingdavid on github.

PHPBB3-11610
2013-12-29 16:33:09 +01:00
Marc Alexander
555cd025b2 [feature/passwords] Remove unnecessary specification of namespace in drivers
PHPBB3-11610
2013-12-29 16:17:37 +01:00
Marc Alexander
b37549ce63 [feature/passwords] Remove IN_PHPBB check from passwords files
PHPBB3-11610
2013-12-29 14:07:27 +01:00
Marc Alexander
382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords
Conflicts:
	phpBB/config/services.yml
2013-12-29 13:46:42 +01:00
Marc Alexander
f906fb41e9 [ticket/11997] Use functional test cases that should always work
The previous test cases that tried to redirect to ../index.php and similar
might cause us to try to go to http://localhost/../index.php, which will
result in http://index.php. As this obviously will trigger an error as
intended, we should not put this inside our test cases for the redirect
function.

PHPBB3-11997
2013-12-28 20:40:18 +01:00
Marc Alexander
ac131a5159 [feature/passwords] Fix indentation in auth providers
PHPBB3-11610
2013-12-28 16:56:20 +01:00
Marc Alexander
3e815616c5 [ticket/11997] Fix redirect tests for mod rewrite
Controller routes that are supposed to link to parent directories can't be
tested as the links are incorrectly created depending on enabled mod rewrite
or not.

PHPBB3-11997
2013-12-28 16:50:15 +01:00
Marc Alexander
4c1569dd8a [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
The user's page directory needs to be added to the redirect URL for proper
redirects outside of the forum root. Fix the unit tests accordingly.

PHPBB3-11997
2013-12-28 00:14:12 +01:00
Marc Alexander
ce2c5213d7 [ticket/11997] Remove obsolete function get_controller_redirect_url()
PHPBB3-11997
2013-12-27 18:41:44 +01:00
Marc Alexander
68ce16f9b3 [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
By using path_helper's clean_url() method, we'll be able to properly check
the full URL instead of just parts of the expected URL.

PHPBB3-11997
2013-12-27 17:55:14 +01:00
Marc Alexander
a304d99b2b [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
Adding a call to this method to the redirect function will make sure that we
do not end up with incorrect URLs after using append_sid().

PHPBB3-11997
2013-12-27 17:50:17 +01:00
Joas Schilling
95d4e6aa97 [ticket/11996] Add explanation how to correctly remove and update an extension
See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more
information about the decision.

PHPBB3-11996
2013-12-27 15:25:03 +01:00
Dhruv
db94f80c5b Merge remote-tracking branch 'nickvergessen/ticket/11911' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11911:
  [ticket/11911] Warn admins when there is no search index for the selected engine
2013-12-27 18:01:48 +05:30
Joas Schilling
bef7bc7900 [ticket/11911] Warn admins when there is no search index for the selected engine
PHPBB3-11911
2013-12-27 13:16:38 +01:00
Marc Alexander
9161816267 [ticket/11997] Do not check if file or dir we redirect to exist
The redirect function will now properly redirect to where we want it to.
It will no longer try to check if the file or directory we redirect to exist.
This will ensure compatibility with the new routes.

PHPBB3-11997
2013-12-27 13:00:22 +01:00
Dhruv
99d312da2a Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
  [ticket/11271] Make path conversion more precise

Conflicts:
	phpBB/feed.php
2013-12-27 03:43:22 +05:30
Dhruv
1aa27f400c [ticket/11271] Make path conversion more precise
PHPBB3-11271
2013-12-27 03:31:28 +05:30
Dhruv
657ddf8309 [ticket/11271] limit absolute path conversion to attachment links only
PHPBB3-11271
2013-12-27 01:33:54 +05:30
Dhruv
fd9366daf5 Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.

Conflicts:
	phpBB/feed.php
2013-12-27 01:33:32 +05:30
Dhruv
a71625ca76 [ticket/11271] Add docblock of feed_generate_content( )
PHPBB3-11271
2013-12-27 00:38:42 +05:30
Dhruv
80c05e861b Merge branch 'develop' into ticket/11271-develop
# By Vjacheslav Trushkin (148) and others
# Via Joas Schilling (50) and others
* develop: (635 commits)
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  ...
2013-12-27 00:28:38 +05:30
Dhruv
f7c764986f [ticket/11271] Fix tabs and use !empty( ) instead of count( )
PHPBB3-11271
2013-12-27 00:22:29 +05:30
Dhruv
6611329d83 [ticket/11271] Remove unnecessary inclusion of functions_display
PHPBB3-11271
2013-12-27 00:22:28 +05:30
Dhruv
3bae72d164 [ticket/11271] Typecast forum and topic id to integer
PHPBB3-11271
2013-12-27 00:22:27 +05:30
Dhruv
dc37f3a0e3 [ticket/11271] Use absolute path for displaying inline attachments in feeds
PHPBB3-11271
2013-12-27 00:22:26 +05:30
erangamapa
62263c13d4 [ticket/11271] Changed executable bit.
Changed executable bit value from 755 to 644.

PHPBB3-11271
2013-12-27 00:22:25 +05:30
erangamapa
08d69de933 [ticket/11271] Formatting code and removing null assignment.
Formatted code and replaced null assignment with empty array
assignment to attachments parameter in method 'feed_generate_content'.

PHPBB3-11271
2013-12-27 00:22:24 +05:30
erangamapa
cca4067694 [ticket/11271] Removing unnecessary database object
Removed unnecessary global database object from 'feed_generate_content'
Method.

PHPBB3-11271
2013-12-27 00:22:22 +05:30
erangamapa
8586171187 [ticket/11271] Separated attachment fetching query
Removed external query used to fetch related attachments.
Added attachments fetching method with database query to
post based feed.

PHPBB3-11271
2013-12-27 00:22:21 +05:30
erangamapa
91a14a9e63 [ticket/11271] Fetched feed attachments before loop.
Fetched feed attachments before looping through feed items and
send them to method 'feed_generate_content' for each feed item.

PHPBB3-11271
2013-12-27 00:22:20 +05:30
erangamapa
a41e2ca380 [ticket/11271] Removed in-line attachment comments properly.
Added a new regex to remove in-line attachment comments.

PHPBB3-11271
2013-12-27 00:22:19 +05:30
erangamapa
5bf4726195 [ticket/11271] Displaying in-line attached images in ATOM feed.
In-line attached images are not displaying as they are not parsing.
Included 'parse_attachments' column name for data fetching queries
in feed.php. Checked weather feeds have in-line attachments and
parsed them by using parse_attachments() method.

PHPBB3-11271
2013-12-27 00:22:18 +05:30
Joas Schilling
98200161fc [ticket/12039] Update command descriptions
PHPBB3-12039
2013-12-26 19:03:43 +01:00
Dhruv
1bb175ce77 [ticket/11271] Add the inline images html to content
PHPBB3-11271
2013-12-25 04:58:41 +05:30
Dhruv
e2f72539e1 [ticket/11271] Use class variable $db instead of global
PHPBB3-11271
2013-12-25 04:58:28 +05:30
Dhruv
f9c7f0fc19 Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
2013-12-25 00:54:07 +05:30
Marc Alexander
4ced162646 [ticket/11997] Modifiy tests after adding path_helper clean_url method
PHPBB3-11997
2013-12-21 20:08:33 +01:00
Marc Alexander
d9358c26da [ticket/11997] Add clean_url() method to path_helper
This method will get rid of unnecessary . and .. in URLs.

PHPBB3-11997
2013-12-21 20:08:00 +01:00
Andreas Fischer
02336d9a69 Merge pull request #1940 from prototech/ticket/12079
[ticket/12079] Add default value to $multibyte in request.untrimmed_varible().

* prototech/ticket/12079:
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
2013-12-21 19:24:21 +01:00
Marc Alexander
235d2069e0 [ticket/11997] Allow redirects to parent folders like previously
Redirects to parent folders were possible with the previous redirect function.
This change will allow these redirects again.

PHPBB3-11997
2013-12-21 16:31:20 +01:00
Marc Alexander
15913fdf79 [ticket/11997] Move expected redirect returns to controller and output to HTML
The controller will now output the expected redirect returns the same way the
redirect returns are output. The extension controller test will compare those
2 outputs.

PHPBB3-11997
2013-12-20 18:13:53 +01:00
Nils Adermann
9f7985d725 Merge pull request #1932 from ptarjan/patch-1
Try running unit tests on HHVM
2013-12-20 07:15:32 -08:00
Joas Schilling
558f3cd21c Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop
* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ...
2013-12-20 16:11:02 +01:00
Cesar G
d512197bb9 [ticket/12077] Fix another strict standards error.
PHPBB3-12077
2013-12-19 19:36:49 -08:00
Cesar G
cd98dba0b9 [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
PHPBB3-12079
2013-12-19 19:09:40 -08:00