Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

Conflicts:
	plugins/OStatus/OStatusPlugin.php

master vs. nightly thing

diff --cc plugins/Favorite/FavoritePlugin.php
Simple merge

diff --cc plugins/Linkback/LinkbackPlugin.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
index 5a871f322b1ac27cdb5b9beb722f7397e0b1e627,bc08a62eff7b6f628417096e0ddb7f8af8f330cc..e8a3c2d66663c58a40c56a511535a94916bc209d
--- 1/plugins/OStatus/OStatusPlugin.php
--- 2/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@@ -1366,34 -1355,19 +1369,50 @@@ class OStatusPlugin extends Plugi
          return true;
      }
  
 +    public function onSalmonSlap($endpoint_uri, MagicEnvelope $magic_env, Profile $target=null)
 +    {
 +        $envxml = $magic_env->toXML($target);
 +
 +        $headers = array('Content-Type: application/magic-envelope+xml');
 +
 +        try {
 +            $client = new HTTPClient();
 +            $client->setBody($envxml);
 +            $response = $client->post($endpoint_uri, $headers);
 +        } catch (HTTP_Request2_Exception $e) {
 +            common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
 +            return false;
 +        }
 +        if ($response->getStatus() === 422) {
 +            common_debug(sprintf('Salmon (from profile %d) endpoint %s returned status %s. We assume it is a Diaspora seed; will adapt and try again if that plugin is enabled!', $magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus()));
 +            return true;
 +        }
 +
 +        // 200 OK is the best response
 +        // 202 Accepted is what we get from Diaspora for example
 +        if (!in_array($response->getStatus(), array(200, 202))) {
 +            common_log(LOG_ERR, sprintf('Salmon (from profile %d) endpoint %s returned status %s: %s',
 +                                $magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus(), $response->getBody()));
 +            return true;
 +        }
 +
 +        // Since we completed the salmon slap, we discontinue the event
 +        return false;
 +    }
++
+     public function onCronDaily()
+     {
+         try {
+             $sub = FeedSub::renewalCheck();
+         } catch (NoResultException $e) {
+             common_log(LOG_INFO, "There were no expiring feeds.");
+             return;
+         }
+ 
+         $qm = QueueManager::get();
+         while ($sub->fetch()) {
+             $item = array('feedsub_id' => $sub->id);
+             $qm->enqueue($item, 'pushrenew');
+         }
+     }
  }