1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 21:13:50 +01:00

17090 Commits

Author SHA1 Message Date
Nathaniel Guse
24be216366 [feature/twig] Attempt to automatically set style dir for ext modules
Extension authors can change it themselves if necessary

PHPBB3-11598
2013-07-04 13:49:56 -05:00
Nathaniel Guse
8cf6dbd950 [feature/twig] Trying some new debug code for this mkdir error
PHPBB3-11598
2013-07-04 13:40:37 -05:00
Nathaniel Guse
fdbdd8bfd9 [feature/twig] Fix a regular expression
PHPBB3-11598
2013-07-04 13:22:41 -05:00
Nathaniel Guse
4f6cb9acbd [feature/twig] Fix helper URL test
PHPBB3-11598
2013-07-04 13:19:21 -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
35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
  ...
2013-07-04 11:19:10 -05:00
Nathaniel Guse
b7ede06835 [feature/twig] Make style dependency optional for resolver
PHPBB3-11598
2013-07-04 11:16:44 -05:00
Nathaniel Guse
1ce33c1ff6 [feature/twig] Safety check for 2fb48d6
PHPBB3-11598
2013-07-04 11:12:26 -05:00
Nathaniel Guse
bb56c1a391 Revert "[feature/twig] Call set_style in the foo/bar controller for functional tests"
This reverts commit 5c39f26cd27d5e4a1debfa24407825906f42d346.
2013-07-04 11:09:33 -05:00
Nathaniel Guse
2fb48d60f1 [feature/twig] Attempt to automatically set style dir for ext controllers
Extension authors can change it themselves if necessary

PHPBB3-11598
2013-07-04 11:08:36 -05:00
Nathaniel Guse
81f27fd87e [feature/twig] Add test to make sure nested loops get the correct S_ROW_COUNT
PHPBB3-11598
2013-07-04 10:40:14 -05:00
Nathaniel Guse
84e0943c7b [feature/twig] Indentation and comments
PHPBB3-11598
2013-07-04 10:22:12 -05:00
Nathaniel Guse
5c39f26cd2 [feature/twig] Call set_style in the foo/bar controller for functional tests
PHPBB3-11598
2013-07-04 10:14:43 -05:00
Nathaniel Guse
884a5b06fa [feature/twig] Add set_style function to controller helper
PHPBB3-11598
2013-07-04 10:13:05 -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
Andreas Fischer
b3487b3167 Merge remote-tracking branch 'VSEphpbb/ticket/11577' into develop
* VSEphpbb/ticket/11577:
  [ticket/11577] Readjust min-height to 35px
  [ticket/11577] Correct over-sized Topic Rows
2013-07-03 22:56:30 +02:00
David King
73c289ae49 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop
* Hardolaf/feature/auth-refactor: (44 commits)
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [feature/auth-refactor] Forgot @inheritdoc on methods
  [feature/auth-refactor] Finish and clean up documentation
  [feature/auth-refactor] Change phpEx to php_ext in new classes
  [feature/auth-refactor] Fix two session tests broken by changes
  [feature/auth-refactor] Removed no longer used variable
  [feature/auth-refactor] Fix errors in acp_board
  [feature/auth-refactor] Fix indentation on acp_board
  [feature/auth-refactor] Refactor auth in acp_board
  [feature/auth-refactor] Don't truncate name then reattach same thing
  [feature/auth-refactor] Remove old auth plugins
  [feature/auth-refactor] Remove references to old auth plugins
  [feature/auth-refactor] Fix auth tests to use mock objects correctly
  [feature/auth-refactor] Test validate_session on provider_apache
  [feature/auth-refactor] Test autologin() on provider_apache
  [feature/auth-refactor] Test login() for provider_apache
  [feature/auth-refactor] Test for init on provider_apache
  ...
2013-07-03 12:46:18 -04:00
Nathaniel Guse
f1717412f3 [feature/twig] Debugging test failures
PHPBB3-11598
2013-07-03 09:31:35 -05:00
Joas Schilling
8ce7d36f70 Merge remote-tracking branch 'dhruvgoel92/ticket/11437' into develop
* dhruvgoel92/ticket/11437:
  [ticket/11437] avoid $start becoming negative when no search results are found
2013-07-03 11:51:28 +02:00
Andreas Fischer
3c3f203f14 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
2013-07-03 04:03:39 +02:00
Andreas Fischer
44de24f1b8 Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympus
* VSEphpbb/ticket/11617:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
2013-07-03 04:03:22 +02:00
Matt Friedman
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines
PHPBB3-11617
2013-07-02 18:47:56 -07:00
Matt Friedman
fba3a9d600 [ticket/11617] Missing U_ACTION in acp_captcha.php
http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
2013-07-02 16:52:15 -07:00
Nathaniel Guse
9652483ef4 [feature/twig] Fix begin loop var regex
PHPBB3-11598
2013-07-02 14:24:48 -05:00
Nathaniel Guse
52bce2ce11 [feature/twig] Prevent errors from mkdir if the dir already exists
PHPBB3-11598
2013-07-02 13:43:02 -05:00
Joseph Warner
f9672e9b45 [feature/auth-refactor] Fix code style issue
PHPBB3-9734
2013-07-02 14:03:43 -04:00
Nathaniel Guse
2507c648fe [feature/twig] template->cachepath is now private, missed checking tests
PHPBB3-11598
2013-07-02 12:59:23 -05:00
Nathaniel Guse
6bbe92a8d0 [feature/twig] Move test_php back to template_test
Was originally moved because I thought that a new test file might mean a new
instance and the memory would be cleared, fixing the original problem, but
that isn't true and it was fixed another way.

PHPBB3-11598
2013-07-02 12:50:55 -05:00
Nathaniel Guse
b4947f94ed [feature/twig] Should compare to $this->test_path rather than hardcoded path
PHPBB3-11598
2013-07-02 12:43:26 -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
c6c064a136 [feature/twig] Fix includejs test
PHPBB3-11598
2013-07-02 11:21:31 -05:00
Nathaniel Guse
9dce2b28af [feature/twig] Fix template test case
PHPBB3-11598
2013-07-02 11:21:05 -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
Joas Schilling
f1b057102d Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-07-02 13:08:58 +02:00
Joas Schilling
ec4a43c91c Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566-develop' into develop
* remotes/dhruvgoel92/ticket/11566-develop:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
2013-07-02 13:07:53 +02:00
Joas Schilling
d4531c9cea Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into develop-olympus
* remotes/dhruvgoel92/ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
2013-07-02 13:07:14 +02:00
Joseph Warner
2743081489 [feature/auth-refactor] Fix comment grammar
PHPBB3-9734
2013-07-02 00:04:32 -04:00
Nathaniel Guse
883b0a9f8c [feature/twig] Update phpbb_template interface
Return $this wherever possible

PHPBB3-11598
2013-07-01 21:44:00 -05:00
Joseph Warner
f48effb001 [feature/auth-refactor] Fix the actual cause of test failures
Enables super globals before the new container is instantiated in
the final step of installation to prevent issues caused by trying
to create a phpbb_request object when super globals are disabled.

PHPBB3-9734
2013-07-01 22:40:49 -04:00
Nathaniel Guse
f249a527e5 [feature/twig] Should have been else
PHPBB3-11598
2013-07-01 21:32:10 -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