Commit graph

9346 commits

Author SHA1 Message Date
Nathan Guse
61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
2012-11-20 23:19:51 -06:00
Nathan Guse
570c5ad3c0 [ticket/11103] Some comments
PHPBB3-11103
2012-11-20 23:12:37 -06:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
Marc Alexander
858c59279c [feature/avatars] Use protected instead of private
PHPBB3-10018
2012-11-19 23:50:34 +01:00
Igor Wiedler
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
David King
01ec608593 [feature/controller] Fix comments, check against more general HttpException
PHPBB3-10864
2012-11-19 12:55:15 -05:00
David King
f8614bfc84 [feature/controller] Check for proper status codes from controllers
PHPBB3-10864
2012-11-19 12:37:20 -05:00
David King
3004350281 [feature/controller] Correctly create Symfony object from globals
PHPBB3-10864
2012-11-19 11:47:42 -05:00
Marc Alexander
8d0c667dce [feature/avatars] Fix the docs and small naming fixes
PHPBB3-10018
2012-11-19 00:30:18 +01:00
Marc Alexander
bea6e845d3 [feature/avatars] Use https for gravatar
PHPBB3-10018
2012-11-19 00:27:22 +01:00
Marc Alexander
c2ba24558f [feature/avatars] Fix local and upload avatar in the ACP
PHPBB3-10018
2012-11-18 23:11:40 +01:00
Marc Alexander
959bc183bf [feature/avatars] Handle deletion of avatars
Previously this wasn't handled correctly if at all.

PHPBB3-10018
2012-11-18 23:09:09 +01:00
David King
e2bf66d065 [feature/controller] Add documentation about input being HTML-escaped
PHPBB3-10864
2012-11-18 15:58:47 -05:00
David King
0f4f81b096 [feature/controller] Create Symfony Request in new function
PHPBB3-10864
2012-11-18 15:52:35 -05:00
David King
60c0a1dd2a [feature/controller] Don't use $user->lang() before container compilation
PHPBB3-10864
2012-11-18 15:51:05 -05:00
Marc Alexander
1c3b3621db [feature/avatars] Add missing assign_block_vars() for avatar options
This is needed for selecting the gallery avatar while using subsilver2.

PHPBB3-10018
2012-11-18 20:45:51 +01:00
David King
53caf83233 [feature/controller] Remove now-unused code
PHPBB3-10864
2012-11-18 13:35:04 -05:00
David King
4d6f6351dd [feature/controller] Allow injecting Symfony Request into controllers
PHPBB3-10864
2012-11-17 18:05:32 -05:00
David King
8913b2c7c4 [feature/controller] Use query string, not path info, for controller access
This is hopefully just temporary until we can fix the relative path issue.

PHPBB3-10864
2012-11-17 17:48:20 -05:00
Oleg Pudeyev
47a90f815d [feature/template-events] Changes per imkingdavid's review.
PHPBB3-9550
2012-11-17 16:43:40 -05:00
Oleg Pudeyev
da7d888448 [feature/template-events] Make style names private on template.
PHPBB3-9550
2012-11-17 16:43:38 -05:00
Oleg Pudeyev
af47779f51 [feature/template-events] Use style names array in template filter.
This provides a straightforward way of iterating over all styles
looking for templates in extensions.

PHPBB3-9550
2012-11-17 16:42:43 -05:00
Oleg Pudeyev
729eeef2bf [feature/template-events] Generate style names array in set_style.
PHPBB3-9550
2012-11-17 16:42:43 -05:00
Oleg Pudeyev
44d6dc4c4c [feature/template-events] Convert a single style name to array of them.
This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
2012-11-17 16:42:40 -05:00
Nathan Guse
0141154ceb [feature/template-events] Indentation fix.
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
6c7f1f7bde [feature/template-events] Cosmetic changes.
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Nathan Guse
4ed9e4124e [feature/template-events] Wording: wrongly -> improperly.
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Nathan Guse
2fb4006056 [feature/template-events] Indentation fix.
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
9c31a0ffc7 [feature/template-events] Rename template_name to style_name.
"Style name" makes a lot more sense and should be in line with
recent style/template changes.

PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
09b4cf2f4c [feature/template-events] Report when templates cannot be compiled.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
4b28b413f2 [feature/template-events] Update EVENT tag documentation.
It should now fairly closely reflect what actually happens.

PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
faf96a1b40 [feature/template-events] Delete old comments/test code.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
bd63b17d00 [feature/template-events] Move comment to the function docblock.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
1b36fc3a60 [feature/template-events] Handle user access correctly.
Pass through $user from template to filter.

Allow $user to be null for standalone usage of the template engine.

PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
45a1219886 [feature/template-events] Always commit suicide for invalid event names.
Note: suicide happens for syntactically invalid event names,
e.g. event names containing punctuation.

Event names for which there are no events are silently dropped.

PHPBB3-9550
2012-11-17 16:39:58 -05:00
Oleg Pudeyev
f46f48a2cf [feature/template-events] Chase template/style renames and changes.
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
7bd5f7641f [feature/template-events] Fix typo (waring -> warning)
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
2add66c0eb [feature/template-events] Add additional space for editors
Use `' ?'. '>'` rather than `' ?>'` as the latter causes problems
in some editors.

PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
6fc0c889fd [feature/template-events] Remove comment
Remove comment per Nils in the PR.

PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
132bbede2b [feature/template-events] Handle incorrect template event identifiers
If the template event identifier is wrongly formatted phpBB will
triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise
the location is ignored.

PHPBB3-9550
2012-11-17 16:39:58 -05:00
Erik Frèrejean
f836277638 [feature/template-events] RUNHOOKS -> EVENT
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Nathan Guse
04f55ba306 [feature/template-events] Correct indentation
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Michael Cullum
8d58e69ed3 [feature/template-events] Rename RUNHOOKS to EVENT
Rename the way to add template events

PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
ecdb54fc04 [feature/template-events] PHP does not parse <?php?>, avoid generating it.
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
bdbb382a26 [feature/template-events] Invoke template hooks that are template-specific.
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
a6c7fbc59d [feature/template-events] Pass top-level template name to template filter.
This will be used to invoke template-specific hooks.

PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
dd7c5183fb [feature/template-events] Add template_compile to template filter params.
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
ea094dd91a [feature/template-events] Rename universal to all (for template fragments).
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
b6f6add9d4 [feature/template-events] Fix property name for extension manager.
PHPBB3-9550
2012-11-17 16:39:57 -05:00
Oleg Pudeyev
66232031e4 [feature/template-events] Really basic template hook implementation.
PHPBB3-9550
2012-11-17 16:39:56 -05:00