eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge conflicts and kill a whole lot of trailing whitespace on lines.

Browse Source 
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
This commit is contained in:
Mike Cochrane 2008-07-09 18:46:30 -04:00
parent 67921b1c18
commit 4b656f47df
31 changed files with 120 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/accesstoken.php
View File

@ -27,12 +27,12 @@ class AccesstokenAction extends Action {
try { try {
common_debug('getting request from env variables', __FILE__); common_debug('getting request from env variables', __FILE__);
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
common_debug('getting a server', __FILE__); common_debug('getting a server', __FILE__);
$server = omb_oauth_server(); $server = omb_oauth_server();
common_debug('fetching the access token', __FILE__); common_debug('fetching the access token', __FILE__);
$token = $server->fetch_access_token($req); $token = $server->fetch_access_token($req);
common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__); common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__);
common_debug('printing the access token', __FILE__); common_debug('printing the access token', __FILE__);
print $token; print $token;
} catch (OAuthException $e) { } catch (OAuthException $e) {
common_server_error($e->getMessage()); common_server_error($e->getMessage());

8
actions/finishimmediate.php
View File

@ -25,7 +25,7 @@ class FinishimmediateAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
$consumer = oid_consumer(); $consumer = oid_consumer();
$response = $consumer->complete(common_local_url('finishimmediate')); $response = $consumer->complete(common_local_url('finishimmediate'));
@ -36,7 +36,7 @@ class FinishimmediateAction extends Action {
$response->endpoint->canonicalID : $response->getDisplayIdentifier(); $response->endpoint->canonicalID : $response->getDisplayIdentifier();
$user = oid_get_user($canonical); $user = oid_get_user($canonical);
if ($user) { if ($user) {
oid_update_user($user, $sreg); oid_update_user($user, $sreg);
oid_set_last($display); # refresh for another year oid_set_last($display); # refresh for another year
@ -47,12 +47,12 @@ class FinishimmediateAction extends Action {
} }
# Failure! Clear openid so we don't try it again # Failure! Clear openid so we don't try it again
oid_clear_last(); oid_clear_last();
$this->go_backto(); $this->go_backto();
return; return;
} }
function go_backto() { function go_backto() {
common_ensure_session(); common_ensure_session();
$backto = $_SESSION['openid_immediate_backto']; $backto = $_SESSION['openid_immediate_backto'];

19
actions/login.php
View File

@ -31,7 +31,7 @@ class LoginAction extends Action {
$this->show_form(); $this->show_form();
} }
} }
function check_login() { function check_login() {
# XXX: form token in $_SESSION to prevent XSS # XXX: form token in $_SESSION to prevent XSS
# XXX: login throttle # XXX: login throttle
@ -40,7 +40,7 @@ class LoginAction extends Action {
if (common_check_user($nickname, $password)) { if (common_check_user($nickname, $password)) {
# success! # success!
if (!common_set_user($nickname)) { if (!common_set_user($nickname)) {
common_server_error(_t('Error setting user.')); common_server_error(_('Error setting user.'));
return; return;
} }
common_real_login(true); common_real_login(true);
@ -60,11 +60,18 @@ class LoginAction extends Action {
} }
common_redirect($url); common_redirect($url);
} else { } else {
$this->show_form(_t('Incorrect username or password.')); $this->show_form(_('Incorrect username or password.'));
return;
} }
# success!
if (!common_set_user($user)) {
common_server_error(_t('Error setting user.'));
return;
}
common_real_login(true); common_real_login(true);
if ($this->boolean('rememberme')) { if ($this->boolean('rememberme')) {
common_debug('Adding rememberme cookie for ' . $nickname); common_debug('Adding rememberme cookie for ' . $nickname);
common_rememberme($user); common_rememberme($user);
@ -102,7 +109,7 @@ class LoginAction extends Action {
} }
function get_instructions() { function get_instructions() {
return _t('Login with your username and password. ' . return _('Login with your username and password. ' .
'Don\'t have a username yet? ' . 'Don\'t have a username yet? ' .
'[Register](%%action.register%%) a new account, or ' . '[Register](%%action.register%%) a new account, or ' .
'try [OpenID](%%action.openidlogin%%). '); 'try [OpenID](%%action.openidlogin%%). ');

9
actions/newnotice.php
View File

@ -90,7 +90,14 @@ class NewnoticeAction extends Action {
function show_form($msg=NULL) { function show_form($msg=NULL) {
$content = $this->trimmed('status_textarea'); $content = $this->trimmed('status_textarea');
common_show_header(_t('New notice'), NULL, $content, if (!$content) {
$replyto = $this->trimmed('replyto');
$profile = Profile::staticGet('nickname', $replyto);
if ($profile) {
$content = '@' . $profile->nickname . ' ';
}
}
common_show_header(_('New notice'), NULL, $content,
array($this, 'show_top')); array($this, 'show_top'));
if ($msg) { if ($msg) {
common_element('p', 'error', $msg); common_element('p', 'error', $msg);

12
actions/publicxrds.php
View File

@ -26,14 +26,14 @@ require_once(INSTALLDIR.'/lib/openid.php');
class PublicxrdsAction extends Action { class PublicxrdsAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
header('Content-Type: application/xrds+xml'); header('Content-Type: application/xrds+xml');
common_start_xml(); common_start_xml();
common_element_start('XRDS', array('xmlns' => 'xri://$xrds')); common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
'version' => '2.0')); 'version' => '2.0'));
@ -44,13 +44,13 @@ class PublicxrdsAction extends Action {
$this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE, $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
common_local_url($finish)); common_local_url($finish));
} }
common_element_end('XRD'); common_element_end('XRD');
common_element_end('XRDS'); common_element_end('XRDS');
common_end_xml(); common_end_xml();
} }
function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) { function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) {
common_element_start('Service'); common_element_start('Service');
if ($uri) { if ($uri) {

4
actions/register.php
View File

@ -68,7 +68,7 @@ class RegisterAction extends Action {
if (!$user) { if (!$user) {
$this->show_form(_t('Invalid username or password.')); $this->show_form(_t('Invalid username or password.'));
return; return;
} }
# success! # success!
if (!common_set_user($user)) { if (!common_set_user($user)) {
common_server_error(_('Error setting user.')); common_server_error(_('Error setting user.'));
@ -82,7 +82,7 @@ class RegisterAction extends Action {
} }
common_redirect(common_local_url('profilesettings')); common_redirect(common_local_url('profilesettings'));
} else { } else {
$this->show_form(_t('Invalid username or password.')); $this->show_form(_('Invalid username or password.'));
} }
} }

2
actions/remotesubscribe.php
View File

@ -64,7 +64,7 @@ class RemotesubscribeAction extends Action {
$profile = $this->trimmed('profile_url'); $profile = $this->trimmed('profile_url');
common_show_header(_('Remote subscribe'), NULL, $err, common_show_header(_('Remote subscribe'), NULL, $err,
array($this, 'show_top')); array($this, 'show_top'));
# id = remotesubscribe conflicts with the # id = remotesubscribe conflicts with the
# button on profile page # button on profile page
common_element_start('form', array('id' => 'remsub', 'method' => 'post', common_element_start('form', array('id' => 'remsub', 'method' => 'post',
'action' => common_local_url('remotesubscribe'))); 'action' => common_local_url('remotesubscribe')));

8
actions/showstream.php
View File

@ -375,14 +375,6 @@ class ShowstreamAction extends StreamAction {
'href' => $noticeurl, 'href' => $noticeurl,
'title' => common_exact_date($notice->created)), 'title' => common_exact_date($notice->created)),
common_date_string($notice->created)); common_date_string($notice->created));
if ($notice->reply_to) {
$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
common_text(' (');
common_element('a', array('class' => 'inreplyto',
'href' => $replyurl),
_t('in reply to...'));
common_text(')');
}
common_element_start('a', common_element_start('a',
array('href' => common_local_url('newnotice', array('href' => common_local_url('newnotice',
array('replyto' => $profile->nickname)), array('replyto' => $profile->nickname)),

12
classes/Avatar.php
View File

@ -4,18 +4,18 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Avatar extends DB_DataObject class Avatar extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
public $__table = 'avatar'; // table name public $__table = 'avatar'; // table name
public $profile_id; // int(4) primary_key not_null public $profile_id; // int(4) primary_key not_null
public $original; // tinyint(1) public $original; // tinyint(1)
public $width; // int(4) primary_key not_null public $width; // int(4) primary_key not_null
public $height; // int(4) primary_key not_null public $height; // int(4) primary_key not_null
public $mediatype; // varchar(32) not_null public $mediatype; // varchar(32) not_null
public $filename; // varchar(255) public $filename; // varchar(255)
public $url; // varchar(255) unique_key public $url; // varchar(255) unique_key
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@ -27,7 +27,7 @@ class Avatar extends DB_DataObject
###END_AUTOCODE ###END_AUTOCODE
# We clean up the file, too # We clean up the file, too
function delete() { function delete() {
$filename = $this->filename; $filename = $this->filename;
if (parent::delete()) { if (parent::delete()) {
@ -36,8 +36,8 @@ class Avatar extends DB_DataObject
} }
# Create and save scaled version of this avatar # Create and save scaled version of this avatar
# XXX: maybe break into different methods # XXX: maybe break into different methods
function scale($size) { function scale($size) {
$image_s = imagecreatetruecolor($size, $size); $image_s = imagecreatetruecolor($size, $size);

8
classes/Confirm_address.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Confirm_address extends DB_DataObject class Confirm_address extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -15,8 +15,8 @@ class Confirm_address extends DB_DataObject
public $address; // varchar(255) not_null public $address; // varchar(255) not_null
public $address_extra; // varchar(255) not_null public $address_extra; // varchar(255) not_null
public $address_type; // varchar(8) not_null public $address_type; // varchar(8) not_null
public $claimed; // datetime() public $claimed; // datetime()
public $sent; // datetime() public $sent; // datetime()
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
/* Static get */ /* Static get */
@ -24,6 +24,6 @@ class Confirm_address extends DB_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function sequenceKey() { return array(false, false); } function sequenceKey() { return array(false, false); }
} }

2
classes/Consumer.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Consumer extends DB_DataObject class Consumer extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */

2
classes/Nonce.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Nonce extends DB_DataObject class Nonce extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */

3
classes/Notice.php
View File

@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Notice extends DB_DataObject class Notice extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -34,7 +34,6 @@ class Notice extends DB_DataObject
public $profile_id; // int(4) not_null public $profile_id; // int(4) not_null
public $uri; // varchar(255) unique_key public $uri; // varchar(255) unique_key
public $content; // varchar(140) public $content; // varchar(140)
public $rendered; // text()
public $url; // varchar(255) public $url; // varchar(255)
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP

14
classes/Profile.php
View File

@ -24,19 +24,19 @@ if (!defined('LACONICA')) { exit(1); }
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Profile extends DB_DataObject class Profile extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
public $__table = 'profile'; // table name public $__table = 'profile'; // table name
public $id; // int(4) primary_key not_null public $id; // int(4) primary_key not_null
public $nickname; // varchar(64) multiple_key not_null public $nickname; // varchar(64) not_null
public $fullname; // varchar(255) multiple_key public $fullname; // varchar(255)
public $profileurl; // varchar(255) public $profileurl; // varchar(255)
public $homepage; // varchar(255) multiple_key public $homepage; // varchar(255)
public $bio; // varchar(140) multiple_key public $bio; // varchar(140)
public $location; // varchar(255) multiple_key public $location; // varchar(255)
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@ -133,7 +133,7 @@ class Profile extends DB_DataObject
} }
return true; return true;
} }
function getBestName() { function getBestName() {
return ($this->fullname) ? $this->fullname : $this->nickname; return ($this->fullname) ? $this->fullname : $this->nickname;
} }

6
classes/Queue_item.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Queue_item extends DB_DataObject class Queue_item extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -12,13 +12,13 @@ class Queue_item extends DB_DataObject
public $__table = 'queue_item'; // table name public $__table = 'queue_item'; // table name
public $notice_id; // int(4) primary_key not_null public $notice_id; // int(4) primary_key not_null
public $created; // datetime() not_null public $created; // datetime() not_null
public $claimed; // datetime() public $claimed; // datetime()
/* Static get */ /* Static get */
function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Queue_item',$k,$v); } function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Queue_item',$k,$v); }
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function sequenceKey() { return array(false, false); } function sequenceKey() { return array(false, false); }
} }

