Commit graph

19105 commits

Author SHA1 Message Date
Nathaniel Guse
ffbc144a73 [ticket/11628] Make get_template_vars protected
Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
2013-07-24 13:38:12 -05:00
Nathaniel Guse
427fa17f7f [ticket/11628] Fix a bug I noticed in template->destroy
Should not be setting $this->context = array()!

PHPBB3-11628
2013-07-24 13:34:41 -05:00
Nathaniel Guse
8795a354fe [ticket/11628] Remove the one usage of get_style_path()
Makes the code easier to follow

PHPBB3-11628
2013-07-24 13:31:09 -05:00
Nathaniel Guse
3b46f77e4e [ticket/11628] Shorten an if to an inline statement
PHPBB3-11628
2013-07-24 13:26:55 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style
PHPBB3-11628
2013-07-24 13:19:20 -05:00
Joseph Warner
5843294813 [feature/oauth] Update comment to better reflect the action
PHPBB3-11673
2013-07-24 14:05:54 -04:00
Nathaniel Guse
4414278209 [ticket/11628] Set admin namespace in the constructor
PHPBB3-11628
2013-07-24 13:05:27 -05:00
Nathaniel Guse
67627f3336 [ticket/11628] Change set_custom_style $template path to default to string
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments

PHPBB3-11628
2013-07-24 13:01:30 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
2013-07-24 12:56:39 -05:00
Joseph Warner
581cb37b8c [feature/oauth] Start linking/registering OAuth accounts during login
PHPBB3-11673
2013-07-24 13:46:33 -04:00
Nathaniel Guse
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style
PHPBB3-11628
2013-07-24 12:45:35 -05:00
Nathaniel Guse
ecaed319ab [ticket/11628] Move setting core namespace to set_style()
PHPBB3-11628
2013-07-24 12:42:37 -05:00
Nathaniel Guse
85ff05bec6 [ticket/11628] Remove $this->names, $this->style_names from phpbb_template
These are not used anywhere

PHPBB3-11628
2013-07-24 12:34:22 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Oliver Schramm
e805036963 [ticket/10917] Using phpbb wrapper
PHPBB3-10917
2013-07-24 19:08:49 +02:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c [ticket/11628] Remove style resource locator
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 11:59:21 -05:00
Joseph Warner
669586c134 [feature/oauth] Token must be updated with the user_id
PHPBB3-11673
2013-07-24 12:56:27 -04:00
Oliver Schramm
5af63a7860 [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
PHPBB3-10917
2013-07-24 18:15:03 +02:00
Oliver Schramm
27126e065d [ticket/11741] Fix empty brackets and remove bullet
PHPBB3-11741
2013-07-24 17:22:10 +02:00
Joseph Warner
58d5820069 [feature/oauth] Basic login functionality now working
These changes are currently unique to OAuth and need to be made
generic so that any auth provider can modify the login template.

PHPBB3-11673
2013-07-24 10:40:42 -04:00
Joseph Warner
ffb14a6988 [feature/oauth] Fix OAuth login
PHPBB3-11673
2013-07-24 10:36:08 -04:00
Joseph Warner
5401673f96 [feature/oauth] Move language constants for oauth services to common.php
PHPBB3-11673
2013-07-24 10:35:36 -04:00
Bruno Ais
4cdccbd42b [ticket/11638] Removed the unneeded reset.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:45:23 +01:00
Bruno Ais
6c68348a71 [ticket/11638] Use the $parse_flags like the other commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:38 +01:00
Bruno Ais
029015e154 [ticket/11638] Reverted to use the $parse tags way as the other ones
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:14 +01:00
Oliver Schramm
0dcf24acc1 [ticket/8228] Fix whitespaces before code in Firefox
Based on the "[code] enhancements" modification by TerraFrost

PHPBB3-8228
2013-07-24 13:31:12 +02:00
Bruno Ais
4ed322b5b8 [ticket/11638] Updated: bitwise $parse_flags use optionset()
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 11:59:28 +01:00
Bruno Ais
13fa346e8f [ticket/11656] Made the check for the bitfield just like other PR's
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
2013-07-24 11:38:04 +01:00
Bruno Ais
1372b4f208 [ticket/11639] Removed a non-needed unset
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-24 10:33:06 +01:00
Joseph Warner
38d4eb073e [feature/oauth] Fix last typo. Authentication works for accounts in db
PHPBB3-11673
2013-07-23 22:35:54 -04:00
Joseph Warner
5fa08b92a2 [feature/oauth] Fix typo in token storage
PHPBB3-11673
2013-07-23 22:33:11 -04:00
Joseph Warner
4369cc8876 [feature/oauth] Fix more errors related to sql changes
PHPBB3-11673
2013-07-23 22:29:27 -04:00
Joseph Warner
da6a8787f8 [feature/oauth] Fix SQL error found in install
PHPBB3-11673
2013-07-23 22:26:34 -04:00
Joseph Warner
dc050e7ece [feature/oauth] Fix OAuth after schema changes
PHPBB3-11673
2013-07-23 22:20:38 -04:00
Joseph Warner
b1c62793c6 [feature/oauth] Fix token storage after sql changes
PHPBB3-11673
2013-07-23 22:20:04 -04:00
Joseph Warner
2483efe9a3 [feature/oauth] Actual final schema changes
PHPBB3-11673
2013-07-23 22:18:56 -04:00
Joseph Warner
e60f4bc88b [feature/oauth] Finalize schema changes
PHPBB3-11673
2013-07-23 22:16:09 -04:00
Joseph Warner
8d568dae71 [feature/oauth] Fix SQL error in token storage
PHPBB3-11673
2013-07-23 21:23:07 -04:00
Joseph Warner
fe9c97cfb4 [feature/oauth] Fix errors in OAuth
PHPBB3-11673
2013-07-23 21:17:05 -04:00
Joseph Warner
c166801fe3 [feature/oauth] Remove temporary google testing code
PHPBB3-11673
2013-07-23 21:07:18 -04:00
Joseph Warner
b1938576f1 [feature/oauth] Fix outstanding issues with OAuth
Includes a temporary change that allows me to test against google.
This will be removed shortly.

PHPBB3-11673
2013-07-23 21:04:29 -04:00
Andreas Fischer
f0516b7d2a Merge remote-tracking branch 'EXreaction/ticket/11667' into develop
* EXreaction/ticket/11667:
  [ticket/11667] Use @inheritdoc
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11667] Make functions abstract in includeasset
  [ticket/11667] includeasset should be abstract
2013-07-24 02:45:35 +02:00
Joseph Warner
c26b68cc54 [feature/oauth] Update error message with actual error
PHPBB3-11673
2013-07-23 19:27:55 -04:00
Joseph Warner
9805927fac [feature/oauth] OAuth init method to minimally validate entered data
PHPBB3-11673
2013-07-23 15:26:57 -04:00
Joseph Warner
77c3264543 [feature/oauth] OAuth acp() method to return config field names
PHPBB3-11673
2013-07-23 14:53:02 -04:00
Joseph Warner
0857d14030 [feature/oauth] Update auth provider interface docs for block vars in ACP
PHPBB3-11673
2013-07-23 14:41:46 -04:00
Joseph Warner
af6a4b2161 [feature/oauth] Clean up the OAuth ACP template
PHPBB3-11673
2013-07-23 14:30:06 -04:00
Joseph Warner
2fc4be1a31 [feature/oauth] Fix language bug with new ACP OAuth template
PHPBB3-11673
2013-07-23 14:24:50 -04:00