Commit graph

1860 commits

Author SHA1 Message Date
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
Igor Wiedler
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
Oleg Pudeyev
44d6dc4c4c [feature/template-events] Convert a single style name to array of them.
This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
2012-11-17 16:42:40 -05:00
Igor Wiedler
98921e0b87 [ticket/11213] Add missing global in install_update.php
PHPBB3-11213
2012-11-17 05:27:36 +01:00
Igor Wiedler
5bc0f4b3d4 [ticket/11015] Move db driver class name fixing to function
PHPBB3-11015
2012-11-17 00:24:32 +01:00
David King
4b6d538b06 [feature/controller] Rename kernel pass class properly
PHPBB3-10864
2012-11-16 16:45:29 -05:00
David King
dd1f8a0e55 [feature/controller-new] Call pass to subscribe the Kernel event listener
PHPBB3-10864
2012-11-16 16:45:26 -05:00
Igor Wiedler
bf1325b1b4 [ticket/11015] Re-introduce accidentally removed require in install_convert
PHPBB3-11015
2012-11-15 23:48:49 +01:00
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
2012-11-14 11:33:24 -06:00
Igor Wiedler
bf641a7f31 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (31 commits)
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11152] Basic tests for the container functions
  [ticket/11152] Compile the install container
  [ticket/11152] Throw error if services.yml is missing
  [ticket/11152] Remove old container processor calls
  [ticket/11152] Use realpath in container extensions consistently
  [ticket/11152] Rename collection to collection_pass
  [ticket/11152] Remove @api docblocks
  [ticket/11152] Create separate function for debug-dependent container
  [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
  [ticket/11152] Convert cron_task_collection to generic di_service_collection
  [ticket/11152] Use relative root path in container, one dumped container per path
  [ticket/11152] Move container functions to a separate function file
  [feature/compiled-dic] Rename $phpEx to $php_ext in new code
  [feature/compiled-dic] Use an absolute path for core.root_path parameter
  [feature/compiled-dic] Update the composer.lock file
  [feature/compiled-dic] Purge cache to make ext services available right away
  [feature/compiled-dic] Fix root path when container is created after install
  [feature/compiled-dic] Remove old test
  ...
2012-11-12 10:46:21 +01:00
Igor Wiedler
5e52216b5e Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (666 commits)
  [ticket/11077] Remove code from old global announcements system
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
  [ticket/11187] Added a blank array to fix errors in functional tests
  [ticket/10780] Make L_COLON available in the installer.
  [ticket/11183] Remove $load_extensions and weird dl() calls
  [ticket/10970] Added extra documentation to parse_dynamic_path.
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  ...

Conflicts:
	phpBB/common.php
	phpBB/download/file.php
	phpBB/includes/db/dbal.php
	phpBB/includes/db/firebird.php
	phpBB/includes/db/mssql.php
	phpBB/includes/db/mssql_odbc.php
	phpBB/includes/db/mssqlnative.php
	phpBB/includes/db/mysql.php
	phpBB/includes/db/mysqli.php
	phpBB/includes/db/oracle.php
	phpBB/includes/db/postgres.php
	phpBB/includes/db/sqlite.php
	phpBB/includes/extension/manager.php
	phpBB/install/database_update.php
2012-11-12 10:33:40 +01:00
Nils Adermann
d2a051cdd4 [ticket/11193] Instantiate a single collection_pass for all collections
PHPBB3-11193
2012-11-11 18:39:24 +01:00
Nils Adermann
69845585a2 Merge pull request #1056 from igorw/feature/compiled-dic
[feature/compiled-dic] Compile the DI Container into a cached class
2012-11-11 09:05:15 -08:00
Igor Wiedler
844770d223 [ticket/11152] Remove old container processor calls
PHPBB3-11152
2012-11-11 17:43:12 +01:00
Igor Wiedler
3e4d3761fd [ticket/11152] Rename collection to collection_pass
PHPBB3-11152
2012-11-11 14:18:11 +01:00
Nathaniel Guse
84ba10ec8c Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-11 04:42:06 -06:00
Igor Wiedler
8851b797fb [ticket/11152] Create separate function for debug-dependent container
PHPBB3-11152
2012-11-10 23:35:52 +01:00
Igor Wiedler
231d743ba9 [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
PHPBB3-11152
2012-11-10 23:34:27 +01:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-11-10 10:58:44 -06:00
Nathaniel Guse
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG
PHPBB3-11189
2012-11-10 10:45:02 -06:00
Andreas Fischer
f5ed04f8ff Merge remote-tracking branch 'bantu/ticket/10780' into develop
* bantu/ticket/10780:
  [ticket/10780] Make L_COLON available in the installer.
2012-11-10 14:07:03 +01:00
Andreas Fischer
40f3ae1d8f Merge remote-tracking branch 'igorw/ticket/11183' into develop
* igorw/ticket/11183:
  [ticket/11183] Remove $load_extensions and weird dl() calls
2012-11-10 14:02:45 +01:00
Andreas Fischer
3ea5b0abbd [ticket/10780] Make L_COLON available in the installer.
PHPBB3-10780
2012-11-10 12:53:45 +01:00
Igor Wiedler
897e8f2e83 [ticket/11152] Move container functions to a separate function file
PHPBB3-11152
2012-11-10 12:02:56 +01:00
David King
cb2725dd5a [feature/compiled-dic] Fix cron task loading
We cannot use container tags at run time if we are using a cached, compiled
container object (i.e. phpbb_cache_container) so we have to load them
beforehand.

PHPBB3-11152
2012-11-10 11:40:49 +01:00
David King
f9f03435f0 [feature/compiled-dic] Move this to the other PR
PHPBB3-11152
2012-11-10 11:40:10 +01:00
David King
996f63fb34 [feature/compiled-dic] Remove re-creation of class loader in install
PHPBB3-11152
2012-11-10 11:40:09 +01:00
David King
2f692ef3b9 [feature/compiled-dic] Remove redundant method call
PHPBB3-11152
2012-11-10 11:40:09 +01:00
David King
f48709f5bb [feature/compiled-dic] Compile the DI Container into a cached class
PHPBB3-11152
2012-11-10 11:40:09 +01:00
Igor Wiedler
195014867a [ticket/11183] Remove $load_extensions and weird dl() calls
PHPBB3-11183
2012-11-10 11:25:22 +01:00
Igor Wiedler
7d7dc98b10 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
PHPBB3-11181
2012-11-09 23:16:42 +01:00
Oleg Pudeyev
957508c8b1 Merge PR #1044 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
2012-11-09 09:58:00 -05:00
Oleg Pudeyev
a16b9d17da Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympus
* bantu/ticket/11178:
  [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
2012-11-09 09:57:33 -05:00
Nathaniel Guse
6c8c54d4d2 [ticket/11103] Inject table prefix to notifications system instead of constants
PHPBB3-11103
2012-11-09 08:48:41 -06:00
Oleg Pudeyev
646d5ef3af Merge PR #1042 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10897] Combine bot updates and bot delete.
  [ticket/10897] Use same code/query for deleting.
  [ticket/10897] Make sure the user we're fetching is a bot.
  [ticket/10897] Do not handle IP address. There is no need.
  [ticket/10897] Update by user_id instead of bot_name.
  [ticket/10897] Move bot delete data to the relevant foreach loop.
  [ticket/10897] Add comment about what's going on.
  [ticket/10897] Remove unnecessary string casting.
  [ticket/10897] Add space after foreach.
  [ticket/10897] Update bots during phpBB update
  [ticket/10897] Bot list updated
2012-11-09 09:22:33 -05:00
Andreas Fischer
ed74c9c487 [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
Take whatever startup.php sets instead.

This especially takes care of E_STRICT messages that are generated because of
PHP4 compatibility.

PHPBB3-11178
2012-11-09 14:30:44 +01:00
Andreas Fischer
60ea1c10ef [ticket/10897] Combine bot updates and bot delete.
PHPBB3-10897
2012-11-09 13:40:48 +01:00
Andreas Fischer
54700f5ba2 [ticket/10897] Use same code/query for deleting.
PHPBB3-10897
2012-11-09 12:53:33 +01:00
Andreas Fischer
520ffdf368 [ticket/10897] Make sure the user we're fetching is a bot.
PHPBB3-10897
2012-11-09 12:47:50 +01:00
Andreas Fischer
c054757f3c [ticket/10897] Do not handle IP address. There is no need.
PHPBB3-10897
2012-11-09 12:46:21 +01:00
Andreas Fischer
63c64694bc [ticket/10897] Update by user_id instead of bot_name.
PHPBB3-10897
2012-11-09 12:41:59 +01:00
Andreas Fischer
935bc33268 [ticket/10897] Move bot delete data to the relevant foreach loop.
PHPBB3-10897
2012-11-09 12:19:58 +01:00
Andreas Fischer
de6d741d96 [ticket/10897] Add comment about what's going on.
PHPBB3-10897
2012-11-09 12:19:18 +01:00
Andreas Fischer
b2183c9b70 [ticket/10897] Remove unnecessary string casting.
PHPBB3-10897
2012-11-09 12:16:38 +01:00
Andreas Fischer
07e7c475d5 [ticket/10897] Add space after foreach.
PHPBB3-10897
2012-11-09 12:16:38 +01:00
Carlo
53e9bab237 [ticket/10897] Update bots during phpBB update
PHPBB3-10897
2012-11-09 12:10:53 +01:00
Carlo
399662d2af [ticket/10897] Bot list updated
'Baidu [Spider]' updated.
'Bing [Bot]' fixed only identation.
'Exabot [Bot]' changed because there is used also 'Exabot-Thumbnails'
user agent.
'NG-Search [Bot]' no longer exists.
'Nutch/CVS [Bot]' is the same of 'Nutch [Bot]'.
'OmniExplorer [Bot]' no longer exists.
'Seekport [Bot]' no longer exists.
'Synoo [Bot]' no longer exists.
'Voyager [Bot]' updated.
'W3C [Validator]' corrected (there was a *).
'WiseNut [Bot]' no longer exists.

PHPBB3-10897
2012-11-09 12:05:34 +01:00
Oleg Pudeyev
196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop
* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php
2012-11-06 16:23:33 -05:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context.
PHPBB3-10933
2012-11-02 18:51:35 -04:00
Nathan Guse
e549b7663d [ticket/11103] Set basic notifications to be enabled by default
Now, if there is no row for the user in the user_notifications table,
the user will receive basic notifications. If the user wishes to not
receive notifications, a row must be added with notify = 0.

For other methods besides the basic (e.g. email, jabber) a row must
still be added with notify = 1 for them to receive notifications

PHPBB3-11103
2012-10-29 18:09:20 -05:00