4
classes/Remember_me.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Remember_me extends DB_DataObject class Remember_me extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -19,6 +19,6 @@ class Remember_me extends DB_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function sequenceKey() { return array(false, false); } function sequenceKey() { return array(false, false); }
} }

6
classes/Remote_profile.php
View File

@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Remote_profile extends DB_DataObject class Remote_profile extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -32,8 +32,8 @@ class Remote_profile extends DB_DataObject
public $__table = 'remote_profile'; // table name public $__table = 'remote_profile'; // table name
public $id; // int(4) primary_key not_null public $id; // int(4) primary_key not_null
public $uri; // varchar(255) unique_key public $uri; // varchar(255) unique_key
public $postnoticeurl; // varchar(255) public $postnoticeurl; // varchar(255)
public $updateprofileurl; // varchar(255) public $updateprofileurl; // varchar(255)
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP

3
classes/Reply.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Reply extends DB_DataObject class Reply extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -12,6 +12,7 @@ class Reply extends DB_DataObject
public $__table = 'reply'; // table name public $__table = 'reply'; // table name
public $notice_id; // int(4) primary_key not_null public $notice_id; // int(4) primary_key not_null
public $profile_id; // int(4) primary_key not_null public $profile_id; // int(4) primary_key not_null
public $replied_id; // int(4)
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
public $replied_id; // int(4) public $replied_id; // int(4)

