1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 14:16:28 +02:00
Commit Graph

7612 Commits

Author SHA1 Message Date
dd7f9f08d5 [ticket/11388] Remove typehints (causing tests to fail)
PHPBB3-11388
2013-07-11 11:24:45 -05:00
a846048918 [ticket/11388] Disable cache if IN_INSTALL defined
PHPBB3-11388
2013-07-11 11:03:28 -05:00
bc4b5c87a9 [ticket/11388] Do not modify by reference
PHPBB3-11388
2013-07-11 10:45:23 -05:00
ac6b4319b3 [ticket/11388] typehits
PHPBB3-11388
2013-07-11 10:32:13 -05:00
99c7483ade [ticket/11388] INCLUDEJS supports //(url)
PHPBB3-11388
2013-07-11 08:36:16 -05:00
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
70a553e0b5 [feature/twig] Variable regular expressions should be lazy
PHPBB3-11598
2013-07-08 15:16:37 -05:00
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
8d11a147f5 [feature/twig] Use Twig mask for IF statements instead of our own tokenparser
PHPBB3-11598
2013-07-05 14:10:57 -05:00
0ffbdc80d1 [feature/twig] context_recursive_loop_builder isn't used anymore, removing it
PHPBB3-11598
2013-07-05 13:15:10 -05:00
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
99ddbe1adc [feature/twig] Can't use typehint here, causes tests to fail
PHPBB3-11598
2013-07-05 12:55:32 -05:00
05984be2c0 [feature/twig] Fix S_NUM_ROWS assignment
PHPBB3-11598
2013-07-05 12:47:50 -05:00
13c3565454 [feature/twig] Remove style dependency for controller helper
If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
2013-07-05 12:11:59 -05:00
81f0715b8e [feature/twig] Clarify comment
PHPBB3-11598
2013-07-05 10:05:20 -05:00
2674740573 [feature/twig] Spacing
PHPBB3-11598
2013-07-05 10:03:48 -05:00
c1a600277d [feature/twig] Nicer code for get_user_style.php()
PHPBB3-11598
2013-07-05 09:57:55 -05:00
576d8d7072 [feature/twig] Docs/typehinting for Twig extension
PHPBB3-11598
2013-07-05 09:56:25 -05:00
192c9d8f86 [feature/twig] Removing template/renderer.php (no longer used)
PHPBB3-11598
2013-07-05 09:37:40 -05:00
0f3086a54b [feature/twig] Spacing
PHPBB3-11598
2013-07-04 15:24:42 -05:00
53496e6a47 [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/
PHPBB3-11598
2013-07-04 15:21:57 -05:00
38700a80f8 [feature/twig] Fix copy/pasted code
PHPBB3-11598
2013-07-04 14:09:50 -05:00
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
fdbdd8bfd9 [feature/twig] Fix a regular expression
PHPBB3-11598
2013-07-04 13:22:41 -05:00
864465761f [feature/twig] Fix debug code
PHPBB3-11598
2013-07-04 13:19:03 -05:00
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
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
b7ede06835 [feature/twig] Make style dependency optional for resolver
PHPBB3-11598
2013-07-04 11:16:44 -05:00
1ce33c1ff6 [feature/twig] Safety check for 2fb48d6
PHPBB3-11598
2013-07-04 11:12:26 -05:00
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
84e0943c7b [feature/twig] Indentation and comments
PHPBB3-11598
2013-07-04 10:22:12 -05:00
884a5b06fa [feature/twig] Add set_style function to controller helper
PHPBB3-11598
2013-07-04 10:13:05 -05:00
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
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
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
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
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines
PHPBB3-11617
2013-07-02 18:47:56 -07:00
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
9652483ef4 [feature/twig] Fix begin loop var regex
PHPBB3-11598
2013-07-02 14:24:48 -05:00
f9672e9b45 [feature/auth-refactor] Fix code style issue
PHPBB3-9734
2013-07-02 14:03:43 -04:00
57c2d99e65 [feature/twig] Fix indentation
PHPBB3-11598
2013-07-02 12:34:16 -05:00
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
985a233a78 [feature/twig] Remove reference to cachepath, it is not used publicly anymore
PHPBB3-11598
2013-07-02 12:22:42 -05:00
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
709b3e9803 [feature/twig] Fix BBCode parser
PHPBB3-11598
2013-07-02 11:29:32 -05:00
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
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
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
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
2743081489 [feature/auth-refactor] Fix comment grammar
PHPBB3-9734
2013-07-02 00:04:32 -04:00