wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some phpcs cleanup

Browse Source
This commit is contained in:
Zach Copley 2009-12-14 21:24:49 +00:00
parent 655dbcedb3
commit 3e6b80d3e9
4 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/RSSCloud/LoggingAggregator.php
View File

@ -111,12 +111,13 @@ class LoggingAggregatorAction extends Action
} }
header('Content-Type: text/xml'); header('Content-Type: text/xml');
echo '<notifyResult success=\'true\' msg=\'Thanks for the update.\' />' . "\n"; Echo "<notifyResult success='true' msg='Thanks for the update.' />\n";
} }
$this->ip = $_SERVER['REMOTE_ADDR']; $this->ip = $_SERVER['REMOTE_ADDR'];
common_log(LOG_INFO, 'RSSCloud Logging Aggregator - ' . $this->ip . ' claims the feed at ' . common_log(LOG_INFO, 'RSSCloud Logging Aggregator - ' .
$this->ip . ' claims the feed at ' .
$this->url . ' has been updated.'); $this->url . ' has been updated.');
} }

35
plugins/RSSCloud/RSSCloudNotifier.php
View File

@ -41,16 +41,16 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
**/ **/
class RSSCloudNotifier { class RSSCloudNotifier
{
const MAX_FAILURES = 3; const MAX_FAILURES = 3;
/** /**
* Send an HTTP GET to the notification handler with a * Send an HTTP GET to the notification handler with a
* challenge string to see if it repsonds correctly. * challenge string to see if it repsonds correctly.
* *
* @param String $endpoint URL of the notification handler * @param string $endpoint URL of the notification handler
* @param String $feed the feed being subscribed to * @param string $feed the feed being subscribed to
* *
* @return boolean success * @return boolean success
*/ */
@ -61,10 +61,11 @@ class RSSCloudNotifier {
$url = $endpoint . '?' . http_build_query($params); $url = $endpoint . '?' . http_build_query($params);
try { try {
$client = new HTTPClient(); $client = new HTTPClient();
$response = $client->get($url); $response = $client->get($url);
} catch (HTTP_Request2_Exception $e) { } catch (HTTP_Request2_Exception $e) {
common_log(LOG_INFO, 'RSSCloud plugin - failure testing notify handler ' . common_log(LOG_INFO,
'RSSCloud plugin - failure testing notify handler ' .
$endpoint . ' - ' . $e->getMessage()); $endpoint . ' - ' . $e->getMessage());
return false; return false;
} }
@ -105,18 +106,19 @@ class RSSCloudNotifier {
* HTTP POST a notification that a feed has been updated * HTTP POST a notification that a feed has been updated
* ('ping the cloud'). * ('ping the cloud').
* *
* @param String $endpoint URL of the notification handler * @param String $endpoint URL of the notification handler
* @param String $feed the feed being subscribed to * @param String $feed the feed being subscribed to
* *
* @return boolean success * @return boolean success
*/ */
function postUpdate($endpoint, $feed) { function postUpdate($endpoint, $feed)
{
$headers = array(); $headers = array();
$postdata = array('url' => $feed); $postdata = array('url' => $feed);
try { try {
$client = new HTTPClient(); $client = new HTTPClient();
$response = $client->post($endpoint, $headers, $postdata); $response = $client->post($endpoint, $headers, $postdata);
} catch (HTTP_Request2_Exception $e) { } catch (HTTP_Request2_Exception $e) {
common_log(LOG_INFO, 'RSSCloud plugin - failure notifying ' . common_log(LOG_INFO, 'RSSCloud plugin - failure notifying ' .
@ -153,6 +155,7 @@ class RSSCloudNotifier {
$profile->nickname . '.rss'; $profile->nickname . '.rss';
$cloudSub = new RSSCloudSubscription(); $cloudSub = new RSSCloudSubscription();
$cloudSub->subscribed = $profile->id; $cloudSub->subscribed = $profile->id;
if ($cloudSub->find()) { if ($cloudSub->find()) {
@ -186,7 +189,8 @@ class RSSCloudNotifier {
if ($failCnt == self::MAX_FAILURES) { if ($failCnt == self::MAX_FAILURES) {
common_log(LOG_INFO, common_log(LOG_INFO,
'Deleting RSSCloud subcription (max failure count reached), profile: ' . 'Deleting RSSCloud subcription ' .
'(max failure count reached), profile: ' .
$cloudSub->subscribed . $cloudSub->subscribed .
' handler: ' . ' handler: ' .
$cloudSub->url); $cloudSub->url);
@ -209,7 +213,8 @@ class RSSCloudNotifier {
} else { } else {
common_debug('Updating failure count on RSSCloud subscription. ' . $failCnt); common_debug('Updating failure count on RSSCloud subscription. ' .
$failCnt);
$failCnt = $cloudSub->failures + 1; $failCnt = $cloudSub->failures + 1;
@ -224,9 +229,11 @@ class RSSCloudNotifier {
if (!$result) { if (!$result) {
common_log_db_error($cloudsub, 'UPDATE', __FILE__); common_log_db_error($cloudsub, 'UPDATE', __FILE__);
common_log(LOG_ERR, 'Could not update failure count on RSSCloud subscription'); common_log(LOG_ERR,
'Could not update failure ' .
'count on RSSCloud subscription');
} }
} }
} }
} }

35
plugins/RSSCloud/RSSCloudPlugin.php
View File

@ -98,16 +98,20 @@ class RSSCloudPlugin extends Plugin
* *
* Hook for RouterInitialized event. * Hook for RouterInitialized event.
* *
* @param Mapper &$m URL parser and mapper
*
* @return boolean hook return * @return boolean hook return
*/ */
function onRouterInitialized(&$m) function onRouterInitialized(&$m)
{ {
$m->connect('/main/rsscloud/request_notify', array('action' => 'RSSCloudRequestNotify')); $m->connect('/main/rsscloud/request_notify',
array('action' => 'RSSCloudRequestNotify'));
// XXX: This is just for end-to-end testing. Uncomment if you need to pretend // XXX: This is just for end-to-end testing. Uncomment if you need to pretend
// to be a cloud hub for some reason. // to be a cloud hub for some reason.
// $m->connect('/main/rsscloud/notify', array('action' => 'LoggingAggregator')); //$m->connect('/main/rsscloud/notify',
// array('action' => 'LoggingAggregator'));
return true; return true;
} }
@ -126,17 +130,18 @@ class RSSCloudPlugin extends Plugin
{ {
switch ($cls) switch ($cls)
{ {
case 'RSSCloudSubscription': case 'RSSCloudSubscription':
include_once(INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php'); include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php';
return false; return false;
case 'RSSCloudNotifier': case 'RSSCloudNotifier':
include_once(INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php'); include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php';
return false; return false;
case 'RSSCloudRequestNotifyAction': case 'RSSCloudRequestNotifyAction':
case 'LoggingAggregatorAction': case 'LoggingAggregatorAction':
include_once(INSTALLDIR . '/plugins/RSSCloud/' . mb_substr($cls, 0, -6) . '.php'); include_once INSTALLDIR . '/plugins/RSSCloud/' .
mb_substr($cls, 0, -6) . '.php';
return false; return false;
default: default:
return true; return true;
} }
} }
@ -145,7 +150,7 @@ class RSSCloudPlugin extends Plugin
* Add a <cloud> element to the RSS feed (after the rss <channel> * Add a <cloud> element to the RSS feed (after the rss <channel>
* element is started). * element is started).
* *
* @param Action $action * @param Action $action the ApiAction
* *
* @return void * @return void
*/ */
@ -215,7 +220,7 @@ class RSSCloudPlugin extends Plugin
/** /**
* Determine whether the notice was locally created * Determine whether the notice was locally created
* *
* @param Notice $notice * @param Notice $notice the notice in question
* *
* @return boolean locality * @return boolean locality
*/ */
@ -233,7 +238,8 @@ class RSSCloudPlugin extends Plugin
* @return boolean hook return * @return boolean hook return
*/ */
function onCheckSchema() { function onCheckSchema()
{
$schema = Schema::get(); $schema = Schema::get();
$schema->ensureTable('rsscloud_subscription', $schema->ensureTable('rsscloud_subscription',
array(new ColumnDef('subscribed', 'integer', array(new ColumnDef('subscribed', 'integer',
@ -248,8 +254,7 @@ class RSSCloudPlugin extends Plugin
null, false, null, null, false, null,
'CURRENT_TIMESTAMP', 'CURRENT_TIMESTAMP',
'on update CURRENT_TIMESTAMP') 'on update CURRENT_TIMESTAMP')
) ));
);
return true; return true;
} }

24
plugins/RSSCloud/RSSCloudRequestNotify.php
View File

@ -56,9 +56,9 @@ class RSSCloudRequestNotifyAction extends Action
{ {
parent::prepare($args); parent::prepare($args);
$this->ip = $_SERVER['REMOTE_ADDR']; $this->ip = $_SERVER['REMOTE_ADDR'];
$this->port = $this->arg('port'); $this->port = $this->arg('port');
$this->path = $this->arg('path'); $this->path = $this->arg('path');
if ($this->path[0] != '/') { if ($this->path[0] != '/') {
$this->path = '/' . $this->path; $this->path = '/' . $this->path;
@ -68,7 +68,7 @@ class RSSCloudRequestNotifyAction extends Action
$this->procedure = $this->arg('notifyProcedure'); $this->procedure = $this->arg('notifyProcedure');
$this->domain = $this->arg('domain'); $this->domain = $this->arg('domain');
$this->feeds = $this->getFeeds(); $this->feeds = $this->getFeeds();
return true; return true;
} }
@ -124,7 +124,8 @@ class RSSCloudRequestNotifyAction extends Action
} }
if (empty($this->feeds)) { if (empty($this->feeds)) {
$msg = 'You must provide at least one valid profile feed url (url1, url2, url3 ... urlN).'; $msg = 'You must provide at least one valid profile feed url ' .
'(url1, url2, url3 ... urlN).';
$this->showResult(false, $msg); $this->showResult(false, $msg);
return; return;
} }
@ -195,7 +196,7 @@ class RSSCloudRequestNotifyAction extends Action
{ {
$feeds = array(); $feeds = array();
while (list($key, $feed) = each ($this->args)) { while (list($key, $feed) = each($this->args)) {
if (preg_match('/^url\d*$/', $key)) { if (preg_match('/^url\d*$/', $key)) {
$feeds[] = $feed; $feeds[] = $feed;
} }
@ -251,7 +252,7 @@ class RSSCloudRequestNotifyAction extends Action
} else { } else {
return 'http://' . $this->ip . ':' . $this->port . $this->path; return 'http://' . $this->ip . ':' . $this->port . $this->path;
} }
} }
/** /**
* Uses the nickname part of the subscribed feed URL to figure out * Uses the nickname part of the subscribed feed URL to figure out
@ -267,7 +268,7 @@ class RSSCloudRequestNotifyAction extends Action
{ {
// We only do profile feeds // We only do profile feeds
$path = common_path('api/statuses/user_timeline/'); $path = common_path('api/statuses/user_timeline/');
$valid = '%^' . $path . '(?<nickname>.*)\.rss$%'; $valid = '%^' . $path . '(?<nickname>.*)\.rss$%';
if (preg_match($valid, $feed, $matches)) { if (preg_match($valid, $feed, $matches)) {
@ -283,7 +284,7 @@ class RSSCloudRequestNotifyAction extends Action
/** /**
* Save an RSSCloud subscription * Save an RSSCloud subscription
* *
* @param $feed a valid profile feed * @param string $feed a valid profile feed
* *
* @return boolean success result * @return boolean success result
*/ */
@ -329,8 +330,9 @@ class RSSCloudRequestNotifyAction extends Action
function showResult($success, $msg) function showResult($success, $msg)
{ {
$this->startXML(); $this->startXML();
$this->elementStart('notifyResult', array('success' => ($success) ? 'true' : 'false', $this->elementStart('notifyResult',
'msg' => $msg)); array('success' => ($success) ? 'true' : 'false',
'msg' => $msg));
$this->endXML(); $this->endXML();
} }