1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 02:51:35 +02:00
Commit Graph

219 Commits

Author SHA1 Message Date
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
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
Joas Schilling
fcfa1a35cc [ticket/11849] Add service definition
PHPBB3-11849
2013-12-18 18:35:07 +01:00
Marc Alexander
943ab555da Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
	phpBB/config/services.yml
2013-11-23 00:54:56 +01:00
Cesar G
287c2550b8 [ticket/12008] Update the run time value for the prune notifications cron task
PHPBB3-12008
2013-11-14 01:05:58 -08:00
Nils Adermann
e48b2c07eb Merge pull request #1871 from nickvergessen/ticket/12016
Ticket/12016 Event listeners should be services
2013-11-13 08:45:48 -08:00
Joas Schilling
d3f9a51709 [ticket/12016] Use a service provider for event listeners
This allows them to use dependency injection

PHPBB3-12016
2013-11-13 17:34:06 +01:00
Marc Alexander
bef6a5a640 [ticket/11912] Introduce guesser priority to mimetype guessers
The mimetype guesser priority can now be set through the service definition.
Mimetypes will be guessed from the guesser with the highest priority to
the one with the lowest priority. Standard priority types have been added
to the service definition file. Any integer value can be used though.
Standard mimetype guessers that do not have the methods get_priority
and set_priority implemented, like the standard MimeTypeGuessers of symfony,
will have the default priority with the value of 0. Lower priority guessers
have values lower than 0 while high priority ones can be added with values
higher than 0.

PHPBB3-11912
2013-11-11 21:18:23 +01:00
Marc Alexander
b1719db47d [ticket/11912] Add extension_guesser for guessing mimetype by extension
The content_guesser now only guesses the mimetype with the function
mime_content_type() while the guessing by extension is done using the
extension_guesser.

PHPBB3-11912
2013-11-11 20:15:28 +01:00
Andreas Fischer
00294e3dae [ticket/11998] Turn develop/extensions.php into console commands.
PHPBB3-11998
2013-11-05 21:40:42 +01:00
Andreas Fischer
743a0560c3 [ticket/11998] Add console command for recalculating email hash.
PHPBB3-11998
2013-11-03 13:02:48 +01:00
Andreas Fischer
5db1ec163d [ticket/11998] Use container to get all commands using 'console.command' tag.
PHPBB3-11998
2013-11-03 03:24:06 +01:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
2013-11-02 11:55:16 -07:00
Cesar G
a95306643e [ticket/11991] Fix incorrect class name for report_post_closed notification.
PHPBB3-11991
2013-10-30 15:17:08 -07:00
Marc Alexander
b2f638b793 [ticket/11857] Use passed service collection instead of container in manager
The service collection that was already passed to the avatar manager should
be used in the avatar manager method get_driver() instead of the container
itself.

PHPBB3-11857
2013-10-27 15:08:58 +01:00
Marc Alexander
5193b3279c [feature/passwords] Pass list of default types to passwords manager
This list is in the order of how the driver types would be used. If a driver
is not supported we will try the subsequent one.

PHPBB3-11610
2013-10-27 14:18:02 +01:00
Marc Alexander
3bd4289562 [ticket/11912] Use lowercase names for guesser services
PHPBB3-11912
2013-10-24 12:10:17 +02:00
Marc Alexander
973682cb2d [ŧicket/11912] Get rid of obsolete variables in content_guesser
PHPBB3-11912
2013-10-24 12:03:28 +02:00
Cesar G
d607f1c927 [ticket/11746] Add "admin activation required" notification.
PHPBB3-11746
2013-10-24 02:37:20 -07:00
Marc Alexander
63945f3687 [ticket/11912] Add content_guesser
The content_guesser will try to use the function mime_content_type()
if it's available. If that is not the case, the content_guesser will try to
guess the mimetype using the file extension of the supplied file.
Since this guesser will be registered after the other guessers, it will
be only used if the other guessers are not available.

PHPBB3-11912
2013-10-23 23:18:22 +02:00
Marc Alexander
789d493595 [ticket/11912] Integrate mimetype guesser with plupload
PHPBB3-11912
2013-10-23 18:34:06 +02:00
Marc Alexander
d7bf50bc80 [ticket/11930] Move path_helper in front of optional cache argument
Optional method arguments should be after any mandatory ones.

