1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

17527 Commits

Author SHA1 Message Date
Joas Schilling
34ad665c8b Merge branch 'ticket/8319' into ticket/8319-develop2
* ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse

Conflicts:
	phpBB/install/database_update.php
2013-07-10 17:24:49 +02:00
Joas Schilling
9210d735a5 [ticket/8319] Do not repeat the replacement
PHPBB3-8319
2013-07-10 17:13:02 +02:00
Nathan Guse
47ec38c011 [feature/twig] Add simple test to make sure Twig filters/tags are working
PHPBB3-11598
2013-07-08 15:21:27 -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
9f85a4d118 [ticket/11420] Use !==, === when comparing strings
PHPBB3-11420
2013-07-06 12:59:26 -05:00
Nathan Guse
bdaa40bb55 [ticket/11420] Fix comments, license link
PHPBB3-11420
2013-07-06 12:58:52 -05:00
Matthew Fonda
300867ab1a [ticket/11630] Improvements to the PHP lint pre-commit hook
The PHP lint pre-commit hook fails to display any output when an error
other than a parse error is decteced.

Additionally, the hook may not display any meaningful output depending
on php.ini settings. This commit removes the dependency on php.ini.

PHPBB3-11630
2013-07-06 12:16:59 -05:00
Nathan Guse
2d7a91ebd6 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11253' into develop
# By David King
# Via David King
* remotes/imkingdavid/ticket/11253:
  [ticket/11253] Put AND clause in correct SQL query
  [ticket/11253] Fix a few things brought up in the PR
  [ticket/11253] Fix typo in constant
  [ticket/11253] Add migration to add auth check to UCP signature module
2013-07-06 11:15:04 -05:00
Nathan Guse
e03586f2cf Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
2013-07-05 18:21:38 -05:00
Nathan Guse
7c84a12f39 Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11619:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
2013-07-05 18:21:01 -05:00
Nathan Guse
921d44aa4d [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for core
Moved below overall_footer_after so events can add JS files in that event.

PHPBB3-11598
2013-07-05 14:17:46 -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
9ac61565fd [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAME
PHPBB3-11598
2013-07-05 12:48:02 -05:00
Nathan Guse
05984be2c0 [feature/twig] Fix S_NUM_ROWS assignment
PHPBB3-11598
2013-07-05 12:47:50 -05:00
Nathan Guse
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
Nathan Guse
1f4a717f9e [feature/twig] Add template test for ===, !==
PHPBB3-11598
2013-07-05 10:29:24 -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
c1a600277d [feature/twig] Nicer code for get_user_style.php()
PHPBB3-11598
2013-07-05 09:57:55 -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
Andreas Fischer
4aef3d0ab9 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop
* Hardolaf/feature/auth-refactor:
  [feature/auth-refactor] Move auth providers to separate directory
2013-07-05 16:06:07 +02:00
Joseph Warner
5746c8d96f [feature/auth-refactor] Move auth providers to separate directory
Moves the provider files to their own directory per bantu's
suggestion.

PHPBB3-9734
2013-07-04 17:14:19 -04:00
Nathaniel Guse
25b4732845 [feature/twig] Remove debug code
PHPBB3-11598
2013-07-04 15:32:04 -05:00
Nathaniel Guse
0f3086a54b [feature/twig] Spacing
PHPBB3-11598
2013-07-04 15:24:42 -05:00
Nathaniel Guse
53496e6a47 [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/
PHPBB3-11598
2013-07-04 15:21:57 -05:00
Marc Alexander
5afcb1d5f4 [ticket/11600] Remove duplicate test case
PHPBB3-11600
2013-07-04 21:15:02 +02:00
Nathaniel Guse
38700a80f8 [feature/twig] Fix copy/pasted code
PHPBB3-11598
2013-07-04 14:09:50 -05:00
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
Marc Alexander
68f001aaaf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600 2013-07-04 00:14:48 +02: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