move opening brace of class declaration to next line

Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
This commit is contained in:
Evan Prodromou 2008-12-23 14:49:23 -05:00
parent 7ad2f2a371
commit b264c03d32
219 changed files with 1183 additions and 528 deletions

View File

@ -86,3 +86,10 @@ Evan Prodromou <evan@prodromou.name>**20081223194428
instances of TRUE to true and FALSE to false. instances of TRUE to true and FALSE to false.
] ]
[move opening brace of class declaration to next line
Evan Prodromou <evan@prodromou.name>**20081223194923
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.
]

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class AccesstokenAction extends Action { class AccesstokenAction extends Action
{
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/actions/showstream.php'); require_once(INSTALLDIR.'/actions/showstream.php');
class AllAction extends StreamAction { class AllAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class AllrssAction extends Rss10Action { class AllrssAction extends Rss10Action
{
var $user = null; var $user = null;

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class ApiAction extends Action { class ApiAction extends Action
{
var $user; var $user;
var $content_type; var $content_type;

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class AvatarbynicknameAction extends Action { class AvatarbynicknameAction extends Action
{
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class BlockAction extends Action { class BlockAction extends Action
{
var $profile = null; var $profile = null;

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class ConfirmaddressAction extends Action { class ConfirmaddressAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/deleteaction.php'); require_once(INSTALLDIR.'/lib/deleteaction.php');
class DeletenoticeAction extends DeleteAction { class DeletenoticeAction extends DeleteAction
{
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class DeleteprofileAction extends Action { class DeleteprofileAction extends Action
{
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class DisfavorAction extends Action { class DisfavorAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class DocAction extends Action { class DocAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
class EmailsettingsAction extends SettingsAction { class EmailsettingsAction extends SettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/facebookaction.php'); require_once(INSTALLDIR.'/lib/facebookaction.php');
class FacebookhomeAction extends FacebookAction { class FacebookhomeAction extends FacebookAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/facebookaction.php'); require_once(INSTALLDIR.'/lib/facebookaction.php');
class FacebookinviteAction extends FacebookAction { class FacebookinviteAction extends FacebookAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/facebookaction.php'); require_once(INSTALLDIR.'/lib/facebookaction.php');
class FacebookremoveAction extends FacebookAction { class FacebookremoveAction extends FacebookAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/facebookaction.php'); require_once(INSTALLDIR.'/lib/facebookaction.php');
class FacebooksettingsAction extends FacebookAction { class FacebooksettingsAction extends FacebookAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/mail.php'); require_once(INSTALLDIR.'/lib/mail.php');
class FavorAction extends Action { class FavorAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/stream.php'); require_once(INSTALLDIR.'/lib/stream.php');
class FavoritedAction extends StreamAction { class FavoritedAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class FavoritesrssAction extends Rss10Action { class FavoritesrssAction extends Rss10Action
{
var $user = null; var $user = null;

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/stream.php'); require_once(INSTALLDIR.'/lib/stream.php');
require_once(INSTALLDIR.'/lib/profilelist.php'); require_once(INSTALLDIR.'/lib/profilelist.php');
class FeaturedAction extends StreamAction { class FeaturedAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/openid.php'); require_once(INSTALLDIR.'/lib/openid.php');
class FinishaddopenidAction extends Action { class FinishaddopenidAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/openid.php'); require_once(INSTALLDIR.'/lib/openid.php');
class FinishimmediateAction extends Action { class FinishimmediateAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/openid.php'); require_once(INSTALLDIR.'/lib/openid.php');
class FinishopenidloginAction extends Action { class FinishopenidloginAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class FinishremotesubscribeAction extends Action { class FinishremotesubscribeAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ define('LISTENER', 1);
define('LISTENEE', -1); define('LISTENEE', -1);
define('BOTH', 0); define('BOTH', 0);
class FoafAction extends Action { class FoafAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
require_once(INSTALLDIR.'/lib/jabber.php'); require_once(INSTALLDIR.'/lib/jabber.php');
class ImsettingsAction extends SettingsAction { class ImsettingsAction extends SettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class InviteAction extends Action { class InviteAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class LoginAction extends Action { class LoginAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/openid.php'); require_once(INSTALLDIR.'/lib/openid.php');
class LogoutAction extends Action { class LogoutAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class MicrosummaryAction extends Action { class MicrosummaryAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class NewmessageAction extends Action { class NewmessageAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once INSTALLDIR . '/lib/noticelist.php'; require_once INSTALLDIR . '/lib/noticelist.php';
class NewnoticeAction extends Action { class NewnoticeAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/searchaction.php');
# XXX common parent for people and content search? # XXX common parent for people and content search?
class NoticesearchAction extends SearchAction { class NoticesearchAction extends SearchAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class NoticesearchrssAction extends Rss10Action { class NoticesearchrssAction extends Rss10Action
{
function init() function init()
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/mail.php'); require_once(INSTALLDIR.'/lib/mail.php');
class NudgeAction extends Action { class NudgeAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/openid.php'); require_once(INSTALLDIR.'/lib/openid.php');
class OpenidloginAction extends Action { class OpenidloginAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
require_once(INSTALLDIR.'/lib/openid.php'); require_once(INSTALLDIR.'/lib/openid.php');
class OpenidsettingsAction extends SettingsAction { class OpenidsettingsAction extends SettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class OpensearchAction extends Action { class OpensearchAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
class OthersettingsAction extends SettingsAction { class OthersettingsAction extends SettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/searchaction.php'); require_once(INSTALLDIR.'/lib/searchaction.php');
require_once(INSTALLDIR.'/lib/profilelist.php'); require_once(INSTALLDIR.'/lib/profilelist.php');
class PeoplesearchAction extends SearchAction { class PeoplesearchAction extends SearchAction
{
function get_instructions() function get_instructions()
{ {
@ -69,7 +70,8 @@ class PeoplesearchAction extends SearchAction {
} }
} }
class PeopleSearchResults extends ProfileList { class PeopleSearchResults extends ProfileList
{
var $terms = null; var $terms = null;
var $pattern = null; var $pattern = null;

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/profilelist.php'); require_once(INSTALLDIR.'/lib/profilelist.php');
class PeopletagAction extends Action { class PeopletagAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class PostnoticeAction extends Action { class PostnoticeAction extends Action
{
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
class ProfilesettingsAction extends SettingsAction { class ProfilesettingsAction extends SettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/stream.php'); require_once(INSTALLDIR.'/lib/stream.php');
class PublicAction extends StreamAction { class PublicAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class PublicrssAction extends Rss10Action { class PublicrssAction extends Rss10Action
{
function init() function init()
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/openid.php');
# XXX: factor out similarities with XrdsAction # XXX: factor out similarities with XrdsAction
class PublicxrdsAction extends Action { class PublicxrdsAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -23,7 +23,8 @@ if (!defined('LACONICA')) { exit(1); }
define(MAX_RECOVERY_TIME, 24 * 60 * 60); define(MAX_RECOVERY_TIME, 24 * 60 * 60);
class RecoverpasswordAction extends Action { class RecoverpasswordAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class RegisterAction extends Action { class RegisterAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class RemotesubscribeAction extends Action { class RemotesubscribeAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/actions/showstream.php'); require_once(INSTALLDIR.'/actions/showstream.php');
class RepliesAction extends StreamAction { class RepliesAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class RepliesrssAction extends Rss10Action { class RepliesrssAction extends Rss10Action
{
var $user = null; var $user = null;

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class RequesttokenAction extends Action { class RequesttokenAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/actions/showstream.php'); require_once(INSTALLDIR.'/actions/showstream.php');
class ShowfavoritesAction extends StreamAction { class ShowfavoritesAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/mailbox.php'); require_once(INSTALLDIR.'/lib/mailbox.php');
class ShowmessageAction extends MailboxAction { class ShowmessageAction extends MailboxAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/stream.php'); require_once(INSTALLDIR.'/lib/stream.php');
class ShownoticeAction extends StreamAction { class ShownoticeAction extends StreamAction
{
var $notice = null; var $notice = null;
var $profile = null; var $profile = null;

View File

@ -24,7 +24,8 @@ require_once(INSTALLDIR.'/lib/stream.php');
define('SUBSCRIPTIONS_PER_ROW', 4); define('SUBSCRIPTIONS_PER_ROW', 4);
define('SUBSCRIPTIONS', 80); define('SUBSCRIPTIONS', 80);
class ShowstreamAction extends StreamAction { class ShowstreamAction extends StreamAction
{
function handle($args) function handle($args)
{ {
@ -449,14 +450,16 @@ class ShowstreamAction extends StreamAction {
# We don't show the author for a profile, since we already know who it is! # We don't show the author for a profile, since we already know who it is!
class ProfileNoticeList extends NoticeList { class ProfileNoticeList extends NoticeList
{
function newListItem($notice) function newListItem($notice)
{ {
return new ProfileNoticeListItem($notice); return new ProfileNoticeListItem($notice);
} }
} }
class ProfileNoticeListItem extends NoticeListItem { class ProfileNoticeListItem extends NoticeListItem
{
function showAuthor() function showAuthor()
{ {
return; return;

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
require_once(INSTALLDIR.'/actions/emailsettings.php'); require_once(INSTALLDIR.'/actions/emailsettings.php');
class SmssettingsAction extends EmailsettingsAction { class SmssettingsAction extends EmailsettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SubeditAction extends Action { class SubeditAction extends Action
{
var $profile = null; var $profile = null;

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SubscribeAction extends Action { class SubscribeAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/gallery.php'); require_once(INSTALLDIR.'/lib/gallery.php');
class SubscribersAction extends GalleryAction { class SubscribersAction extends GalleryAction
{
function gallery_type() function gallery_type()
{ {
@ -59,7 +60,8 @@ class SubscribersAction extends GalleryAction {
} }
} }
class SubscribersList extends ProfileList { class SubscribersList extends ProfileList
{
function show_owner_controls($profile) function show_owner_controls($profile)
{ {
common_block_form($profile, array('action' => 'subscribers', common_block_form($profile, array('action' => 'subscribers',

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/gallery.php'); require_once(INSTALLDIR.'/lib/gallery.php');
class SubscriptionsAction extends GalleryAction { class SubscriptionsAction extends GalleryAction
{
function gallery_type() function gallery_type()
{ {
@ -59,7 +60,8 @@ class SubscriptionsAction extends GalleryAction {
} }
} }
class SubscriptionsList extends ProfileList { class SubscriptionsList extends ProfileList
{
function show_owner_controls($profile) function show_owner_controls($profile)
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SupAction extends Action { class SupAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/actions/showstream.php'); require_once(INSTALLDIR.'/actions/showstream.php');
define('TAGS_PER_PAGE', 100); define('TAGS_PER_PAGE', 100);
class TagAction extends StreamAction { class TagAction extends StreamAction
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
class TagotherAction extends Action { class TagotherAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class TagrssAction extends Rss10Action { class TagrssAction extends Rss10Action
{
function init() function init()
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapiaccountAction extends TwitterapiAction { class TwitapiaccountAction extends TwitterapiAction
{
function verify_credentials($args, $apidata) function verify_credentials($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapiblocksAction extends TwitterapiAction { class TwitapiblocksAction extends TwitterapiAction
{
function create($args, $apidata) function create($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class Twitapidirect_messagesAction extends TwitterapiAction { class Twitapidirect_messagesAction extends TwitterapiAction
{
function direct_messages($args, $apidata) function direct_messages($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapifavoritesAction extends TwitterapiAction { class TwitapifavoritesAction extends TwitterapiAction
{
function favorites($args, $apidata) function favorites($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapifriendshipsAction extends TwitterapiAction { class TwitapifriendshipsAction extends TwitterapiAction
{
function create($args, $apidata) function create($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapihelpAction extends TwitterapiAction { class TwitapihelpAction extends TwitterapiAction
{
/* Returns the string "ok" in the requested format with a 200 OK HTTP status code. /* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
* URL:http://identi.ca/api/help/test.format * URL:http://identi.ca/api/help/test.format

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
# This naming convention looks real sick # This naming convention looks real sick
class TwitapinotificationsAction extends TwitterapiAction { class TwitapinotificationsAction extends TwitterapiAction
{
function follow($args, $apidata) function follow($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapistatusesAction extends TwitterapiAction { class TwitapistatusesAction extends TwitterapiAction
{
function public_timeline($args, $apidata) function public_timeline($args, $apidata)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
class TwitapiusersAction extends TwitterapiAction { class TwitapiusersAction extends TwitterapiAction
{
function show($args, $apidata) function show($args, $apidata)
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
define('SUBSCRIPTIONS', 80); define('SUBSCRIPTIONS', 80);
class TwittersettingsAction extends SettingsAction { class TwittersettingsAction extends SettingsAction
{
function get_instructions() function get_instructions()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class UnblockAction extends Action { class UnblockAction extends Action
{
var $profile = null; var $profile = null;

View File

@ -17,7 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
class UnsubscribeAction extends Action { class UnsubscribeAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class UpdateprofileAction extends Action { class UpdateprofileAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
define('TIMESTAMP_THRESHOLD', 300); define('TIMESTAMP_THRESHOLD', 300);
class UserauthorizationAction extends Action { class UserauthorizationAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class UserbyidAction extends Action { class UserbyidAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
// Formatting of RSS handled by Rss10Action // Formatting of RSS handled by Rss10Action
class UserrssAction extends Rss10Action { class UserrssAction extends Rss10Action
{
var $user = null; var $user = null;

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');
class XrdsAction extends Action { class XrdsAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class Channel { class Channel
{
function on($user) function on($user)
{ {
@ -47,7 +48,8 @@ class Channel {
} }
} }
class XMPPChannel extends Channel { class XMPPChannel extends Channel
{
var $conn = null; var $conn = null;
@ -104,7 +106,8 @@ class XMPPChannel extends Channel {
} }
class WebChannel extends Channel { class WebChannel extends Channel
{
function source() function source()
{ {
@ -138,7 +141,8 @@ class WebChannel extends Channel {
} }
class AjaxWebChannel extends WebChannel { class AjaxWebChannel extends WebChannel
{
function output($user, $text) function output($user, $text)
{ {
@ -166,7 +170,8 @@ class AjaxWebChannel extends WebChannel {
} }
class MailChannel extends Channel { class MailChannel extends Channel
{
var $addr = null; var $addr = null;

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/classes/Channel.php'); require_once(INSTALLDIR.'/classes/Channel.php');
class Command { class Command
{
var $user = null; var $user = null;
@ -36,20 +37,24 @@ class Command {
} }
} }
class UnimplementedCommand extends Command { class UnimplementedCommand extends Command
{
function execute($channel) function execute($channel)
{ {
$channel->error($this->user, _("Sorry, this command is not yet implemented.")); $channel->error($this->user, _("Sorry, this command is not yet implemented."));
} }
} }
class TrackingCommand extends UnimplementedCommand { class TrackingCommand extends UnimplementedCommand
{
} }
class TrackOffCommand extends UnimplementedCommand { class TrackOffCommand extends UnimplementedCommand
{
} }
class TrackCommand extends UnimplementedCommand { class TrackCommand extends UnimplementedCommand
{
var $word = null; var $word = null;
function __construct($user, $word) function __construct($user, $word)
{ {
@ -58,7 +63,8 @@ class TrackCommand extends UnimplementedCommand {
} }
} }
class UntrackCommand extends UnimplementedCommand { class UntrackCommand extends UnimplementedCommand
{
var $word = null; var $word = null;
function __construct($user, $word) function __construct($user, $word)
{ {
@ -67,7 +73,8 @@ class UntrackCommand extends UnimplementedCommand {
} }
} }
class NudgeCommand extends UnimplementedCommand { class NudgeCommand extends UnimplementedCommand
{
var $other = null; var $other = null;
function __construct($user, $other) function __construct($user, $other)
{ {
@ -76,7 +83,8 @@ class NudgeCommand extends UnimplementedCommand {
} }
} }
class InviteCommand extends UnimplementedCommand { class InviteCommand extends UnimplementedCommand
{
var $other = null; var $other = null;
function __construct($user, $other) function __construct($user, $other)
{ {
@ -85,7 +93,8 @@ class InviteCommand extends UnimplementedCommand {
} }
} }
class StatsCommand extends Command { class StatsCommand extends Command
{
function execute($channel) function execute($channel)
{ {
@ -110,7 +119,8 @@ class StatsCommand extends Command {
} }
} }
class FavCommand extends Command { class FavCommand extends Command
{
var $other = null; var $other = null;
@ -157,7 +167,8 @@ class FavCommand extends Command {
} }
} }
class WhoisCommand extends Command { class WhoisCommand extends Command
{
var $other = null; var $other = null;
function __construct($user, $other) function __construct($user, $other)
{ {
@ -193,7 +204,8 @@ class WhoisCommand extends Command {
} }
} }
class MessageCommand extends Command { class MessageCommand extends Command
{
var $other = null; var $other = null;
var $text = null; var $text = null;
function __construct($user, $other, $text) function __construct($user, $other, $text)
@ -237,7 +249,8 @@ class MessageCommand extends Command {
} }
} }
class GetCommand extends Command { class GetCommand extends Command
{
var $other = null; var $other = null;
@ -269,7 +282,8 @@ class GetCommand extends Command {
} }
} }
class SubCommand extends Command { class SubCommand extends Command
{
var $other = null; var $other = null;
@ -297,7 +311,8 @@ class SubCommand extends Command {
} }
} }
class UnsubCommand extends Command { class UnsubCommand extends Command
{
var $other = null; var $other = null;
@ -324,7 +339,8 @@ class UnsubCommand extends Command {
} }
} }
class OffCommand extends Command { class OffCommand extends Command
{
var $other = null; var $other = null;
function __construct($user, $other=null) function __construct($user, $other=null)
{ {
@ -345,7 +361,8 @@ class OffCommand extends Command {
} }
} }
class OnCommand extends Command { class OnCommand extends Command
{
var $other = null; var $other = null;
function __construct($user, $other=null) function __construct($user, $other=null)
{ {
@ -367,7 +384,8 @@ class OnCommand extends Command {
} }
} }
class HelpCommand extends Command { class HelpCommand extends Command
{
function execute($channel) function execute($channel)
{ {
$channel->output($this->user, $channel->output($this->user,

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/classes/Command.php'); require_once(INSTALLDIR.'/classes/Command.php');
class CommandInterpreter { class CommandInterpreter
{
function handle_command($user, $text) function handle_command($user, $text)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/classes/Notice.php'); require_once(INSTALLDIR.'/classes/Notice.php');
class NoticeWrapper extends Notice { class NoticeWrapper extends Notice
{
public $id; // int(4) primary_key not_null public $id; // int(4) primary_key not_null
public $profile_id; // int(4) not_null public $profile_id; // int(4) not_null

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class ShortUrlApi { class ShortUrlApi
{
protected $service_url; protected $service_url;
function __construct($service_url) function __construct($service_url)
@ -69,7 +70,8 @@ class ShortUrlApi {
} }
} }
class LilUrl extends ShortUrlApi { class LilUrl extends ShortUrlApi
{
function __construct() function __construct()
{ {
parent::__construct('http://ur1.ca/'); parent::__construct('http://ur1.ca/');
@ -88,7 +90,8 @@ class LilUrl extends ShortUrlApi {
} }
class PtitUrl extends ShortUrlApi { class PtitUrl extends ShortUrlApi
{
function __construct() function __construct()
{ {
parent::__construct('http://ptiturl.com/?creer=oui&action=Reduire&url='); 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() function __construct()
{ {
parent::__construct('http://2tu.us/?save=y&url='); parent::__construct('http://2tu.us/?save=y&url=');

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class DeleteAction extends Action { class DeleteAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/extlib/facebook/facebook.php'); require_once(INSTALLDIR.'/extlib/facebook/facebook.php');
class FacebookAction extends Action { class FacebookAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -21,9 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/omb.php'); 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) function lookup_consumer($consumer_key)
{ {
@ -75,8 +76,8 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$t->consumer_key = $consumer->key; $t->consumer_key = $consumer->key;
$t->tok = common_good_rand(16); $t->tok = common_good_rand(16);
$t->secret = common_good_rand(16); $t->secret = common_good_rand(16);
$t->type = 0; # request $t->type = 0; // request
$t->state = 0; # unauthorized $t->state = 0; // unauthorized
$t->created = DB_DataObject_Cast::dateTime(); $t->created = DB_DataObject_Cast::dateTime();
if (!$t->insert()) { if (!$t->insert()) {
return null; 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) function fetch_request_token($consumer)
{ {
@ -98,14 +99,14 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$rt = new Token(); $rt = new Token();
$rt->consumer_key = $consumer->key; $rt->consumer_key = $consumer->key;
$rt->tok = $token->key; $rt->tok = $token->key;
$rt->type = 0; # request $rt->type = 0; // request
if ($rt->find(true) && $rt->state == 1) { # authorized if ($rt->find(true) && $rt->state == 1) { // authorized
common_debug('request token found.', __FILE__); common_debug('request token found.', __FILE__);
$at = new Token(); $at = new Token();
$at->consumer_key = $consumer->key; $at->consumer_key = $consumer->key;
$at->tok = common_good_rand(16); $at->tok = common_good_rand(16);
$at->secret = common_good_rand(16); $at->secret = common_good_rand(16);
$at->type = 1; # access $at->type = 1; // access
$at->created = DB_DataObject_Cast::dateTime(); $at->created = DB_DataObject_Cast::dateTime();
if (!$at->insert()) { if (!$at->insert()) {
$e = $at->_lastError; $e = $at->_lastError;
@ -113,15 +114,15 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
return null; return null;
} else { } else {
common_debug('access token "'.$at->tok.'" inserted', __FILE__); common_debug('access token "'.$at->tok.'" inserted', __FILE__);
# burn the old one // burn the old one
$orig_rt = clone($rt); $orig_rt = clone($rt);
$rt->state = 2; # used $rt->state = 2; // used
if (!$rt->update($orig_rt)) { if (!$rt->update($orig_rt)) {
return null; return null;
} }
common_debug('request token "'.$rt->tok.'" updated', __FILE__); common_debug('request token "'.$rt->tok.'" updated', __FILE__);
# Update subscription // Update subscription
# XXX: mixing levels here // XXX: mixing levels here
$sub = Subscription::staticGet('token', $rt->tok); $sub = Subscription::staticGet('token', $rt->tok);
if (!$sub) { if (!$sub) {
return null; 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) function fetch_access_token($consumer)
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class PersonalAction extends Action { class PersonalAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
define('PROFILES_PER_PAGE', 20); define('PROFILES_PER_PAGE', 20);
class ProfileList { class ProfileList
{
var $profile = null; var $profile = null;
var $owner = null; var $owner = null;

View File

@ -25,7 +25,8 @@ require_once(INSTALLDIR.'/lib/daemon.php');
require_once(INSTALLDIR.'/classes/Queue_item.php'); require_once(INSTALLDIR.'/classes/Queue_item.php');
require_once(INSTALLDIR.'/classes/Notice.php'); require_once(INSTALLDIR.'/classes/Notice.php');
class QueueHandler extends Daemon { class QueueHandler extends Daemon
{
var $_id = 'generic'; var $_id = 'generic';

View File

@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
define('DEFAULT_RSS_LIMIT', 48); 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. # This will contain the details of each feed item's author and be used to generate SIOC data.
var $creators = array(); var $creators = array();

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SearchEngine { class SearchEngine
{
protected $target; protected $target;
protected $table; protected $table;
@ -45,7 +46,8 @@ class SearchEngine {
} }
} }
class SphinxSearch extends SearchEngine { class SphinxSearch extends SearchEngine
{
private $sphinx; private $sphinx;
private $connected; private $connected;
@ -103,7 +105,8 @@ class SphinxSearch extends SearchEngine {
} }
} }
class MySQLSearch extends SearchEngine { class MySQLSearch extends SearchEngine
{
function query($q) function query($q)
{ {
if ('identica_people' === $this->table) if ('identica_people' === $this->table)
@ -115,7 +118,8 @@ class MySQLSearch extends SearchEngine {
} }
} }
class PGSearch extends SearchEngine { class PGSearch extends SearchEngine
{
function query($q) function query($q)
{ {
if ('identica_people' === $this->table) if ('identica_people' === $this->table)

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SearchAction extends Action { class SearchAction extends Action
{
function is_readonly() function is_readonly()
{ {

View File

@ -19,7 +19,8 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SettingsAction extends Action { class SettingsAction extends Action
{
function handle($args) function handle($args)
{ {

View File

@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/personal.php'); require_once(INSTALLDIR.'/lib/personal.php');
require_once(INSTALLDIR.'/lib/noticelist.php'); require_once(INSTALLDIR.'/lib/noticelist.php');
class StreamAction extends PersonalAction { class StreamAction extends PersonalAction
{
function public_views_menu() function public_views_menu()
{ {

Some files were not shown because too many files have changed in this diff Show More