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

2134 Commits

Author SHA1 Message Date
Joas Schilling
360862fad0 [ticket/12151] Remove old dependency from profile type in tests
PHPBB3-12151
2014-02-02 19:52:23 +01:00
Nils Adermann
38af79dd30 Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
2014-02-02 16:34:55 +01:00
Nils Adermann
f8d6a07392 Merge pull request #1716 from marc1706/feature/passwords
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
2014-02-02 06:26:35 -08:00
Marc Alexander
b094c79996 [feature/passwords] Move combined hashing methods to manager
This will get rid of the circular dependency between the passwords manager
and the passwords helper. The combined_hash_password() method was also
slightly changed to allow both the definitions of service names or prefixes
for the hash types.

PHPBB3-11610
2014-02-02 14:57:43 +01:00
Marc Alexander
292961a277 [feature/passwords] Get rid of set_name/get_name methods for passwords drivers
PHPBB3-11610
2014-02-02 14:09:09 +01:00
Joas Schilling
dea91108fe Merge remote-tracking branch 'EXreaction/ticket/12006' into develop
* EXreaction/ticket/12006:
  [ticket/12006] global $phpbb_dispatcher;
  [ticket/12006] Missing a space
  [ticket/12006] Add module_auth event
  [ticket/12006] Test for ext module auth
  [ticket/12006] Add extension enabled check token to module auth
  [ticket/12006] Cleanup the module auth function token replacement code
