1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00

55 Commits

Author SHA1 Message Date
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
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
Oleg Pudeyev
6c7f1f7bde [feature/template-events] Cosmetic changes.
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
f46f48a2cf [feature/template-events] Chase template/style renames and changes.
PHPBB3-9550
2012-11-17 16:39:58 -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
d6c881d0c6 [feature/template-events] Inject extension manager into template class.
Template class passes extension manager to template compiler.

Template compiler passes extension manager to template filter.

Template filter will use extension manager to locate hooks
as it is compiling templates.

All extension manager arguments are optional. If an extension
manager is not given, template hooks will not be invoked.

PHPBB3-9550
2012-11-17 16:39:54 -05:00
Igor Wiedler
b5e069f879 Merge remote-tracking branch 'p/ticket/10933' into develop
* p/ticket/10933:
  [ticket/10933] Prose for get_first_file_location.
  [ticket/10933] Remaining documentation for added functions in resource locator
  [ticket/10933] Update template locator test to use style resource locator.
  [ticket/10933] Dispose of locate function in template class.
  [ticket/10933] Add mutators for template_path to style resource locator.
  [ticket/10933] Delete template_path assignment.
  [ticket/10933] Delete template_path from template class.
  [ticket/10933] Add get_first_template_location.
2012-11-17 19:49:03 +01:00
Andreas Fischer
847feb07e7 Merge remote-tracking branch 'EXreaction/ticket/11189' into develop
* EXreaction/ticket/11189:
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
2012-11-10 23:39:00 +01:00
Nathaniel Guse
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG
PHPBB3-11189
2012-11-10 10:45:02 -06:00
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
Oleg Pudeyev
0dd981071b [ticket/10933] Dispose of locate function in template class.
It had no callers other than the test suite.

PHPBB3-10933
2012-11-02 19:39:07 -04:00
Oleg Pudeyev
97e53103c3 [ticket/10933] Delete template_path from template class.
template_path is now only present in style resource locator.

PHPBB3-10933
2012-11-02 19:37:52 -04:00
Oleg Pudeyev
615d5ef628 [ticket/10933] Add get_first_template_location.
This localizes template_path to style resource locator.

locate function on template will be removed in a subsequent commit.

PHPBB3-10933
2012-11-02 19:37:52 -04:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context.
PHPBB3-10933
2012-11-02 18:51:35 -04:00
Oleg Pudeyev
766353fe5c [ticket/10933] Useful documentation for template locate function
PHPBB3-10933
2012-11-02 18:03:52 -04:00
Oleg Pudeyev
0c18f92c0a [ticket/10933] Typo fixes
PHPBB3-10933
2012-11-02 18:03:52 -04:00
Oleg Pudeyev
8528d8ff34 [ticket/10933] Initialize template context when template is constructed.
There is no apparent reason for either initializing or clearing
the context in set_style/set_custom_style.

Initially the initialization there was added in
0501640d5db158a010741e27803191ab469834c4, for reasons that
presently I do not see.

This permits making context property back private.

PHPBB3-10933
2012-11-02 18:03:52 -04:00
Andreas Fischer
ae612de663 [ticket/11043] Allow call_hook() to be called from more than one location.
Allow the helper function call_hook() of class phpbb_template to be called
from more than once location and thus for more than one hook (although there is
only one) by adding the method name as a parameter.

PHPBB3-11043
2012-08-03 05:56:49 -05:00
Fyorl
003220dc7c [ticket/10970] Fixed a problem with prepending root paths
PHPBB3-10970
2012-07-24 11:55:38 +01:00
Igor Wiedler
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext
PHPBB3-11012
2012-07-21 16:19:01 +02:00
Vjacheslav Trushkin
63b41913a4 [ticket/10799] Removing global variable from includejs
Removing global $phpbb_root_path from includejs implementation

PHPBB3-10799
2012-05-01 18:25:11 +03:00
Vjacheslav Trushkin
ed9a58a6cc [ticket/10756] Fixing variable declarations in style and template classes
Fixing variable declaration, removing function from template locator that does not belong there

PHPBB3-10756
2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
d91abbb146 [ticket/10756] Renaming phpbb_style_template to phpbb_template
Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
7d414d04ca [feature/merging-style-components] Moving template classes to style
Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates

PHPBB3-10632
2012-03-14 22:57:58 +02:00
Vjacheslav Trushkin
a98117b229 [feature/append_var] Adding append_var template class function
Adding append_var template class function

PHPBB3-10666
2012-03-05 02:41:42 +02:00
Vjacheslav Trushkin
5aad71b220 [ticket/10652] Fixing typo in template class
Fixing typo in template class that prevents template inheritance from working

