Commit graph

16058 commits

Author SHA1 Message Date
Andreas Fischer
d221f2901a Merge remote-tracking branch 'igorw/ticket/11101' into develop
* igorw/ticket/11101:
  [ticket/11101] Delay execution of container processors
2012-09-14 13:34:21 +02:00
Andreas Fischer
635a58a7e2 Merge remote-tracking branch 'bantu/ticket/11109' into develop
* bantu/ticket/11109:
  [ticket/11109] Re-add file conflict checks to compress class
2012-09-14 01:27:48 +02:00
Fyorl
b24ee89cfc [ticket/11109] Re-add file conflict checks to compress class
PHPBB3-11109
2012-09-14 01:26:33 +02:00
Andreas Fischer
91423880da Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11045] Removed file conflict tests for compress class
  [ticket/11045] Replaced __DIR__ with dirname(__FILE__)
  [ticket/11045] Opening brace on its own line
  [ticket/11045] Explicitely check for zlib and bz2
  [ticket/11045] Added tests for file conflicts
  [ticket/11045] Added unit tests for the compress class
2012-09-14 00:49:48 +02:00
Andreas Fischer
888aa47b0e Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympus
* Fyorl/ticket/11045:
  [ticket/11045] Removed file conflict tests for compress class
  [ticket/11045] Replaced __DIR__ with dirname(__FILE__)
  [ticket/11045] Opening brace on its own line
  [ticket/11045] Explicitely check for zlib and bz2
  [ticket/11045] Added tests for file conflicts
  [ticket/11045] Added unit tests for the compress class
2012-09-14 00:46:04 +02:00
David King
298fa894e7 [ticket/11086] Move DI processing below $request definition
As per PR #991 (ticket/11101).

PHPBB3-11086
2012-09-13 16:56:09 -04:00
David King
503989979a [ticket/11086] Fix database_update.php to use Dependency Injection Container
PHPBB3-11086
2012-09-13 16:44:26 -04:00
Nathan Guse
207bbdf48c [ticket/11103] Quote notifications
PHPBB3-11103
2012-09-12 23:55:29 -05:00
Nathan Guse
97fde62b14 [ticket/11103] Jabber notification method
PHPBB3-11103
2012-09-12 23:03:26 -05:00
Nathan Guse
48cb98045e [ticket/11103] Correctly find users for notification for new topics
Append the forum_id to the URL to view the new topic in the notification

PHPBB3-11103
2012-09-12 22:38:23 -05:00
Nathan Guse
3d1549d43f [ticket/11103] Add ability for notification types to load special data
For consistency, links to posts do not include topic_id. As is done in
viewtopic, do not include the topic_id when linking to a post

PHPBB3-11103
2012-09-12 22:29:48 -05:00
Nathan Guse
e145956212 [ticket/11103] Use the Topic/Forum Subscriptions system
Using the Topic/Forum Subscription system that already exists
is going to save many hours of work.

If it is desired, it can always be easily converted over to the new
USER_NOTIFICATIONS_TABLE later (for the same amount of work).