2014-01-18 21:20:01 +01:00
Joas Schilling
ad8d4492a7 [ticket/11201] Add tables to constructor in tests
PHPBB3-11201
2014-01-18 13:16:28 +01:00
Cesar G
1fedad5e07 [ticket/11915] Fix the Plupload test.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Nathan Guse
ce8b8593e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
2014-01-17 20:50:25 -06:00
Nathan Guse
90f3cc48e5 Merge remote-tracking branch 'remotes/bantu/ticket/12046' into develop-olympus
* remotes/bantu/ticket/12046:
  [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
2014-01-17 20:50:04 -06:00
Joas Schilling
39ff387d36 [ticket/11201] Update schema files and unit test
PHPBB3-11201
2014-01-17 21:53:08 +01:00
Joas Schilling
0ec6af38a9 [ticket/11201] Fix construction of dropdown type once again
PHPBB3-11201
2014-01-17 21:13:58 +01:00
Joas Schilling
1dbc2d6218 [ticket/11201] Fix dropdown tests
The error message is now already the language string including the fieldname
and not the language key anymore.

PHPBB3-11201
2014-01-15 12:36:54 +01:00
Joas Schilling
dda5992a79 [ticket/11201] Rename test file for now, so the other tests run
PHPBB3-11201
2014-01-14 10:20:33 +01:00
Joas Schilling
3e84fb76a3 Merge remote-tracking branch 'Marc/ticket/11997' into develop
* Marc/ticket/11997: (23 commits)
  [ticket/11997] Use functional test cases that should always work
  [ticket/11997] Fix redirect tests for mod rewrite
  [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
  [ticket/11997] Remove obsolete function get_controller_redirect_url()
  [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
  [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
  [ticket/11997] Do not check if file or dir we redirect to exist
  [ticket/11997] Modifiy tests after adding path_helper clean_url method
  [ticket/11997] Add clean_url() method to path_helper
  [ticket/11997] Allow redirects to parent folders like previously
  [ticket/11997] Move expected redirect returns to controller and output to HTML
  [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
  [ticket/11997] Use get_controller_redirect_url() in redirect() function
  [ticket/11997] Add method for controller redirect URLs to path helper
  [ticket/11997] Undo changes to phpbb_own_realpath()
  [ticket/11997] Remove obsolete failover_flag in function redirect()
  [ticket/11997] Add functional test for redirects in controller
  [ticket/11997] Fix missing global
  [ticket/11997] Fix redirects from inside controllers
  [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
  ...
2014-01-08 16:17:48 +01:00
Nathan Guse
6ab12c1779 [ticket/12006] Test for ext module auth
PHPBB3-12006
2013-12-30 12:32:48 -06: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
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
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
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
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
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
Joas Schilling
a836a107ca [ticket/11849] Remove old pagination test
PHPBB3-11849
2013-12-18 18:35:32 +01:00
Joas Schilling
725c512468 [ticket/11849] Replace pagination in viewforum.php with class
PHPBB3-11849
2013-12-18 18:35:16 +01:00
Joas Schilling
ed16fbd5b7 [ticket/11849] Test validate_start and on_page
PHPBB3-11849
2013-12-18 18:34:49 +01:00
Joas Schilling
268afe20f4 [ticket/11849] Move pagination code to class
PHPBB3-11849
2013-12-18 18:34:13 +01:00
Joas Schilling
4a73ce0933 Merge remote-tracking branch 'prototech/ticket/12009' into develop
* prototech/ticket/12009:
  [ticket/12009] Prevent user from enabling invalid extension through direct URL
  [ticket/12009] Update functional test to check for invalid extensions.
  [ticket/12009] Fix functional tests.
  [ticket/12009] Move valid extensions in tests to correct dir structure.
  [ticket/12009] Do not allow incorrectly structured extensions to be installed.
2013-12-16 10:18:56 +01:00
Cesar G
c42bd28d17 [ticket/12009] Prevent user from enabling invalid extension through direct URL
PHPBB3-12009
2013-12-12 14:40:03 -08:00
Cesar G
2735982c55 [ticket/12009] Update functional test to check for invalid extensions.
PHPBB3-12009
2013-12-12 13:03:04 -08:00
Cesar G
495ded59f3 [ticket/12009] Fix functional tests.
PHPBB3-12009
2013-12-12 12:24:16 -08:00
Cesar G
31234b26d8 [ticket/12009] Move valid extensions in tests to correct dir structure.
PHPBB3-12009
2013-12-12 10:52:51 -08:00
Joas Schilling
4816446c4a Merge remote-tracking branch 'Marc/ticket/11859' into develop
* Marc/ticket/11859:
  [ticket/11859] Add missing get_template_name method to test drivers
  [ticket/11859] Make avatar drivers return template filename
2013-12-12 10:21:36 +01:00
Marc Alexander
47ea6bc9e6 Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml
2013-12-07 13:32:19 +01:00
Marc Alexander
f32a30eeca [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
PHPBB3-11997
2013-12-07 13:28:44 +01:00
Nathan Guse
1d243b78bb Merge pull request #1813 from marc1706/ticket/11912
[ticket/11912] Add mimetype guesser for proper mimetype guessing
2013-12-04 14:12:25 -08:00
Nathan Guse
97bf88dd32 Merge pull request #1879 from Pico88/ticket/12026
[ticket/12026] Correct path for template files
2013-12-04 13:59:59 -08:00
Nathan Guse
e399a52816 Merge pull request #1887 from nickvergessen/ticket/skouat/10910
[ticket/10910] Function build_cfg_template() allow $size for $tpl_type = select
2013-12-04 09:48:10 -08:00
Joas Schilling
b474917ba3 Merge remote-tracking branch 'Marc/ticket/11842' into develop
* Marc/ticket/11842:
  [ticket/11842] Add functional test for creating group
  [ticket/11842] Use avatar_data for obtaining driver that should be deleted
  [ticket/11842] Use type map for updating avatar types in database
  [ticket/11842] Add missing prefix for group id in avatar data
  [ticket/11842] Use only new avatar type in user_delete function
  [ticket/11842] Add migration file for updating avatar type in database
  [ticket/11842] Replace outdated occurences of user and group avatar_type
  [ticket/11842] Use group_id 0 and correct avatar name after creating group
2013-12-04 17:20:20 +01:00
Joas Schilling
fa33abaf0d Merge remote-tracking branch 'bantu/ticket/12056-develop' into develop
* bantu/ticket/12056-develop:
  [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
  [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
  [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
  [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
  [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
  [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
  [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
  [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
  [ticket/12056] validate_range: Fix "Creating default object from empty value"
  [ticket/12056] build_select: Fix "Creating default object from empty value"
  [ticket/12056] h_radio test: Fix "Creating default object from empty value"
2013-12-04 16:01:32 +01:00
Marc Alexander
80fa658e8f [ticket/11842] Add functional test for creating group
PHPBB3-11842
2013-12-04 15:58:07 +01:00
Joas Schilling
8087a76c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
2013-12-04 15:57:25 +01:00
Marc Alexander
abb2def48d [ticket/11842] Use avatar_data for obtaining driver that should be deleted
PHPBB3-11842
2013-12-04 15:42:17 +01:00
Andreas Fischer
3a03b01ce0 [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
PHPBB3-12056
2013-12-04 14:22:33 +01:00
Andreas Fischer
ffc24a507d [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
PHPBB3-12056
2013-12-04 14:16:10 +01:00
Andreas Fischer
d589696827 [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
PHPBB3-12056
2013-12-04 14:13:59 +01:00