Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / EmailSummary / EmailSummaryPlugin.php

diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php
index d67ddf9fb3deffc8069c6c88f93f3ca2f28cec79..e00617ee3d44c464411be52f23e96fbb7a4576cc 100644 (file)
--- a/plugins/EmailSummary/EmailSummaryPlugin.php
+++ b/plugins/EmailSummary/EmailSummaryPlugin.php
@@ -66,7 +66,7 @@ class EmailSummaryPlugin extends Plugin
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'EmailSummary',
                             'version' => GNUSOCIAL_VERSION,
@@ -85,7 +85,7 @@ class EmailSummaryPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onEndInitializeQueueManager($qm)
+    function onEndInitializeQueueManager(QueueManager $qm)
     {
         $qm->connect('sitesum', 'SiteEmailSummaryHandler');
         $qm->connect('usersum', 'UserEmailSummaryHandler');
@@ -96,18 +96,17 @@ class EmailSummaryPlugin extends Plugin
      * Add a checkbox to turn off email summaries
      *
      * @param Action $action Action being executed (emailsettings)
+     * @param Profile $scoped Profile for whom settings are configured (current user)
      *
      * @return boolean hook value
      */
-    function onEndEmailFormData($action)
+    public function onEndEmailFormData(Action $action, Profile $scoped)
     {
-        $user = common_current_user();
-
         $action->elementStart('li');
         $action->checkbox('emailsummary',
                           // TRANS: Checkbox label in e-mail preferences form.
                           _m('Send me a periodic summary of updates from my network'),
-                          Email_summary_status::getSendSummary($user->id));
+                          Email_summary_status::getSendSummary($scoped->id));
         $action->elementEnd('li');
         return true;
     }
@@ -116,39 +115,35 @@ class EmailSummaryPlugin extends Plugin
      * Add a checkbox to turn off email summaries
      *
      * @param Action $action Action being executed (emailsettings)
+     * @param Profile $scoped Profile for whom settings are configured (current user)
      *
      * @return boolean hook value
      */
-    function onEndEmailSaveForm($action)
+    public function onEndEmailSaveForm(Action $action, Profile $scoped)
     {
         $sendSummary = $action->boolean('emailsummary');
 
-        $user = common_current_user();
-
-        if (!empty($user)) {
-
-            $ess = Email_summary_status::getKV('user_id', $user->id);
+        $ess = Email_summary_status::getKV('user_id', $scoped->id);
 
-            if (empty($ess)) {
+        if (empty($ess)) {
 
-                $ess = new Email_summary_status();
+            $ess = new Email_summary_status();
 
-                $ess->user_id      = $user->id;
-                $ess->send_summary = $sendSummary;
-                $ess->created      = common_sql_now();
-                $ess->modified     = common_sql_now();
+            $ess->user_id      = $scoped->id;
+            $ess->send_summary = $sendSummary;
+            $ess->created      = common_sql_now();
+            $ess->modified     = common_sql_now();
 
-                $ess->insert();
+            $ess->insert();
 
-            } else {
+        } else {
 
-                $orig = clone($ess);
+            $orig = clone($ess);
 
-                $ess->send_summary = $sendSummary;
-                $ess->modified     = common_sql_now();
+            $ess->send_summary = $sendSummary;
+            $ess->modified     = common_sql_now();
 
-                $ess->update($orig);
-            }
+            $ess->update($orig);
         }
 
         return true;