PHPBB3-11103
2012-09-12 21:23:24 -05:00
Nathan Guse
9b1de1e487 [ticket/11103] Add topic ID to view post URL
PHPBB3-11103
2012-09-12 21:05:11 -05:00
Fyorl
ce7cffcf9e [ticket/11045] Removed file conflict tests for compress class
PHPBB3-11045
2012-09-11 09:42:29 +01:00
Nathan Guse
12e46e48c8 [ticket/11103] Remove notifications to posts/topics when they are deleted
PHPBB3-11103
2012-09-09 17:43:10 -05:00
Nathan Guse
2c31e82b60 [ticket/11103] Coding guidelines (SQL Queries)
PHPBB3-11103
2012-09-09 17:23:32 -05:00
Nathan Guse
5502f3c4aa [ticket/11103] Restyle the notification list
Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
2012-09-09 17:20:39 -05:00
Nathan Guse
e09f25d597 [ticket/11103] Update notifications on post/topic edit
PHPBB3-11103
2012-09-09 14:55:40 -05:00
Andreas Fischer
238fab3bb9 [ticket/8713] Update untrimmed_variable() doc block.
PHPBB3-8713
2012-09-09 21:53:17 +02:00
Nathan Guse
3624d2c50a [ticket/11103] Use the language system, topic notifications
PHPBB3-11103
2012-09-09 14:20:14 -05:00
Andreas Fischer
73a75fc3d3 [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores

  phpbb_hash(htmlspecialchars(trim($password)))

Setting passwords for other auth modules is currently not supported.

Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.

PHPBB3-8713
2012-09-09 21:10:29 +02:00
Nathan Guse
74e2a8f893 [ticket/11103] Post notifications
PHPBB3-11103
2012-09-09 13:29:47 -05:00
Nathan Guse
570fe6cee8 [ticket/11103] Do not initialize the notifications in common.php
DIC initializes it when it is needed.

PHPBB3-11103
2012-09-09 12:27:37 -05:00
Nathan Guse
ff45c9aa7c [ticket/11103] General notification email template.
PHPBB3-11103
2012-09-09 10:36:22 -05:00
Nathan Guse
4b4ea7c5cd [ticket/11103] The service now handles all user loading itself
Delete pm notifications when pms are deleted

PHPBB3-11103
2012-09-09 10:19:46 -05:00
Nathan Guse
2fb9f2ce6a Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103 2012-09-09 09:10:11 -05:00
Nathan Guse
b58ef116e1 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-09-09 09:09:21 -05:00
Nathaniel Guse
98a03090a0 [ticket/11103] Move banned user checking to email method
This will make sure banned users are never sent notification emails

PHPBB3-11103
2012-09-08 21:05:49 -05:00
Nathaniel Guse
6983f380c5 [ticket/11103] Full url function
PHPBB3-11103
2012-09-08 17:48:13 -05:00
Nathaniel Guse
16a0757f2a [ticket/11103] Order notifications properly
PHPBB3-11103
2012-09-08 17:28:13 -05:00
Nathan Guse
86b801df73 [ticket/11103] Some fixes for the email method
PHPBB3-11103
2012-09-08 16:12:20 -05:00
Nathan Guse
1e53f7df9d [ticket/11103] Fixing some db columns that were of the incorrect type
PHPBB3-11103
2012-09-08 16:02:32 -05:00
Nathan Guse
a4eb8bf47a [ticket/11103] Jabber notification method base
PHPBB3-11103
2012-09-08 15:49:22 -05:00
Nathan Guse
7fee0cfdf6 [ticket/11103] Work on the pm type and email method
PHPBB3-11103
2012-09-08 15:48:46 -05:00
David King
8a91598b14 Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop 2012-09-08 15:58:25 -04:00
Nathan Guse
7b0b6fc63c [ticket/11103] Forgot a constant
PHPBB3-11103
2012-09-08 13:40:05 -05:00
Nathan Guse
b594635526 [ticket/11103] Add tables to the database updater and installer
PHPBB3-11103
2012-09-08 13:09:34 -05:00
Nathan Guse
32a966b21d [ticket/11103] Private Message type notification
Also cleanup

PHPBB3-11103
2012-09-08 12:28:58 -05:00
Nathan Guse
e45fb0025e [ticket/11103] Output the notifications to the template
For now, just dumping the notifications in the header.

PHPBB3-11103
2012-09-08 12:05:55 -05:00
Nathan Guse
44f07df96f [ticket/11103] Working on the add/update notifications functions
Some cleanup and additional commenting as well

PHPBB3-11103
2012-09-08 11:40:02 -05:00
Nathan Guse
b887fcc3d1 [ticket/11103] The start of an all-encompassing notifications system
This system will take input from various systems to store notifications
and send notifications to users all in one nice extendable system.

This system should act something like the notifications system on
other social networking sites (in that, there is a single location where
a user can see all of their notifications for various events).

PHPBB3-11103
2012-09-08 10:49:58 -05:00
Andreas Fischer
1e05fd4c62 [ticket/8713] Trim password in auth_db to keep compatibility.
PHPBB3-8713
2012-09-08 15:01:29 +02:00
Andreas Fischer
cc0c378caf [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
PHPBB3-8713
2012-09-08 14:42:38 +02:00
Igor Wiedler
d543f0ffb1 [ticket/11101] Delay execution of container processors
Also fix the name of the ext processor service.

PHPBB3-11101
2012-09-08 14:41:41 +02:00
Andreas Fischer
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
Andreas Fischer
b62c37c579 [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
PHPBB3-8713
2012-09-08 14:09:12 +02:00
Andreas Fischer
c3e0d1b6d1 [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
PHPBB3-8713
2012-09-08 14:07:42 +02:00
Andreas Fischer
798033075b [ticket/8713] Always trim array keys.
PHPBB3-8713
2012-09-08 14:07:06 +02:00
Andreas Fischer
160c49351b [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
PHPBB3-8713
2012-09-08 13:44:50 +02:00
Andreas Fischer
4550fff55a [ticket/8713] Use \t in double quotes instead of tabs.
PHPBB3-8713
2012-09-08 13:43:14 +02:00