mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00
Code Issues Releases Wiki Activity
11,179 Commits 18 Branches 192 Tags
Commit Graph

11179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleg Pudeyev
f3befa4b29 [feature/template-engine] Remaining documentation. 
PHPBB3-9726
 2011-08-07 19:07:27 -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
Oleg Pudeyev
4126a571ac [feature/template-engine] Delete $files_template property. 
This seems to have been used for db storage of templates.
We no longer offer db storage of templates, and thus currenty
$files_template is only written to but not read anywhere.

PHPBB3-9726
 2011-07-30 15:20:25 -04:00
Oleg Pudeyev
e116561348 [feature/template-engine] Rename is_absolute to phpbb_is_absolute. 
PHPBB3-9726
 2011-07-24 13:37:46 -04:00
Nils Adermann
ee203b4632 [feature/template-engine] Test template DEFINE statements across files 
PHPBB3-9726
 2011-07-17 14:28:56 -04:00
Igor Wiedler
bf34264f4f [feature/template-engine] Docblocks, no more constructor for filter 
Add docblocks for phpbb_template_filter, remove the useless constructor.

PHPBB3-9726
 2011-07-16 15:24:14 +02:00
Oleg Pudeyev
e43d8732d4 [feature/template-engine] Add ampersands to return refs by reference. 
PHPBB3-9726
 2011-07-10 03:45:57 -04:00
Oleg Pudeyev
66cef00589 [feature/template-engine] Delete useless assignment by reference for $lang. 
PHPBB3-9726
 2011-07-10 03:41:09 -04:00
Igor Wiedler
c58b09e65d [feature/template-engine] Remove $include_once argument of display() 
PHPBB3-9726
 2011-07-10 01:05:54 +02:00
Igor Wiedler
ae53623230 [feature/template-engine] Refactor $config dependency out of the filter 
The template stream filter no longer depends on the $config global.
Instead it uses a 'allow_php' param that is passed via
stream_bucket_append's last argument.

Tests also adjusted.

PHPBB3-9726
 2011-07-10 00:35:07 +02:00
Igor Wiedler
ee0bba3ab6 [feature/template-engine] Fix some comments 
PHPBB3-9726
 2011-07-10 00:33:25 +02:00
Igor Wiedler
f7b06ca12d [feature/template-engine] Move template.php to includes/template 
This allows making use of autoloading.

PHPBB3-9726
 2011-07-10 00:30:50 +02:00
Oleg Pudeyev
1d26398faa [feature/template-engine] Fixed copyright year. 
PHPBB3-9726
 2011-05-19 22:55:08 -04:00
Oleg Pudeyev
6ae5a64f6c [feature/template-engine] Fixed absolute path PHP includes, added test. 
PHPBB3-9726
 2011-05-19 12:18:16 -04:00
Oleg Pudeyev
efda4da19f [feature/template-engine] Moved includephp test to its own file. 
PHPBB3-9726
 2011-05-18 10:57:04 -04:00
Oleg Pudeyev
f24d858cff [feature/template-engine] Added tests for template inheritance. 
PHPBB3-9726
 2011-05-18 10:51:33 -04:00
Oleg Pudeyev
20b4df2853 [feature/template-engine] Delete useless template require. 
It is now handled by autoloading.

PHPBB3-9726
 2011-05-18 10:36:17 -04:00
Oleg Pudeyev
7d911e0bc1 [feature/template-engine] Delete @version everywhere. 
This is not used since the switch to git.

PHPBB3-9726
 2011-05-14 15:30:20 -04:00
Oleg Pudeyev
70ccf04e06 [feature/template-engine] Moved phpbb_template_filter into own file. 
PHPBB3-9726
 2011-05-14 15:30:20 -04:00
Oleg Pudeyev
b04f0a5f70 [feature/template-engine] Delete @access everywhere. 
Access specification in php 5 is done directly on functions/properties.

PHPBB3-9726
 2011-05-14 15:30:20 -04:00
