summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Shorturl_api.php12
-rw-r--r--lib/deleteaction.php3
-rw-r--r--lib/facebookaction.php3
-rw-r--r--lib/oauthstore.php27
-rw-r--r--lib/personal.php3
-rw-r--r--lib/profilelist.php3
-rw-r--r--lib/queuehandler.php3
-rw-r--r--lib/rssaction.php3
-rw-r--r--lib/search_engines.php12
-rw-r--r--lib/searchaction.php3
-rw-r--r--lib/settingsaction.php3
-rw-r--r--lib/stream.php3
-rw-r--r--lib/twitterapi.php3
-rw-r--r--lib/xmppqueuehandler.php3
14 files changed, 52 insertions, 32 deletions
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index f3f4f08df..fe106cb83 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class ShortUrlApi {
+class ShortUrlApi
+{
protected $service_url;
function __construct($service_url)
@@ -69,7 +70,8 @@ class ShortUrlApi {
}
}
-class LilUrl extends ShortUrlApi {
+class LilUrl extends ShortUrlApi
+{
function __construct()
{
parent::__construct('http://ur1.ca/');
@@ -88,7 +90,8 @@ class LilUrl extends ShortUrlApi {
}
-class PtitUrl extends ShortUrlApi {
+class PtitUrl extends ShortUrlApi
+{
function __construct()
{
parent::__construct('http://ptiturl.com/?creer=oui&action=Reduire&url=');
@@ -106,7 +109,8 @@ class PtitUrl extends ShortUrlApi {
}
}
-class TightUrl extends ShortUrlApi {
+class TightUrl extends ShortUrlApi
+{
function __construct()
{
parent::__construct('http://2tu.us/?save=y&url=');
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index a6e365121..9e89c0a54 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class DeleteAction extends Action {
+class DeleteAction extends Action
+{
function handle($args)
{
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 43464b19b..d5b7ed0fb 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/extlib/facebook/facebook.php');
-class FacebookAction extends Action {
+class FacebookAction extends Action
+{
function handle($args)
{
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index faae82db1..7ad3be20e 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -21,9 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php');
-class LaconicaOAuthDataStore extends OAuthDataStore {
+class LaconicaOAuthDataStore extends OAuthDataStore
+{
- # We keep a record of who's contacted us
+ // We keep a record of who's contacted us
function lookup_consumer($consumer_key)
{
@@ -75,8 +76,8 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$t->consumer_key = $consumer->key;
$t->tok = common_good_rand(16);
$t->secret = common_good_rand(16);
- $t->type = 0; # request
- $t->state = 0; # unauthorized
+ $t->type = 0; // request
+ $t->state = 0; // unauthorized
$t->created = DB_DataObject_Cast::dateTime();
if (!$t->insert()) {
return null;
@@ -85,7 +86,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
}
}
- # defined in OAuthDataStore, but not implemented anywhere
+ // defined in OAuthDataStore, but not implemented anywhere
function fetch_request_token($consumer)
{
@@ -98,14 +99,14 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$rt = new Token();
$rt->consumer_key = $consumer->key;
$rt->tok = $token->key;
- $rt->type = 0; # request
- if ($rt->find(true) && $rt->state == 1) { # authorized
+ $rt->type = 0; // request
+ if ($rt->find(true) && $rt->state == 1) { // authorized
common_debug('request token found.', __FILE__);
$at = new Token();
$at->consumer_key = $consumer->key;
$at->tok = common_good_rand(16);
$at->secret = common_good_rand(16);
- $at->type = 1; # access
+ $at->type = 1; // access
$at->created = DB_DataObject_Cast::dateTime();
if (!$at->insert()) {
$e = $at->_lastError;
@@ -113,15 +114,15 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
return null;
} else {
common_debug('access token "'.$at->tok.'" inserted', __FILE__);
- # burn the old one
+ // burn the old one
$orig_rt = clone($rt);
- $rt->state = 2; # used
+ $rt->state = 2; // used
if (!$rt->update($orig_rt)) {
return null;
}
common_debug('request token "'.$rt->tok.'" updated', __FILE__);
- # Update subscription
- # XXX: mixing levels here
+ // Update subscription
+ // XXX: mixing levels here
$sub = Subscription::staticGet('token', $rt->tok);
if (!$sub) {
return null;
@@ -142,7 +143,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
}
}
- # defined in OAuthDataStore, but not implemented anywhere
+ // defined in OAuthDataStore, but not implemented anywhere
function fetch_access_token($consumer)
{
diff --git a/lib/personal.php b/lib/personal.php
index 34ebe6894..02b01fece 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class PersonalAction extends Action {
+class PersonalAction extends Action
+{
function is_readonly()
{
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 60737c3d4..bda05daf3 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
define('PROFILES_PER_PAGE', 20);
-class ProfileList {
+class ProfileList
+{
var $profile = null;
var $owner = null;
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 48487f8e9..9ce9e32b3 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -25,7 +25,8 @@ require_once(INSTALLDIR.'/lib/daemon.php');
require_once(INSTALLDIR.'/classes/Queue_item.php');
require_once(INSTALLDIR.'/classes/Notice.php');
-class QueueHandler extends Daemon {
+class QueueHandler extends Daemon
+{
var $_id = 'generic';
diff --git a/lib/rssaction.php b/lib/rssaction.php
index e02e1febb..9564cfb46 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
define('DEFAULT_RSS_LIMIT', 48);
-class Rss10Action extends Action {
+class Rss10Action extends Action
+{
# This will contain the details of each feed item's author and be used to generate SIOC data.
var $creators = array();
diff --git a/lib/search_engines.php b/lib/search_engines.php
index e96570d63..559107910 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class SearchEngine {
+class SearchEngine
+{
protected $target;
protected $table;
@@ -45,7 +46,8 @@ class SearchEngine {
}
}
-class SphinxSearch extends SearchEngine {
+class SphinxSearch extends SearchEngine
+{
private $sphinx;
private $connected;
@@ -103,7 +105,8 @@ class SphinxSearch extends SearchEngine {
}
}
-class MySQLSearch extends SearchEngine {
+class MySQLSearch extends SearchEngine
+{
function query($q)
{
if ('identica_people' === $this->table)
@@ -115,7 +118,8 @@ class MySQLSearch extends SearchEngine {
}
}
-class PGSearch extends SearchEngine {
+class PGSearch extends SearchEngine
+{
function query($q)
{
if ('identica_people' === $this->table)
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 12a44a861..bc90fac1a 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class SearchAction extends Action {
+class SearchAction extends Action
+{
function is_readonly()
{
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 5979c11f0..46f713fa8 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class SettingsAction extends Action {
+class SettingsAction extends Action
+{
function handle($args)
{
diff --git a/lib/stream.php b/lib/stream.php
index 45fbb9bd9..73758adee 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/personal.php');
require_once(INSTALLDIR.'/lib/noticelist.php');
-class StreamAction extends PersonalAction {
+class StreamAction extends PersonalAction
+{
function public_views_menu()
{
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 3cddfa9c9..50bcb06fe 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
-class TwitterapiAction extends Action {
+class TwitterapiAction extends Action
+{
var $auth_user;
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 0a73403f9..91015fd45 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -28,7 +28,8 @@ require_once(INSTALLDIR.'/lib/queuehandler.php');
* superclass.
*/
-class XmppQueueHandler extends QueueHandler {
+class XmppQueueHandler extends QueueHandler
+{
function start()
{
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-02 21:15:50 +0000