2
classes/Sms_carrier.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Sms_carrier extends DB_DataObject class Sms_carrier extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */

6
classes/Subscription.php
View File

@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Subscription extends DB_DataObject class Subscription extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -32,8 +32,8 @@ class Subscription extends DB_DataObject
public $__table = 'subscription'; // table name public $__table = 'subscription'; // table name
public $subscriber; // int(4) primary_key not_null public $subscriber; // int(4) primary_key not_null
public $subscribed; // int(4) primary_key not_null public $subscribed; // int(4) primary_key not_null
public $token; // varchar(255) public $token; // varchar(255)
public $secret; // varchar(255) public $secret; // varchar(255)
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP

4
classes/Token.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class Token extends DB_DataObject class Token extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -14,7 +14,7 @@ class Token extends DB_DataObject
public $tok; // char(32) primary_key not_null public $tok; // char(32) primary_key not_null
public $secret; // char(32) not_null public $secret; // char(32) not_null
public $type; // tinyint(1) not_null public $type; // tinyint(1) not_null
public $state; // tinyint(1) public $state; // tinyint(1)
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP

18
classes/User.php
View File

@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
require_once 'Validate.php'; require_once 'Validate.php';
class User extends DB_DataObject class User extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -32,14 +32,14 @@ class User extends DB_DataObject
public $__table = 'user'; // table name public $__table = 'user'; // table name
public $id; // int(4) primary_key not_null public $id; // int(4) primary_key not_null
public $nickname; // varchar(64) unique_key public $nickname; // varchar(64) unique_key
public $password; // varchar(255) public $password; // varchar(255)
public $email; // varchar(255) unique_key public $email; // varchar(255) unique_key
public $jabber; // varchar(255) unique_key public $jabber; // varchar(255) unique_key
public $jabbernotify; // tinyint(1) public $jabbernotify; // tinyint(1)
public $updatefrompresence; // tinyint(1) public $updatefrompresence; // tinyint(1)
public $sms; // varchar(64) unique_key public $sms; // varchar(64) unique_key
public $carrier; // int(4) public $carrier; // int(4)
public $smsnotify; // tinyint(1) public $smsnotify; // tinyint(1)
public $uri; // varchar(255) unique_key public $uri; // varchar(255) unique_key
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@ -69,7 +69,7 @@ class User extends DB_DataObject
} }
# 'update' won't write key columns, so we have to do it ourselves. # 'update' won't write key columns, so we have to do it ourselves.
function updateKeys(&$orig) { function updateKeys(&$orig) {
$parts = array(); $parts = array();
foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) { foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) {
@ -82,11 +82,11 @@ class User extends DB_DataObject
return true; return true;
} }
$toupdate = implode(', ', $parts); $toupdate = implode(', ', $parts);
$qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
' WHERE id = ' . $this->id; ' WHERE id = ' . $this->id;
return $this->query($qry); return $this->query($qry);
} }
function allowed_nickname($nickname) { function allowed_nickname($nickname) {
# XXX: should already be validated for size, content, etc. # XXX: should already be validated for size, content, etc.
static $blacklist = array('rss', 'xrds', 'doc', 'main', static $blacklist = array('rss', 'xrds', 'doc', 'main',

2
classes/User_openid.php
View File

@ -4,7 +4,7 @@
*/ */
require_once 'DB/DataObject.php'; require_once 'DB/DataObject.php';
class User_openid extends DB_DataObject class User_openid extends DB_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */

2
db/laconica.sql
View File

@ -201,6 +201,6 @@ create table queue_item (
claimed datetime comment 'date this item was claimed', claimed datetime comment 'date this item was claimed',
index queue_item_created_idx (created) index queue_item_created_idx (created)
) ENGINE=MyISAM; ) ENGINE=MyISAM;

8
fixup_replies.php
View File

@ -20,8 +20,8 @@
# Abort if called from a web server # Abort if called from a web server
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
print "This script must be run from the command line\n"; print "This script must be run from the command line\n";
exit(); exit();
} }
define('INSTALLDIR', dirname(__FILE__)); define('INSTALLDIR', dirname(__FILE__));
@ -35,6 +35,6 @@ $notice = new Notice();
$cnt = $notice->find(); $cnt = $notice->find();
while ($notice->fetch()) { while ($notice->fetch()) {
common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id); common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
common_save_replies($notice); common_save_replies($notice);
} }

