rename 'friendika'

This commit is contained in:
friendica 2011-12-16 01:45:53 -08:00
parent 873972509b
commit 318cb246f9
4 changed files with 16 additions and 18 deletions

View File

@ -6,19 +6,17 @@
*/ */
/** /**
* Installing the Friendika/Facebook connector * Installing the Friendica/Facebook connector
* *
* 1. register an API key for your site from developer.facebook.com * 1. register an API key for your site from developer.facebook.com
* a. We'd be very happy if you include "Friendika" in the application name * a. We'd be very happy if you include "Friendica" in the application name
* to increase name recognition. The Friendika icons are also present * to increase name recognition. The Friendica icons are also present
* in the images directory and may be uploaded as a Facebook app icon. * in the images directory and may be uploaded as a Facebook app icon.
* Use images/friendika-16.jpg for the Icon and images/friendika-128.jpg for the Logo. * Use images/friendica-16.jpg for the Icon and images/friendica-128.jpg for the Logo.
* b. The url should be your site URL with a trailing slash. * b. The url should be your site URL with a trailing slash.
* You may use http://portal.friendika.com/privacy as the privacy policy * Friendica is a software application and does not require a Privacy Policy
* URL unless your site has different requirements, and * or Terms of Service, though your installation of it might. Facebook may require
* http://portal.friendika.com as the Terms of Service URL unless * that you provide a Privacy Policy, which we find ironic.
* you have different requirements. (Friendika is a software application
* and does not require Terms of Service, though your installation of it might).
* c. Set the following values in your .htconfig.php file * c. Set the following values in your .htconfig.php file
* $a->config['facebook']['appid'] = 'xxxxxxxxxxx'; * $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
* $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx'; * $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
@ -632,7 +630,7 @@ function facebook_post_hook(&$a,&$b) {
$msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg); $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
if((strpos($link,z_root()) !== false) && (! $image)) if((strpos($link,z_root()) !== false) && (! $image))
$image = $a->get_baseurl() . '/images/friendika-64.jpg'; $image = $a->get_baseurl() . '/images/friendica-64.jpg';
$msg = trim(strip_tags(bbcode($msg))); $msg = trim(strip_tags(bbcode($msg)));
$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
@ -705,7 +703,7 @@ function facebook_post_hook(&$a,&$b) {
else { else {
$url = 'https://graph.facebook.com/me/feed'; $url = 'https://graph.facebook.com/me/feed';
if($b['plink']) if($b['plink'])
$postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' . $b['plink'] . '"}'; $postvars['actions'] = '{"name": "' . t('View on Friendica') . '", "link": "' . $b['plink'] . '"}';
} }
logger('facebook: post to ' . $url); logger('facebook: post to ' . $url);

View File

@ -5,7 +5,7 @@
* Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias> * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
*/ */
/* StatusNet Plugin for Friendika /* StatusNet Plugin for Friendica
* *
* Author: Tobias Diekershoff * Author: Tobias Diekershoff
* tobias.diekershoff@gmx.net * tobias.diekershoff@gmx.net
@ -56,7 +56,7 @@ class StatusNetOAuth extends TwitterOAuth {
* *
* @return API results * @return API results
* *
* Copied here from the twitteroauth library and complemented by applying the proxy settings of friendika * Copied here from the twitteroauth library and complemented by applying the proxy settings of friendica
*/ */
function http($url, $method, $postfields = NULL) { function http($url, $method, $postfields = NULL) {
$this->http_info = array(); $this->http_info = array();
@ -282,7 +282,7 @@ function statusnet_settings(&$a,&$s) {
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
} }
$s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>'; $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 .= '<p>'. t('No consumer key pair for StatusNet found. Register your Friendica 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 Friendica installation at your favorited StatusNet installation.') .'</p>';
$s .= '<div id="statusnet-consumer-wrapper">'; $s .= '<div id="statusnet-consumer-wrapper">';
$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>'; $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 .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';

View File

@ -6,7 +6,7 @@
*/ */
/* Twitter Plugin for Friendika /* Twitter Plugin for Friendica
* *
* Author: Tobias Diekershoff * Author: Tobias Diekershoff
* tobias.diekershoff@gmx.net * tobias.diekershoff@gmx.net
@ -17,7 +17,7 @@
* To use this plugin you need a OAuth Consumer key pair (key & secret) * To use this plugin you need a OAuth Consumer key pair (key & secret)
* you can get it from Twitter at https://twitter.com/apps * you can get it from Twitter at https://twitter.com/apps
* *
* Register your Friendika site as "Client" application with "Read & Write" access * Register your Friendica site as "Client" application with "Read & Write" access
* we do not need "Twitter as login". When you've registered the app you get the * we do not need "Twitter as login". When you've registered the app you get the
* OAuth Consumer key and secret pair for your application/site. * OAuth Consumer key and secret pair for your application/site.
* *
@ -168,7 +168,7 @@ function twitter_settings(&$a,&$s) {
/*** /***
* make some nice form * make some nice form
*/ */
$s .= '<p>'. t('At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') .'</p>'; $s .= '<p>'. t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') .'</p>';
$s .= '<a href="'.$connection->getAuthorizeURL($token).'" target="_twitter"><img src="addon/twitter/lighter.png" alt="'.t('Log in with Twitter').'"></a>'; $s .= '<a href="'.$connection->getAuthorizeURL($token).'" target="_twitter"><img src="addon/twitter/lighter.png" alt="'.t('Log in with Twitter').'"></a>';
$s .= '<div id="twitter-pin-wrapper">'; $s .= '<div id="twitter-pin-wrapper">';
$s .= '<label id="twitter-pin-label" for="twitter-pin">'. t('Copy the PIN from Twitter here') .'</label>'; $s .= '<label id="twitter-pin-label" for="twitter-pin">'. t('Copy the PIN from Twitter here') .'</label>';

View File

@ -37,6 +37,6 @@ function friends_widget_content(&$a, $conf){
</style>"; </style>";
$o .= _abs_url(contact_block()); $o .= _abs_url(contact_block());
$o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."'>". t('Connect on Friendika!') ."</a>"; $o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."'>". t('Connect on Friendica!') ."</a>";
return $o; return $o;
} }