PHPBB3-11930
2013-10-21 10:20:12 +02:00
Marc Alexander
e1fc008d15 [ticket/11930] Use \phpbb\path_helper for avatar URLs
This will ensure that avatars still properly display on extension pages
supplied via app.php.

PHPBB3-11930
2013-10-17 14:20:59 +02:00
Nils Adermann
40932c26ea Merge pull request #1772 from bantu/feature/plupload/integration
[ticket/10929] Integration of Plupload
2013-10-13 16:01:00 -07:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00
Andreas Fischer
beda12c055 [feature/plupload/cron] Namespacification
PHPBB3-10929
2013-10-11 15:53:22 +02:00
Andreas Fischer
67530d132a [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.
PHPBB3-10929
2013-10-11 15:48:04 +02:00
Joas Schilling
5d28d22976 [ticket/11906] Add notification purge cron to cron tasks
PHPBB3-11906
2013-10-11 11:51:37 +02:00
Marc Alexander
7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/includes/functions.php
2013-10-03 10:04:59 +02:00
Marc Alexander
356f3eef07 [feature/passwords] Inject passwords manager into auth providers
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().

PHPBB3-11610
2013-10-02 13:28:38 +02:00
Marc Alexander
3ebff0a960 [feature/passwords] Pass config via service container to driver helper
This will get rid of the global $config in the driver helper

PHPBB3-11610
2013-09-28 12:42:11 +02:00
Marc Alexander
5bc5e4716c [feature/passwords] More changes due to namespacing
PHPBB3-11610
2013-09-27 16:58:06 +02:00
Marc Alexander
663b4b2eb7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/develop/create_schema_files.php
2013-09-27 10:47:10 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
2013-09-26 15:34:44 +02:00
Marc Alexander
01512104b5 [feature/passwords] Use dependency injection for passwords driver helper
The passwords driver helper is now injected into the driver base instead
of being manually loaded.

PHPBB3-11610
2013-09-22 22:53:10 +02:00
Marc Alexander
f5eb0d744e [feature/passwords] Use dependency injection for helper
This will now be used instead of manually loading the passwords helper
instance in the passwords manager.

PHPBB3-11610
2013-09-22 21:17:30 +02:00
Marc Alexander
a00854c406 [feature/passwords] Do not pass phpbb_container to passwords manager
PHPBB3-11610
2013-09-20 17:31:32 +02:00
Nils Adermann
1d7f8f8193 [ticket/11700] Get functional tests running after develop merge
PHPBB3-11700
2013-09-17 18:10:58 +02:00
Nils Adermann
f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-17 16:56:50 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces
PHPBB3-11700
2013-09-17 16:15:44 +02:00
Nils Adermann
3634ff14a0 [ticket/11700] Correct service definitions with namespaces
PHPBB3-11700
2013-09-16 06:16:53 +02:00
Nils Adermann
1fa673bded [ticket/11700] Fix authentication acp after develop merge
PHPBB3-11700
2013-09-16 03:22:13 +02:00
Nils Adermann
09cfa01d58 [ticket/11700] Fix installation after develop merge
PHPBB3-11700
2013-09-16 03:14:39 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Marc Alexander
19512b2595 [feature/passwords] Rename "crypto" files to "passwords" files
PHPBB3-11610
2013-09-14 14:04:48 +02:00
Marc Alexander
8b9370c6a9 [feature/passwords] Define default hashing algorithm in container file
The default hashing algorithm type is defined as a parameter in the service
definition file for the password hashing system. This will allow us to change
this in the future but it will also prevent unexperienced admins from changing
the hashing algorithm.

PHPBB3-11610
2013-09-14 13:55:45 +02:00
Marc Alexander
58755c4972 [feature/passwords] Add get_name() method to drivers
This will allow us to actually properly differentiate between the available
drivers.

PHPBB3-11610
2013-09-14 13:55:39 +02:00
Marc Alexander
d66cae7cbc [feature/passwords] Add service collection file crypto.yml
This will contain definitions of the services and the service collection
that will be passed to the passwords manager.

PHPBB3-11610
2013-09-14 13:50:42 +02:00
Marc Alexander
3a0dd248d0 [feature/passwords] Add basic implementation of passwords manager
The passwords manager is capable of checking and hashing passwords.
It will support different hashing algorithms.

PHPBB3-11610
2013-09-14 13:50:07 +02:00