summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-08 21:23:25 -0500
committerEvan Prodromou <evan@status.net>2009-11-08 21:23:25 -0500
commitaa0d9a86152d2485de6de5ec572ae87085ebe780 (patch)
treebe142ab0f12a2e580aa36de31e0ceddadd0158b5 /plugins
parentf086dddf43a8e1593a615e77c2fdd605623acf49 (diff)
parent8e58f241739b97bd53f78035781f16e2067a31d9 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Autocomplete/autocomplete.php2
-rw-r--r--plugins/BlogspamNetPlugin.php2
-rw-r--r--plugins/Facebook/FBConnectAuth.php4
-rw-r--r--plugins/Facebook/FacebookPlugin.php4
-rw-r--r--plugins/Facebook/facebook/facebook.php8
-rw-r--r--plugins/Facebook/facebook/facebook_desktop.php2
-rwxr-xr-xplugins/Facebook/facebook/facebookapi_php5_restlib.php6
-rw-r--r--plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php2
-rw-r--r--plugins/Facebook/facebookaction.php6
-rw-r--r--plugins/GeonamesPlugin.php8
-rw-r--r--plugins/OpenID/finishopenidlogin.php4
-rw-r--r--plugins/OpenID/openid.php2
-rw-r--r--plugins/PiwikAnalyticsPlugin.php2
-rw-r--r--plugins/Realtime/RealtimePlugin.php2
-rw-r--r--plugins/Realtime/realtimeupdate.js2
-rwxr-xr-xplugins/TwitterBridge/daemons/synctwitterfriends.php2
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php4
-rw-r--r--plugins/TwitterBridge/twitter.php2
18 files changed, 32 insertions, 32 deletions
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index 379390ffd..aeb100cfa 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -79,7 +79,7 @@ class AutocompleteAction extends Action
function etag()
{
return '"' . implode(':', array($this->arg('action'),
- crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag
+ crc32($this->arg('q')), //the actual string can have funny characters in we do not want showing up in the etag
$this->arg('limit'),
$this->lastModified())) . '"';
}
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php
index 51236001a..bf60fdcaf 100644
--- a/plugins/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNetPlugin.php
@@ -85,7 +85,7 @@ class BlogspamNetPlugin extends Plugin
} else if (preg_match('/^SPAM(:(.*))?$/', $response, $match)) {
throw new ClientException(sprintf(_("Spam checker results: %s"), $match[2]), 400);
} else if (preg_match('/^OK$/', $response)) {
- // don't do anything
+ // do not do anything
} else {
throw new ServerException(sprintf(_("Unexpected response from %s: %s"), $this->baseUrl, $response), 500);
}
diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php
index b909a4977..165477419 100644
--- a/plugins/Facebook/FBConnectAuth.php
+++ b/plugins/Facebook/FBConnectAuth.php
@@ -71,7 +71,7 @@ class FBConnectauthAction extends Action
'There is already a local user (' . $flink->user_id .
') linked with this Facebook (' . $this->fbuid . ').');
- // We don't want these cookies
+ // We do not want these cookies
getFacebook()->clear_cookie_state();
$this->clientError(_('There is already a local user linked with this Facebook.'));
@@ -364,7 +364,7 @@ class FBConnectauthAction extends Action
{
$url = common_get_returnto();
if ($url) {
- // We don't have to return to it again
+ // We do not have to return to it again
common_set_returnto(null);
} else {
$url = common_local_url('all',
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index b68534b24..cd1ad7b45 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -182,7 +182,7 @@ class FacebookPlugin extends Plugin
$login_url = common_local_url('FBConnectAuth');
$logout_url = common_local_url('logout');
- // XXX: Facebook says we don't need this FB_RequireFeatures(),
+ // XXX: Facebook says we do not need this FB_RequireFeatures(),
// but we actually do, for IE and Safari. Gar.
$js = '<script type="text/javascript">';
@@ -201,7 +201,7 @@ class FacebookPlugin extends Plugin
// The below function alters the logout link so that it logs the user out
// of Facebook Connect as well as the site. However, for some pages
// (FB Connect Settings) we need to output the FB Connect scripts (to
- // show an existing FB connection even if the user isn't authenticated
+ // show an existing FB connection even if the user is not authenticated
// with Facebook connect) but NOT alter the logout link. And the only
// way to reliably do that is with the FB Connect .js libs. Crazy.
diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php
index 016e8e8e0..7b0107788 100644
--- a/plugins/Facebook/facebook/facebook.php
+++ b/plugins/Facebook/facebook/facebook.php
@@ -57,7 +57,7 @@ class Facebook {
* @param api_key your Developer API key
* @param secret your Developer API secret
* @param generate_session_secret whether to automatically generate a session
- * if the user doesn't have one, but
+ * if the user does not have one, but
* there is an auth token present in the url,
*/
public function __construct($api_key, $secret, $generate_session_secret=false) {
@@ -192,7 +192,7 @@ class Facebook {
}
return $session_secret;
} catch (FacebookRestClientException $e) {
- // API_EC_PARAM means we don't have a logged in user, otherwise who
+ // API_EC_PARAM means we do not have a logged in user, otherwise who
// knows what it means, so just throw it.
if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
throw $e;
@@ -204,7 +204,7 @@ class Facebook {
try {
return $this->api_client->auth_getSession($auth_token, $this->generate_session_secret);
} catch (FacebookRestClientException $e) {
- // API_EC_PARAM means we don't have a logged in user, otherwise who
+ // API_EC_PARAM means we do not have a logged in user, otherwise who
// knows what it means, so just throw it.
if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
throw $e;
@@ -265,7 +265,7 @@ class Facebook {
if ($this->in_fb_canvas()) {
echo '<fb:redirect url="' . $url . '"/>';
} else if (preg_match('/^https?:\/\/([^\/]*\.)?facebook\.com(:\d+)?/i', $url)) {
- // make sure facebook.com url's load in the full frame so that we don't
+ // make sure facebook.com url's load in the full frame so that we do not
// get a frame within a frame.
echo "<script type=\"text/javascript\">\ntop.location.href = \"$url\";\n</script>";
} else {
diff --git a/plugins/Facebook/facebook/facebook_desktop.php b/plugins/Facebook/facebook/facebook_desktop.php
index e79a2ca34..425bb5c7b 100644
--- a/plugins/Facebook/facebook/facebook_desktop.php
+++ b/plugins/Facebook/facebook/facebook_desktop.php
@@ -93,7 +93,7 @@ class FacebookDesktop extends Facebook {
}
public function verify_signature($fb_params, $expected_sig) {
- // we don't want to verify the signature until we have a valid
+ // we do not want to verify the signature until we have a valid
// session secret
if ($this->verify_sig) {
return parent::verify_signature($fb_params, $expected_sig);
diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
index 55cb7fb86..c742df748 100755
--- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php
+++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
@@ -46,7 +46,7 @@ class FacebookRestClient {
// on canvas pages
public $added;
public $is_user;
- // we don't pass friends list to iframes, but we want to make
+ // we do not pass friends list to iframes, but we want to make
// friends_get really simple in the canvas_user (non-logged in) case.
// So we use the canvas_user as default arg to friends_get
public $canvas_user;
@@ -657,7 +657,7 @@ function toggleDisplay(id, type) {
* deleted.
*
* IMPORTANT: If your application has registered public tags
- * that other applications may be using, don't delete those tags!
+ * that other applications may be using, do not delete those tags!
* Doing so can break the FBML ofapplications that are using them.
*
* @param array $tag_names the names of the tags to delete (optinal)
@@ -820,7 +820,7 @@ function toggleDisplay(id, type) {
if (is_array($target_ids)) {
$target_ids = json_encode($target_ids);
- $target_ids = trim($target_ids, "[]"); // we don't want square brackets
+ $target_ids = trim($target_ids, "[]"); // we do not want square brackets
}
return $this->call_method('facebook.feed.publishUserAction',
diff --git a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
index 29509deba..9c6c62663 100644
--- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
+++ b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
@@ -1,5 +1,5 @@
<?php
-# In PHP 5.2 or higher we don't need to bring this in
+# In PHP 5.2 or higher we do not need to bring this in
if (!function_exists('json_encode')) {
require_once 'jsonwrapper_inner.php';
}
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index a10fdf90d..2327694e4 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -95,7 +95,7 @@ class FacebookAction extends Action
/**
* Start an Facebook ready HTML document
*
- * For Facebook we don't want to actually output any headers,
+ * For Facebook we do not want to actually output any headers,
* DTD info, etc. Just Stylesheet and JavaScript links.
*
* @param string $type MIME type to use; default is to do negotation.
@@ -129,7 +129,7 @@ class FacebookAction extends Action
*/
function showNoticeForm()
{
- // don't do it for most of the Facebook pages
+ // do not do it for most of the Facebook pages
}
function showBody()
@@ -581,7 +581,7 @@ class FacebookNoticeListItem extends NoticeListItem
/**
* recipe function for displaying a single notice in the Facebook App.
*
- * Overridden to strip out some of the controls that we don't
+ * Overridden to strip out some of the controls that we do not
* want to be available.
*
* @return void
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index e18957c36..8059d49d7 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -87,12 +87,12 @@ class GeonamesPlugin extends Plugin
$location->location_id = $n->geonameId;
$location->location_ns = self::NAMESPACE;
- // handled, don't continue processing!
+ // handled, do not continue processing!
return false;
}
}
- // Continue processing; we don't have the answer
+ // Continue processing; we do not have the answer
return true;
}
@@ -217,7 +217,7 @@ class GeonamesPlugin extends Plugin
}
}
- // For some reason we don't know, so pass.
+ // For some reason we do not know, so pass.
return true;
}
@@ -299,7 +299,7 @@ class GeonamesPlugin extends Plugin
$url = 'http://www.geonames.org/' . $location->location_id;
- // it's been filled, so don't process further.
+ // it's been filled, so do not process further.
return false;
}
}
diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index ff0b451d3..b5d978294 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -341,7 +341,7 @@ class FinishopenidloginAction extends Action
{
$url = common_get_returnto();
if ($url) {
- # We don't have to return to it again
+ # We do not have to return to it again
common_set_returnto(null);
} else {
$url = common_local_url('all',
@@ -421,7 +421,7 @@ class FinishopenidloginAction extends Action
$parts = parse_url($openid);
- # If any of these parts exist, this won't work
+ # If any of these parts exist, this will not work
foreach ($bad as $badpart) {
if (array_key_exists($badpart, $parts)) {
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index ff7a93899..c5f6d1713 100644
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -187,7 +187,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
$form_html = $auth_request->formMarkup($trust_root, $process_url,
$immediate, array('id' => $form_id));
- # XXX: This is cheap, but things choke if we don't escape ampersands
+ # XXX: This is cheap, but things choke if we do not escape ampersands
# in the HTML attributes
$form_html = preg_replace('/&/', '&amp;', $form_html);
diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 54faa0bdb..81ef7c683 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
* 'piwikId' => 'id'));
*
* Replace 'example.com/piwik/' with the URL to your Piwik installation and
- * make sure you don't forget the final /.
+ * make sure you do not forget the final /.
* Replace 'id' with the ID your statusnet installation has in your Piwik
* analytics setup - for example '8'.
*
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 0c7c1240c..88a87dcf9 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -240,7 +240,7 @@ class RealtimePlugin extends Plugin
// FIXME: this code should be abstracted to a neutral third
// party, like Notice::asJson(). I'm not sure of the ethics
// of refactoring from within a plugin, so I'm just abusing
- // the ApiAction method. Don't do this unless you're me!
+ // the ApiAction method. Do not do this unless you're me!
require_once(INSTALLDIR.'/lib/api.php');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index e82b4dbfb..ca6ea891a 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -76,7 +76,7 @@ RealtimeUpdate = {
$("#notices_primary .notices").prepend(noticeItem);
$("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(1000);
- NoticeReply();
+ SN.U.NoticeReply();
RealtimeUpdate._updatecounter += 1;
document.title = '('+RealtimeUpdate._updatecounter+') ' + DT;
diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index 671e3c7af..c89c02eed 100755
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -115,7 +115,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
// Each child ps needs its own DB connection
// Note: DataObject::getDatabaseConnection() creates
- // a new connection if there isn't one already
+ // a new connection if there is not one already
$conn = &$flink->getDatabaseConnection();
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index b5428316b..25df0d839 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -136,7 +136,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
// Each child ps needs its own DB connection
// Note: DataObject::getDatabaseConnection() creates
- // a new connection if there isn't one already
+ // a new connection if there is not one already
$conn = &$flink->getDatabaseConnection();
@@ -499,7 +499,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$avatar->height = 73;
}
- $avatar->original = 0; // we don't have the original
+ $avatar->original = 0; // we do not have the original
$avatar->mediatype = $mediatype;
$avatar->filename = $filename;
$avatar->url = Avatar::url($filename);
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 3c6803e49..d48089caa 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -33,7 +33,7 @@ function updateTwitter_user($twitter_id, $screen_name)
$fuser->query('BEGIN');
- // Dropping down to SQL because regular DB_DataObject udpate stuff doesn't seem
+ // Dropping down to SQL because regular DB_DataObject udpate stuff does not seem
// to work so good with tables that have multiple column primary keys
// Any time we update the uri for a forein user we have to make sure there