1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00

191 Commits

Author SHA1 Message Date
rechosen
7f76c9f9c7 [ticket/11777] Rename the extension template listener subdirectory to 'event/'
Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
2013-08-12 09:59:11 +02:00
rechosen
49824a0fd3 [ticket/11777] Add subdirectory 'events/' to the template event search path
Makes the twig template engine look in the events/ subdirectory instead of the
main styles/[style]/template/ directory for extension template events. Note
that it does _not_ look recursively!

PHPBB3-11777
2013-08-12 09:59:10 +02:00
Vjacheslav Trushkin
a0206a61bc [ticket/11781] Include func update_post_information()
Include functions_posting before using functions defined in that file

PHPBB3-11781
2013-08-11 11:31:02 +03:00
Nathan Guse
c9cd7412f2 Merge pull request #1633 from nickvergessen/ticket/11751
[ticket/11751] Add mcp modules for softdelete  on update
2013-08-09 12:08:36 -07:00
Joas Schilling
e399dc162b Merge remote-tracking branch 'EXreaction/ticket/11701' into develop
* EXreaction/ticket/11701:
  [ticket/11701] New line at EOF
  [ticket/11701] Test events in loops
  [ticket/11701] Refix regex for appending |length
  [ticket/11701] Fix regex for appending |length
  [ticket/11701] Fix loops var check
  [ticket/11701] Remove useless str_replace
  [ticket/11701] Loop variables are not passed correctly to events
2013-08-09 17:25:00 +02:00
Joseph Warner
69cb2e4c60 [feature/oauth] More template work
PHPBB3-11673
2013-08-09 05:26:44 -04:00
Joseph Warner
0b80aaf217 [feature/oauth] Add method to return necessary data for auth_link
PHPBB3-11673
2013-08-09 05:17:27 -04:00
Dhruv
f35d732f40 Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
2013-08-08 13:56:39 +05:30
Joseph Warner
6be6de2b29 [feature/oauth] Migration update for new ucp module
PHPBB3-11673
2013-08-07 21:40:49 -04:00
Joseph Warner
3cbb973160 [feature/oauth] Pass users_table as parameter to OAuth in construct
PHPBB3-11673
2013-08-02 14:37:39 -04:00
Joseph Warner
e16dd958e3 [feature/oauth] OAuth clear tokens on logout
PHPBB3-11673
2013-08-02 14:31:35 -04:00
Joseph Warner
2222f3f380 [feature/oauth] Fix error caused by previous change in OAuth
PHPBB3-11673
2013-08-02 14:23:35 -04:00
Joseph Warner
1ae2283b34 [feature/oauth] Finish updating interface and related code
PHPBB3-11673
2013-08-02 14:21:25 -04:00
Joseph Warner
245e71e4e2 [feature/oauth] Add get_login_data to the auth_provider_interface
PHPBB3-11673
2013-08-02 14:05:44 -04:00
Joseph Warner
abe9f27723 [feature/oauth] Clean up OAuth services
PHPBB3-11673
2013-08-01 21:35:05 -04:00
Joseph Warner
abee776018 [feature/oauth] Clean up oauth.php
PHPBB3-11673
2013-08-01 21:30:51 -04:00
Oliver Schramm
e667481c6c [ticket/11760] Use phpbb_version_compare() wrapper
PHPBB3-11760
2013-08-02 03:28:32 +02:00
Oliver Schramm
7d90f0a8a0 [ticket/11759] Change lowercase to uppercase
PHPBB3-11759
2013-08-02 02:49:28 +02:00
Joas Schilling
07bc935efe [ticket/11751] Add mcp modules for softdelete on update
PHPBB3-11751
2013-07-31 23:03:32 +02:00
Joseph Warner
3264a7ece5 [feature/oauth] Attempt to fix postgres issue
PHPBB3-11673
2013-07-31 16:34:07 -04:00
Nathan Guse
d536a69e29 Merge pull request #1563 from cyberalien/ticket/11688
[ticket/11688] Purge TWIG cache
2013-07-31 08:10:46 -07:00
Oliver Schramm
8892205644 [ticket/11757] Fix typo in signature_module_auth migration
PHPBB3-11757
2013-07-30 22:41:12 +02:00
Joseph Warner
b74e65801a [feature/oauth] Clean up documentation
PHPBB3-11673
2013-07-30 14:15:00 -04:00
Joseph Warner
bf9d4e0cdf [feature/oauth] Consolidate repeated query into one function
PHPBB3-11673
2013-07-30 14:08:33 -04:00
Vjacheslav Trushkin
5eb321d311 [ticket/11688] Fix docblock
PHPBB3-11688
2013-07-30 21:02:40 +03:00
Vjacheslav Trushkin
212294382d [ticket/11688] Rename purge_dir to remove_dir
PHPBB3-11688
2013-07-30 12:32:14 +03:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
2013-07-30 01:06:11 +02:00
Joseph Warner
e53ebb1b68 [feature/oauth] Update user_id on the access token
PHPBB3-11673
2013-07-29 16:29:12 -04:00
Joseph Warner
e91b73e62d [feature/oauth] Update the auth interface
PHPBB3-11673
2013-07-29 16:12:47 -04:00
Joseph Warner
d21ab4f629 [feature/oauth] Update the OAuth service interface
PHPBB3-11673
2013-07-29 16:07:26 -04:00
Joseph Warner
3d55e5faa9 [feature/oauth] Works in all tests now
PHPBB3-11673
2013-07-29 16:04:08 -04:00
Joseph Warner
641433920e [feature/oauth] Worked in at least one test
PHPBB3-11673
2013-07-29 15:07:55 -04:00
Joseph Warner
9eb4d55e82 [feature/oauth] Start work on linking an oauth account
Updates token storage to allow retrieval only by session_id

PHPBB3-11673
2013-07-29 14:27:46 -04:00
Joseph Warner
c09bda10fc [feature/oauth] Properly check that all data needed is available
PHPBB3-11673
2013-07-29 13:11:15 -04:00
Nathan Guse
0215e0bd95 [ticket/11724] Replace spaces with tabs
PHPBB3-11724
2013-07-28 21:31:12 -05:00
Nathan Guse
d5c56c5d50 [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
PHPBB3-11724
2013-07-27 20:02:03 -05:00
Nathan Guse
57bc3c7d3a [ticket/11628] phpbb_template, not phpbb_template_interface
PHPBB3-11628
2013-07-25 09:32:28 -05:00
Joseph Warner
7c065bc9a2 [feature/oauth] Finish fixes from tests and tests for token storage
PHPBB3-11673
2013-07-24 16:06:34 -04:00
Joseph Warner
f8dbaa148d [feature/oauth] Fixes for problems found by tests
PHPBB3-11673
2013-07-24 16:02:59 -04:00
Joseph Warner
15a2ad3149 [feature/oauth] Fix error in token_storage::set_user_id()
PHPBB3-11673
2013-07-24 15:08:08 -04:00
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