Oleg Pudeyev
be8fc0864c [feature/template-engine] Added a test for inclusion of php files from subdir. 
PHPBB3-9726
 2011-05-14 15:30:20 -04:00
Oleg Pudeyev
94560d7086 [feature/template-engine] Make INCLUDEPHP relative to board root. 
PHPBB3-9726
 2011-05-12 20:13:32 -04:00
Oleg Pudeyev
d2ac05aa74 [feature/template-engine] Replaced globals with dependency injection. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
581374c9c3 [feature/template-engine] Deleted useless catch. 
In tests there is no need to catch unexpected exceptions.

PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
ac9a910c64 [feature/template-engine] Delete obsolete comments pertaining to notices. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
345852d240 [feature/template-engine] Clarify cache directory path for set_custom_template 
Even if the template may be outside of phpBB, phpBB's cache directory
is still going to be used for storing compiled template code.

PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
d2daaf0317 [feature/template-engine] Try to handle failed template includes. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
7638bcb560 [feature/template-engine] Rename $filename to $compiled_path for clarity. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
7778771819 [feature/template-engine] Move DEBUG_EXTRA check for $recompile up. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
504acaba6b [feature/template-engine] Deleted useless assignment. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
d6f75e97d6 [feature/template-engine] Added docblocks to get_*_ref in context. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
635460fa6d [feature/template-engine] Fixed reference usage. 
Hopefully this is right, I have not checked it against the manual
(assuming the manual even covers these things).

PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
169c4377e9 [feature/template-engine] Disposed of underscores in property names. 
PHPBB3-9726
 2011-05-12 20:13:31 -04:00
Oleg Pudeyev
97d2a6527e [feature/template-engine] Remove commented out error reporting logic. 
PHPBB3-9726
 2011-05-12 20:13:30 -04:00
Oleg Pudeyev
0ca7ad66dc [feature/template-engine] Refactor hook logic into a separate function. 
PHPBB3-9726
 2011-05-12 20:13:30 -04:00
Oleg Pudeyev
df76885b11 [feature/template-engine] Reinstate phpbb_template#destroy function. 
PHPBB3-9726
 2011-05-12 20:13:30 -04:00
Oleg Pudeyev
0462ab3a4a [feature/template-engine] Add back IN_PHPBB preamble. 
PHPBB3-9726
 2011-05-12 20:13:30 -04:00
Oleg Pudeyev
49cf28a9c4 [feature/template-engine] Moved template classes to subdirectory. 
PHPBB3-9726
 2011-05-08 04:06:25 -04:00
Oleg Pudeyev
84bc485ccc [feature/template-engine] Renamed template executor and friends to renderer. 
PHPBB3-9726
 2011-05-08 04:03:41 -04:00
Oleg Pudeyev
1cba674b9a [feature/template-engine] Added docblocks and boilerplate to new files. 
PHPBB3-9726
 2011-05-07 17:58:56 -04:00
Oleg Pudeyev
b5444a7d7d [feature/template-engine] Removed more dead code. 
PHPBB3-9726
 2011-05-07 17:50:48 -04:00
Oleg Pudeyev
0501640d5d [feature/template-engine] Added phpbb_template_context class. 
Objects of this class hold variables assigned to templates.

PHPBB3-9726
 2011-05-07 17:47:02 -04:00
Oleg Pudeyev
d8122df332 [feature/template-engine] Always call ob_end_clean. 
We have to stop output buffering even when rendering fails.

PHPBB3-9726
 2011-05-05 19:03:46 -04:00
Oleg Pudeyev
b057d7439e [feature/template-engine] Removed some dead code. 
PHPBB3-9726
 2011-05-04 01:21:45 -04:00
Oleg Pudeyev
d06e59f63b [feature/template-engine] Split template execution logic into classes. 
Template executor interface defines a template executor object.
It is an object which can execute (i.e. display/render) a template.
Currently there are two implementations:

 * phpbb_template_executor_include includes php code from a file.
 * phpbb_template_executor_eval eval's php code.

PHPBB3-9726
 2011-05-04 01:21:44 -04:00