MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
Chris Case 2011-05-22 19:20:12 -07:00
parent 991885f1d4 44a22c2915
commit 150830d38c
8 changed files with 210 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

168
addon/statusnet/statusnet.php
View file

@ -86,69 +86,91 @@ function statusnet_settings_post ($a,$post) {
if(! local_user()) if(! local_user())
return; return;
if (isset($_POST['statusnet-disconnect'])) { if (isset($_POST['statusnet-disconnect'])) {
/*** /***
* if the statusnet-disconnect checkbox is set, clear the statusnet configuration * if the statusnet-disconnect checkbox is set, clear the statusnet configuration
* TODO can we revoke the access tokens at Twitter and do we need to do so? * TODO can we revoke the access tokens at Twitter and do we need to do so?
*/ */
del_pconfig( local_user(), 'statusnet', 'consumerkey' ); del_pconfig( local_user(), 'statusnet', 'consumerkey' );
del_pconfig( local_user(), 'statusnet', 'consumersecret' ); del_pconfig( local_user(), 'statusnet', 'consumersecret' );
del_pconfig( local_user(), 'statusnet', 'post' ); del_pconfig( local_user(), 'statusnet', 'post' );
del_pconfig( local_user(), 'statusnet', 'post_by_default' ); del_pconfig( local_user(), 'statusnet', 'post_by_default' );
del_pconfig( local_user(), 'statusnet', 'oauthtoken' ); del_pconfig( local_user(), 'statusnet', 'oauthtoken' );
del_pconfig( local_user(), 'statusnet', 'oauthsecret' ); del_pconfig( local_user(), 'statusnet', 'oauthsecret' );
del_pconfig( local_user(), 'statusnet', 'baseapi' ); del_pconfig( local_user(), 'statusnet', 'baseapi' );
} else { } else {
if (isset($_POST['statusnet-consumersecret'])) { if (isset($_POST['statusnet-preconf-apiurl'])) {
// check if we can reach the API of the StatusNet server /***
// we'll check the API Version for that, if we don't get one we'll try to fix the path but will * If the user used one of the preconfigured StatusNet server credentials
// resign quickly after this one try to fix the path ;-) * use them. All the data are available in the global config.
$apibase = $_POST['statusnet-baseapi']; * Check the API Url never the less and blame the admin if it's not working ^^
$c = fetch_url( $apibase . 'statusnet/version.xml' ); */
if (strlen($c) > 0) { $globalsn = get_config('statusnet', 'sites');
// ok the API path is correct, let's save the settings foreach ( $globalsn as $asn) {
set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) {
set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); $apibase = $asn['apiurl'];
set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase ); $c = fetch_url( $apibase . 'statusnet/version.xml' );
if (strlen($c) > 0) {
set_pconfig(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
set_pconfig(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
set_pconfig(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
} else {
notice( t('Please contact your site administrator.<br />The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
}
}
}
goaway($a->get_baseurl().'/settings/addon');
} else { } else {
// the API path is not correct, maybe missing trailing / ? if (isset($_POST['statusnet-consumersecret'])) {
$apibase = $apibase . '/'; // check if we can reach the API of the StatusNet server
// we'll check the API Version for that, if we don't get one we'll try to fix the path but will
// resign quickly after this one try to fix the path ;-)
$apibase = $_POST['statusnet-baseapi'];
$c = fetch_url( $apibase . 'statusnet/version.xml' ); $c = fetch_url( $apibase . 'statusnet/version.xml' );
if (strlen($c) > 0) { if (strlen($c) > 0) {
// ok the API path is now correct, let's save the settings // ok the API path is correct, let's save the settings
set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase ); set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase );
} else { } else {
// still not the correct API base, let's do noting // the API path is not correct, maybe missing trailing / ?
notice( t('We could not contact the StatusNet API with the Path you entered.').EOL ); $apibase = $apibase . '/';
$c = fetch_url( $apibase . 'statusnet/version.xml' );
if (strlen($c) > 0) {
// ok the API path is now correct, let's save the settings
set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase );
} else {
// still not the correct API base, let's do noting
notice( t('We could not contact the StatusNet API with the Path you entered.').EOL );
}
} }
} goaway($a->get_baseurl().'/settings/addon');
goaway($a->get_baseurl().'/settings/addon'); } else {
} else { if (isset($_POST['statusnet-pin'])) {
if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen logger('got a StatusNet security code');
logger('got a StatusNet security code'); $api = get_pconfig(local_user(), 'statusnet', 'baseapi');
$api = get_pconfig(local_user(), 'statusnet', 'baseapi'); $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' );
$ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
$csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); // the token and secret for which the PIN was generated were hidden in the settings
// the token and secret for which the PIN was generated were hidden in the settings // form as token and token2, we need a new connection to Twitter using these token
// form as token and token2, we need a new connection to Twitter using these token // and secret to request a Access Token with the PIN
// and secret to request a Access Token with the PIN $connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']); $token = $connection->getAccessToken( $_POST['statusnet-pin'] );
$token = $connection->getAccessToken( $_POST['statusnet-pin'] ); // ok, now that we have the Access Token, save them in the user config
// ok, now that we have the Access Token, save them in the user config set_pconfig(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']);
set_pconfig(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']); set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']); set_pconfig(local_user(),'statusnet', 'post', 1);
set_pconfig(local_user(),'statusnet', 'post', 1); // reload the Addon Settings page, if we don't do it see Bug #42
// reload the Addon Settings page, if we don't do it see Bug #42 goaway($a->get_baseurl().'/settings/addon');
goaway($a->get_baseurl().'/settings/addon'); } else {
} else { // if no PIN is supplied in the POST variables, the user has changed the setting
// if no PIN is supplied in the POST variables, the user has changed the setting // to post a tweet for every new __public__ posting to the wall
// to post a tweet for every new __public__ posting to the wall set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable'])); set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default'])); notice( t('StatusNet settings updated.') . EOL);
notice( t('StatusNet settings updated.') . EOL); }}}}
}}}
} }
function statusnet_settings(&$a,&$s) { function statusnet_settings(&$a,&$s) {
if(! local_user()) if(! local_user())
@ -175,19 +197,37 @@ function statusnet_settings(&$a,&$s) {
if ( (!$ckey) && (!$csecret) ) { if ( (!$ckey) && (!$csecret) ) {
/*** /***
* no consumer keys * no consumer keys
*/ */
$s .= '<p>'. t('No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.') .'</p>'; $globalsn = get_config('statusnet', 'sites');
$s .= '<div id="statusnet-consumer-wrapper">'; /***
$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>'; * lets check if we have one or more globally configured StatusNet
$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" />'; * server OAuth credentials in the configuration. If so offer them
$s .= '<div class="clear"></div>'; * with a little explanation to the user as choice - otherwise
$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>'; * ignore this option entirely.
$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" />'; */
$s .= '<div class="clear"></div>'; if (! $globalsn == null) {
$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>'; $s .= '<h4>' . t('Globally Available StatusNet OAuthKeys') . '</h4>';
$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" />'; $s .= '<p>'. t('There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below).') .'</p>';
$s .= '<div class="clear"></div></div>'; $s .= '<div id="statusnet-preconf-wrapper">';
foreach ($globalsn as $asn) {
$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
}
$s .= '<p></p><div class="clear"></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
}
$s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
$s .= '<p>'. t('No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.') .'</p>';
$s .= '<div id="statusnet-consumer-wrapper">';
$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>';
$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
$s .= '<div class="clear"></div>';
$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>';
$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
$s .= '<div class="clear"></div>';
$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
$s .= '<p></p><div class="clear"></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
} else { } else {
/*** /***
* ok we have a consumer key pair now look into the OAuth stuff * ok we have a consumer key pair now look into the OAuth stuff

7
boot.php
View file

@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000); ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.2.987' ); define ( 'FRIENDIKA_VERSION', '2.2.988' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 ); define ( 'DB_UPDATE_VERSION', 1054 );
@ -1508,6 +1508,8 @@ function lrdd($uri) {
logger('lrdd: host_meta: ' . $xml, LOGGER_DATA); logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
$h = parse_xml_string($xml); $h = parse_xml_string($xml);
if(! $h)
return array();
$arr = convert_xml_element_to_array($h); $arr = convert_xml_element_to_array($h);
@ -1672,6 +1674,9 @@ function fetch_xrd_links($url) {
logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
$h = parse_xml_string($xml); $h = parse_xml_string($xml);
if(! $h)
return array();
$arr = convert_xml_element_to_array($h); $arr = convert_xml_element_to_array($h);
$links = array(); $links = array();

138
include/Scrape.php
View file

@ -292,7 +292,9 @@ function probe_url($url) {
$diaspora = false; $diaspora = false;
$email_conversant = false; $email_conversant = false;
if($url) { $twitter = ((strpos($url,'twitter.com') !== false) ? true : false);
if(! $twitter) {
$links = lrdd($url); $links = lrdd($url);
if(count($links)) { if(count($links)) {
@ -413,76 +415,94 @@ function probe_url($url) {
$profile = $url; $profile = $url;
} }
if($twitter) {
logger('twitter: setup');
$tid = basename($url);
$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
if(intval($tid))
$poll = $tapi . '?user_id=' . $tid;
else
$poll = $tapi . '?screen_name=' . $tid;
$profile = 'http://twitter.com/!#/' . $tid;
}
if(! x($vcard,'fn')) if(! x($vcard,'fn'))
if(x($vcard,'nick')) if(x($vcard,'nick'))
$vcard['fn'] = $vcard['nick']; $vcard['fn'] = $vcard['nick'];
if((! isset($vcard)) && (! $poll)) {
if(((! isset($vcard)) && (! $poll)) || ($twitter)) {
$ret = scrape_feed($url); $feedret = scrape_feed($url);
logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA); logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) { if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss'])); $poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
$vcard = array(); $vcard = array();
if(x($ret,'photo')) }
$vcard['photo'] = $ret['photo'];
require_once('simplepie/simplepie.inc');
$feed = new SimplePie();
$xml = fetch_url($poll);
$feed->set_raw_data($xml); if(x($feedret,'photo'))
$vcard['photo'] = $feedret['photo'];
require_once('simplepie/simplepie.inc');
$feed = new SimplePie();
$xml = fetch_url($poll);
$feed->init(); $feed->set_raw_data($xml);
if(! x($vcard,'photo')) $feed->init();
$vcard['photo'] = $feed->get_image_url();
$author = $feed->get_author(); if(! x($vcard,'photo'))
if($author) { $vcard['photo'] = $feed->get_image_url();
$vcard['fn'] = unxmlify(trim($author->get_name())); $author = $feed->get_author();
if(! $vcard['fn']) if($author) {
$vcard['fn'] = trim(unxmlify($author->get_email())); $vcard['fn'] = unxmlify(trim($author->get_name()));
if(strpos($vcard['fn'],'@') !== false) if(! $vcard['fn'])
$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@')); $vcard['fn'] = trim(unxmlify($author->get_email()));
$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn']))); if(strpos($vcard['fn'],'@') !== false)
if(strpos($vcard['nick'],' ')) $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); $email = unxmlify($author->get_email());
$email = unxmlify($author->get_email()); }
} else {
else { $item = $feed->get_item(0);
$item = $feed->get_item(0); if($item) {
if($item) { $author = $item->get_author();
$author = $item->get_author(); if($author) {
if($author) { $vcard['fn'] = trim(unxmlify($author->get_name()));
$vcard['fn'] = trim(unxmlify($author->get_name())); if(! $vcard['fn'])
if(! $vcard['fn']) $vcard['fn'] = trim(unxmlify($author->get_email()));
$vcard['fn'] = trim(unxmlify($author->get_email())); if(strpos($vcard['fn'],'@') !== false)
if(strpos($vcard['fn'],'@') !== false) $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@')); $email = unxmlify($author->get_email());
$vcard['nick'] = strtolower(unxmlify($vcard['fn'])); }
if(strpos($vcard['nick'],' ')) if(! $vcard['photo']) {
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); $rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
$email = unxmlify($author->get_email()); if($rawmedia && $rawmedia[0]['attribs']['']['url'])
} $vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
if(! $vcard['photo']) {
$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
if($rawmedia && $rawmedia[0]['attribs']['']['url'])
$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
}
} }
} }
if((! $vcard['photo']) && strlen($email))
$vcard['photo'] = gravatar_img($email);
if($poll === $profile)
$lnk = $feed->get_permalink();
if(isset($lnk) && strlen($lnk))
$profile = $lnk;
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_title());
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_description());
$network = 'feed';
$priority = 2;
} }
if((! $vcard['photo']) && strlen($email))
$vcard['photo'] = gravatar_img($email);
if($poll === $profile)
$lnk = $feed->get_permalink();
if(isset($lnk) && strlen($lnk))
$profile = $lnk;
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_title());
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_description());
if(strpos($vcard['fn'],'Twitter / ') !== false) {
$vcard['fn'] = substr($vcard['fn'],strpos($vcard['fn'],'/')+1);
$vcard['fn'] = trim($vcard['fn']);
}
if(! x($vcard,'nick')) {
$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
if(strpos($vcard['nick'],' '))
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
}
$network = 'feed';
$priority = 2;
} }
} }

2
include/conversation.php
View file

@ -357,7 +357,7 @@ function conversation(&$a, $items, $mode, $update) {
if($page_writeable) { if($page_writeable) {
if($toplevelpost) { if($toplevelpost) {
$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array( $likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array(
'$id' => $item['id'], '$id' => $item['id'],
'$likethis' => t("I like this \x28toggle\x29"), '$likethis' => t("I like this \x28toggle\x29"),
'$nolike' => t("I don't like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"),

8
include/items.php
View file

@ -384,6 +384,9 @@ function get_atom_elements($feed,$item) {
else else
$res['private'] = 0; $res['private'] = 0;
$extid = $item->get_item_tags(NAMESPACE_DFRN,'extid');
if($extid && $extid[0]['data'])
$res['extid'] = $extid[0]['data'];
$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location'); $rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
if($rawlocation) if($rawlocation)
@ -634,6 +637,7 @@ function item_store($arr,$force_parent = false) {
$arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0);
$arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : random_string()); $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : random_string());
$arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : '');
$arr['author-name'] = ((x($arr,'author-name')) ? notags(trim($arr['author-name'])) : ''); $arr['author-name'] = ((x($arr,'author-name')) ? notags(trim($arr['author-name'])) : '');
$arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : '');
$arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : '');
@ -1568,6 +1572,10 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
$o .= '<dfrn:private>1</dfrn:private>' . "\r\n"; $o .= '<dfrn:private>1</dfrn:private>' . "\r\n";
if($item['extid'])
$o .= '<dfrn:extid>' . $item['extid'] . '</dfrn:extid>' . "\r\n";
$verb = construct_verb($item); $verb = construct_verb($item);
$o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n"; $o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
$actobj = construct_activity_object($item); $actobj = construct_activity_object($item);

10
mod/follow.php
View file

@ -12,7 +12,7 @@ function follow_post(&$a) {
$url = $orig_url = notags(trim($_POST['url'])); $url = $orig_url = notags(trim($_POST['url']));
// remove ajax junk // remove ajax junk, e.g. Twitter
$url = str_replace('/#!/','/',$url); $url = str_replace('/#!/','/',$url);
@ -41,6 +41,14 @@ function follow_post(&$a) {
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) { if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
notice( t('The profile address specified does not provide adequate information.') . EOL); notice( t('The profile address specified does not provide adequate information.') . EOL);
if(! x($ret,'poll'))
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
if(! x($ret,'name'))
notice( t('An author or name was not found.') . EOL);
if(! x($ret,'url'))
notice( t('No browser URL could be matched to this address.') . EOL);
if(strpos($url,'@') !== false)
notice('Unable to match @-style Identity Address with a known protocol or email contact');
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} }

4
mod/friendika.php
View file

@ -62,7 +62,9 @@ function friendika_content(&$a) {
} }
else else
$o .= '<p>' . t('No installed plugins/addons/apps'); $o .= '<p>' . t('No installed plugins/addons/apps');
call_hooks('about_hook', $o);
return $o; return $o;
} }

3
mod/item.php
View file

@ -589,9 +589,6 @@ function item_post(&$a) {
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($post_id) intval($post_id)
); );
foreach( $r as $key => $val) {
logger("key: " . $key . " val: " . $val);
}
// photo comments turn the corresponding item visible to the profile wall // photo comments turn the corresponding item visible to the profile wall
// This way we don't see every picture in your new photo album posted to your wall at once. // This way we don't see every picture in your new photo album posted to your wall at once.