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

238 Commits

Author SHA1 Message Date
Nathaniel Guse
7e20b71180 [ticket/11665] Can't change file names already sent to set_filenames
PHPBB3-11665
2013-07-12 11:47:34 -05:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS
PHPBB3-11388
2013-07-11 15:31:55 -05:00
Nathaniel Guse
947b907efe [ticket/11388] Do not append assets_version if using remote path (e.g. http)
PHPBB3-11388
2013-07-11 11:28:35 -05:00
Nathaniel Guse
dd7f9f08d5 [ticket/11388] Remove typehints (causing tests to fail)
PHPBB3-11388
2013-07-11 11:24:45 -05:00
Nathaniel Guse
a846048918 [ticket/11388] Disable cache if IN_INSTALL defined
PHPBB3-11388
2013-07-11 11:03:28 -05:00
Nathaniel Guse
ac6b4319b3 [ticket/11388] typehits
PHPBB3-11388
2013-07-11 10:32:13 -05:00
Nathaniel Guse
99c7483ade [ticket/11388] INCLUDEJS supports //(url)
PHPBB3-11388
2013-07-11 08:36:16 -05:00
Nathaniel Guse
ab5a79a823 [ticket/11388] includejs inherit from includeasset
Copied from the INCLUDECSS PR, since this needed to be modified.

Added checks for argument strings/anchors/http/https paths in asset files
to load files properly

PHPBB3-11388
2013-07-10 13:19:34 -05:00
Nathan Guse
70a553e0b5 [feature/twig] Variable regular expressions should be lazy
PHPBB3-11598
2013-07-08 15:16:37 -05:00
Nathan Guse
0894a13770 [feature/twig] If DEBUG, EVENT will always look for new/missing tpl event files
If debug mode is enabled, lets check for new/removed EVENT templates on
page load rather than at compile. This is slower, but makes developing
extensions easier (no need to purge the cache when a new event template
file is added)

PHPBB3-11598
2013-07-06 16:26:56 -05:00
Nathan Guse
8d11a147f5 [feature/twig] Use Twig mask for IF statements instead of our own tokenparser
PHPBB3-11598
2013-07-05 14:10:57 -05:00
Nathan Guse
0ffbdc80d1 [feature/twig] context_recursive_loop_builder isn't used anymore, removing it
PHPBB3-11598
2013-07-05 13:15:10 -05:00
Nathan Guse
c5c34ff831 [feature/twig] Add check for defined IN_PHPBB in all new Twig related files
PHPBB3-11598
2013-07-05 13:10:35 -05:00
Nathan Guse
99ddbe1adc [feature/twig] Can't use typehint here, causes tests to fail
PHPBB3-11598
2013-07-05 12:55:32 -05:00
Nathan Guse
05984be2c0 [feature/twig] Fix S_NUM_ROWS assignment
PHPBB3-11598
2013-07-05 12:47:50 -05:00
Nathan Guse
81f0715b8e [feature/twig] Clarify comment
PHPBB3-11598
2013-07-05 10:05:20 -05:00
Nathan Guse
2674740573 [feature/twig] Spacing
PHPBB3-11598
2013-07-05 10:03:48 -05:00
Nathan Guse
576d8d7072 [feature/twig] Docs/typehinting for Twig extension
PHPBB3-11598
2013-07-05 09:56:25 -05:00
Nathan Guse
192c9d8f86 [feature/twig] Removing template/renderer.php (no longer used)
PHPBB3-11598
2013-07-05 09:37:40 -05:00
Nathaniel Guse
fdbdd8bfd9 [feature/twig] Fix a regular expression
PHPBB3-11598
2013-07-04 13:22:41 -05:00
Nathaniel Guse
864465761f [feature/twig] Fix debug code
PHPBB3-11598
2013-07-04 13:19:03 -05:00
Nathaniel Guse
5f03321fac [feature/twig] Support using Twig filters on {VAR}, add masks for Twig tags
Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc

We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo -->
= {% block foo %]. All tags are the same as the Twig tag names, but are
in uppercase.

PHPBB3-11598
2013-07-04 12:44:12 -05:00
Nathaniel Guse
84e0943c7b [feature/twig] Indentation and comments
PHPBB3-11598
2013-07-04 10:22:12 -05:00
Nathaniel Guse
36f25ea09b [feature/twig] Change style->set_style to accept a list of base directories
set_style now accepts an array containing a list of paths, e.g. array(
'ext/foo/bar/styles', 'styles'). Default: array('styles')

Using this option allows us to set the style based on the user's preferred
style (including the full tree), but use one or more base directories to
add the paths from.

The main use for this ability is so that extensions can call set_style,
including their path and the phpBB styles path (or any others) and have
their template files loaded from those directories (in the order given).

