1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 10:35:20 +02:00

108 Commits

Author SHA1 Message Date
David King
fedd9d18d2 Merge remote-tracking branch 'EXreaction/ticket/11413' into develop
* EXreaction/ticket/11413: (23 commits)
  [ticket/11413] Revert some cache service related changes from earlier
  [ticket/11413] Use phpbb_user in test
  [ticket/11413] $user should have been $this->user
  [ticket/11413] Fix unit tests
  [ticket/11413] Translate the error
  [ticket/11413] Rename file to something more helpful
  [ticket/11413] Remove remaining irrelevant code to this PR
  [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
  [ticket/11413] Remove conversion of user_notifications
  [ticket/11413] Correct copyright year
  [ticket/11413] Remove changes for ticket 11420 from this branch
  [ticket/11413] Include mock class
  [ticket/11413] Don't use the database for the convert test
  [ticket/11413] Test get_notification_type_id and _ids functions
  [ticket/11413] Use sql_insert_buffer
  [ticket/11413] Create test for notification conversion
  [ticket/11413] Fix test fixtures and tests
  [ticket/11413] Fix some more tests
  [ticket/11413] Fix notification tests
  [ticket/11413] Prevent recursive function calls
  ...
2013-05-20 11:54:39 -04:00
Nathaniel Guse
05cd045923 [ticket/11413] Revert some cache service related changes from earlier
PHPBB3-11413
2013-05-13 00:56:08 -05:00
Nathaniel Guse
ad430ae406 [ticket/11413] $user should have been $this->user
PHPBB3-11413
2013-05-13 00:41:57 -05:00
Nathaniel Guse
fe13b89dd4 Merge remote-tracking branch 'remotes/bantu/ticket/11452' into develop 2013-05-11 20:52:52 -05:00
Nathan Guse
7d66a9ad52 [ticket/11413] Translate the error
PHPBB3-11413
2013-05-10 13:42:54 -05:00
Nathaniel Guse
3c76cdeb67 [ticket/11413] Remove remaining irrelevant code to this PR
PHPBB3-11413
2013-05-03 08:50:27 -05:00
Nathaniel Guse
4cd0914f89 [ticket/11413] Fix notification tests
Send types/methods the cache service, not the driver (not sure why the
driver was sent before)

PHPBB3-11413
2013-04-29 22:16:46 -05:00
Nathaniel Guse
7bda5a016a [ticket/11413] Prevent recursive function calls
PHPBB3-11413
2013-04-29 21:42:14 -05:00
Nathaniel Guse
33287a7360 [ticket/11413] Undo editing the user_notifications table
item_type is not equivalent to notification_type_name, it can be a generic
string (typically used to be able to subscribe to multiple notification
types while only subscribing to one item

PHPBB3-11413
2013-04-29 21:22:07 -05:00
Nathaniel Guse
4c5e51e379 [ticket/11413] Rename columns in notification/manager.php
PHPBB3-11413
2013-04-28 23:40:48 -05:00
Nathaniel Guse
ebb5169a46 [ticket/11454] Add messenger function set_addresses
Automatically fills to/im from a user row

Send messenger the Jabber address if using Jabber notifications

PHPBB3-11454
2013-04-24 15:19:37 -05:00
Nathaniel Guse
212971a3a6 [ticket/11454] Correct jabber global available check
Copied from msg_jabber()

PBPBB3-11454
2013-04-24 10:37:53 -05:00
Marc Alexander
c1dedabdfb [ticket/11488] Use correct base class in email notification method
In ticket/11451 this was not correctly changed to reflect the new class
phpbb_notifcation_method_messenger_base. Additionally, an undefined
variable error has been fixed in messenger_base.php (change should be
confirmed by bantu though).

PHPBB3-11488
2013-04-15 12:50:21 +02:00
Nils Adermann
78dc1c84c8 Merge pull request #1316 from nickvergessen/ticket/11405
Ticket/11405 Users that are subscribed to a forum, should receive notifications for new replies
2013-03-31 15:02:48 -07:00
Nils Adermann
133307b6bf Merge pull request #1300 from bantu/ticket/11451
[ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
2013-03-29 08:58:40 -07:00
Andreas Fischer
b156b22f35 [ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.
PHPBB3-11403
2013-03-29 16:53:50 +01:00
Andreas Fischer
6910d44154 [ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches.
PHPBB3-11403
2013-03-29 16:37:04 +01:00
David King
6dddc22ec7 [ticket/11448] Use of $user_id parameter to mark a user's notifications read
Currently, the $user_id is a parameter but is not used. This patch fixes that.

PHPBB3-11448
2013-03-26 17:07:20 -04:00
Joas Schilling
d8a63047aa [ticket/11474] Clarify comment with "global" and forum_id = 0
Forum ID 0 in permission checks, checks the global moderator permission.

PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:51 +01:00
Joas Schilling
1af89968dd [ticket/11474] Check read permission before sending *_in_queue notifications
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:26 +01:00
Joas Schilling
81cf02e057 [ticket/11405] Order users in bookmark, in order to pass postgres tests
PHPBB3-11405
2013-03-26 13:54:33 +01:00
Joas Schilling
1259117d21 [ticket/11405] Sort $users array in order to prevent issues on postgres
PHPBB3-11405
2013-03-25 15:07:06 +01:00
Joas Schilling
a91ffe06c7 [ticket/11405] Send post notifications to forum subscribers
Like in 3.0 we should also send notifications about new posts to users
that subscribed to the forum. (Subscriptions are verbose)

PHPBB3-11405
2013-03-25 09:28:53 +01:00
Andreas Fischer
58d7acbf5a [ticket/11452] Now notification_method_email checks whether user has address.
Make sure the user has an email address set before offering email
notifications. The address could be missing for whatever reason, e.g. external
authentication. This is also consistent with XMPP/Jabber now.

PHPBB3-11452
2013-03-17 19:54:32 +01:00
Andreas Fischer
c9e7247ab4 [ticket/11445] Add abstract class phpbb_notification_method_messenger_base.
PHPBB3-11445
2013-03-16 21:50:30 +01:00
Nathaniel Guse
36de18e174 [ticket/11423] Send unformatted usernames to the email template
PHPBB3-11423
2013-03-09 09:12:46 -06:00
David King
d658d6640b Merge remote-tracking branch 'EXreaction/ticket/11408' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11408:
  [ticket/11408] user_jabber instead of jabber
2013-03-06 17:01:30 -05:00
Nathaniel Guse
3aab72d79b [ticket/11408] user_jabber instead of jabber
PHPBB3-11408
2013-03-06 09:53:41 -06:00
David King
597c16a936 Merge remote-tracking branch 'EXreaction/ticket/11400' into develop
# By Nathan Guse
# Via Nathan Guse
* EXreaction/ticket/11400:
  [ticket/11400] If email is disabled, disable it for notifications
2013-03-05 14:46:58 -05:00
Nathan Guse
0eb6f56a9a [ticket/11402] Fix undefined index in post/topic_in_queue
PHPBB3-11402
2013-03-05 11:46:58 -06:00
Nathan Guse
ab4c1b5d0c [ticket/11400] If email is disabled, disable it for notifications
PHPBB3-11400
2013-03-05 10:28:52 -06:00
Nathan Guse
ee264e7235 [ticket/11103] Don't call generate_board_url many times
Fix a URL and some comments

PHPBB3-11103
2013-02-28 17:25:39 -06:00
Nathan Guse
b41b1a36d1 [ticket/11103] Case time in queries as an int
PHPBB3-11103
2013-02-28 15:25:18 -06:00
Nathan Guse
bd49942552 [ticket/11103] Correcting constructor comments
PHPBB3-11103
2013-01-15 12:54:39 -06:00
Nathan Guse
f089e099fe [ticket/11103] Including the set call in the declaration throws errors
Call the set_notification_manager from the load_object function instead.

PHPBB3-11103
2013-01-15 12:29:20 -06:00
Nathan Guse
07282a30ae [ticket/11103] Fix some various issues, better comments
PHPBB3-11103
2013-01-15 12:10:07 -06:00
Nathaniel Guse
192039a9e0 [ticket/11103] Fix sending the user ids to get the username/avatar
PHPBB3-11103
2012-12-27 10:31:43 -06:00
Nathaniel Guse
5a8520da62 [ticket/11103] Fix some more merging issues
PHPBB3-11103
2012-12-27 10:31:42 -06:00
Nathaniel Guse
bf93dceb1f [ticket/11103] Fix merge conflict
PHPBB3-11103
2012-12-26 11:09:03 -06:00
Nathan Guse
30356efab9 [ticket/11103] updating comments
PHPBB3-11103
2012-12-15 22:08:47 -06:00
Nathan Guse
eeb4018195 [ticket/11103] data -> notification_data
PHPBB3-11103
2012-12-15 22:08:10 -06:00
Nathan Guse
fad6bc5a7e [ticket/11103] unread -> notification_read
PHPBB3-11103
2012-12-15 22:06:32 -06:00
Nathan Guse
47bed33216 [ticket/11103] time -> notification_time
PHPBB3-11103
2012-12-15 22:02:16 -06:00
Nathan Guse
f47e51d6de [ticket/11103] Move is_enabled to a separate table for better performance
PHPBB3-11103
2012-12-15 19:18:26 -06:00
Nathan Guse
c6f138ff12 [ticket/11103] Prune notifications function
To delete all notifications before a certain time

PHPBB3-11103
2012-12-15 18:35:17 -06:00
Nathan Guse
c9ca705149 Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-15 18:25:51 -06:00
Nathan Guse
d0375c46f9 [ticket/11103] Purge notifications (to be used when an extension is purged)
PHPBB3-11103
2012-12-15 18:25:26 -06:00
Nathan Guse
95bd4d73eb [ticket/11103] Mark topic/post subscription notification read when approved
PHPBB3-11103
2012-12-15 10:33:03 -06:00
Nathan Guse
ddd874ba76 [ticket/11103] dbal -> phpbb_db_driver
PHPBB3-11103
2012-12-13 19:46:32 -06:00
Nathan Guse
84284a9cce [ticket/11103] Use scope: prototype
This lets us clean up the mess that was in load_object(), but requires
scope: prototype to be added to the service definitions for all types
or methods!

PHPBB3-11103
2012-12-09 13:43:06 -06:00