' - .' Lost or forgotten password?' - .'
' - .'To add the Identi.ca application, you need to log into your Identi.ca account.' + .'' + .'
'
+ .''
+ .'Login
' + .''
+ .'
'
+ .'Login with your username and password. Don\'t have a username yet?' + .' Register a new account.' + .'
' + .''
+ .' '
+ .' - '
- .''
- .'
'
+ .''
+ .' {
- $html .= common_avatar_display_url($avatar);
- } else {
- $html .= common_default_avatar(AVATAR_STREAM_SIZE);
- }
+ if ($avatar) {
+ $html .= common_avatar_display_url($avatar);
+ } else {
+ $html .= common_default_avatar(AVATAR_STREAM_SIZE);
+ }
hunk ./lib/facebookaction.php 176
- $html .=
- ')
'
- .'' . $profile->nickname . ''
- .' ';
+ $html .= '';
hunk ./lib/facebookaction.php 207
- return $html;
- }
+ return $html;
+ }
hunk ./lib/facebookaction.php 210
- function source_link($source) {
- $source_name = _($source);
+ function source_link($source) {
+ $source_name = _($source);
hunk ./lib/facebookaction.php 213
- $html = '';
+ $html = '';
hunk ./lib/facebookaction.php 215
- switch ($source) {
- case 'web':
- case 'xmpp':
- case 'mail':
- case 'omb':
- case 'api':
- $html .= $source_name;
- break;
- default:
- $ns = Notice_source::staticGet($source);
- if ($ns) {
- $html .= '' . $ns->name . '';
- } else {
- $html .= $source_name;
- }
- break;
- }
+ switch ($source) {
+ case 'web':
+ case 'xmpp':
+ case 'mail':
+ case 'omb':
+ case 'api':
+ $html .= $source_name;
+ break;
+ default:
+ $ns = Notice_source::staticGet($source);
+ if ($ns) {
+ $html .= '' . $ns->name . '';
+ } else {
+ $html .= $source_name;
+ }
+ break;
+ }
hunk ./lib/facebookaction.php 233
- $html .= '';
+ $html .= '';
hunk ./lib/facebookaction.php 235
- return $html;
- }
+ return $html;
+ }
hunk ./lib/facebookaction.php 238
- function pagination($have_before, $have_after, $page, $fbaction, $args=NULL) {
+ function pagination($have_before, $have_after, $page, $fbaction, $args=NULL) {
hunk ./lib/facebookaction.php 240
- $html = '';
+ $html = '';
hunk ./lib/facebookaction.php 242
- if ($have_before || $have_after) {
- $html = '
' + .' Lost or forgotten password?' + .'
' + .'getProfile(); - $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); + $profile = $notice->getProfile(); + $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); hunk ./lib/facebookaction.php 158 - $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); + $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); hunk ./lib/facebookaction.php 160 - # XXX: we need to figure this out better. Is this right? - if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) { - $noticeurl = $notice->uri; - } + # XXX: we need to figure this out better. Is this right? + if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) { + $noticeurl = $notice->uri; + } hunk ./lib/facebookaction.php 165 - $html = - '' . $notice->rendered . '
' - .'' - .'' . common_date_string($notice->created) . ''; + $html .= + '">' + .'' . $profile->nickname . '' + .'
' . $notice->rendered . '
' + .'' + .'' . common_date_string($notice->created) . ''; hunk ./lib/facebookaction.php 194 - if ($notice->source) { - $html .= _(' from '); - $html .= $this->source_link($notice->source); - } + if ($notice->source) { + $html .= _(' from '); + $html .= $this->source_link($notice->source); + } hunk ./lib/facebookaction.php 199 - if ($notice->reply_to) { - $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); - $html .= - ' (' . _('in reply to...') . ')'; - } + if ($notice->reply_to) { + $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); + $html .= + ' (' . _('in reply to...') . ')'; + } hunk ./lib/facebookaction.php 205 - $html .= '
';
- $html .'
- ';
- }
+ if ($have_before || $have_after) {
+ $html = '
- '; - $html .'' . _('« After') . ''; - $html .' '; - } + if ($have_before) { + $pargs = array('page' => $page-1); + $newargs = ($args) ? array_merge($args,$pargs) : $pargs; + $html .= '
- '; + $html .'' . _('« After') . ''; + $html .' '; + } hunk ./lib/facebookaction.php 255 - if ($have_after) { - $pargs = array('page' => $page+1); - $newargs = ($args) ? array_merge($args,$pargs) : $pargs; - $html .= '
- '; - $html .'' . _('Before »') . ''; - $html .' '; - } + if ($have_after) { + $pargs = array('page' => $page+1); + $newargs = ($args) ? array_merge($args,$pargs) : $pargs; + $html .= '
- '; + $html .'' . _('Before »') . ''; + $html .' '; + } hunk ./lib/facebookaction.php 263 - if ($have_before || $have_after) { - $html .= '
';
+ $html .'
- ';
+ }
hunk ./lib/facebookaction.php 247
- if ($have_before) {
- $pargs = array('page' => $page-1);
- $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
- $html .= '
- ';
- $html .'
';
- }
- }
+ if ($have_before || $have_after) {
+ $html .= '
- ';
+ $html .'
';
+ }
+ }
hunk ./lib/facebookaction.php 269
- function pagination_url($fbaction, $args=NULL) {
- global $config;
+ function pagination_url($fbaction, $args=NULL) {
+ global $config;
hunk ./lib/facebookaction.php 272
- $extra = '';
+ $extra = '';
hunk ./lib/facebookaction.php 274
- if ($args) {
- foreach ($args as $key => $value) {
- $extra .= "&${key}=${value}";
- }
- }
+ if ($args) {
+ foreach ($args as $key => $value) {
+ $extra .= "&${key}=${value}";
+ }
+ }
hunk ./lib/facebookaction.php 280
- return "$fbaction?${extra}";
- }
+ return "$fbaction?${extra}";
+ }
hunk ./lib/oauthstore.php 26
- # We keep a record of who's contacted us
+ # We keep a record of who's contacted us
hunk ./lib/oauthstore.php 28
- function lookup_consumer($consumer_key) {
- $con = Consumer::staticGet('consumer_key', $consumer_key);
- if (!$con) {
- $con = new Consumer();
- $con->consumer_key = $consumer_key;
- $con->seed = common_good_rand(16);
- $con->created = DB_DataObject_Cast::dateTime();
- if (!$con->insert()) {
- return NULL;
- }
- }
- return new OAuthConsumer($con->consumer_key, '');
- }
+ function lookup_consumer($consumer_key) {
+ $con = Consumer::staticGet('consumer_key', $consumer_key);
+ if (!$con) {
+ $con = new Consumer();
+ $con->consumer_key = $consumer_key;
+ $con->seed = common_good_rand(16);
+ $con->created = DB_DataObject_Cast::dateTime();
+ if (!$con->insert()) {
+ return NULL;
+ }
+ }
+ return new OAuthConsumer($con->consumer_key, '');
+ }
hunk ./lib/oauthstore.php 42
- function lookup_token($consumer, $token_type, $token_key) {
- $t = new Token();
- $t->consumer_key = $consumer->key;
- $t->tok = $token_key;
- $t->type = ($token_type == 'access') ? 1 : 0;
- if ($t->find(true)) {
- return new OAuthToken($t->tok, $t->secret);
- } else {
- return NULL;
- }
- }
+ function lookup_token($consumer, $token_type, $token_key) {
+ $t = new Token();
+ $t->consumer_key = $consumer->key;
+ $t->tok = $token_key;
+ $t->type = ($token_type == 'access') ? 1 : 0;
+ if ($t->find(true)) {
+ return new OAuthToken($t->tok, $t->secret);
+ } else {
+ return NULL;
+ }
+ }
hunk ./lib/oauthstore.php 54
- function lookup_nonce($consumer, $token, $nonce, $timestamp) {
- $n = new Nonce();
- $n->consumer_key = $consumer->key;
- $n->tok = $token->key;
- $n->nonce = $nonce;
- if ($n->find(TRUE)) {
- return TRUE;
- } else {
- $n->timestamp = $timestamp;
- $n->created = DB_DataObject_Cast::dateTime();
- $n->insert();
- return FALSE;
- }
- }
+ function lookup_nonce($consumer, $token, $nonce, $timestamp) {
+ $n = new Nonce();
+ $n->consumer_key = $consumer->key;
+ $n->tok = $token->key;
+ $n->nonce = $nonce;
+ if ($n->find(TRUE)) {
+ return TRUE;
+ } else {
+ $n->timestamp = $timestamp;
+ $n->created = DB_DataObject_Cast::dateTime();
+ $n->insert();
+ return FALSE;
+ }
+ }
hunk ./lib/oauthstore.php 69
- function new_request_token($consumer) {
- $t = new Token();
- $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->created = DB_DataObject_Cast::dateTime();
- if (!$t->insert()) {
- return NULL;
- } else {
- return new OAuthToken($t->tok, $t->secret);
- }
- }
+ function new_request_token($consumer) {
+ $t = new Token();
+ $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->created = DB_DataObject_Cast::dateTime();
+ if (!$t->insert()) {
+ return NULL;
+ } else {
+ return new OAuthToken($t->tok, $t->secret);
+ }
+ }
hunk ./lib/oauthstore.php 84
- # defined in OAuthDataStore, but not implemented anywhere
+ # defined in OAuthDataStore, but not implemented anywhere
hunk ./lib/oauthstore.php 86
- function fetch_request_token($consumer) {
- return $this->new_request_token($consumer);
- }
+ function fetch_request_token($consumer) {
+ return $this->new_request_token($consumer);
+ }
hunk ./lib/oauthstore.php 90
- function new_access_token($token, $consumer) {
- common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__);
- $rt = new Token();
- $rt->consumer_key = $consumer->key;
- $rt->tok = $token->key;
- $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->created = DB_DataObject_Cast::dateTime();
- if (!$at->insert()) {
- $e = $at->_lastError;
- common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__);
- return NULL;
- } else {
- common_debug('access token "'.$at->tok.'" inserted', __FILE__);
- # burn the old one
- $orig_rt = clone($rt);
- $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
- $sub = Subscription::staticGet('token', $rt->tok);
- if (!$sub) {
- return NULL;
- }
- common_debug('subscription for request token found', __FILE__);
- $orig_sub = clone($sub);
- $sub->token = $at->tok;
- $sub->secret = $at->secret;
- if (!$sub->update($orig_sub)) {
- return NULL;
- } else {
- common_debug('subscription updated to use access token', __FILE__);
- return new OAuthToken($at->tok, $at->secret);
- }
- }
- } else {
- return NULL;
- }
- }
+ function new_access_token($token, $consumer) {
+ common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__);
+ $rt = new Token();
+ $rt->consumer_key = $consumer->key;
+ $rt->tok = $token->key;
+ $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->created = DB_DataObject_Cast::dateTime();
+ if (!$at->insert()) {
+ $e = $at->_lastError;
+ common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__);
+ return NULL;
+ } else {
+ common_debug('access token "'.$at->tok.'" inserted', __FILE__);
+ # burn the old one
+ $orig_rt = clone($rt);
+ $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
+ $sub = Subscription::staticGet('token', $rt->tok);
+ if (!$sub) {
+ return NULL;
+ }
+ common_debug('subscription for request token found', __FILE__);
+ $orig_sub = clone($sub);
+ $sub->token = $at->tok;
+ $sub->secret = $at->secret;
+ if (!$sub->update($orig_sub)) {
+ return NULL;
+ } else {
+ common_debug('subscription updated to use access token', __FILE__);
+ return new OAuthToken($at->tok, $at->secret);
+ }
+ }
+ } else {
+ return NULL;
+ }
+ }
hunk ./lib/oauthstore.php 139
- # defined in OAuthDataStore, but not implemented anywhere
+ # defined in OAuthDataStore, but not implemented anywhere
hunk ./lib/oauthstore.php 141
- function fetch_access_token($consumer) {
- return $this->new_access_token($consumer);
- }
+ function fetch_access_token($consumer) {
+ return $this->new_access_token($consumer);
+ }
hunk ./lib/omb.php 47
- static $con = NULL;
- if (!$con) {
- $con = new OAuthConsumer(common_root_url(), '');
- }
- return $con;
+ static $con = NULL;
+ if (!$con) {
+ $con = new OAuthConsumer(common_root_url(), '');
+ }
+ return $con;
hunk ./lib/omb.php 55
- static $server = null;
- if (!$server) {
- $server = new OAuthServer(omb_oauth_datastore());
- $server->add_signature_method(omb_hmac_sha1());
- }
- return $server;
+ static $server = null;
+ if (!$server) {
+ $server = new OAuthServer(omb_oauth_datastore());
+ $server->add_signature_method(omb_hmac_sha1());
+ }
+ return $server;
hunk ./lib/omb.php 64
- static $store = NULL;
- if (!$store) {
- $store = new LaconicaOAuthDataStore();
- }
- return $store;
+ static $store = NULL;
+ if (!$store) {
+ $store = new LaconicaOAuthDataStore();
+ }
+ return $store;
hunk ./lib/omb.php 72
- static $hmac_method = NULL;
- if (!$hmac_method) {
- $hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
- }
- return $hmac_method;
+ static $hmac_method = NULL;
+ if (!$hmac_method) {
+ $hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
+ }
+ return $hmac_method;
hunk ./lib/omb.php 80
- return $xrd->services(array(omb_service_filter($type)));
+ return $xrd->services(array(omb_service_filter($type)));
hunk ./lib/omb.php 84
- return create_function('$s',
- 'return omb_match_service($s, \''.$type.'\');');
+ return create_function('$s',
+ 'return omb_match_service($s, \''.$type.'\');');
hunk ./lib/omb.php 89
- return in_array($type, $service->getTypes());
+ return in_array($type, $service->getTypes());
hunk ./lib/omb.php 93
- if (!$service) {
- return NULL;
- }
- $uris = $service->getURIs();
- if (!$uris) {
- return NULL;
- }
- return $uris[0];
+ if (!$service) {
+ return NULL;
+ }
+ $uris = $service->getURIs();
+ if (!$uris) {
+ return NULL;
+ }
+ return $uris[0];
hunk ./lib/omb.php 104
- if (!$service) {
- return NULL;
- }
- $els = $service->getElements('xrd:LocalID');
- if (!$els) {
- return NULL;
- }
- $el = $els[0];
- return $service->parser->content($el);
+ if (!$service) {
+ return NULL;
+ }
+ $els = $service->getElements('xrd:LocalID');
+ if (!$els) {
+ return NULL;
+ }
+ $el = $els[0];
+ return $service->parser->content($el);
hunk ./lib/omb.php 117
- # First, get remote users subscribed to this profile
- $rp = new Remote_profile();
+ # First, get remote users subscribed to this profile
+ $rp = new Remote_profile();
hunk ./lib/omb.php 120
- $rp->query('SELECT postnoticeurl, token, secret ' .
- 'FROM subscription JOIN remote_profile ' .
- 'ON subscription.subscriber = remote_profile.id ' .
- 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
+ $rp->query('SELECT postnoticeurl, token, secret ' .
+ 'FROM subscription JOIN remote_profile ' .
+ 'ON subscription.subscriber = remote_profile.id ' .
+ 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
hunk ./lib/omb.php 125
- $posted = array();
+ $posted = array();
hunk ./lib/omb.php 127
- while ($rp->fetch()) {
- if (!$posted[$rp->postnoticeurl]) {
- common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
- if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
- common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
- $posted[$rp->postnoticeurl] = TRUE;
- } else {
- common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
- }
- }
- }
+ while ($rp->fetch()) {
+ if (!$posted[$rp->postnoticeurl]) {
+ common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
+ if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
+ common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
+ $posted[$rp->postnoticeurl] = TRUE;
+ } else {
+ common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
+ }
+ }
+ }
hunk ./lib/omb.php 139
- $rp->free();
- unset($rp);
+ $rp->free();
+ unset($rp);
hunk ./lib/omb.php 142
- return true;
+ return true;
hunk ./lib/omb.php 146
- return omb_post_notice_keys($notice, $remote_profile->postnoticeurl, $subscription->token, $subscription->secret);
+ return omb_post_notice_keys($notice, $remote_profile->postnoticeurl, $subscription->token, $subscription->secret);
hunk ./lib/omb.php 151
- common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__);
+ common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__);
hunk ./lib/omb.php 153
- $user = User::staticGet('id', $notice->profile_id);
+ $user = User::staticGet('id', $notice->profile_id);
hunk ./lib/omb.php 155
- if (!$user) {
- common_debug('Failed to get user for notice ' . $notice->id . ', profile = ' . $notice->profile_id, __FILE__);
- return false;
- }
+ if (!$user) {
+ common_debug('Failed to get user for notice ' . $notice->id . ', profile = ' . $notice->profile_id, __FILE__);
+ return false;
+ }
hunk ./lib/omb.php 160
- $con = omb_oauth_consumer();
+ $con = omb_oauth_consumer();
hunk ./lib/omb.php 162
- $token = new OAuthToken($tk, $secret);
+ $token = new OAuthToken($tk, $secret);
hunk ./lib/omb.php 164
- $url = $postnoticeurl;
- $parsed = parse_url($url);
- $params = array();
- parse_str($parsed['query'], $params);
+ $url = $postnoticeurl;
+ $parsed = parse_url($url);
+ $params = array();
+ parse_str($parsed['query'], $params);
hunk ./lib/omb.php 169
- $req = OAuthRequest::from_consumer_and_token($con, $token,
- 'POST', $url, $params);
+ $req = OAuthRequest::from_consumer_and_token($con, $token,
+ 'POST', $url, $params);
hunk ./lib/omb.php 172
- $req->set_parameter('omb_version', OMB_VERSION_01);
- $req->set_parameter('omb_listenee', $user->uri);
- $req->set_parameter('omb_notice', $notice->uri);
- $req->set_parameter('omb_notice_content', $notice->content);
- $req->set_parameter('omb_notice_url', common_local_url('shownotice',
- array('notice' =>
- $notice->id)));
- $req->set_parameter('omb_notice_license', common_config('license', 'url'));
+ $req->set_parameter('omb_version', OMB_VERSION_01);
+ $req->set_parameter('omb_listenee', $user->uri);
+ $req->set_parameter('omb_notice', $notice->uri);
+ $req->set_parameter('omb_notice_content', $notice->content);
+ $req->set_parameter('omb_notice_url', common_local_url('shownotice',
+ array('notice' =>
+ $notice->id)));
+ $req->set_parameter('omb_notice_license', common_config('license', 'url'));
hunk ./lib/omb.php 181
- $user->free();
- unset($user);
+ $user->free();
+ unset($user);
hunk ./lib/omb.php 184
- $req->sign_request(omb_hmac_sha1(), $con, $token);
+ $req->sign_request(omb_hmac_sha1(), $con, $token);
hunk ./lib/omb.php 186
- # We re-use this tool's fetcher, since it's pretty good
+ # We re-use this tool's fetcher, since it's pretty good
hunk ./lib/omb.php 188
- $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+ $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
hunk ./lib/omb.php 190
- if (!$fetcher) {
- common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
- return false;
- }
+ if (!$fetcher) {
+ common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
+ return false;
+ }
hunk ./lib/omb.php 195
- $result = $fetcher->post($req->get_normalized_http_url(),
- $req->to_postdata(),
+ $result = $fetcher->post($req->get_normalized_http_url(),
+ $req->to_postdata(),
hunk ./lib/omb.php 199
- common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+ common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
hunk ./lib/omb.php 201
- if ($result->status == 403) { # not authorized, don't send again
- common_debug('403 result, deleting subscription', __FILE__);
- # FIXME: figure out how to delete this
- # $subscription->delete();
- return false;
- } else if ($result->status != 200) {
- common_debug('Error status '.$result->status, __FILE__);
- return false;
- } else { # success!
- parse_str($result->body, $return);
- if ($return['omb_version'] == OMB_VERSION_01) {
- return true;
- } else {
- return false;
- }
- }
+ if ($result->status == 403) { # not authorized, don't send again
+ common_debug('403 result, deleting subscription', __FILE__);
+ # FIXME: figure out how to delete this
+ # $subscription->delete();
+ return false;
+ } else if ($result->status != 200) {
+ common_debug('Error status '.$result->status, __FILE__);
+ return false;
+ } else { # success!
+ parse_str($result->body, $return);
+ if ($return['omb_version'] == OMB_VERSION_01) {
+ return true;
+ } else {
+ return false;
+ }
+ }
hunk ./lib/omb.php 220
- # First, get remote users subscribed to this profile
- # XXX: use a join here rather than looping through results
- $sub = new Subscription();
- $sub->subscribed = $profile->id;
- if ($sub->find()) {
- $updated = array();
- while ($sub->fetch()) {
- $rp = Remote_profile::staticGet('id', $sub->subscriber);
- if ($rp) {
- if (!$updated[$rp->updateprofileurl]) {
- if (omb_update_profile($profile, $rp, $sub)) {
- $updated[$rp->updateprofileurl] = TRUE;
- }
- }
- }
- }
- }
+ # First, get remote users subscribed to this profile
+ # XXX: use a join here rather than looping through results
+ $sub = new Subscription();
+ $sub->subscribed = $profile->id;
+ if ($sub->find()) {
+ $updated = array();
+ while ($sub->fetch()) {
+ $rp = Remote_profile::staticGet('id', $sub->subscriber);
+ if ($rp) {
+ if (!$updated[$rp->updateprofileurl]) {
+ if (omb_update_profile($profile, $rp, $sub)) {
+ $updated[$rp->updateprofileurl] = TRUE;
+ }
+ }
+ }
+ }
+ }
hunk ./lib/omb.php 240
- global $config; # for license URL
- $user = User::staticGet($profile->id);
- $con = omb_oauth_consumer();
- $token = new OAuthToken($subscription->token, $subscription->secret);
- $url = $remote_profile->updateprofileurl;
- $parsed = parse_url($url);
- $params = array();
- parse_str($parsed['query'], $params);
- $req = OAuthRequest::from_consumer_and_token($con, $token,
- "POST", $url, $params);
- $req->set_parameter('omb_version', OMB_VERSION_01);
- $req->set_parameter('omb_listenee', $user->uri);
- $req->set_parameter('omb_listenee_profile', common_profile_url($profile->nickname));
- $req->set_parameter('omb_listenee_nickname', $profile->nickname);
+ global $config; # for license URL
+ $user = User::staticGet($profile->id);
+ $con = omb_oauth_consumer();
+ $token = new OAuthToken($subscription->token, $subscription->secret);
+ $url = $remote_profile->updateprofileurl;
+ $parsed = parse_url($url);
+ $params = array();
+ parse_str($parsed['query'], $params);
+ $req = OAuthRequest::from_consumer_and_token($con, $token,
+ "POST", $url, $params);
+ $req->set_parameter('omb_version', OMB_VERSION_01);
+ $req->set_parameter('omb_listenee', $user->uri);
+ $req->set_parameter('omb_listenee_profile', common_profile_url($profile->nickname));
+ $req->set_parameter('omb_listenee_nickname', $profile->nickname);
hunk ./lib/omb.php 255
- # 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
hunk ./lib/omb.php 257
- $req->set_parameter('omb_listenee_fullname',
- ($profile->fullname) ? $profile->fullname : '');
- $req->set_parameter('omb_listenee_homepage',
- ($profile->homepage) ? $profile->homepage : '');
- $req->set_parameter('omb_listenee_bio',
- ($profile->bio) ? $profile->bio : '');
- $req->set_parameter('omb_listenee_location',
- ($profile->location) ? $profile->location : '');
+ $req->set_parameter('omb_listenee_fullname',
+ ($profile->fullname) ? $profile->fullname : '');
+ $req->set_parameter('omb_listenee_homepage',
+ ($profile->homepage) ? $profile->homepage : '');
+ $req->set_parameter('omb_listenee_bio',
+ ($profile->bio) ? $profile->bio : '');
+ $req->set_parameter('omb_listenee_location',
+ ($profile->location) ? $profile->location : '');
hunk ./lib/omb.php 266
- $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
- $req->set_parameter('omb_listenee_avatar',
- ($avatar) ? $avatar->url : '');
+ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+ $req->set_parameter('omb_listenee_avatar',
+ ($avatar) ? $avatar->url : '');
hunk ./lib/omb.php 270
- $req->sign_request(omb_hmac_sha1(), $con, $token);
+ $req->sign_request(omb_hmac_sha1(), $con, $token);
hunk ./lib/omb.php 272
- # We re-use this tool's fetcher, since it's pretty good
+ # We re-use this tool's fetcher, since it's pretty good
hunk ./lib/omb.php 274
- $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+ $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
hunk ./lib/omb.php 276
- common_debug('request URL = '.$req->get_normalized_http_url(), __FILE__);
- common_debug('postdata = '.$req->to_postdata(), __FILE__);
- $result = $fetcher->post($req->get_normalized_http_url(),
- $req->to_postdata(),
+ common_debug('request URL = '.$req->get_normalized_http_url(), __FILE__);
+ common_debug('postdata = '.$req->to_postdata(), __FILE__);
+ $result = $fetcher->post($req->get_normalized_http_url(),
+ $req->to_postdata(),
hunk ./lib/omb.php 282
- common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+ common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
hunk ./lib/omb.php 284
- if ($result->status == 403) { # not authorized, don't send again
- common_debug('403 result, deleting subscription', __FILE__);
- $subscription->delete();
- return false;
- } else if ($result->status != 200) {
- common_debug('Error status '.$result->status, __FILE__);
- return false;
- } else { # success!
- parse_str($result->body, $return);
- if ($return['omb_version'] == OMB_VERSION_01) {
- return true;
- } else {
- return false;
- }
- }
+ if ($result->status == 403) { # not authorized, don't send again
+ common_debug('403 result, deleting subscription', __FILE__);
+ $subscription->delete();
+ return false;
+ } else if ($result->status != 200) {
+ common_debug('Error status '.$result->status, __FILE__);
+ return false;
+ } else { # success!
+ parse_str($result->body, $return);
+ if ($return['omb_version'] == OMB_VERSION_01) {
+ return true;
+ } else {
+ return false;
+ }
+ }
hunk ./lib/openid.php 36
- if (!$store) {
- # Can't be called statically
- $user = new User();
- $conn = $user->getDatabaseConnection();
- $store = new Auth_OpenID_MySQLStore($conn);
- }
- return $store;
+ if (!$store) {
+ # Can't be called statically
+ $user = new User();
+ $conn = $user->getDatabaseConnection();
+ $store = new Auth_OpenID_MySQLStore($conn);
+ }
+ return $store;
hunk ./lib/openid.php 46
- $store = oid_store();
- $consumer = new Auth_OpenID_Consumer($store);
- return $consumer;
+ $store = oid_store();
+ $consumer = new Auth_OpenID_Consumer($store);
+ return $consumer;
hunk ./lib/openid.php 52
- oid_set_last('');
+ oid_set_last('');
hunk ./lib/openid.php 56
- common_set_cookie(OPENID_COOKIE_KEY,
- $openid_url,
- time() + OPENID_COOKIE_EXPIRY);
+ common_set_cookie(OPENID_COOKIE_KEY,
+ $openid_url,
+ time() + OPENID_COOKIE_EXPIRY);
hunk ./lib/openid.php 62
- $openid_url = $_COOKIE[OPENID_COOKIE_KEY];
- if ($openid_url && strlen($openid_url) > 0) {
- return $openid_url;
- } else {
- return NULL;
- }
+ $openid_url = $_COOKIE[OPENID_COOKIE_KEY];
+ if ($openid_url && strlen($openid_url) > 0) {
+ return $openid_url;
+ } else {
+ return NULL;
+ }
hunk ./lib/openid.php 72
- $oid = new User_openid();
- $oid->user_id = $id;
- $oid->canonical = $canonical;
- $oid->display = $display;
- $oid->created = DB_DataObject_Cast::dateTime();
+ $oid = new User_openid();
+ $oid->user_id = $id;
+ $oid->canonical = $canonical;
+ $oid->display = $display;
+ $oid->created = DB_DataObject_Cast::dateTime();
hunk ./lib/openid.php 78
- if (!$oid->insert()) {
- $err = PEAR::getStaticProperty('DB_DataObject','lastError');
- common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
- return false;
- }
+ if (!$oid->insert()) {
+ $err = PEAR::getStaticProperty('DB_DataObject','lastError');
+ common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
+ return false;
+ }
hunk ./lib/openid.php 84
- return true;
+ return true;
hunk ./lib/openid.php 88
- $user = NULL;
- $oid = User_openid::staticGet('canonical', $openid_url);
- if ($oid) {
- $user = User::staticGet('id', $oid->user_id);
- }
- return $user;
+ $user = NULL;
+ $oid = User_openid::staticGet('canonical', $openid_url);
+ if ($oid) {
+ $user = User::staticGet('id', $oid->user_id);
+ }
+ return $user;
hunk ./lib/openid.php 97
- if (!$backto) {
- $action = $_REQUEST['action'];
- $args = common_copy_args($_GET);
- unset($args['action']);
- $backto = common_local_url($action, $args);
- }
- common_debug('going back to "' . $backto . '"', __FILE__);
+ if (!$backto) {
+ $action = $_REQUEST['action'];
+ $args = common_copy_args($_GET);
+ unset($args['action']);
+ $backto = common_local_url($action, $args);
+ }
+ common_debug('going back to "' . $backto . '"', __FILE__);
hunk ./lib/openid.php 105
- common_ensure_session();
+ common_ensure_session();
hunk ./lib/openid.php 107
- $_SESSION['openid_immediate_backto'] = $backto;
- common_debug('passed-in variable is "' . $backto . '"', __FILE__);
- common_debug('session variable is "' . $_SESSION['openid_immediate_backto'] . '"', __FILE__);
+ $_SESSION['openid_immediate_backto'] = $backto;
+ common_debug('passed-in variable is "' . $backto . '"', __FILE__);
+ common_debug('session variable is "' . $_SESSION['openid_immediate_backto'] . '"', __FILE__);
hunk ./lib/openid.php 111
- oid_authenticate($openid_url,
- 'finishimmediate',
- true);
+ oid_authenticate($openid_url,
+ 'finishimmediate',
+ true);
hunk ./lib/openid.php 118
- $consumer = oid_consumer();
+ $consumer = oid_consumer();
hunk ./lib/openid.php 120
- if (!$consumer) {
- common_server_error(_('Cannot instantiate OpenID consumer object.'));
- return false;
- }
+ if (!$consumer) {
+ common_server_error(_('Cannot instantiate OpenID consumer object.'));
+ return false;
+ }
hunk ./lib/openid.php 125
- common_ensure_session();
+ common_ensure_session();
hunk ./lib/openid.php 127
- $auth_request = $consumer->begin($openid_url);
+ $auth_request = $consumer->begin($openid_url);
hunk ./lib/openid.php 129
- // Handle failure status return values.
- if (!$auth_request) {
- return _('Not a valid OpenID.');
- } else if (Auth_OpenID::isFailure($auth_request)) {
- return sprintf(_('OpenID failure: %s'), $auth_request->message);
- }
+ // Handle failure status return values.
+ if (!$auth_request) {
+ return _('Not a valid OpenID.');
+ } else if (Auth_OpenID::isFailure($auth_request)) {
+ return sprintf(_('OpenID failure: %s'), $auth_request->message);
+ }
hunk ./lib/openid.php 136
- $sreg_request = Auth_OpenID_SRegRequest::build(// Required
- array(),
- // Optional
- array('nickname',
- 'email',
- 'fullname',
- 'language',
- 'timezone',
- 'postcode',
- 'country'));
+ $sreg_request = Auth_OpenID_SRegRequest::build(// Required
+ array(),
+ // Optional
+ array('nickname',
+ 'email',
+ 'fullname',
+ 'language',
+ 'timezone',
+ 'postcode',
+ 'country'));
hunk ./lib/openid.php 147
- if ($sreg_request) {
- $auth_request->addExtension($sreg_request);
- }
+ if ($sreg_request) {
+ $auth_request->addExtension($sreg_request);
+ }
hunk ./lib/openid.php 151
- $trust_root = common_local_url('public');
- $process_url = common_local_url($returnto);
+ $trust_root = common_local_url('public');
+ $process_url = common_local_url($returnto);
hunk ./lib/openid.php 154
- if ($auth_request->shouldSendRedirect()) {
- $redirect_url = $auth_request->redirectURL($trust_root,
- $process_url,
- $immediate);
- if (!$redirect_url) {
- } else if (Auth_OpenID::isFailure($redirect_url)) {
- return sprintf(_('Could not redirect to server: %s'), $redirect_url->message);
- } else {
- common_redirect($redirect_url);
- }
- } else {
- // Generate form markup and render it.
- $form_id = 'openid_message';
- $form_html = $auth_request->formMarkup($trust_root, $process_url,
- $immediate, array('id' => $form_id));
+ if ($auth_request->shouldSendRedirect()) {
+ $redirect_url = $auth_request->redirectURL($trust_root,
+ $process_url,
+ $immediate);
+ if (!$redirect_url) {
+ } else if (Auth_OpenID::isFailure($redirect_url)) {
+ return sprintf(_('Could not redirect to server: %s'), $redirect_url->message);
+ } else {
+ common_redirect($redirect_url);
+ }
+ } else {
+ // Generate form markup and render it.
+ $form_id = 'openid_message';
+ $form_html = $auth_request->formMarkup($trust_root, $process_url,
+ $immediate, array('id' => $form_id));
hunk ./lib/openid.php 170
- # XXX: This is cheap, but things choke if we don't escape ampersands
- # in the HTML attributes
+ # XXX: This is cheap, but things choke if we don't escape ampersands
+ # in the HTML attributes
hunk ./lib/openid.php 173
- $form_html = preg_replace('/&/', '&', $form_html);
+ $form_html = preg_replace('/&/', '&', $form_html);
hunk ./lib/openid.php 175
- // Display an error if the form markup couldn't be generated;
- // otherwise, render the HTML.
- if (Auth_OpenID::isFailure($form_html)) {
- $this->show_form(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
- } else {
- common_show_header(_('OpenID Auto-Submit'), NULL, NULL, '_oid_print_instructions');
- common_raw($form_html);
- common_element('script', NULL,
- '$(document).ready(function() { ' .
- ' $("#'. $form_id .'").submit(); '.
- '});');
- common_show_footer();
- }
- }
+ // Display an error if the form markup couldn't be generated;
+ // otherwise, render the HTML.
+ if (Auth_OpenID::isFailure($form_html)) {
+ $this->show_form(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
+ } else {
+ common_show_header(_('OpenID Auto-Submit'), NULL, NULL, '_oid_print_instructions');
+ common_raw($form_html);
+ common_element('script', NULL,
+ '$(document).ready(function() { ' .
+ ' $("#'. $form_id .'").submit(); '.
+ '});');
+ common_show_footer();
+ }
+ }
hunk ./lib/openid.php 194
- common_element('div', 'instructions',
- _('This form should automatically submit itself. '.
- 'If not, click the submit button to go to your '.
- 'OpenID provider.'));
+ common_element('div', 'instructions',
+ _('This form should automatically submit itself. '.
+ 'If not, click the submit button to go to your '.
+ 'OpenID provider.'));
hunk ./lib/openid.php 204
- $profile = $user->getProfile();
+ $profile = $user->getProfile();
hunk ./lib/openid.php 206
- $orig_profile = clone($profile);
+ $orig_profile = clone($profile);
hunk ./lib/openid.php 208
- if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
- $profile->fullname = $sreg['fullname'];
- }
+ if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
+ $profile->fullname = $sreg['fullname'];
+ }
hunk ./lib/openid.php 212
- if ($sreg['country']) {
- if ($sreg['postcode']) {
- # XXX: use postcode to get city and region
- # XXX: also, store postcode somewhere -- it's valuable!
- $profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
- } else {
- $profile->location = $sreg['country'];
- }
- }
+ if ($sreg['country']) {
+ if ($sreg['postcode']) {
+ # XXX: use postcode to get city and region
+ # XXX: also, store postcode somewhere -- it's valuable!
+ $profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
+ } else {
+ $profile->location = $sreg['country'];
+ }
+ }
hunk ./lib/openid.php 222
- # XXX save language if it's passed
- # XXX save timezone if it's passed
+ # XXX save language if it's passed
+ # XXX save timezone if it's passed
hunk ./lib/openid.php 225
- if (!$profile->update($orig_profile)) {
- common_server_error(_('Error saving the profile.'));
- return false;
- }
+ if (!$profile->update($orig_profile)) {
+ common_server_error(_('Error saving the profile.'));
+ return false;
+ }
hunk ./lib/openid.php 230
- $orig_user = clone($user);
+ $orig_user = clone($user);
hunk ./lib/openid.php 232
- if ($sreg['email'] && Validate::email($sreg['email'], true)) {
- $user->email = $sreg['email'];
- }
+ if ($sreg['email'] && Validate::email($sreg['email'], true)) {
+ $user->email = $sreg['email'];
+ }
hunk ./lib/openid.php 236
- if (!$user->update($orig_user)) {
- common_server_error(_('Error saving the user.'));
- return false;
- }
+ if (!$user->update($orig_user)) {
+ common_server_error(_('Error saving the user.'));
+ return false;
+ }
hunk ./lib/openid.php 241
- return true;
+ return true;
hunk ./lib/personal.php 23
-
- function is_readonly() {
- return true;
- }
-
- function handle($args) {
- parent::handle($args);
- common_set_returnto($this->self_url());
- }
+
+ function is_readonly() {
+ return true;
+ }
+
+ function handle($args) {
+ parent::handle($args);
+ common_set_returnto($this->self_url());
+ }
hunk ./lib/personal.php 33
- function views_menu() {
+ function views_menu() {
hunk ./lib/personal.php 35
- $user = NULL;
- $action = $this->trimmed('action');
- $nickname = $this->trimmed('nickname');
+ $user = NULL;
+ $action = $this->trimmed('action');
+ $nickname = $this->trimmed('nickname');
hunk ./lib/personal.php 39
- if ($nickname) {
- $user = User::staticGet('nickname', $nickname);
- $user_profile = $user->getProfile();
- } else {
- $user_profile = false;
- }
+ if ($nickname) {
+ $user = User::staticGet('nickname', $nickname);
+ $user_profile = $user->getProfile();
+ } else {
+ $user_profile = false;
+ }
hunk ./lib/personal.php 46
- common_element_start('ul', array('id' => 'nav_views'));
+ common_element_start('ul', array('id' => 'nav_views'));
hunk ./lib/personal.php 48
- common_menu_item(common_local_url('all', array('nickname' =>
- $nickname)),
- _('Personal'),
- sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
- $action == 'all');
- common_menu_item(common_local_url('replies', array('nickname' =>
- $nickname)),
- _('Replies'),
- sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
- $action == 'replies');
- common_menu_item(common_local_url('showstream', array('nickname' =>
- $nickname)),
- _('Profile'),
- ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
- $action == 'showstream');
- common_menu_item(common_local_url('showfavorites', array('nickname' =>
- $nickname)),
- _('Favorites'),
- sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
- $action == 'showfavorites');
-
- $cur = common_current_user();
-
- if ($cur && $cur->id == $user->id) {
-
- common_menu_item(common_local_url('inbox', array('nickname' =>
- $nickname)),
- _('Inbox'),
- _('Your incoming messages'),
- $action == 'inbox');
- common_menu_item(common_local_url('outbox', array('nickname' =>
- $nickname)),
- _('Outbox'),
- _('Your sent messages'),
- $action == 'outbox');
- }
-
- common_element_end('ul');
- }
+ common_menu_item(common_local_url('all', array('nickname' =>
+ $nickname)),
+ _('Personal'),
+ sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+ $action == 'all');
+ common_menu_item(common_local_url('replies', array('nickname' =>
+ $nickname)),
+ _('Replies'),
+ sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+ $action == 'replies');
+ common_menu_item(common_local_url('showstream', array('nickname' =>
+ $nickname)),
+ _('Profile'),
+ ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
+ $action == 'showstream');
+ common_menu_item(common_local_url('showfavorites', array('nickname' =>
+ $nickname)),
+ _('Favorites'),
+ sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+ $action == 'showfavorites');
+
+ $cur = common_current_user();
+
+ if ($cur && $cur->id == $user->id) {
+
+ common_menu_item(common_local_url('inbox', array('nickname' =>
+ $nickname)),
+ _('Inbox'),
+ _('Your incoming messages'),
+ $action == 'inbox');
+ common_menu_item(common_local_url('outbox', array('nickname' =>
+ $nickname)),
+ _('Outbox'),
+ _('Your sent messages'),
+ $action == 'outbox');
+ }
+
+ common_element_end('ul');
+ }
hunk ./lib/personal.php 88
- function show_feeds_list($feeds) {
- common_element_start('div', array('class' => 'feeds'));
- common_element('p', null, 'Feeds:');
- common_element_start('ul', array('class' => 'xoxo'));
+ function show_feeds_list($feeds) {
+ common_element_start('div', array('class' => 'feeds'));
+ common_element('p', null, 'Feeds:');
+ common_element_start('ul', array('class' => 'xoxo'));
hunk ./lib/personal.php 93
- foreach ($feeds as $key => $value) {
- $this->common_feed_item($feeds[$key]);
- }
- common_element_end('ul');
- common_element_end('div');
- }
+ foreach ($feeds as $key => $value) {
+ $this->common_feed_item($feeds[$key]);
+ }
+ common_element_end('ul');
+ common_element_end('div');
+ }
hunk ./lib/personal.php 100
- function common_feed_item($feed) {
- $nickname = $this->trimmed('nickname');
+ function common_feed_item($feed) {
+ $nickname = $this->trimmed('nickname');
hunk ./lib/personal.php 103
- switch($feed['item']) {
- case 'notices': default:
- $feed_classname = $feed['type'];
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "$nickname's ".$feed['version']." notice feed";
- $feed['textContent'] = "RSS";
- break;
+ switch($feed['item']) {
+ case 'notices': default:
+ $feed_classname = $feed['type'];
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "$nickname's ".$feed['version']." notice feed";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 111
- case 'allrss':
- $feed_classname = $feed['type'];
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = $feed['version']." feed for $nickname and friends";
- $feed['textContent'] = "RSS";
- break;
+ case 'allrss':
+ $feed_classname = $feed['type'];
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = $feed['version']." feed for $nickname and friends";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 118
- case 'repliesrss':
- $feed_classname = $feed['type'];
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = $feed['version']." feed for replies to $nickname";
- $feed['textContent'] = "RSS";
- break;
+ case 'repliesrss':
+ $feed_classname = $feed['type'];
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = $feed['version']." feed for replies to $nickname";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 125
- case 'publicrss':
- $feed_classname = $feed['type'];
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "Public timeline ".$feed['version']." feed";
- $feed['textContent'] = "RSS";
- break;
+ case 'publicrss':
+ $feed_classname = $feed['type'];
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "Public timeline ".$feed['version']." feed";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 132
- case 'publicatom':
- $feed_classname = "atom";
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "Public timeline ".$feed['version']." feed";
- $feed['textContent'] = "Atom";
- break;
+ case 'publicatom':
+ $feed_classname = "atom";
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "Public timeline ".$feed['version']." feed";
+ $feed['textContent'] = "Atom";
+ break;
hunk ./lib/personal.php 139
- case 'tagrss':
- $feed_classname = $feed['type'];
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = $feed['version']." feed for this tag";
- $feed['textContent'] = "RSS";
- break;
+ case 'tagrss':
+ $feed_classname = $feed['type'];
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = $feed['version']." feed for this tag";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 146
- case 'favoritedrss':
- $feed_classname = $feed['type'];
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "Favorited ".$feed['version']." feed";
- $feed['textContent'] = "RSS";
- break;
+ case 'favoritedrss':
+ $feed_classname = $feed['type'];
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "Favorited ".$feed['version']." feed";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 153
- case 'foaf':
- $feed_classname = "foaf";
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "$nickname's FOAF file";
- $feed['textContent'] = "FOAF";
- break;
+ case 'foaf':
+ $feed_classname = "foaf";
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "$nickname's FOAF file";
+ $feed['textContent'] = "FOAF";
+ break;
hunk ./lib/personal.php 160
- case 'favoritesrss':
- $feed_classname = "favorites";
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "Feed for favorites of $nickname";
- $feed['textContent'] = "RSS";
- break;
+ case 'favoritesrss':
+ $feed_classname = "favorites";
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "Feed for favorites of $nickname";
+ $feed['textContent'] = "RSS";
+ break;
hunk ./lib/personal.php 167
- case 'usertimeline':
- $feed_classname = "atom";
- $feed_mimetype = "application/".$feed['type']."+xml";
- $feed_title = "$nickname's ".$feed['version']." notice feed";
- $feed['textContent'] = "Atom";
- break;
- }
- common_element_start('li');
- common_element('a', array('href' => $feed['href'],
- 'class' => $feed_classname,
- 'type' => $feed_mimetype,
- 'title' => $feed_title),
- $feed['textContent']);
- common_element_end('li');
- }
+ case 'usertimeline':
+ $feed_classname = "atom";
+ $feed_mimetype = "application/".$feed['type']."+xml";
+ $feed_title = "$nickname's ".$feed['version']." notice feed";
+ $feed['textContent'] = "Atom";
+ break;
+ }
+ common_element_start('li');
+ common_element('a', array('href' => $feed['href'],
+ 'class' => $feed_classname,
+ 'type' => $feed_mimetype,
+ 'title' => $feed_title),
+ $feed['textContent']);
+ common_element_end('li');
+ }
hunk ./lib/personal.php 183
-
- function source_link($source) {
- $source_name = _($source);
- switch ($source) {
- case 'web':
- case 'xmpp':
- case 'mail':
- case 'omb':
- case 'api':
- common_element('span', 'noticesource', $source_name);
- break;
- default:
- $ns = Notice_source::staticGet($source);
- if ($ns) {
- common_element('a', array('href' => $ns->url),
- $ns->name);
- } else {
- common_element('span', 'noticesource', $source_name);
- }
- break;
- }
- return;
- }
+
+ function source_link($source) {
+ $source_name = _($source);
+ switch ($source) {
+ case 'web':
+ case 'xmpp':
+ case 'mail':
+ case 'omb':
+ case 'api':
+ common_element('span', 'noticesource', $source_name);
+ break;
+ default:
+ $ns = Notice_source::staticGet($source);
+ if ($ns) {
+ common_element('a', array('href' => $ns->url),
+ $ns->name);
+ } else {
+ common_element('span', 'noticesource', $source_name);
+ }
+ break;
+ }
+ return;
+ }
hunk ./lib/profilelist.php 27
- var $profile = NULL;
- var $owner = NULL;
- var $action = NULL;
+ var $profile = NULL;
+ var $owner = NULL;
+ var $action = NULL;
hunk ./lib/profilelist.php 31
- function __construct($profile, $owner=NULL, $action=NULL) {
- $this->profile = $profile;
- $this->owner = $owner;
- $this->action = $action;
- }
+ function __construct($profile, $owner=NULL, $action=NULL) {
+ $this->profile = $profile;
+ $this->owner = $owner;
+ $this->action = $action;
+ }
hunk ./lib/profilelist.php 37
- function show_list() {
+ function show_list() {
hunk ./lib/profilelist.php 39
- common_element_start('ul', array('id' => 'profiles', 'class' => 'profile_list'));
+ common_element_start('ul', array('id' => 'profiles', 'class' => 'profile_list'));
hunk ./lib/profilelist.php 41
- $cnt = 0;
+ $cnt = 0;
hunk ./lib/profilelist.php 43
- while ($this->profile->fetch()) {
- $cnt++;
- if($cnt > PROFILES_PER_PAGE) {
- break;
- }
- $this->show();
- }
+ while ($this->profile->fetch()) {
+ $cnt++;
+ if($cnt > PROFILES_PER_PAGE) {
+ break;
+ }
+ $this->show();
+ }
hunk ./lib/profilelist.php 51
- common_element_end('ul');
+ common_element_end('ul');
hunk ./lib/profilelist.php 53
- return $cnt;
- }
+ return $cnt;
+ }
hunk ./lib/profilelist.php 56
- function show() {
+ function show() {
hunk ./lib/profilelist.php 58
- common_element_start('li', array('class' => 'profile_single',
- 'id' => 'profile-' . $this->profile->id));
+ common_element_start('li', array('class' => 'profile_single',
+ 'id' => 'profile-' . $this->profile->id));
hunk ./lib/profilelist.php 61
- $user = common_current_user();
+ $user = common_current_user();
hunk ./lib/profilelist.php 63
- if ($user && $user->id != $this->profile->id) {
- # XXX: special-case for user looking at own
- # subscriptions page
- if ($user->isSubscribed($this->profile)) {
- common_unsubscribe_form($this->profile);
- } else {
- common_subscribe_form($this->profile);
- }
- }
+ if ($user && $user->id != $this->profile->id) {
+ # XXX: special-case for user looking at own
+ # subscriptions page
+ if ($user->isSubscribed($this->profile)) {
+ common_unsubscribe_form($this->profile);
+ } else {
+ common_subscribe_form($this->profile);
+ }
+ }
hunk ./lib/profilelist.php 73
- $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
- common_element_start('a', array('href' => $this->profile->profileurl));
- common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
- 'class' => 'avatar stream',
- 'width' => AVATAR_STREAM_SIZE,
- 'height' => AVATAR_STREAM_SIZE,
- 'alt' =>
- ($this->profile->fullname) ? $this->profile->fullname :
- $this->profile->nickname));
- common_element_end('a');
- common_element_start('p');
- common_element_start('a', array('href' => $this->profile->profileurl,
- 'class' => 'nickname'));
- common_raw($this->highlight($this->profile->nickname));
- common_element_end('a');
- if ($this->profile->fullname) {
- common_text(' | ');
- common_element_start('span', 'fullname');
- common_raw($this->highlight($this->profile->fullname));
- common_element_end('span');
- }
- if ($this->profile->location) {
- common_text(' | ');
- common_element_start('span', 'location');
- common_raw($this->highlight($this->profile->location));
- common_element_end('span');
- }
- common_element_end('p');
- if ($this->profile->homepage) {
- common_element_start('p', 'website');
- common_element_start('a', array('href' => $this->profile->homepage));
- common_raw($this->highlight($this->profile->homepage));
- common_element_end('a');
- common_element_end('p');
- }
- if ($this->profile->bio) {
- common_element_start('p', 'bio');
- common_raw($this->highlight($this->profile->bio));
- common_element_end('p');
- }
+ $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+ common_element_start('a', array('href' => $this->profile->profileurl));
+ common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+ 'class' => 'avatar stream',
+ 'width' => AVATAR_STREAM_SIZE,
+ 'height' => AVATAR_STREAM_SIZE,
+ 'alt' =>
+ ($this->profile->fullname) ? $this->profile->fullname :
+ $this->profile->nickname));
+ common_element_end('a');
+ common_element_start('p');
+ common_element_start('a', array('href' => $this->profile->profileurl,
+ 'class' => 'nickname'));
+ common_raw($this->highlight($this->profile->nickname));
+ common_element_end('a');
+ if ($this->profile->fullname) {
+ common_text(' | ');
+ common_element_start('span', 'fullname');
+ common_raw($this->highlight($this->profile->fullname));
+ common_element_end('span');
+ }
+ if ($this->profile->location) {
+ common_text(' | ');
+ common_element_start('span', 'location');
+ common_raw($this->highlight($this->profile->location));
+ common_element_end('span');
+ }
+ common_element_end('p');
+ if ($this->profile->homepage) {
+ common_element_start('p', 'website');
+ common_element_start('a', array('href' => $this->profile->homepage));
+ common_raw($this->highlight($this->profile->homepage));
+ common_element_end('a');
+ common_element_end('p');
+ }
+ if ($this->profile->bio) {
+ common_element_start('p', 'bio');
+ common_raw($this->highlight($this->profile->bio));
+ common_element_end('p');
+ }
hunk ./lib/profilelist.php 114
- # If we're on a list with an owner (subscriptions or subscribers)...
+ # If we're on a list with an owner (subscriptions or subscribers)...
hunk ./lib/profilelist.php 116
- if ($this->owner) {
- # Get tags
- $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
+ if ($this->owner) {
+ # Get tags
+ $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
hunk ./lib/profilelist.php 120
- common_element_start('div', 'tags_user');
- common_element_start('dl');
- common_element_start('dt');
- if ($user->id == $this->owner->id) {
- common_element('a', array('href' => common_local_url('tagother',
- array('id' => $this->profile->id))),
- _('Tags'));
- } else {
- common_text(_('Tags'));
- }
- common_text(":");
- common_element_end('dt');
- common_element_start('dd');
- if ($tags) {
- common_element_start('ul', 'tags xoxo');
- foreach ($tags as $tag) {
- common_element_start('li');
- common_element('a', array('rel' => 'tag',
- 'href' => common_local_url($this->action,
- array('nickname' => $this->owner->nickname,
- 'tag' => $tag))),
- $tag);
- common_element_end('li');
- }
- common_element_end('ul');
- } else {
- common_text(_('(none)'));
- }
- common_element_end('dd');
- common_element_end('dl');
- common_element_end('div');
- }
+ common_element_start('div', 'tags_user');
+ common_element_start('dl');
+ common_element_start('dt');
+ if ($user->id == $this->owner->id) {
+ common_element('a', array('href' => common_local_url('tagother',
+ array('id' => $this->profile->id))),
+ _('Tags'));
+ } else {
+ common_text(_('Tags'));
+ }
+ common_text(":");
+ common_element_end('dt');
+ common_element_start('dd');
+ if ($tags) {
+ common_element_start('ul', 'tags xoxo');
+ foreach ($tags as $tag) {
+ common_element_start('li');
+ common_element('a', array('rel' => 'tag',
+ 'href' => common_local_url($this->action,
+ array('nickname' => $this->owner->nickname,
+ 'tag' => $tag))),
+ $tag);
+ common_element_end('li');
+ }
+ common_element_end('ul');
+ } else {
+ common_text(_('(none)'));
+ }
+ common_element_end('dd');
+ common_element_end('dl');
+ common_element_end('div');
+ }
hunk ./lib/profilelist.php 157
- common_element_end('li');
- }
+ common_element_end('li');
+ }
hunk ./lib/profilelist.php 166
- function highlight($text) {
- return htmlspecialchars($text);
- }
+ function highlight($text) {
+ return htmlspecialchars($text);
+ }
hunk ./lib/queuehandler.php 30
- var $_id = 'generic';
+ var $_id = 'generic';
hunk ./lib/queuehandler.php 32
- function QueueHandler($id=NULL) {
- if ($id) {
- $this->set_id($id);
- }
- }
-
- function class_name() {
- return ucfirst($this->transport()) . 'Handler';
- }
+ function QueueHandler($id=NULL) {
+ if ($id) {
+ $this->set_id($id);
+ }
+ }
+
+ function class_name() {
+ return ucfirst($this->transport()) . 'Handler';
+ }
hunk ./lib/queuehandler.php 42
- function name() {
- return strtolower($this->class_name().'.'.$this->get_id());
- }
-
- function get_id() {
- return $this->_id;
- }
+ function name() {
+ return strtolower($this->class_name().'.'.$this->get_id());
+ }
+
+ function get_id() {
+ return $this->_id;
+ }
hunk ./lib/queuehandler.php 50
- function set_id($id) {
- $this->_id = $id;
- }
-
- function transport() {
- return NULL;
- }
-
- function start() {
- }
-
- function finish() {
- }
+ function set_id($id) {
+ $this->_id = $id;
+ }
+
+ function transport() {
+ return NULL;
+ }
+
+ function start() {
+ }
+
+ function finish() {
+ }
hunk ./lib/queuehandler.php 64
- function handle_notice($notice) {
- return true;
- }
-
- function run() {
- if (!$this->start()) {
- return false;
- }
- $this->log(LOG_INFO, 'checking for queued notices');
- $transport = $this->transport();
- do {
- $qi = Queue_item::top($transport);
- if ($qi) {
- $this->log(LOG_INFO, 'Got item enqueued '.common_exact_date($qi->created));
- $notice = Notice::staticGet($qi->notice_id);
- if ($notice) {
- $this->log(LOG_INFO, 'broadcasting notice ID = ' . $notice->id);
- # XXX: what to do if broadcast fails?
- $result = $this->handle_notice($notice);
- if (!$result) {
- $this->log(LOG_WARNING, 'Failed broadcast for notice ID = ' . $notice->id);
- $orig = $qi;
- $qi->claimed = NULL;
- $qi->update($orig);
- $this->log(LOG_WARNING, 'Abandoned claim for notice ID = ' . $notice->id);
- continue;
- }
- $this->log(LOG_INFO, 'finished broadcasting notice ID = ' . $notice->id);
- $notice->free();
- unset($notice);
- $notice = NULL;
- } else {
- $this->log(LOG_WARNING, 'queue item for notice that does not exist');
- }
- $qi->delete();
- $qi->free();
- unset($qi);
- $this->idle(0);
- } else {
- $this->clear_old_claims();
- $this->idle(5);
- }
- } while (true);
- if (!$this->finish()) {
- return false;
- }
- return true;
- }
+ function handle_notice($notice) {
+ return true;
+ }
+
+ function run() {
+ if (!$this->start()) {
+ return false;
+ }
+ $this->log(LOG_INFO, 'checking for queued notices');
+ $transport = $this->transport();
+ do {
+ $qi = Queue_item::top($transport);
+ if ($qi) {
+ $this->log(LOG_INFO, 'Got item enqueued '.common_exact_date($qi->created));
+ $notice = Notice::staticGet($qi->notice_id);
+ if ($notice) {
+ $this->log(LOG_INFO, 'broadcasting notice ID = ' . $notice->id);
+ # XXX: what to do if broadcast fails?
+ $result = $this->handle_notice($notice);
+ if (!$result) {
+ $this->log(LOG_WARNING, 'Failed broadcast for notice ID = ' . $notice->id);
+ $orig = $qi;
+ $qi->claimed = NULL;
+ $qi->update($orig);
+ $this->log(LOG_WARNING, 'Abandoned claim for notice ID = ' . $notice->id);
+ continue;
+ }
+ $this->log(LOG_INFO, 'finished broadcasting notice ID = ' . $notice->id);
+ $notice->free();
+ unset($notice);
+ $notice = NULL;
+ } else {
+ $this->log(LOG_WARNING, 'queue item for notice that does not exist');
+ }
+ $qi->delete();
+ $qi->free();
+ unset($qi);
+ $this->idle(0);
+ } else {
+ $this->clear_old_claims();
+ $this->idle(5);
+ }
+ } while (true);
+ if (!$this->finish()) {
+ return false;
+ }
+ return true;
+ }
hunk ./lib/queuehandler.php 113
- function idle($timeout=0) {
- if ($timeout>0) {
- sleep($timeout);
- }
- }
-
- function clear_old_claims() {
- $qi = new Queue_item();
- $qi->transport = $this->transport();
- $qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
- $qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
- $qi->free();
- unset($qi);
- }
-
- function log($level, $msg) {
- common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg);
- }
+ function idle($timeout=0) {
+ if ($timeout>0) {
+ sleep($timeout);
+ }
+ }
+
+ function clear_old_claims() {
+ $qi = new Queue_item();
+ $qi->transport = $this->transport();
+ $qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
+ $qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
+ $qi->free();
+ unset($qi);
+ }
+
+ function log($level, $msg) {
+ common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg);
+ }
hunk ./lib/queuehandler.php 132
-
+
hunk ./lib/rssaction.php 26
- # This will contain the details of each feed item's author and be used to generate SIOC data.
- var $creators = array();
+ # This will contain the details of each feed item's author and be used to generate SIOC data.
+ var $creators = array();
hunk ./lib/rssaction.php 29
- function is_readonly() {
- return true;
- }
+ function is_readonly() {
+ return true;
+ }
hunk ./lib/rssaction.php 33
- function handle($args) {
- parent::handle($args);
- $limit = (int) $this->trimmed('limit');
- if ($limit == 0) {
- $limit = DEFAULT_RSS_LIMIT;
- }
- $this->show_rss($limit);
- }
+ function handle($args) {
+ parent::handle($args);
+ $limit = (int) $this->trimmed('limit');
+ if ($limit == 0) {
+ $limit = DEFAULT_RSS_LIMIT;
+ }
+ $this->show_rss($limit);
+ }
hunk ./lib/rssaction.php 42
- function init() {
- return true;
- }
+ function init() {
+ return true;
+ }
hunk ./lib/rssaction.php 46
- function get_notices() {
- return array();
- }
+ function get_notices() {
+ return array();
+ }
hunk ./lib/rssaction.php 50
- function get_channel() {
- return array('url' => '',
- 'title' => '',
- 'link' => '',
- 'description' => '');
- }
+ function get_channel() {
+ return array('url' => '',
+ 'title' => '',
+ 'link' => '',
+ 'description' => '');
+ }
hunk ./lib/rssaction.php 57
- function get_image() {
- return NULL;
- }
+ function get_image() {
+ return NULL;
+ }
hunk ./lib/rssaction.php 61
- function show_rss($limit=0) {
+ function show_rss($limit=0) {
hunk ./lib/rssaction.php 63
- if (!$this->init()) {
- return;
- }
+ if (!$this->init()) {
+ return;
+ }
hunk ./lib/rssaction.php 67
- $notices = $this->get_notices($limit);
+ $notices = $this->get_notices($limit);
hunk ./lib/rssaction.php 69
- $this->init_rss();
- $this->show_channel($notices);
- $this->show_image();
+ $this->init_rss();
+ $this->show_channel($notices);
+ $this->show_image();
hunk ./lib/rssaction.php 73
- foreach ($notices as $n) {
- $this->show_item($n);
- }
+ foreach ($notices as $n) {
+ $this->show_item($n);
+ }
hunk ./lib/rssaction.php 77
- $this->show_creators();
- $this->end_rss();
- }
+ $this->show_creators();
+ $this->end_rss();
+ }
hunk ./lib/rssaction.php 81
- function show_channel($notices) {
+ function show_channel($notices) {
hunk ./lib/rssaction.php 83
- $channel = $this->get_channel();
- $image = $this->get_image();
+ $channel = $this->get_channel();
+ $image = $this->get_image();
hunk ./lib/rssaction.php 86
- common_element_start('channel', array('rdf:about' => $channel['url']));
- common_element('title', NULL, $channel['title']);
- common_element('link', NULL, $channel['link']);
- common_element('description', NULL, $channel['description']);
- common_element('cc:licence', array('rdf:resource' => common_config('license','url')));
+ common_element_start('channel', array('rdf:about' => $channel['url']));
+ common_element('title', NULL, $channel['title']);
+ common_element('link', NULL, $channel['link']);
+ common_element('description', NULL, $channel['description']);
+ common_element('cc:licence', array('rdf:resource' => common_config('license','url')));
hunk ./lib/rssaction.php 92
- if ($image) {
- common_element('image', array('rdf:resource' => $image));
- }
+ if ($image) {
+ common_element('image', array('rdf:resource' => $image));
+ }
hunk ./lib/rssaction.php 96
- common_element_start('items');
- common_element_start('rdf:Seq');
+ common_element_start('items');
+ common_element_start('rdf:Seq');
hunk ./lib/rssaction.php 99
- foreach ($notices as $notice) {
- common_element('sioct:MicroblogPost', array('rdf:resource' => $notice->uri));
- }
+ foreach ($notices as $notice) {
+ common_element('sioct:MicroblogPost', array('rdf:resource' => $notice->uri));
+ }
hunk ./lib/rssaction.php 103
- common_element_end('rdf:Seq');
- common_element_end('items');
+ common_element_end('rdf:Seq');
+ common_element_end('items');
hunk ./lib/rssaction.php 106
- common_element_end('channel');
- }
+ common_element_end('channel');
+ }
hunk ./lib/rssaction.php 109
- function show_image() {
- $image = $this->get_image();
- if ($image) {
- $channel = $this->get_channel();
- common_element_start('image', array('rdf:about' => $image));
- common_element('title', NULL, $channel['title']);
- common_element('link', NULL, $channel['link']);
- common_element('url', NULL, $image);
- common_element_end('image');
- }
- }
+ function show_image() {
+ $image = $this->get_image();
+ if ($image) {
+ $channel = $this->get_channel();
+ common_element_start('image', array('rdf:about' => $image));
+ common_element('title', NULL, $channel['title']);
+ common_element('link', NULL, $channel['link']);
+ common_element('url', NULL, $image);
+ common_element_end('image');
+ }
+ }
hunk ./lib/rssaction.php 121
- function show_item($notice) {
- $profile = Profile::staticGet($notice->profile_id);
- $nurl = common_local_url('shownotice', array('notice' => $notice->id));
- $creator_uri = common_profile_uri($profile);
- common_element_start('item', array('rdf:about' => $notice->uri));
- $title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
- common_element('title', NULL, $title);
- common_element('link', NULL, $nurl);
- common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));
- common_element('dc:date', NULL, common_date_w3dtf($notice->created));
- common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
- common_element('sioc:has_creator', array('rdf:resource' => $creator_uri));
- common_element('laconica:postIcon', array('rdf:resource' => common_profile_avatar_url($profile)));
- common_element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
- common_element_end('item');
- $this->creators[$creator_uri] = $profile;
- }
+ function show_item($notice) {
+ $profile = Profile::staticGet($notice->profile_id);
+ $nurl = common_local_url('shownotice', array('notice' => $notice->id));
+ $creator_uri = common_profile_uri($profile);
+ common_element_start('item', array('rdf:about' => $notice->uri));
+ $title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
+ common_element('title', NULL, $title);
+ common_element('link', NULL, $nurl);
+ common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));
+ common_element('dc:date', NULL, common_date_w3dtf($notice->created));
+ common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
+ common_element('sioc:has_creator', array('rdf:resource' => $creator_uri));
+ common_element('laconica:postIcon', array('rdf:resource' => common_profile_avatar_url($profile)));
+ common_element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
+ common_element_end('item');
+ $this->creators[$creator_uri] = $profile;
+ }
hunk ./lib/rssaction.php 139
- function show_creators() {
- foreach ($this->creators as $uri => $profile) {
- $id = $profile->id;
- $nickname = $profile->nickname;
- common_element_start('sioc:User', array('rdf:about' => $uri));
- common_element('foaf:nick', NULL, $nickname);
- if ($profile->fullname) {
- common_element('foaf:name', NULL, $profile->fullname);
- }
- common_element('sioc:id', NULL, $id);
- $avatar = common_profile_avatar_url($profile);
- common_element('sioc:avatar', array('rdf:resource' => $avatar));
- common_element_end('sioc:User');
- }
- }
+ function show_creators() {
+ foreach ($this->creators as $uri => $profile) {
+ $id = $profile->id;
+ $nickname = $profile->nickname;
+ common_element_start('sioc:User', array('rdf:about' => $uri));
+ common_element('foaf:nick', NULL, $nickname);
+ if ($profile->fullname) {
+ common_element('foaf:name', NULL, $profile->fullname);
+ }
+ common_element('sioc:id', NULL, $id);
+ $avatar = common_profile_avatar_url($profile);
+ common_element('sioc:avatar', array('rdf:resource' => $avatar));
+ common_element_end('sioc:User');
+ }
+ }
hunk ./lib/rssaction.php 155
- function init_rss() {
- $channel = $this->get_channel();
- header('Content-Type: application/rdf+xml');
+ function init_rss() {
+ $channel = $this->get_channel();
+ header('Content-Type: application/rdf+xml');
hunk ./lib/rssaction.php 159
- common_start_xml();
- common_element_start('rdf:RDF', array('xmlns:rdf' =>
- 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
- 'xmlns:dc' =>
- 'http://purl.org/dc/elements/1.1/',
- 'xmlns:cc' =>
- 'http://web.resource.org/cc/',
+ common_start_xml();
+ common_element_start('rdf:RDF', array('xmlns:rdf' =>
+ 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+ 'xmlns:dc' =>
+ 'http://purl.org/dc/elements/1.1/',
+ 'xmlns:cc' =>
+ 'http://web.resource.org/cc/',
hunk ./lib/rssaction.php 168
- 'xmlns:foaf' =>
- 'http://xmlns.com/foaf/0.1/',
- 'xmlns:sioc' =>
- 'http://rdfs.org/sioc/ns#',
- 'xmlns:sioct' =>
- 'http://rdfs.org/sioc/types#',
- 'xmlns:laconica' =>
- 'http://laconi.ca/ont/',
- 'xmlns' => 'http://purl.org/rss/1.0/'));
- common_element_start('sioc:Site', array('rdf:about' => common_root_url()));
- common_element('sioc:name', NULL, common_config('site', 'name'));
- common_element_start('sioc:container_of');
- common_element('sioc:Container', array('rdf:about' =>
- $channel['url']));
- common_element_end('sioc:container_of');
- common_element_end('sioc:Site');
- }
+ 'xmlns:foaf' =>
+ 'http://xmlns.com/foaf/0.1/',
+ 'xmlns:sioc' =>
+ 'http://rdfs.org/sioc/ns#',
+ 'xmlns:sioct' =>
+ 'http://rdfs.org/sioc/types#',
+ 'xmlns:laconica' =>
+ 'http://laconi.ca/ont/',
+ 'xmlns' => 'http://purl.org/rss/1.0/'));
+ common_element_start('sioc:Site', array('rdf:about' => common_root_url()));
+ common_element('sioc:name', NULL, common_config('site', 'name'));
+ common_element_start('sioc:container_of');
+ common_element('sioc:Container', array('rdf:about' =>
+ $channel['url']));
+ common_element_end('sioc:container_of');
+ common_element_end('sioc:Site');
+ }
hunk ./lib/rssaction.php 186
- function end_rss() {
- common_element_end('rdf:RDF');
- }
+ function end_rss() {
+ common_element_end('rdf:RDF');
+ }
hunk ./lib/search_engines.php 101
- 'against (\''.addslashes($q).'\')');
+ 'against (\''.addslashes($q).'\')');
hunk ./lib/search_engines.php 104
- 'against (\''.addslashes($q).'\')');
+ 'against (\''.addslashes($q).'\')');
hunk ./lib/searchaction.php 24
- function is_readonly() {
- return true;
- }
+ function is_readonly() {
+ return true;
+ }
hunk ./lib/searchaction.php 28
- function handle($args) {
- parent::handle($args);
- $this->show_form();
- }
+ function handle($args) {
+ parent::handle($args);
+ $this->show_form();
+ }
hunk ./lib/searchaction.php 33
- function show_top($arr=NULL) {
- if ($arr) {
- $error = $arr[1];
- }
- if ($error) {
- common_element('p', 'error', $error);
- } else {
- $instr = $this->get_instructions();
- $output = common_markup_to_html($instr);
- common_element_start('div', 'instructions');
- common_raw($output);
- common_element_end('div');
- }
- $this->search_menu();
- }
+ function show_top($arr=NULL) {
+ if ($arr) {
+ $error = $arr[1];
+ }
+ if ($error) {
+ common_element('p', 'error', $error);
+ } else {
+ $instr = $this->get_instructions();
+ $output = common_markup_to_html($instr);
+ common_element_start('div', 'instructions');
+ common_raw($output);
+ common_element_end('div');
+ }
+ $this->search_menu();
+ }
hunk ./lib/searchaction.php 49
- function get_title() {
- return NULL;
- }
+ function get_title() {
+ return NULL;
+ }
hunk ./lib/searchaction.php 53
- function show_header($arr) {
- return;
- }
+ function show_header($arr) {
+ return;
+ }
hunk ./lib/searchaction.php 57
- function show_form($error=NULL) {
- global $config;
+ function show_form($error=NULL) {
+ global $config;
hunk ./lib/searchaction.php 60
- $q = $this->trimmed('q');
- $page = $this->trimmed('page', 1);
+ $q = $this->trimmed('q');
+ $page = $this->trimmed('page', 1);
hunk ./lib/searchaction.php 63
- common_show_header($this->get_title(), array($this, 'show_header'), array($q, $error),
- array($this, 'show_top'));
- common_element_start('form', array('method' => 'get',
- 'id' => 'login',
- 'action' => common_local_url($this->trimmed('action'))));
- common_element_start('p');
- if (!isset($config['site']['fancy']) || !$config['site']['fancy']) {
- common_element('input', array('name' => 'action',
- 'type' => 'hidden',
- 'value' => $this->trimmed('action')));
- }
- common_element('input', array('name' => 'q',
- 'id' => 'q',
- 'type' => 'text',
- 'class' => 'input_text',
- 'value' => ($q) ? $q : ''));
- common_text(' ');
- common_element('input', array('type' => 'submit',
- 'id' => 'search',
- 'name' => 'search',
- 'class' => 'submit',
- 'value' => _('Search')));
+ common_show_header($this->get_title(), array($this, 'show_header'), array($q, $error),
+ array($this, 'show_top'));
+ common_element_start('form', array('method' => 'get',
+ 'id' => 'login',
+ 'action' => common_local_url($this->trimmed('action'))));
+ common_element_start('p');
+ if (!isset($config['site']['fancy']) || !$config['site']['fancy']) {
+ common_element('input', array('name' => 'action',
+ 'type' => 'hidden',
+ 'value' => $this->trimmed('action')));
+ }
+ common_element('input', array('name' => 'q',
+ 'id' => 'q',
+ 'type' => 'text',
+ 'class' => 'input_text',
+ 'value' => ($q) ? $q : ''));
+ common_text(' ');
+ common_element('input', array('type' => 'submit',
+ 'id' => 'search',
+ 'name' => 'search',
+ 'class' => 'submit',
+ 'value' => _('Search')));
hunk ./lib/searchaction.php 86
- common_element_end('p');
- common_element_end('form');
- if ($q) {
- $this->show_results($q, $page);
- }
- common_show_footer();
- }
+ common_element_end('p');
+ common_element_end('form');
+ if ($q) {
+ $this->show_results($q, $page);
+ }
+ common_show_footer();
+ }
hunk ./lib/searchaction.php 94
- function search_menu() {
- # action => array('prompt', 'title', $args)
- $action = $this->trimmed('action');
- $menu =
- array('peoplesearch' =>
- array(
- _('People'),
- _('Find people on this site'),
- ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
- 'noticesearch' =>
- array( _('Text'),
- _('Find content of notices'),
- ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
- );
- $this->nav_menu($menu);
- }
+ function search_menu() {
+ # action => array('prompt', 'title', $args)
+ $action = $this->trimmed('action');
+ $menu =
+ array('peoplesearch' =>
+ array(
+ _('People'),
+ _('Find people on this site'),
+ ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
+ 'noticesearch' =>
+ array( _('Text'),
+ _('Find content of notices'),
+ ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
+ );
+ $this->nav_menu($menu);
+ }
hunk ./lib/settingsaction.php 30
- # Cookie theft means that automatic logins can't
- # change important settings or see private info, and
- # _all_ our settings are important
+ # Cookie theft means that automatic logins can't
+ # change important settings or see private info, and
+ # _all_ our settings are important
hunk ./lib/settingsaction.php 58
- function form_header($title, $msg=NULL, $success=false) {
- common_show_header($title,
- NULL,
- array($msg, $success),
- array($this, 'show_top'));
- }
+ function form_header($title, $msg=NULL, $success=false) {
+ common_show_header($title,
+ NULL,
+ array($msg, $success),
+ array($this, 'show_top'));
+ }
hunk ./lib/settingsaction.php 65
- function show_top($arr) {
- $msg = $arr[0];
- $success = $arr[1];
- if ($msg) {
- $this->message($msg, $success);
- } else {
- $inst = $this->get_instructions();
- $output = common_markup_to_html($inst);
- common_element_start('div', 'instructions');
- common_raw($output);
- common_element_end('div');
- }
- $this->settings_menu();
- }
+ function show_top($arr) {
+ $msg = $arr[0];
+ $success = $arr[1];
+ if ($msg) {
+ $this->message($msg, $success);
+ } else {
+ $inst = $this->get_instructions();
+ $output = common_markup_to_html($inst);
+ common_element_start('div', 'instructions');
+ common_raw($output);
+ common_element_end('div');
+ }
+ $this->settings_menu();
+ }
hunk ./lib/settingsaction.php 82
- $menu =
- array('profilesettings' =>
- array(_('Profile'),
- _('Change your profile settings')),
- 'emailsettings' =>
- array(_('Email'),
- _('Change email handling')),
- 'openidsettings' =>
- array(_('OpenID'),
- _('Add or remove OpenIDs')),
- 'smssettings' =>
- array(_('SMS'),
- _('Updates by SMS')),
- 'imsettings' =>
- array(_('IM'),
- _('Updates by instant messenger (IM)')),
- 'twittersettings' =>
- array(_('Twitter'),
- _('Twitter integration options')),
- 'othersettings' =>
- array(_('Other'),
- _('Other options')));
-
+ $menu =
+ array('profilesettings' =>
+ array(_('Profile'),
+ _('Change your profile settings')),
+ 'emailsettings' =>
+ array(_('Email'),
+ _('Change email handling')),
+ 'openidsettings' =>
+ array(_('OpenID'),
+ _('Add or remove OpenIDs')),
+ 'smssettings' =>
+ array(_('SMS'),
+ _('Updates by SMS')),
+ 'imsettings' =>
+ array(_('IM'),
+ _('Updates by instant messenger (IM)')),
+ 'twittersettings' =>
+ array(_('Twitter'),
+ _('Twitter integration options')),
+ 'othersettings' =>
+ array(_('Other'),
+ _('Other options')));
+
hunk ./lib/settingsaction.php 108
- if ($menuaction == 'imsettings' &&
- !common_config('xmpp', 'enabled')) {
- continue;
- }
+ if ($menuaction == 'imsettings' &&
+ !common_config('xmpp', 'enabled')) {
+ continue;
+ }
hunk ./lib/stream.php 13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
hunk ./lib/stream.php 17
- * along with this program. If not, see \n";
- $address .= "\n";
- $address .= " \n";
- return $address;
- }
+ function ofrom($from) {
+ $address = "\n";
+ $address .= "\n";
+ $address .= " \n";
+ return $address;
+ }
hunk ./lib/xmppqueuehandler.php 84
- function listener() {
- if (common_config('xmpp', 'listener')) {
- return common_config('xmpp', 'listener');
- } else {
- return jabber_daemon_address() . '/' . common_config('xmpp','resource') . '-listener';
- }
- }
+ function listener() {
+ if (common_config('xmpp', 'listener')) {
+ return common_config('xmpp', 'listener');
+ } else {
+ return jabber_daemon_address() . '/' . common_config('xmpp','resource') . '-listener';
+ }
+ }
hunk ./scripts/enjitqueuehandler.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/enjitqueuehandler.php 37
-
- function transport() {
- return 'enjit';
- }
+
+ function transport() {
+ return 'enjit';
+ }
hunk ./scripts/enjitqueuehandler.php 42
- function start() {
+ function start() {
hunk ./scripts/enjitqueuehandler.php 45
- return true;
- }
+ return true;
+ }
hunk ./scripts/enjitqueuehandler.php 48
- function handle_notice($notice) {
+ function handle_notice($notice) {
hunk ./scripts/enjitqueuehandler.php 50
- $profile = Profile::staticGet($notice->profile_id);
+ $profile = Profile::staticGet($notice->profile_id);
hunk ./scripts/enjitqueuehandler.php 63
- $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
- $msg = $profile->nickname . ': ' . $notice->content;
+ $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+ $msg = $profile->nickname . ': ' . $notice->content;
hunk ./scripts/enjitqueuehandler.php 66
- $atom = "\n";
- $atom .= "".common_config('enjit','source')." \n";
- $atom .= "\n";
- $atom .= "" . $profile->nickname . " - " . common_config('site', 'name') . " \n";
- $atom .= "\n";
- $atom .= " $profile->nickname)) . "'/>\n";
- $atom .= "" . $profile->nickname . " " . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . " \n";
- $atom .= " \n";
- $atom .= "" . htmlspecialchars($msg) . " \n";
- $atom .= "" . htmlspecialchars($msg) . " \n";
- $atom .= "\n";
- $atom .= "". $notice->uri . " \n";
- $atom .= "".common_date_w3dtf($notice->created)." \n";
- $atom .= "".common_date_w3dtf($notice->modified)." \n";
- $atom .= " \n";
+ $atom = "\n";
+ $atom .= "".common_config('enjit','source')." \n";
+ $atom .= "\n";
+ $atom .= "" . $profile->nickname . " - " . common_config('site', 'name') . " \n";
+ $atom .= "\n";
+ $atom .= " $profile->nickname)) . "'/>\n";
+ $atom .= "" . $profile->nickname . " " . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . " \n";
+ $atom .= " \n";
+ $atom .= "" . htmlspecialchars($msg) . " \n";
+ $atom .= "" . htmlspecialchars($msg) . " \n";
+ $atom .= "\n";
+ $atom .= "". $notice->uri . " \n";
+ $atom .= "".common_date_w3dtf($notice->created)." \n";
+ $atom .= "".common_date_w3dtf($notice->modified)." \n";
+ $atom .= " \n";
hunk ./scripts/enjitqueuehandler.php 89
- $ch = curl_init();
+ $ch = curl_init();
hunk ./scripts/enjitqueuehandler.php 91
- curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_URL, $url);
hunk ./scripts/enjitqueuehandler.php 94
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_POST, 1) ;
- curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_POST, 1) ;
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
hunk ./scripts/enjitqueuehandler.php 100
- # curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
- # curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+ # curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+ # curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
hunk ./scripts/enjitqueuehandler.php 104
- $result = curl_exec($ch);
+ $result = curl_exec($ch);
hunk ./scripts/enjitqueuehandler.php 106
- $code = curl_getinfo($ch, CURLINFO_HTTP_CODE );
+ $code = curl_getinfo($ch, CURLINFO_HTTP_CODE );
hunk ./scripts/enjitqueuehandler.php 110
- curl_close($ch);
+ curl_close($ch);
hunk ./scripts/enjitqueuehandler.php 113
- }
-
+ }
+
hunk ./scripts/enjitqueuehandler.php 125
- $handler->handle_queue();
+ $handler->handle_queue();
hunk ./scripts/fixup_hashtags.php 40
- $original = clone($notice);
- $notice->rendered = common_render_content($notice->content, $notice);
- $result = $notice->update($original);
- if (!$result) {
- common_log_db_error($notice, 'UPDATE', __FILE__);
- }
+ $original = clone($notice);
+ $notice->rendered = common_render_content($notice->content, $notice);
+ $result = $notice->update($original);
+ if (!$result) {
+ common_log_db_error($notice, 'UPDATE', __FILE__);
+ }
hunk ./scripts/fixup_inboxes.php 44
- $user->whereAdd('id >= ' . $start_at);
+ $user->whereAdd('id >= ' . $start_at);
hunk ./scripts/fixup_inboxes.php 52
- $user->query('BEGIN');
- $inbox = new Notice_inbox();
- $result = $inbox->query('INSERT LOW_PRIORITY INTO notice_inbox (user_id, notice_id, created) ' .
- 'SELECT ' . $user->id . ', notice.id, notice.created ' .
- 'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
- 'WHERE subscription.subscriber = ' . $user->id . ' ' .
- 'AND notice.created >= subscription.created ' .
- 'AND NOT EXISTS (SELECT user_id, notice_id ' .
- 'FROM notice_inbox ' .
- 'WHERE user_id = ' . $user->id . ' ' .
- 'AND notice_id = notice.id)');
- if (is_null($result) || $result === false) {
- common_log_db_error($inbox, 'INSERT', __FILE__);
- continue;
- }
- $orig = clone($user);
- $user->inboxed = 1;
- $result = $user->update($orig);
- if (!$result) {
- common_log_db_error($user, 'UPDATE', __FILE__);
- continue;
- }
- $user->query('COMMIT');
- $inbox->free();
- unset($inbox);
- if ($cache) {
- $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
- }
+ $user->query('BEGIN');
+ $inbox = new Notice_inbox();
+ $result = $inbox->query('INSERT LOW_PRIORITY INTO notice_inbox (user_id, notice_id, created) ' .
+ 'SELECT ' . $user->id . ', notice.id, notice.created ' .
+ 'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
+ 'WHERE subscription.subscriber = ' . $user->id . ' ' .
+ 'AND notice.created >= subscription.created ' .
+ 'AND NOT EXISTS (SELECT user_id, notice_id ' .
+ 'FROM notice_inbox ' .
+ 'WHERE user_id = ' . $user->id . ' ' .
+ 'AND notice_id = notice.id)');
+ if (is_null($result) || $result === false) {
+ common_log_db_error($inbox, 'INSERT', __FILE__);
+ continue;
+ }
+ $orig = clone($user);
+ $user->inboxed = 1;
+ $result = $user->update($orig);
+ if (!$result) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ continue;
+ }
+ $user->query('COMMIT');
+ $inbox->free();
+ unset($inbox);
+ if ($cache) {
+ $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+ }
hunk ./scripts/fixup_notices_rendered.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/fixup_notices_rendered.php 38
- $notice->whereAdd('id >= ' . $start_at);
+ $notice->whereAdd('id >= ' . $start_at);
hunk ./scripts/fixup_notices_rendered.php 43
- common_log(LOG_INFO, 'Pre-rendering notice #' . $notice->id);
- $original = clone($notice);
- $notice->rendered = common_render_content($notice->content, $notice);
- $result = $notice->update($original);
- if (!$result) {
- common_log_db_error($notice, 'UPDATE', __FILE__);
- }
+ common_log(LOG_INFO, 'Pre-rendering notice #' . $notice->id);
+ $original = clone($notice);
+ $notice->rendered = common_render_content($notice->content, $notice);
+ $result = $notice->update($original);
+ if (!$result) {
+ common_log_db_error($notice, 'UPDATE', __FILE__);
+ }
hunk ./scripts/getpiddir.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/inbox_users.php 45
-
- $user = User::staticGet('id', $id);
+
+ $user = User::staticGet('id', $id);
hunk ./scripts/inbox_users.php 48
- if (!$user) {
- common_log(LOG_WARNING, 'No such user: ' . $id);
- continue;
- }
-
- if ($user->inboxed) {
- common_log(LOG_WARNING, 'Already inboxed: ' . $id);
- continue;
- }
-
+ if (!$user) {
+ common_log(LOG_WARNING, 'No such user: ' . $id);
+ continue;
+ }
+
+ if ($user->inboxed) {
+ common_log(LOG_WARNING, 'Already inboxed: ' . $id);
+ continue;
+ }
+
hunk ./scripts/inbox_users.php 59
-
- $user->query('BEGIN');
-
- $old_inbox = new Notice_inbox();
- $old_inbox->user_id = $user->id;
-
- $result = $old_inbox->delete();
-
- if (is_null($result) || $result === false) {
- common_log_db_error($old_inbox, 'DELETE', __FILE__);
- continue;
- }
+
+ $user->query('BEGIN');
+
+ $old_inbox = new Notice_inbox();
+ $old_inbox->user_id = $user->id;
+
+ $result = $old_inbox->delete();
+
+ if (is_null($result) || $result === false) {
+ common_log_db_error($old_inbox, 'DELETE', __FILE__);
+ continue;
+ }
hunk ./scripts/inbox_users.php 72
- $old_inbox->free();
-
- $inbox = new Notice_inbox();
-
- $result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
- 'SELECT ' . $user->id . ', notice.id, notice.created ' .
- 'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
- 'WHERE subscription.subscriber = ' . $user->id . ' ' .
- 'AND notice.created >= subscription.created ' .
- 'AND now() - notice.created < ' . (7 * 24 * 3600) . ' ' .
- 'AND NOT EXISTS (SELECT user_id, notice_id ' .
- 'FROM notice_inbox ' .
- 'WHERE user_id = ' . $user->id . ' ' .
- 'AND notice_id = notice.id)');
-
- if (is_null($result) || $result === false) {
- common_log_db_error($inbox, 'INSERT', __FILE__);
- continue;
- }
-
- $orig = clone($user);
- $user->inboxed = 1;
- $result = $user->update($orig);
-
- if (!$result) {
- common_log_db_error($user, 'UPDATE', __FILE__);
- continue;
- }
-
- $user->query('COMMIT');
-
- $inbox->free();
- unset($inbox);
-
- if ($cache) {
- $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
- }
+ $old_inbox->free();
+
+ $inbox = new Notice_inbox();
+
+ $result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
+ 'SELECT ' . $user->id . ', notice.id, notice.created ' .
+ 'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
+ 'WHERE subscription.subscriber = ' . $user->id . ' ' .
+ 'AND notice.created >= subscription.created ' .
+ 'AND now() - notice.created < ' . (7 * 24 * 3600) . ' ' .
+ 'AND NOT EXISTS (SELECT user_id, notice_id ' .
+ 'FROM notice_inbox ' .
+ 'WHERE user_id = ' . $user->id . ' ' .
+ 'AND notice_id = notice.id)');
+
+ if (is_null($result) || $result === false) {
+ common_log_db_error($inbox, 'INSERT', __FILE__);
+ continue;
+ }
+
+ $orig = clone($user);
+ $user->inboxed = 1;
+ $result = $user->update($orig);
+
+ if (!$result) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ continue;
+ }
+
+ $user->query('COMMIT');
+
+ $inbox->free();
+ unset($inbox);
+
+ if ($cache) {
+ $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+ }
hunk ./scripts/jabberqueuehandler.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/jabberqueuehandler.php 38
- var $conn = NULL;
+ var $conn = NULL;
hunk ./scripts/jabberqueuehandler.php 40
- function transport() {
- return 'jabber';
- }
+ function transport() {
+ return 'jabber';
+ }
hunk ./scripts/jabberqueuehandler.php 44
- function handle_notice($notice) {
- try {
- return jabber_broadcast_notice($notice);
- } catch (XMPPHP_Exception $e) {
- $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
- exit(1);
- }
- }
+ function handle_notice($notice) {
+ try {
+ return jabber_broadcast_notice($notice);
+ } catch (XMPPHP_Exception $e) {
+ $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+ exit(1);
+ }
+ }
hunk ./scripts/maildaemon.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/maildaemon.php 39
- function __construct() {
- }
+ function __construct() {
+ }
hunk ./scripts/maildaemon.php 42
- function handle_message($fname='php://stdin') {
- list($from, $to, $msg) = $this->parse_message($fname);
- if (!$from || !$to || !$msg) {
- $this->error(NULL, _('Could not parse message.'));
- }
- common_log(LOG_INFO, "Mail from $from to $to: " .substr($msg, 0, 20));
- $user = $this->user_from($from);
- if (!$user) {
- $this->error($from, _('Not a registered user.'));
- return false;
- }
- if (!$this->user_match_to($user, $to)) {
- $this->error($from, _('Sorry, that is not your incoming email address.'));
- return false;
- }
- if (!$user->emailpost) {
- $this->error($from, _('Sorry, no incoming email allowed.'));
- return false;
- }
- $response = $this->handle_command($user, $from, $msg);
- if ($response) {
- return true;
- }
- $msg = $this->cleanup_msg($msg);
- $this->add_notice($user, $msg);
- }
+ function handle_message($fname='php://stdin') {
+ list($from, $to, $msg) = $this->parse_message($fname);
+ if (!$from || !$to || !$msg) {
+ $this->error(NULL, _('Could not parse message.'));
+ }
+ common_log(LOG_INFO, "Mail from $from to $to: " .substr($msg, 0, 20));
+ $user = $this->user_from($from);
+ if (!$user) {
+ $this->error($from, _('Not a registered user.'));
+ return false;
+ }
+ if (!$this->user_match_to($user, $to)) {
+ $this->error($from, _('Sorry, that is not your incoming email address.'));
+ return false;
+ }
+ if (!$user->emailpost) {
+ $this->error($from, _('Sorry, no incoming email allowed.'));
+ return false;
+ }
+ $response = $this->handle_command($user, $from, $msg);
+ if ($response) {
+ return true;
+ }
+ $msg = $this->cleanup_msg($msg);
+ $this->add_notice($user, $msg);
+ }
hunk ./scripts/maildaemon.php 69
- function error($from, $msg) {
- file_put_contents("php://stderr", $msg . "\n");
- exit(1);
- }
+ function error($from, $msg) {
+ file_put_contents("php://stderr", $msg . "\n");
+ exit(1);
+ }
hunk ./scripts/maildaemon.php 74
- function user_from($from_hdr) {
- $froms = mailparse_rfc822_parse_addresses($from_hdr);
- if (!$froms) {
- return NULL;
- }
- $from = $froms[0];
- $addr = common_canonical_email($from['address']);
- $user = User::staticGet('email', $addr);
- if (!$user) {
- $user = User::staticGet('smsemail', $addr);
- }
- return $user;
- }
+ function user_from($from_hdr) {
+ $froms = mailparse_rfc822_parse_addresses($from_hdr);
+ if (!$froms) {
+ return NULL;
+ }
+ $from = $froms[0];
+ $addr = common_canonical_email($from['address']);
+ $user = User::staticGet('email', $addr);
+ if (!$user) {
+ $user = User::staticGet('smsemail', $addr);
+ }
+ return $user;
+ }
hunk ./scripts/maildaemon.php 88
- function user_match_to($user, $to_hdr) {
- $incoming = $user->incomingemail;
- $tos = mailparse_rfc822_parse_addresses($to_hdr);
- foreach ($tos as $to) {
- if (strcasecmp($incoming, $to['address']) == 0) {
- return true;
- }
- }
- return false;
- }
+ function user_match_to($user, $to_hdr) {
+ $incoming = $user->incomingemail;
+ $tos = mailparse_rfc822_parse_addresses($to_hdr);
+ foreach ($tos as $to) {
+ if (strcasecmp($incoming, $to['address']) == 0) {
+ return true;
+ }
+ }
+ return false;
+ }
hunk ./scripts/maildaemon.php 99
- function handle_command($user, $from, $msg) {
- $inter = new CommandInterpreter();
- $cmd = $inter->handle_command($user, $msg);
- if ($cmd) {
- $cmd->execute(new MailChannel($from));
- return true;
- }
- return false;
- }
+ function handle_command($user, $from, $msg) {
+ $inter = new CommandInterpreter();
+ $cmd = $inter->handle_command($user, $msg);
+ if ($cmd) {
+ $cmd->execute(new MailChannel($from));
+ return true;
+ }
+ return false;
+ }
hunk ./scripts/maildaemon.php 109
- function respond($from, $to, $response) {
+ function respond($from, $to, $response) {
hunk ./scripts/maildaemon.php 111
- $headers['From'] = $to;
- $headers['To'] = $from;
- $headers['Subject'] = "Command complete";
+ $headers['From'] = $to;
+ $headers['To'] = $from;
+ $headers['Subject'] = "Command complete";
hunk ./scripts/maildaemon.php 115
- return mail_send(array($from), $headers, $response);
- }
+ return mail_send(array($from), $headers, $response);
+ }
hunk ./scripts/maildaemon.php 118
- function log($level, $msg) {
- common_log($level, 'MailDaemon: '.$msg);
- }
+ function log($level, $msg) {
+ common_log($level, 'MailDaemon: '.$msg);
+ }
hunk ./scripts/maildaemon.php 122
- function add_notice($user, $msg) {
+ function add_notice($user, $msg) {
hunk ./scripts/maildaemon.php 126
- $notice = Notice::saveNew($user->id, $msg, 'mail');
- if (is_string($notice)) {
- $this->log(LOG_ERR, $notice);
- return;
- }
- common_broadcast_notice($notice);
- $this->log(LOG_INFO,
- 'Added notice ' . $notice->id . ' from user ' . $user->nickname);
- }
+ $notice = Notice::saveNew($user->id, $msg, 'mail');
+ if (is_string($notice)) {
+ $this->log(LOG_ERR, $notice);
+ return;
+ }
+ common_broadcast_notice($notice);
+ $this->log(LOG_INFO,
+ 'Added notice ' . $notice->id . ' from user ' . $user->nickname);
+ }
hunk ./scripts/maildaemon.php 136
- function parse_message($fname) {
- $contents = file_get_contents($fname);
- $parsed = Mail_mimeDecode::decode(array('input' => $contents,
- 'include_bodies' => true,
- 'decode_headers' => true,
- 'decode_bodies' => true));
- if (!$parsed) {
- return NULL;
- }
+ function parse_message($fname) {
+ $contents = file_get_contents($fname);
+ $parsed = Mail_mimeDecode::decode(array('input' => $contents,
+ 'include_bodies' => true,
+ 'decode_headers' => true,
+ 'decode_bodies' => true));
+ if (!$parsed) {
+ return NULL;
+ }
hunk ./scripts/maildaemon.php 146
- $from = $parsed->headers['from'];
+ $from = $parsed->headers['from'];
hunk ./scripts/maildaemon.php 148
- $to = $parsed->headers['to'];
+ $to = $parsed->headers['to'];
hunk ./scripts/maildaemon.php 150
- $type = $parsed->ctype_primary . '/' . $parsed->ctype_secondary;
+ $type = $parsed->ctype_primary . '/' . $parsed->ctype_secondary;
hunk ./scripts/maildaemon.php 152
- if ($parsed->ctype_primary == 'multipart') {
- foreach ($parsed->parts as $part) {
- if ($part->ctype_primary == 'text' &&
- $part->ctype_secondary == 'plain') {
- $msg = $part->body;
- break;
- }
- }
- } else if ($type == 'text/plain') {
- $msg = $parsed->body;
- } else {
- $this->unsupported_type($type);
- }
+ if ($parsed->ctype_primary == 'multipart') {
+ foreach ($parsed->parts as $part) {
+ if ($part->ctype_primary == 'text' &&
+ $part->ctype_secondary == 'plain') {
+ $msg = $part->body;
+ break;
+ }
+ }
+ } else if ($type == 'text/plain') {
+ $msg = $parsed->body;
+ } else {
+ $this->unsupported_type($type);
+ }
hunk ./scripts/maildaemon.php 166
- return array($from, $to, $msg);
- }
+ return array($from, $to, $msg);
+ }
hunk ./scripts/maildaemon.php 169
- function unsupported_type($type) {
- $this->error(NULL, "Unsupported message type: " . $type);
- }
+ function unsupported_type($type) {
+ $this->error(NULL, "Unsupported message type: " . $type);
+ }
hunk ./scripts/maildaemon.php 173
- function cleanup_msg($msg) {
- $lines = explode("\n", $msg);
+ function cleanup_msg($msg) {
+ $lines = explode("\n", $msg);
hunk ./scripts/maildaemon.php 176
- $output = '';
+ $output = '';
hunk ./scripts/maildaemon.php 178
- foreach ($lines as $line) {
- // skip quotes
- if (preg_match('/^\s*>.*$/', $line)) {
- continue;
- }
- // skip start of quote
- if (preg_match('/^\s*On.*wrote:\s*$/', $line)) {
- continue;
- }
- // probably interesting to someone, not us
- if (preg_match('/^\s*Sent via/', $line)) {
- continue;
- }
- // skip everything after a sig
- if (preg_match('/^\s*--+\s*$/', $line) ||
- preg_match('/^\s*__+\s*$/', $line))
- {
- break;
- }
- // skip everything after Outlook quote
- if (preg_match('/^\s*-+\s*Original Message\s*-+\s*$/', $line)) {
- break;
- }
- // skip everything after weird forward
- if (preg_match('/^\s*Begin\s+forward/', $line)) {
- break;
- }
+ foreach ($lines as $line) {
+ // skip quotes
+ if (preg_match('/^\s*>.*$/', $line)) {
+ continue;
+ }
+ // skip start of quote
+ if (preg_match('/^\s*On.*wrote:\s*$/', $line)) {
+ continue;
+ }
+ // probably interesting to someone, not us
+ if (preg_match('/^\s*Sent via/', $line)) {
+ continue;
+ }
+ // skip everything after a sig
+ if (preg_match('/^\s*--+\s*$/', $line) ||
+ preg_match('/^\s*__+\s*$/', $line))
+ {
+ break;
+ }
+ // skip everything after Outlook quote
+ if (preg_match('/^\s*-+\s*Original Message\s*-+\s*$/', $line)) {
+ break;
+ }
+ // skip everything after weird forward
+ if (preg_match('/^\s*Begin\s+forward/', $line)) {
+ break;
+ }
hunk ./scripts/maildaemon.php 206
- $output .= ' ' . $line;
- }
+ $output .= ' ' . $line;
+ }
hunk ./scripts/maildaemon.php 209
- preg_replace('/\s+/', ' ', $output);
- return trim($output);
- }
+ preg_replace('/\s+/', ' ', $output);
+ return trim($output);
+ }
hunk ./scripts/ombqueuehandler.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/ombqueuehandler.php 37
-
- function transport() {
- return 'omb';
- }
-
- function start() {
- $this->log(LOG_INFO, "INITIALIZE");
- return true;
- }
+
+ function transport() {
+ return 'omb';
+ }
+
+ function start() {
+ $this->log(LOG_INFO, "INITIALIZE");
+ return true;
+ }
hunk ./scripts/ombqueuehandler.php 47
- function handle_notice($notice) {
- if ($this->is_remote($notice)) {
- $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
- return true;
- } else {
- return omb_broadcast_remote_subscribers($notice);
- }
- }
-
- function finish() {
- }
+ function handle_notice($notice) {
+ if ($this->is_remote($notice)) {
+ $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
+ return true;
+ } else {
+ return omb_broadcast_remote_subscribers($notice);
+ }
+ }
+
+ function finish() {
+ }
hunk ./scripts/ombqueuehandler.php 59
- function is_remote($notice) {
- $user = User::staticGet($notice->profile_id);
- return is_null($user);
- }
+ function is_remote($notice) {
+ $user = User::staticGet($notice->profile_id);
+ return is_null($user);
+ }
hunk ./scripts/publicqueuehandler.php 23
- print "This script must be run from the command line\n";
- exit();
+ print "This script must be run from the command line\n";
+ exit();
hunk ./scripts/publicqueuehandler.php 37
-
- function transport() {
- return 'public';
- }
-
- function handle_notice($notice) {
- try {
- return jabber_public_notice($notice);
- } catch (XMPPHP_Exception $e) {
- $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
- die($e->getMessage());
- }
- }
+
+ function transport() {
+ return 'public';
+ }
+
+ function handle_notice($notice) {
+ try {
+ return jabber_public_notice($notice);
+ } catch (XMPPHP_Exception $e) {
+ $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+ die($e->getMessage());
+ }
+ }
hunk ./scripts/sitemap.php 22
- global $output_paths;
- $output_dir = $output_paths['output_dir'];
- $output_url = $output_paths['output_url'];
+ global $output_paths;
+ $output_dir = $output_paths['output_dir'];
+ $output_url = $output_paths['output_url'];
hunk ./scripts/sitemap.php 26
- foreach (glob("$output_dir*.xml") as $file_name) {
+ foreach (glob("$output_dir*.xml") as $file_name) {
hunk ./scripts/sitemap.php 28
- # Just the file name please.
- $file_name = preg_replace("|$output_dir|", '', $file_name);
+ # Just the file name please.
+ $file_name = preg_replace("|$output_dir|", '', $file_name);
hunk ./scripts/sitemap.php 31
- $index_urls .= sitemap(
- array(
- 'url' => $output_url . $file_name,
- 'changefreq' => 'daily'
- )
- );
- }
+ $index_urls .= sitemap(
+ array(
+ 'url' => $output_url . $file_name,
+ 'changefreq' => 'daily'
+ )
+ );
+ }
hunk ./scripts/sitemap.php 39
- write_file($output_paths['index_file'], sitemapindex($index_urls));
+ write_file($output_paths['index_file'], sitemapindex($index_urls));
hunk ./scripts/sitemap.php 44
- global $output_paths;
+ global $output_paths;
hunk ./scripts/sitemap.php 46
- $standard_map_urls .= url(
- array(
- 'url' => common_local_url('public'),
- 'changefreq' => 'daily',
- 'priority' => '1',
- )
- );
+ $standard_map_urls .= url(
+ array(
+ 'url' => common_local_url('public'),
+ 'changefreq' => 'daily',
+ 'priority' => '1',
+ )
+ );
hunk ./scripts/sitemap.php 54
- $standard_map_urls .= url(
- array(
- 'url' => common_local_url('publicrss'),
- 'changefreq' => 'daily',
- 'priority' => '0.3',
- )
- );
+ $standard_map_urls .= url(
+ array(
+ 'url' => common_local_url('publicrss'),
+ 'changefreq' => 'daily',
+ 'priority' => '0.3',
+ )
+ );
hunk ./scripts/sitemap.php 62
- $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog', 'privacy', 'source');
+ $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog', 'privacy', 'source');
hunk ./scripts/sitemap.php 64
- foreach($docs as $title) {
- $standard_map_urls .= url(
- array(
- 'url' => common_local_url('doc', array('title' => $title)),
- 'changefreq' => 'monthly',
- 'priority' => '0.2',
- )
- );
- }
+ foreach($docs as $title) {
+ $standard_map_urls .= url(
+ array(
+ 'url' => common_local_url('doc', array('title' => $title)),
+ 'changefreq' => 'monthly',
+ 'priority' => '0.2',
+ )
+ );
+ }
hunk ./scripts/sitemap.php 74
- $urlset_path = $output_paths['output_dir'] . 'standard.xml';
+ $urlset_path = $output_paths['output_dir'] . 'standard.xml';
hunk ./scripts/sitemap.php 76
- write_file($urlset_path, urlset($standard_map_urls));
+ write_file($urlset_path, urlset($standard_map_urls));
hunk ./scripts/sitemap.php 81
- global $output_paths;
+ global $output_paths;
hunk ./scripts/sitemap.php 83
- $notices = DB_DataObject::factory('notice');
+ $notices = DB_DataObject::factory('notice');
hunk ./scripts/sitemap.php 85
- $notices->query('SELECT id, uri, url, modified FROM notice where is_local = 1');
+ $notices->query('SELECT id, uri, url, modified FROM notice where is_local = 1');
hunk ./scripts/sitemap.php 87
- $notice_count = 0;
- $map_count = 1;
+ $notice_count = 0;
+ $map_count = 1;
hunk ./scripts/sitemap.php 90
- while ($notices->fetch()) {
+ while ($notices->fetch()) {
hunk ./scripts/sitemap.php 92
- # Maximum 50,000 URLs per sitemap file.
- if ($notice_count == 50000) {
- $notice_count = 0;
- $map_count++;
- }
+ # Maximum 50,000 URLs per sitemap file.
+ if ($notice_count == 50000) {
+ $notice_count = 0;
+ $map_count++;
+ }
hunk ./scripts/sitemap.php 98
- # remote notices have an URL
-
- if (!$notices->url && $notices->uri) {
- $notice = array(
- 'url' => ($notices->uri) ? $notices->uri : common_local_url('shownotice', array('notice' => $notices->id)),
- 'lastmod' => common_date_w3dtf($notices->modified),
- 'changefreq' => 'never',
- 'priority' => '1',
- );
+ # remote notices have an URL
+
+ if (!$notices->url && $notices->uri) {
+ $notice = array(
+ 'url' => ($notices->uri) ? $notices->uri : common_local_url('shownotice', array('notice' => $notices->id)),
+ 'lastmod' => common_date_w3dtf($notices->modified),
+ 'changefreq' => 'never',
+ 'priority' => '1',
+ );
hunk ./scripts/sitemap.php 108
- $notice_list[$map_count] .= url($notice);
- $notice_count++;
- }
- }
+ $notice_list[$map_count] .= url($notice);
+ $notice_count++;
+ }
+ }
hunk ./scripts/sitemap.php 113
- # Make full sitemaps from the lists and save them.
- array_to_map($notice_list, 'notice');
+ # Make full sitemaps from the lists and save them.
+ array_to_map($notice_list, 'notice');
hunk ./scripts/sitemap.php 119
- global $output_paths;
+ global $output_paths;
hunk ./scripts/sitemap.php 121
- $users = DB_DataObject::factory('user');
+ $users = DB_DataObject::factory('user');
hunk ./scripts/sitemap.php 123
- $users->query('SELECT id, nickname FROM user');
+ $users->query('SELECT id, nickname FROM user');
hunk ./scripts/sitemap.php 125
- $user_count = 0;
- $map_count = 1;
+ $user_count = 0;
+ $map_count = 1;
hunk ./scripts/sitemap.php 128
- while ($users->fetch()) {
+ while ($users->fetch()) {
hunk ./scripts/sitemap.php 130
- # Maximum 50,000 URLs per sitemap file.
- if ($user_count == 50000) {
- $user_count = 0;
- $map_count++;
- }
+ # Maximum 50,000 URLs per sitemap file.
+ if ($user_count == 50000) {
+ $user_count = 0;
+ $map_count++;
+ }
hunk ./scripts/sitemap.php 136
- $user_args = array('nickname' => $users->nickname);
+ $user_args = array('nickname' => $users->nickname);
hunk ./scripts/sitemap.php 138
- # Define parameters for generating \n";
- $url_out .= "\t\t$url \n";
+ $url_out = "\t\n";
+ $url_out .= "\t\t$url \n";
hunk ./scripts/sitemap.php 224
- if ($changefreq) {
- $url_out .= "\t\t$changefreq \n";
- }
+ if ($changefreq) {
+ $url_out .= "\t\t$changefreq \n";
+ }
hunk ./scripts/sitemap.php 228
- if ($lastmod) {
- $url_out .= "\t\t$lastmod \n";
- }
+ if ($lastmod) {
+ $url_out .= "\t\t$lastmod \n";
+ }
hunk ./scripts/sitemap.php 232
- if ($priority) {
- $url_out .= "\t\t$priority \n";
- }
+ if ($priority) {
+ $url_out .= "\t\t$priority \n";
+ }
hunk ./scripts/sitemap.php 236
- $url_out .= "\t \n";
+ $url_out .= "\t \n";
hunk ./scripts/sitemap.php 238
- return $url_out;
+ return $url_out;
hunk ./scripts/sitemap.php 242
- $url = preg_replace('/&/', '&', $sitemap_args['url']); # escape ampersands for XML
- $lastmod = $sitemap_args['lastmod'];
+ $url = preg_replace('/&/', '&', $sitemap_args['url']); # escape ampersands for XML
+ $lastmod = $sitemap_args['lastmod'];
hunk ./scripts/sitemap.php 245
- if (is_null($url)) {
- error("url() arguments require 'url' value.");
- }
+ if (is_null($url)) {
+ error("url() arguments require 'url' value.");
+ }
hunk ./scripts/sitemap.php 249
- $sitemap_out = "\t\n";
- $sitemap_out .= "\t\t$url \n";
+ $sitemap_out = "\t\n";
+ $sitemap_out .= "\t\t$url \n";
hunk ./scripts/sitemap.php 252
- if ($lastmod) {
- $sitemap_out .= "\t\t$lastmod \n";
- }
+ if ($lastmod) {
+ $sitemap_out .= "\t\t$lastmod \n";
+ }
hunk ./scripts/sitemap.php 256
- $sitemap_out .= "\t \n";
+ $sitemap_out .= "\t \n";
hunk ./scripts/sitemap.php 258
- return $sitemap_out;
+ return $sitemap_out;
hunk ./scripts/sitemap.php 263
- $urlset = '' . "\n" .
- '' . "\n" .
- $urlset_text .
- ' ';
+ $urlset = '' . "\n" .
+ '' . "\n" .
+ $urlset_text .
+ ' ';
hunk ./scripts/sitemap.php 268
- return $urlset;
+ return $urlset;
hunk ./scripts/sitemap.php 273
- $sitemapindex = '' . "\n" .
- '' . "\n" .
- $sitemapindex_text .
- ' ';
+ $sitemapindex = '' . "\n" .
+ '' . "\n" .
+ $sitemapindex_text .
+ ' ';
hunk ./scripts/sitemap.php 278
- return $sitemapindex;
+ return $sitemapindex;
hunk ./scripts/sitemap.php 283
- global $output_paths;
+ global $output_paths;
hunk ./scripts/sitemap.php 285
- if ($url_list) {
- # $map_urls is a long string containing concatenated -d