PHPBB3-10652
2012-02-15 18:46:27 +02:00
Igor Wiedler
dd495e7a14 Merge pull request #526 from p/ticket/10500
Ticket/10500 Miscellaneous issues in the new template engine
2012-02-14 15:41:15 -08:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Oleg Pudeyev
552df1f6eb [ticket/10500] Use correct class name in @uses.
PHPBB3-10500
2011-12-03 21:15:29 -05:00
Nils Adermann
e52022c572 [feature/extension-manager] Make sure named styles are loaded from root dir
PHPBB3-10323
2011-09-29 16:15:54 +02:00
Nils Adermann
4d08d769c2 [feature/extension-manager] Fallback template might not always be set
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
520a5f9295 [feature/extension-manager] Refactoring the structure of extension provider
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
ea46feb115 [feature/extension-manager] Add support for templates in extensions.
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
2011-09-29 16:15:53 +02:00
Chris Smith
95d24e6fb7 [ticket/10375] Rework $source_file setting.
Only set the file if an mtime check or recompile are required.

PHPBB3-10375
2011-09-21 13:24:04 +01:00
Chris Smith
9d5e9af54b [ticket/10375] Make _tpl_load() a little leaner.
- Removed duplicate variables
- Set $source_file earlier for cache checks
- Fixed useless mtime check

PHPBB3-10375
2011-09-21 13:17:51 +01:00
Chris Smith
25aee49ca5 [ticket/10375] Use existing method to generate cache file name.
PHPBB3-10375
2011-09-21 13:17:10 +01:00
Chris Smith
903bc5b78a [ticket/10374] Remove 'custom template' cache prefix.
PHPBB3-10374
2011-09-20 23:33:08 +01:00
Oleg Pudeyev
41de09e408 [feature/template-engine] Delete _get_locator function.
It is no longer needed as locator is injected into template.

PHPBB3-9726
2011-08-13 23:49:54 -04:00
Oleg Pudeyev
fb8a1d999f [feature/template-engine] Need to call set_template on template.
PHPBB3-9726
2011-08-09 23:33:47 -04:00
Oleg Pudeyev
acb767f14d [feature/template-engine] Dependency inject locator into template.
PHPBB3-9726
2011-08-09 23:28:40 -04:00
Oleg Pudeyev
66232035aa [feature/template-engine] Delete useless code from set_template.
set_custom_template performs these calls, repeating them in
set_template is not needed.

PHPBB3-9726
2011-08-09 23:20:54 -04:00
Oleg Pudeyev
df46a576e9 [feature/template-engine] Use template engine class in bbcode class.
PHPBB3-9726
2011-08-07 19:26:28 -04:00
Oleg Pudeyev
02fc533066 [feature/template-engine] More documentation for template class.
PHPBB3-9726
2011-08-07 15:42:04 -04:00
Oleg Pudeyev
0b381516a0 [feature/template-engine] Create load_and_render to reduce code duplication.
PHPBB3-9726
2011-08-07 15:35:35 -04:00
Oleg Pudeyev
52f208900f [feature/template-engine] Get rid of orig_tpl_* in template engine.
The origins of orig_tpl_* are not pretty. Please see the following commits
and associated tickets: r9823, r9839, r9847, r10150, r10460.

In short, multiple hacks were required due to template engine reading
inheritance/storedb flags from $user (global) even when the template that
was being looked up or rendered was not the "active style of the
current user".

We no longer store templates in the database, removing half of the problem.
This commit fixes the second half of the problem by deleting
set_template_path function from template locator, and moving that logic
back into the template class' set_template. set_template now calls
set_custom_template, the latter only taking the template path and the
fallback paths as parameters. With this change template locator no longer
uses $user and does not use phpbb root path either.

All logic involving setting the user's "active" template is now
encapsulated in a single template class's function, set_template.
Setting other templates is done via set_custom_template and the caller
is responsible for determining and passing in fallback/inheritance path,
if any.

PHPBB3-9726
2011-08-04 21:45:42 -04:00
Oleg Pudeyev
1a6250d8b6 [feature/template-engine] Delete $style_name param from locator's set_custom_template.
This parameter was unused, it was only used by template's set_custom_template
to determine cache file prefix.

PHPBB3-9726
2011-08-04 21:24:40 -04:00
Oleg Pudeyev
13536f2be5 [feature/template-engine] Add constructor to template locator.
PHPBB3-9726
2011-08-04 21:23:06 -04:00
Oleg Pudeyev
05b71ca04e [feature/template-engine] Factor template locator out of template class.
Template locator is responsible for maintaining mapping from template
handles to filenames and paths, and provides resolution services
using these mappings.

Template locator is aware of template inheritance and is capable of
checking template file existence on the filesystem.

PHPBB3-9726
2011-07-30 17:06:22 -04:00