12
lib/action.php
View File

@ -38,14 +38,14 @@ class Action { // lawsuit
$arg = $this->arg($key, $def); $arg = $this->arg($key, $def);
return (is_string($arg)) ? trim($arg) : $arg; return (is_string($arg)) ? trim($arg) : $arg;
} }
function handle($argarray) { function handle($argarray) {
$this->args =& common_copy_args($argarray); $this->args =& common_copy_args($argarray);
} }
function boolean($key, $def=false) { function boolean($key, $def=false) {
$arg = strtolower($this->trimmed($key)); $arg = strtolower($this->trimmed($key));
if (is_null($arg)) { if (is_null($arg)) {
return $def; return $def;
} else if (in_array($arg, array('true', 'yes', '1'))) { } else if (in_array($arg, array('true', 'yes', '1'))) {
@ -56,19 +56,19 @@ class Action { // lawsuit
return $def; return $def;
} }
} }
function server_error($msg, $code=500) { function server_error($msg, $code=500) {
$action = $this->trimmed('action'); $action = $this->trimmed('action');
common_debug("Server error '$code' on '$action': $msg", __FILE__); common_debug("Server error '$code' on '$action': $msg", __FILE__);
common_server_error($msg, $code); common_server_error($msg, $code);
} }
function client_error($msg, $code=400) { function client_error($msg, $code=400) {
$action = $this->trimmed('action'); $action = $this->trimmed('action');
common_debug("User error '$code' on '$action': $msg", __FILE__); common_debug("User error '$code' on '$action': $msg", __FILE__);
common_user_error($msg, $code); common_user_error($msg, $code);
} }
function self_url() { function self_url() {
$action = $this->trimmed('action'); $action = $this->trimmed('action');
$args = $this->args; $args = $this->args;

2
lib/jabber.php
View File

@ -133,7 +133,7 @@ function jabber_broadcast_notice($notice) {
while ($sub->fetch()) { while ($sub->fetch()) {
$user = User::staticGet($sub->subscriber); $user = User::staticGet($sub->subscriber);
if ($user && $user->jabber && $user->jabbernotify) { if ($user && $user->jabber && $user->jabbernotify) {
common_log(LOG_INFO, common_log(LOG_INFO,
'Sending notice ' . $notice->id . ' to ' . $user->jabber, 'Sending notice ' . $notice->id . ' to ' . $user->jabber,
__FILE__); __FILE__);
$success = jabber_send_message($user->jabber, $msg); $success = jabber_send_message($user->jabber, $msg);

20
lib/oauthstore.php
View File

@ -24,7 +24,7 @@ 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) {
$con = Consumer::staticGet('consumer_key', $consumer_key); $con = Consumer::staticGet('consumer_key', $consumer_key);
if (!$con) { if (!$con) {
@ -38,7 +38,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
} }
return new OAuthConsumer($con->consumer_key, ''); return new OAuthConsumer($con->consumer_key, '');
} }
function lookup_token($consumer, $token_type, $token_key) { function lookup_token($consumer, $token_type, $token_key) {
$t = new Token(); $t = new Token();
$t->consumer_key = $consumer->key; $t->consumer_key = $consumer->key;
@ -50,7 +50,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
return NULL; return NULL;
} }
} }
function lookup_nonce($consumer, $token, $nonce, $timestamp) { function lookup_nonce($consumer, $token, $nonce, $timestamp) {
$n = new Nonce(); $n = new Nonce();
$n->consumer_key = $consumer->key; $n->consumer_key = $consumer->key;
@ -65,7 +65,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
return FALSE; return FALSE;
} }
} }
function new_request_token($consumer) { function new_request_token($consumer) {
$t = new Token(); $t = new Token();
$t->consumer_key = $consumer->key; $t->consumer_key = $consumer->key;
@ -82,11 +82,11 @@ 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) {
return $this->new_request_token($consumer); return $this->new_request_token($consumer);
} }
function new_access_token($token, $consumer) { function new_access_token($token, $consumer) {
common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__); common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__);
$rt = new Token(); $rt = new Token();
@ -112,7 +112,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$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
@ -129,15 +129,15 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
} else { } else {
common_debug('subscription updated to use access token', __FILE__); common_debug('subscription updated to use access token', __FILE__);
return new OAuthToken($at->tok, $at->secret); return new OAuthToken($at->tok, $at->secret);
} }
} }
} else { } else {
return NULL; return NULL;
} }
} }
# defined in OAuthDataStore, but not implemented anywhere # defined in OAuthDataStore, but not implemented anywhere
function fetch_access_token($consumer) { function fetch_access_token($consumer) {
return $this->new_access_token($consumer); return $this->new_access_token($consumer);
} }