PHPBB3-11598
2013-07-04 10:12:09 -05:00
Nathaniel Guse
9652483ef4 [feature/twig] Fix begin loop var regex
PHPBB3-11598
2013-07-02 14:24:48 -05:00
Nathaniel Guse
57c2d99e65 [feature/twig] Fix indentation
PHPBB3-11598
2013-07-02 12:34:16 -05:00
Nathaniel Guse
f102f609f5 [feature/twig] Remove getCacheFilename function I was working on
This can be addressed later if we decide we want to have more nicely named
cache files. It does not need to be addressed now

PHPBB3-11598
2013-07-02 12:23:42 -05:00
Nathaniel Guse
985a233a78 [feature/twig] Remove reference to cachepath, it is not used publicly anymore
PHPBB3-11598
2013-07-02 12:22:42 -05:00
Nathaniel Guse
f39edcea3f [feature/twig] Check the template context for language vars
We output some language vars to the context (e.g. L_TITLE in the ACP). These
do not exist in user->lang, so we must check the context vars first, if not
in context, we output the result of user->lang.

PHPBB3-11598
2013-07-02 12:17:56 -05:00
Nathaniel Guse
709b3e9803 [feature/twig] Fix BBCode parser
PHPBB3-11598
2013-07-02 11:29:32 -05:00
Nathaniel Guse
02a8150bb6 [feature/twig] INCLUDEPHP behavior now supports local relative paths
As a last resort, now we use the Twig Loader to find the correct file to
include to (most specific file first, then parent styles). Also allows
using @namespace convention. This is ONLY done if the specified path is not
an absolute path AND the file does not exist relative to the phpBB root path.

PHPBB3-11598
2013-07-02 11:08:52 -05:00
Nathaniel Guse
59d13d0535 [feature/twig] INCLUDEJS behavior now supports local relative paths
This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
2013-07-02 11:07:12 -05:00
Nathaniel Guse
156d5c671f [feature/twig] INCLUDEJS now uses the definition class
This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
2013-07-02 10:13:16 -05:00
Nathaniel Guse
883b0a9f8c [feature/twig] Update phpbb_template interface
Return $this wherever possible

PHPBB3-11598
2013-07-01 21:44:00 -05:00
Nathaniel Guse
3b9cb7faa7 [feature/twig] Fix call for previous change to var name case
PHPBB3-11598
2013-07-01 21:29:15 -05:00
Nathaniel Guse
f902523956 [feature/twig] Comments
PHPBB3-11598
2013-07-01 21:24:27 -05:00
Nathaniel Guse
3dc40ad844 [feature/twig] Use correct case for variable name
PHPBB3-11598
2013-07-01 21:22:50 -05:00
Nathaniel Guse
e0f5e23032 [feature/twig] Fixed tabs in environment.php
PHPBB3-11598
2013-07-01 21:21:37 -05:00
Nathaniel Guse
8f303b376b [feature/twig] Don't forget to set the context when rendering!
PHPBB3-11598
2013-07-01 21:16:36 -05:00
Nathaniel Guse
1c7e077fea [feature/twig] Remove get_lang function (it's not used anywhere)
PHPBB3-11598
2013-07-01 21:11:24 -05:00
Nathaniel Guse
46d6899b46 [feature/twig] Do not assign var by reference
PHPBB3-11598
2013-07-01 20:41:36 -05:00
Nathaniel Guse
943728d3ef [feature/twig] Fix length replace in lexer
PHPBB3-11598
2013-07-01 14:58:20 -05:00
Nathaniel Guse
1a58d188aa [feature/twig] Prevent errors from empty user->style
PHPBB3-11598
2013-07-01 14:42:05 -05:00
Nathaniel Guse
d7cff78443 [feature/twig] Use adm_relative_path to build admin namespace
PHPBB3-11598
2013-07-01 13:39:51 -05:00
Nathaniel Guse
9fbba760fb [feature/twig] Remove classes related to old template engine
PHPBB3-11598
2013-07-01 13:34:28 -05:00
Nathaniel Guse
793ee3f8d9 [feature/twig] Remove debug code, set debug/auto reload correctly
PHPBB3-11598
2013-07-01 13:32:43 -05:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template
PHPBB3-11598
2013-07-01 13:28:08 -05:00
Nathaniel Guse
2d9bbe0ef2 [feature/twig] Fix template/context.php
PHPBB3-11598
2013-07-01 13:26:00 -05:00
Nathaniel Guse
341bae40eb [feature/twig] Remove the twig loader class that I started (don't use it)
PHPBB3-11598
2013-07-01 12:58:31 -05:00
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
2013-07-01 12:26:01 -05:00