24
lib/omb.php
View File

@ -152,7 +152,7 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
array('notice' => array('notice' =>
$notice->id))); $notice->id)));
$req->set_parameter('omb_notice_license', $config['license']['url']); $req->set_parameter('omb_notice_license', $config['license']['url']);
$req->sign_request(omb_hmac_sha1(), $con, $token); $req->sign_request(omb_hmac_sha1(), $con, $token);
# We re-use this tool's fetcher, since it's pretty good # We re-use this tool's fetcher, since it's pretty good
@ -163,13 +163,13 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
$req->to_postdata()); $req->to_postdata());
common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__); common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
if ($result->status == 403) { # not authorized, don't send again if ($result->status == 403) { # not authorized, don't send again
common_debug('403 result, deleting subscription', __FILE__); common_debug('403 result, deleting subscription', __FILE__);
$subscription->delete(); $subscription->delete();
return false; return false;
} else if ($result->status != 200) { } else if ($result->status != 200) {
common_debug('Error status '.$result->status, __FILE__); common_debug('Error status '.$result->status, __FILE__);
return false; return false;
} else { # success! } else { # success!
parse_str($result->body, $return); parse_str($result->body, $return);
@ -216,22 +216,22 @@ function omb_update_profile($profile, $remote_profile, $subscription) {
$req->set_parameter('omb_listenee', $user->uri); $req->set_parameter('omb_listenee', $user->uri);
$req->set_parameter('omb_listenee_profile', common_profile_url($profile->nickname)); $req->set_parameter('omb_listenee_profile', common_profile_url($profile->nickname));
$req->set_parameter('omb_listenee_nickname', $profile->nickname); $req->set_parameter('omb_listenee_nickname', $profile->nickname);
# We use blanks to force emptying any existing values in these optional fields # We use blanks to force emptying any existing values in these optional fields
$req->set_parameter('omb_listenee_fullname', $req->set_parameter('omb_listenee_fullname',
($profile->fullname) ? $profile->fullname : ''); ($profile->fullname) ? $profile->fullname : '');
$req->set_parameter('omb_listenee_homepage', $req->set_parameter('omb_listenee_homepage',
($profile->homepage) ? $profile->homepage : ''); ($profile->homepage) ? $profile->homepage : '');
$req->set_parameter('omb_listenee_bio', $req->set_parameter('omb_listenee_bio',
($profile->bio) ? $profile->bio : ''); ($profile->bio) ? $profile->bio : '');
$req->set_parameter('omb_listenee_location', $req->set_parameter('omb_listenee_location',
($profile->location) ? $profile->location : ''); ($profile->location) ? $profile->location : '');
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
$req->set_parameter('omb_listenee_avatar', $req->set_parameter('omb_listenee_avatar',
($avatar) ? $avatar->url : ''); ($avatar) ? $avatar->url : '');
$req->sign_request(omb_hmac_sha1(), $con, $token); $req->sign_request(omb_hmac_sha1(), $con, $token);
# We re-use this tool's fetcher, since it's pretty good # We re-use this tool's fetcher, since it's pretty good
@ -244,13 +244,13 @@ function omb_update_profile($profile, $remote_profile, $subscription) {
$req->to_postdata()); $req->to_postdata());
common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__); common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
if ($result->status == 403) { # not authorized, don't send again if ($result->status == 403) { # not authorized, don't send again
common_debug('403 result, deleting subscription', __FILE__); common_debug('403 result, deleting subscription', __FILE__);
$subscription->delete(); $subscription->delete();
return false; return false;
} else if ($result->status != 200) { } else if ($result->status != 200) {
common_debug('Error status '.$result->status, __FILE__); common_debug('Error status '.$result->status, __FILE__);
return false; return false;
} else { # success! } else { # success!
parse_str($result->body, $return); parse_str($result->body, $return);

2
lib/stream.php
View File

@ -101,7 +101,7 @@ class StreamAction extends Action {
_t(' in reply to...')); _t(' in reply to...'));
common_text(')'); common_text(')');
} }
common_element_start('a', common_element_start('a',
array('href' => common_local_url('newnotice', array('href' => common_local_url('newnotice',
array('replyto' => $profile->nickname)), array('replyto' => $profile->nickname)),
'onclick' => 'doreply("'.$profile->nickname.'"); return false', 'onclick' => 'doreply("'.$profile->nickname.'"); return false',

4
lib/util.php
View File

@ -95,7 +95,7 @@ function common_element_start($tag, $attrs=NULL) {
function common_element_end($tag) { function common_element_end($tag) {
static $empty_tag = array('base', 'meta', 'link', 'hr', static $empty_tag = array('base', 'meta', 'link', 'hr',
'br', 'param', 'img', 'area', 'br', 'param', 'img', 'area',
'input', 'col'); 'input', 'col');
global $xw; global $xw;
# XXX: check namespace # XXX: check namespace
if (in_array($tag, $empty_tag)) { if (in_array($tag, $empty_tag)) {
@ -460,7 +460,7 @@ function common_set_user($user) {
} else if (!($user instanceof User)) { } else if (!($user instanceof User)) {
return false; return false;
} }
if ($user) { if ($user) {
common_ensure_session(); common_ensure_session();
$_SESSION['userid'] = $user->id; $_SESSION['userid'] = $user->id;