From 3ea3cd9ec368ce024623060a676438961dbaaeb9 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 5 Apr 2012 20:04:36 +0100 Subject: [PATCH 1/9] . --- smiley_pack/smiley_pack.php~ | 485 +++++++++++++++++++++++++++++++++++ 1 file changed, 485 insertions(+) create mode 100644 smiley_pack/smiley_pack.php~ diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~ new file mode 100644 index 00000000..d85f9b5e --- /dev/null +++ b/smiley_pack/smiley_pack.php~ @@ -0,0 +1,485 @@ +get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />'; + + $b['texts'][] = ':chick'; + $b['icons'][] = '' . ':chick' . ''; + + $b['texts'][] = ':bumblebee'; + $b['icons'][] = '' . ':bee' . ''; + + $b['texts'][] = ':ladybird'; + $b['icons'][] = '' . ':ladybird' . ''; + + $b['texts'][] = ':bigspider'; + $b['icons'][] = '' . ':bigspider' . ''; + + $b['texts'][] = ':cat'; + $b['icons'][] = '' . ':cat' . ''; + + $b['texts'][] = ':bunny'; + $b['icons'][] = '' . ':bunny' . ''; + + $b['texts'][] = ':chick'; + $b['icons'][] = '' . ':chick' . ''; + + $b['texts'][] = ':cow'; + $b['icons'][] = '' . ':cow' . ''; + + $b['texts'][] = ':crab'; + $b['icons'][] = '' . ':crab' . ''; + + $b['texts'][] = ':dolphin'; + $b['icons'][] = '' . ':dolphin' . ''; + + $b['texts'][] = ':dragonfly'; + $b['icons'][] = '' . ':dragonfly' . ''; + + $b['texts'][] = ':frog'; + $b['icons'][] = '' . ':frog' . ''; + + $b['texts'][] = ':hamster'; + $b['icons'][] = '' . ':hamster' . ''; + + $b['texts'][] = ':monkey'; + $b['icons'][] = '' . ':monkey' . ''; + + $b['texts'][] = ':horse'; + $b['icons'][] = '' . ':horse' . ''; + + $b['texts'][] = ':parrot'; + $b['icons'][] = '' . ':parrot' . ''; + + $b['texts'][] = ':tux'; + $b['icons'][] = '' . ':tux' . ''; + + $b['texts'][] = ':snail'; + $b['icons'][] = '' . ':snail' . ''; + + $b['texts'][] = ':sheep'; + $b['icons'][] = '' . ':sheep' . ''; + + $b['texts'][] = ':dog'; + $b['icons'][] = '' . ':dog' . ''; + + $b['texts'][] = ':elephant'; + $b['icons'][] = '' . ':elephant' . ''; + + $b['texts'][] = ':fish'; + $b['icons'][] = '' . ':fish' . ''; + + $b['texts'][] = ':giraffe'; + $b['icons'][] = '' . ':giraffe' . ''; + + $b['texts'][] = ':pig'; + $b['icons'][] = '' . ':pig' . ''; + + + +#Baby Smileys + + $b['texts'][] = ':baby'; + $b['icons'][] = '' . ':baby' . ''; + + $b['texts'][] = ':babycot'; + $b['icons'][] = '' . ':babycot' . ''; + + + $b['texts'][] = ':pregnant'; + $b['icons'][] = '' . ':pregnant' . ''; + + $b['texts'][] = ':stork'; + $b['icons'][] = '' . ':stork' . ''; + + +#Confused Smileys + $b['texts'][] = ':confused'; + $b['icons'][] = '' . ':confused' . ''; + + $b['texts'][] = ':shrug'; + $b['icons'][] = '' . ':shrug' . ''; + + $b['texts'][] = ':stupid'; + $b['icons'][] = '' . ':stupid' . ''; + + $b['texts'][] = ':dazed'; + $b['icons'][] = '' . ':dazed' . ''; + + +#Cool Smileys + + $b['texts'][] = ':affro'; + $b['icons'][] = '' . ':affro' . ''; + + $b['texts'][] = ':cool'; + $b['icons'][] = '' . ':cool' . ''; + +#Devil/Angel Smileys + + $b['texts'][] = ':angel'; + $b['icons'][] = '' . ':angel' . ''; + + $b['texts'][] = ':cherub'; + $b['icons'][] = '' . ':cherub' . ''; + + $b['texts'][] = ':devilangel'; + $b['icons'][] = '' . ':devilangel' . ''; + + $b['texts'][] = ':catdevil'; + $b['icons'][] = '' . ':catdevil' . ''; + + $b['texts'][] = ':devillish'; + $b['icons'][] = '' . ':devillish' . ''; + + $b['texts'][] = ':daseesaw'; + $b['icons'][] = '' . ':daseesaw' . ''; + + $b['texts'][] = ':turnevil'; + $b['icons'][] = '' . ':turnevil' . ''; + + $b['texts'][] = ':saint'; + $b['icons'][] = '' . ':saint' . ''; + + $b['texts'][] = ':graveside'; + $b['icons'][] = '' . ':graveside' . ''; + +#Unpleasent smileys. + + $b['texts'][] = ':toilet'; + $b['icons'][] = '' . ':toilet' . ''; + + $b['texts'][] = ':fartinbed'; + $b['icons'][] = '' . ':fartinbed' . ''; + + $b['texts'][] = ':vomit'; + $b['icons'][] = '' . ':vomit' . ''; + + $b['texts'][] = ':fartblush'; + $b['icons'][] = '' . ':fartblush' . ''; + +#Drinks + + $b['texts'][] = ':tea'; + $b['icons'][] = '' . ':tea' . ''; + + $b['texts'][] = ':drool'; + $b['icons'][] = '' . ':drool' . ''; + +#Sad smileys + + $b['texts'][] = ':crying'; + $b['icons'][] = '' . ':crying' . ''; + + $b['texts'][] = ':prisoner'; + $b['icons'][] = '' . ':prisoner' . ''; + +#Smoking - only one smiley in here, maybe it needs moving elsewhere? + + $b['texts'][] = ':smoking'; + $b['icons'][] = '' . ':smoking' . ''; + +#Sport smileys + + $b['texts'][] = ':basketball'; + $b['icons'][] = '' . ':basketball' . ''; + + $b['texts'][] = ':bowling'; + $b['icons'][] = '' . ':bowling' . ''; + + $b['texts'][] = ':cycling'; + $b['icons'][] = '' . ':cycling' . ''; + + $b['texts'][] = ':darts'; + $b['icons'][] = '' . ':darts' . ''; + + $b['texts'][] = ':fencing'; + $b['icons'][] = '' . ':fencing' . ''; + + $b['texts'][] = ':golf'; + $b['icons'][] = '' . ':golf' . ''; + + $b['texts'][] = ':juggling'; + $b['icons'][] = '' . ':juggling' . ''; + + $b['texts'][] = ':skipping'; + $b['icons'][] = '' . ':skipping' . ''; + + $b['texts'][] = ':archery'; + $b['icons'][] = '' . ':archery' . ''; + + $b['texts'][] = ':football'; + $b['icons'][] = '' . ':football' . ''; + + $b['texts'][] = ':surfing'; + $b['icons'][] = '' . ':surfing' . ''; + + $b['texts'][] = ':snooker'; + $b['icons'][] = '' . ':snooker' . ''; + + $b['texts'][] = ':tennis'; + $b['icons'][] = '' . ':tennis' . ''; + + $b['texts'][] = ':horseriding'; + $b['icons'][] = '' . ':horseriding' . ''; + +#Love smileys + + $b['texts'][] = ':iloveyou'; + $b['icons'][] = '' . ':iloveyou' . ''; + + $b['texts'][] = ':inlove'; + $b['icons'][] = '' . ':inlove' . ''; + + $b['texts'][] = '~love'; + $b['icons'][] = '' . ':love' . ''; + + $b['texts'][] = ':lovebear'; + $b['icons'][] = '' . ':lovebear' . ''; + + $b['texts'][] = ':lovebed'; + $b['icons'][] = '' . ':lovebed' . ''; + + $b['texts'][] = ':loveheart'; + $b['icons'][] = '' . ':loveheart' . ''; + +#Tired/Sleep smileys + + $b['texts'][] = ':countsheep'; + $b['icons'][] = '' . ':countsheep' . ''; + + $b['texts'][] = ':hammock'; + $b['icons'][] = '' . ':hammock' . ''; + + $b['texts'][] = ':pillow'; + $b['icons'][] = '' . ':pillow' . ''; + +#Fight/Flame/Violent smileys + + $b['texts'][] = ':2guns'; + $b['icons'][] = '' . ':2guns' . ''; + + $b['texts'][] = ':alienfight'; + $b['icons'][] = '' . ':alienfight' . ''; + + $b['texts'][] = ':army'; + $b['icons'][] = '' . ':army' . ''; + + $b['texts'][] = ':arrowhead'; + $b['icons'][] = '' . ':arrowhead' . ''; + + $b['texts'][] = ':bfg'; + $b['icons'][] = '' . ':bfg' . ''; + + $b['texts'][] = ':bowman'; + $b['icons'][] = '' . ':bowman' . ''; + + $b['texts'][] = ':chainsaw'; + $b['icons'][] = '' . ':chainsaw' . ''; + + $b['texts'][] = ':crossbow'; + $b['icons'][] = '' . ':crossbow' . ''; + + $b['texts'][] = ':crusader'; + $b['icons'][] = '' . ':crusader' . ''; + + $b['texts'][] = ':dead'; + $b['icons'][] = '' . ':dead' . ''; + + $b['texts'][] = ':hammersplat'; + $b['icons'][] = '' . ':hammersplat' . ''; + + $b['texts'][] = ':lasergun'; + $b['icons'][] = '' . ':lasergun' . ''; + + $b['texts'][] = ':machinegun'; + $b['icons'][] = '' . ':machinegun' . ''; + + $b['texts'][] = ':marine'; + $b['icons'][] = '' . ':marine' . ''; + + $b['texts'][] = ':sabre'; + $b['icons'][] = '' . ':sabre' . ''; + + $b['texts'][] = ':tank'; + $b['icons'][] = '' . ':tank' . ''; + + $b['texts'][] = ':viking'; + $b['icons'][] = '' . ':viking' . ''; + + $b['texts'][] = ':gangs'; + $b['icons'][] = '' . ':gangs' . ''; + + $b['texts'][] = ':acid'; + $b['icons'][] = '' . ':acid' . ''; + +#Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys + + $b['texts'][] = ':alienmonster'; + $b['icons'][] = '' . ':alienmonster' . ''; + + $b['texts'][] = ':barbarian'; + $b['icons'][] = '' . ':barbarian' . ''; + + $b['texts'][] = ':dinosaur'; + $b['icons'][] = '' . ':dinosaur' . ''; + + $b['texts'][] = ':dragon'; + $b['icons'][] = '' . ':dragon' . ''; + + $b['texts'][] = ':draco'; + $b['icons'][] = '' . ':draco' . ''; + + $b['texts'][] = ':ghost'; + $b['icons'][] = '' . ':ghost' . ''; + + $b['texts'][] = ':mummy'; + $b['icons'][] = '' . ':mummy' . ''; + +#Food smileys + + $b['texts'][] = ':apple'; + $b['icons'][] = '' . ':apple' . ''; + + $b['texts'][] = ':broccoli'; + $b['icons'][] = '' . ':brocolli' . ''; + + $b['texts'][] = ':cake'; + $b['icons'][] = '' . ':cake' . ''; + + $b['texts'][] = ':carrot'; + $b['icons'][] = '' . ':carrot' . ''; + + $b['texts'][] = ':popcorn'; + $b['icons'][] = '' . ':popcorn' . ''; + + $b['texts'][] = ':tomato'; + $b['icons'][] = '' . ':tomato' . ''; + + $b['texts'][] = ':banana'; + $b['icons'][] = '' . ':banana' . ''; + + $b['texts'][] = ':cooking'; + $b['icons'][] = '' . ':cooking' . ''; + + $b['texts'][] = ':fryegg'; + $b['icons'][] = '' . ':fryegg' . ''; + +#Happy smileys + + $b['texts'][] = ':cloud9'; + $b['icons'][] = '' . ':cloud9' . ''; + + $b['texts'][] = ':tearsofjoy'; + $b['icons'][] = '' . ':tearsofjoy' . ''; + +#Repsect smileys + + $b['texts'][] = ':bow'; + $b['icons'][] = '' . ':bow' . ''; + + $b['texts'][] = ':bravo'; + $b['icons'][] = '' . ':bravo' . ''; + + $b['texts'][] = ':hailking'; + $b['icons'][] = '' . ':hailking' . ''; + + $b['texts'][] = ':number1'; + $b['icons'][] = '' . ':number1' . ''; + +#Laugh smileys + + $b['texts'][] = ':hahaha'; + $b['icons'][] = '' . ':hahaha' . ''; + + $b['texts'][] = ':loltv'; + $b['icons'][] = '' . ':loltv' . ''; + + $b['texts'][] = ':rofl'; + $b['icons'][] = '' . ':rofl' . ''; + +#Music smileys + + $b['texts'][] = ':dj'; + $b['icons'][] = '' . ':dj' . ''; + + $b['texts'][] = ':drums'; + $b['icons'][] = '' . ':drums' . ''; + + $b['texts'][] = ':elvis'; + $b['icons'][] = '' . ':elivs' . ''; + + $b['texts'][] = ':guitar'; + $b['icons'][] = '' . ':guitar' . ''; + + $b['texts'][] = ':trumpet'; + $b['icons'][] = '' . ':trumpet' . ''; + + $b['texts'][] = ':violin'; + $b['icons'][] = '' . ':violin' . ''; + +#Smileys that used to be in core + + $b['texts'][] = ':headbang'; + $b['icons'][] = '' . ':headbang' . ''; + + $b['texts'][] = ':beard'; + $b['icons'][] = '' . ':beard' . ''; + + $b['texts'][] = ':whitebeard'; + $b['icons'][] = '' . ':whitebeard' . ''; + + $b['texts'][] = ':shaka'; + $b['icons'][] = '' . ':shaka' . ''; + + $b['texts'][] = ':\\.../'; + $b['icons'][] = '' . ':\\.../' . ''; + + $b['texts'][] = ':\\ooo/'; + $b['icons'][] = '' . ':\\ooo/' . ''; + + $b['texts'][] = ':headdesk'; + $b['icons'][] = '' . ':headdesk' . ''; + +#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories + + $b['texts'][] = ':-d'; + $b['icons'][] = '' . ':-d' . ''; + + $b['texts'][] = ':-o'; + $b['icons'][] = '' . ':-o' . ''; + + + + +} From 1405c0c6375371100d4e464bfbdaf2848c14a2ce Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 5 Apr 2012 20:23:40 +0100 Subject: [PATCH 2/9] Tobias outlined a rare situation where a site admin may not have an admin account, and will therefore need to do things in .htconfig.php So, restore the .htconfig.php method as "If you prefer..." --- facebook/README | 12 ++++++ facebook/README~ | 40 +++++++++++++++++++ impressum/README | 13 +++++++ impressum/README~ | 18 +++++++++ openstreetmap/README | 21 ++++++++++ openstreetmap/README~ | 27 +++++++++++++ twitter/README | 18 ++++++++- twitter/README~ | 91 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 239 insertions(+), 1 deletion(-) create mode 100755 facebook/README~ create mode 100755 impressum/README~ create mode 100644 openstreetmap/README~ create mode 100755 twitter/README~ diff --git a/facebook/README b/facebook/README index 650ae1e3..b68ba3da 100755 --- a/facebook/README +++ b/facebook/README @@ -20,6 +20,18 @@ Installing the Friendica/Facebook connector c) Click save. d) Finally, return to the Facebook settings page, and activate real-time updates. + i. If you for any reason prefer to use a configuration file instead of the admin panels, + Activate the plugin by including it in .htconfig.php, e.g. + + $a->config['system']['addon'] = 'plugin1,plugin2,facebook'; + + and set the following values: + $a->config['facebook']['appid'] = 'xxxxxxxxxxx'; + $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx'; + + Replace with the settings Facebook gives you. + + 3. To use the Facebook plugin, visit the "connector settings" area of your settings page. Click "Install Facebook Connector". 4. This will ask you to login to Facebook and allow the plugin to do it's stuff. diff --git a/facebook/README~ b/facebook/README~ new file mode 100755 index 00000000..650ae1e3 --- /dev/null +++ b/facebook/README~ @@ -0,0 +1,40 @@ +Installing the Friendica/Facebook connector + +1. Visit https://developers.facebook.com/apps to register an app. + a) Click "Create a new app" + b) We'd be very happy if you include "Friendica" in the application name + to increase name recognition. + c) Edit your app settings on the setup page. The Friendica icons are present + in the images directory and may be uploaded as a Facebook app icon. Use + images/friendica-16.jpg for the Icon and images/Friendica-128.jpg for the logo. + d) In the App Display name enter the name of your app (this should default to the + name you chose in part a). + e) Enter YourDomain.com in the App Domain field and hit return. + f) In "Select how your app connects with Facebook select "Website" and enter the + full URL to your Friendica install including HTTPS and a trailing slash. + +2. Enable the Facebook plugin by clicking on the icon next to it's name on the plugin + page of your admin panel. + b) return to the Facebook plugin page in your admin panel, and fill in the App-ID + and Application Secret settings you got from Facebook. + c) Click save. + d) Finally, return to the Facebook settings page, and activate real-time updates. + +3. To use the Facebook plugin, visit the "connector settings" area of your settings + page. Click "Install Facebook Connector". +4. This will ask you to login to Facebook and allow the plugin to do it's stuff. + Allow it to do so. +5. You're done. To turn it off visit the Plugin Settings page again and + 'Remove Facebook posting'. + +Vidoes and embeds will not be posted if there is no other content. Links +and images will be converted to a format suitable for the Facebook API and +long posts truncated - with a link to view the full post. + +Facebook contacts will not be able to view private photos, as they are not able to +authenticate to your site to establish identity. We will address this +in a future release. + +Info: please make sure that you understand all aspects due to Friendica's +default licence which is: MIT License (further info: +https://github.com/friendica/friendica/blob/master/LICENSE) diff --git a/impressum/README b/impressum/README index 457729dc..bea55db2 100755 --- a/impressum/README +++ b/impressum/README @@ -15,4 +15,17 @@ Configuration: Simply fill in the fields in the impressium settings page in the plugins area of your admin panel. +If you for any reason prefer to use a configuration file instead, you can set the +following variables in the .htconfig file + * $a->config['impressum']['owner'] this is the Name of the Operator + * $a->config['impressum']['ownerprofile'] this is an optional Friendica account + where the above owner name will link to + * $a->config['impressum']['email'] a contact email address (optional) + will be displayed slightly obfuscated + as name(at)example(dot)com + + * $a->config['impressum']['postal'] should contain a postal address where + you can be reached at (optional) + * $a->config['impressum']['notes'] additional informations that should + be displayed in the Impressum block diff --git a/impressum/README~ b/impressum/README~ new file mode 100755 index 00000000..457729dc --- /dev/null +++ b/impressum/README~ @@ -0,0 +1,18 @@ +Impressum Plugin for Friendica + +Author: Tobias Diekershoff + tobias.diekershoff@gmx.net + +License: 3-clause BSD license (same as Friendica) + +About + This plugin adds an Impressum block to the /friendica page with informations + about the page operator/owner and how to contact you in case of any questions. + + In the notes and postal fields you can use HTML tags for formatting. + +Configuration: + Simply fill in the fields in the impressium settings page in the plugins area + of your admin panel. + + diff --git a/openstreetmap/README b/openstreetmap/README index 5c731fac..beac3a21 100644 --- a/openstreetmap/README +++ b/openstreetmap/README @@ -16,6 +16,9 @@ Support the OpenStreetMap community and share the load. ___ Configuration ___ +If you for any reason prefer to use a configuration file instead +of the admin panels, please refer to the Alternative Configuration below. + Activate the plugin from your admin panel. You can now add a Tile Server and default zoom level in the plugin settings @@ -25,3 +28,21 @@ The Time Server URL points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash. You can configure the default zoom level on the map in the Default Zoom box. 1 will show the whole world and 18 is the highest zoom level available. + + +___ Alternative Configuration ___ + +Open the .htconfig.php file and add "openstreetmap" to the list of activated +addons. + + $a->config['system']['addon'] = "openstreetmap, ..." + +You have to add two configuration variables for the addon: + + $a->config['openstreetmap']['tmsserver'] = 'http://www.openstreetmap.org/'; + $a->config['openstreetmap']['zoom'] = '18'; + +The *tmsserver* points to the tile server you want to use. Use the full URL, +with protocol (http/s) and trailing slash. You can configure the default zoom +level on the map with *zoom*. 1 will show the whole world and 18 is the highest +zoom level available. \ No newline at end of file diff --git a/openstreetmap/README~ b/openstreetmap/README~ new file mode 100644 index 00000000..5c731fac --- /dev/null +++ b/openstreetmap/README~ @@ -0,0 +1,27 @@ + ____ OpenStreetMap Plugin ____ +by Mike Macgirvin + Klaus Weidenbach + +This addon allows you to use OpenStreetMap for displaying locations. + +___ Requirements ___ + +To use this plugin you need a tile Server that provides the maps. +OpenStreetMap data is free for everyone to use. Their tile servers are not. +Please take a look at their "Tile Usage Policy": +http://wiki.openstreetmap.org/wiki/Tile_usage_policy +You can run your own tile server or choose one from their list of public +tile servers: http://wiki.openstreetmap.org/wiki/TMS +Support the OpenStreetMap community and share the load. + +___ Configuration ___ + +Activate the plugin from your admin panel. + +You can now add a Tile Server and default zoom level in the plugin settings +page of your admin panel. + +The Time Server URL points to the tile server you want to use. Use the full URL, +with protocol (http/s) and trailing slash. You can configure the default zoom +level on the map in the Default Zoom box. 1 will show the whole world and 18 is the highest +zoom level available. diff --git a/twitter/README b/twitter/README index ba396d5d..3b8f0e85 100755 --- a/twitter/README +++ b/twitter/README @@ -48,7 +48,8 @@ ___ Configuration ___ __ Global Configuration __ If you enabled an administrator account, please use the admin panel to cofigure -the Twitter relay. +the Twitter relay. If you for any reason prefer to use a configuration file instead +of the admin panels, please refer to the Alternative Configuration below. Activate the plugin from the plugins section of your admin panel. When you have done so, add your consumer key and consumer secret in the settings section of the @@ -58,6 +59,20 @@ When this is done your user can now configure their Twitter connection at "Settings -> Plugin Settings" and enable the forwarding of their *public* messages to Twitter. +__ Alternative Configuration __ + +-To activate this addon add @twitter@ to the list of active addons in your +.htconfig.php file + +$a->config['system']['addon'] = "twitter, ..." + +Afterwards you need to add your OAuth consumer key / secret pair to it by +adding the following two lines + +$a->config['twitter']['consumerkey'] = 'your consumer KEY here'; +$a->config['twitter']['consumersecret'] = 'your consumer SECRET here'; + + __ User Configuration __ When the OAuth consumer informations are correctly placed into the @@ -73,3 +88,4 @@ on the "Plugin Settings" page displaying two check boxes. One to enable/disable the forwarding of *all public* postings to Twitter and one to clear the personal configuration from the Twitter credentials. + diff --git a/twitter/README~ b/twitter/README~ new file mode 100755 index 00000000..3b8f0e85 --- /dev/null +++ b/twitter/README~ @@ -0,0 +1,91 @@ +____ Twitter Plugin ____ +By Tobias Diekershoff + tobias.diekershoff(at)gmx.net + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! This addon is currently under development. If you have any problem !! +!! with it, please contact the Author. !! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +With this addon to Friendica you can give your user the possibility to post +their *public* messages to Twitter. The messages will be strapped their rich +context and shortened to 140 characters length if necessary. If shortening of +the message was performed a link will be added to the Tweet pointing to the +original message on your server. + +There is a similar addon for forwarding public messages to +"StatusNet":http://status.net [[StatusNet Plugin]]. + +Online version of this document: http://ur1.ca/35mml + +___ Requirements ___ + +To use this plugin you have to register your Friendica instance as an +_client application_ for Twitter with _read and write_ access, we do not intend +to use Twitter for login. The registration can be done at twitter.com/apps +and you need to have a Twitter account to do so. + +After you registered the application you get an OAuth consumer key / secret +pair that identifies your app, you will need them for configuration. + +The inclusion of a shorturl for the original posting in cases when the +message was longer than 140 characters requires it, that you have *PHP5+* and +*curl* on your server. + +___ Where to find ___ + +In the Friendica git repository /addon/twitter/, this directory contains +all required PHP files (including the Twitter OAuth library [1] by Abraham +Williams, MIT licensed and the Slinky library [2] by Beau Lebens, BSD license), +a CSS file for styling of the user configuration and an image to _Sign in with +Twitter_. + +[1] https://github.com/abraham/twitteroauth +[2] http://dentedreality.com.au/projects/slinky/ + +___ Configuration ___ + +__ Global Configuration __ + +If you enabled an administrator account, please use the admin panel to cofigure +the Twitter relay. If you for any reason prefer to use a configuration file instead +of the admin panels, please refer to the Alternative Configuration below. + +Activate the plugin from the plugins section of your admin panel. When you have +done so, add your consumer key and consumer secret in the settings section of the +plugin page. + +When this is done your user can now configure their Twitter connection at +"Settings -> Plugin Settings" and enable the forwarding of their *public* +messages to Twitter. + +__ Alternative Configuration __ + +-To activate this addon add @twitter@ to the list of active addons in your +.htconfig.php file + +$a->config['system']['addon'] = "twitter, ..." + +Afterwards you need to add your OAuth consumer key / secret pair to it by +adding the following two lines + +$a->config['twitter']['consumerkey'] = 'your consumer KEY here'; +$a->config['twitter']['consumersecret'] = 'your consumer SECRET here'; + + +__ User Configuration __ + +When the OAuth consumer informations are correctly placed into the +configuration file and a user visits the "Plugin Settings" page they can now +connect to Twitter. To do so one has to follow the _Sign in with Twitter_ +button (the page will be opened in a new browser window/tab) and get a PIN from +Twitter. This PIN has to be entered on the settings page. After submitting the +PIN the plugin will get OAuth credentials identifying this user from the +Friendica account. + +If this first step was successful the Twitter configuration will be changed +on the "Plugin Settings" page displaying two check boxes. One to enable/disable +the forwarding of *all public* postings to Twitter and one to clear the +personal configuration from the Twitter credentials. + + From 5ad2d3c7f837f02873dd63078a8a1a9877f471c8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 5 Apr 2012 20:26:51 +0100 Subject: [PATCH 3/9] Remove tilde files --- facebook/README~ | 40 --- impressum/README~ | 18 -- openstreetmap/README~ | 27 -- smiley_pack/smiley_pack.php~ | 485 ----------------------------------- twitter/README~ | 91 ------- 5 files changed, 661 deletions(-) delete mode 100755 facebook/README~ delete mode 100755 impressum/README~ delete mode 100644 openstreetmap/README~ delete mode 100644 smiley_pack/smiley_pack.php~ delete mode 100755 twitter/README~ diff --git a/facebook/README~ b/facebook/README~ deleted file mode 100755 index 650ae1e3..00000000 --- a/facebook/README~ +++ /dev/null @@ -1,40 +0,0 @@ -Installing the Friendica/Facebook connector - -1. Visit https://developers.facebook.com/apps to register an app. - a) Click "Create a new app" - b) We'd be very happy if you include "Friendica" in the application name - to increase name recognition. - c) Edit your app settings on the setup page. The Friendica icons are present - in the images directory and may be uploaded as a Facebook app icon. Use - images/friendica-16.jpg for the Icon and images/Friendica-128.jpg for the logo. - d) In the App Display name enter the name of your app (this should default to the - name you chose in part a). - e) Enter YourDomain.com in the App Domain field and hit return. - f) In "Select how your app connects with Facebook select "Website" and enter the - full URL to your Friendica install including HTTPS and a trailing slash. - -2. Enable the Facebook plugin by clicking on the icon next to it's name on the plugin - page of your admin panel. - b) return to the Facebook plugin page in your admin panel, and fill in the App-ID - and Application Secret settings you got from Facebook. - c) Click save. - d) Finally, return to the Facebook settings page, and activate real-time updates. - -3. To use the Facebook plugin, visit the "connector settings" area of your settings - page. Click "Install Facebook Connector". -4. This will ask you to login to Facebook and allow the plugin to do it's stuff. - Allow it to do so. -5. You're done. To turn it off visit the Plugin Settings page again and - 'Remove Facebook posting'. - -Vidoes and embeds will not be posted if there is no other content. Links -and images will be converted to a format suitable for the Facebook API and -long posts truncated - with a link to view the full post. - -Facebook contacts will not be able to view private photos, as they are not able to -authenticate to your site to establish identity. We will address this -in a future release. - -Info: please make sure that you understand all aspects due to Friendica's -default licence which is: MIT License (further info: -https://github.com/friendica/friendica/blob/master/LICENSE) diff --git a/impressum/README~ b/impressum/README~ deleted file mode 100755 index 457729dc..00000000 --- a/impressum/README~ +++ /dev/null @@ -1,18 +0,0 @@ -Impressum Plugin for Friendica - -Author: Tobias Diekershoff - tobias.diekershoff@gmx.net - -License: 3-clause BSD license (same as Friendica) - -About - This plugin adds an Impressum block to the /friendica page with informations - about the page operator/owner and how to contact you in case of any questions. - - In the notes and postal fields you can use HTML tags for formatting. - -Configuration: - Simply fill in the fields in the impressium settings page in the plugins area - of your admin panel. - - diff --git a/openstreetmap/README~ b/openstreetmap/README~ deleted file mode 100644 index 5c731fac..00000000 --- a/openstreetmap/README~ +++ /dev/null @@ -1,27 +0,0 @@ - ____ OpenStreetMap Plugin ____ -by Mike Macgirvin - Klaus Weidenbach - -This addon allows you to use OpenStreetMap for displaying locations. - -___ Requirements ___ - -To use this plugin you need a tile Server that provides the maps. -OpenStreetMap data is free for everyone to use. Their tile servers are not. -Please take a look at their "Tile Usage Policy": -http://wiki.openstreetmap.org/wiki/Tile_usage_policy -You can run your own tile server or choose one from their list of public -tile servers: http://wiki.openstreetmap.org/wiki/TMS -Support the OpenStreetMap community and share the load. - -___ Configuration ___ - -Activate the plugin from your admin panel. - -You can now add a Tile Server and default zoom level in the plugin settings -page of your admin panel. - -The Time Server URL points to the tile server you want to use. Use the full URL, -with protocol (http/s) and trailing slash. You can configure the default zoom -level on the map in the Default Zoom box. 1 will show the whole world and 18 is the highest -zoom level available. diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~ deleted file mode 100644 index d85f9b5e..00000000 --- a/smiley_pack/smiley_pack.php~ +++ /dev/null @@ -1,485 +0,0 @@ -get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />'; - - $b['texts'][] = ':chick'; - $b['icons'][] = '' . ':chick' . ''; - - $b['texts'][] = ':bumblebee'; - $b['icons'][] = '' . ':bee' . ''; - - $b['texts'][] = ':ladybird'; - $b['icons'][] = '' . ':ladybird' . ''; - - $b['texts'][] = ':bigspider'; - $b['icons'][] = '' . ':bigspider' . ''; - - $b['texts'][] = ':cat'; - $b['icons'][] = '' . ':cat' . ''; - - $b['texts'][] = ':bunny'; - $b['icons'][] = '' . ':bunny' . ''; - - $b['texts'][] = ':chick'; - $b['icons'][] = '' . ':chick' . ''; - - $b['texts'][] = ':cow'; - $b['icons'][] = '' . ':cow' . ''; - - $b['texts'][] = ':crab'; - $b['icons'][] = '' . ':crab' . ''; - - $b['texts'][] = ':dolphin'; - $b['icons'][] = '' . ':dolphin' . ''; - - $b['texts'][] = ':dragonfly'; - $b['icons'][] = '' . ':dragonfly' . ''; - - $b['texts'][] = ':frog'; - $b['icons'][] = '' . ':frog' . ''; - - $b['texts'][] = ':hamster'; - $b['icons'][] = '' . ':hamster' . ''; - - $b['texts'][] = ':monkey'; - $b['icons'][] = '' . ':monkey' . ''; - - $b['texts'][] = ':horse'; - $b['icons'][] = '' . ':horse' . ''; - - $b['texts'][] = ':parrot'; - $b['icons'][] = '' . ':parrot' . ''; - - $b['texts'][] = ':tux'; - $b['icons'][] = '' . ':tux' . ''; - - $b['texts'][] = ':snail'; - $b['icons'][] = '' . ':snail' . ''; - - $b['texts'][] = ':sheep'; - $b['icons'][] = '' . ':sheep' . ''; - - $b['texts'][] = ':dog'; - $b['icons'][] = '' . ':dog' . ''; - - $b['texts'][] = ':elephant'; - $b['icons'][] = '' . ':elephant' . ''; - - $b['texts'][] = ':fish'; - $b['icons'][] = '' . ':fish' . ''; - - $b['texts'][] = ':giraffe'; - $b['icons'][] = '' . ':giraffe' . ''; - - $b['texts'][] = ':pig'; - $b['icons'][] = '' . ':pig' . ''; - - - -#Baby Smileys - - $b['texts'][] = ':baby'; - $b['icons'][] = '' . ':baby' . ''; - - $b['texts'][] = ':babycot'; - $b['icons'][] = '' . ':babycot' . ''; - - - $b['texts'][] = ':pregnant'; - $b['icons'][] = '' . ':pregnant' . ''; - - $b['texts'][] = ':stork'; - $b['icons'][] = '' . ':stork' . ''; - - -#Confused Smileys - $b['texts'][] = ':confused'; - $b['icons'][] = '' . ':confused' . ''; - - $b['texts'][] = ':shrug'; - $b['icons'][] = '' . ':shrug' . ''; - - $b['texts'][] = ':stupid'; - $b['icons'][] = '' . ':stupid' . ''; - - $b['texts'][] = ':dazed'; - $b['icons'][] = '' . ':dazed' . ''; - - -#Cool Smileys - - $b['texts'][] = ':affro'; - $b['icons'][] = '' . ':affro' . ''; - - $b['texts'][] = ':cool'; - $b['icons'][] = '' . ':cool' . ''; - -#Devil/Angel Smileys - - $b['texts'][] = ':angel'; - $b['icons'][] = '' . ':angel' . ''; - - $b['texts'][] = ':cherub'; - $b['icons'][] = '' . ':cherub' . ''; - - $b['texts'][] = ':devilangel'; - $b['icons'][] = '' . ':devilangel' . ''; - - $b['texts'][] = ':catdevil'; - $b['icons'][] = '' . ':catdevil' . ''; - - $b['texts'][] = ':devillish'; - $b['icons'][] = '' . ':devillish' . ''; - - $b['texts'][] = ':daseesaw'; - $b['icons'][] = '' . ':daseesaw' . ''; - - $b['texts'][] = ':turnevil'; - $b['icons'][] = '' . ':turnevil' . ''; - - $b['texts'][] = ':saint'; - $b['icons'][] = '' . ':saint' . ''; - - $b['texts'][] = ':graveside'; - $b['icons'][] = '' . ':graveside' . ''; - -#Unpleasent smileys. - - $b['texts'][] = ':toilet'; - $b['icons'][] = '' . ':toilet' . ''; - - $b['texts'][] = ':fartinbed'; - $b['icons'][] = '' . ':fartinbed' . ''; - - $b['texts'][] = ':vomit'; - $b['icons'][] = '' . ':vomit' . ''; - - $b['texts'][] = ':fartblush'; - $b['icons'][] = '' . ':fartblush' . ''; - -#Drinks - - $b['texts'][] = ':tea'; - $b['icons'][] = '' . ':tea' . ''; - - $b['texts'][] = ':drool'; - $b['icons'][] = '' . ':drool' . ''; - -#Sad smileys - - $b['texts'][] = ':crying'; - $b['icons'][] = '' . ':crying' . ''; - - $b['texts'][] = ':prisoner'; - $b['icons'][] = '' . ':prisoner' . ''; - -#Smoking - only one smiley in here, maybe it needs moving elsewhere? - - $b['texts'][] = ':smoking'; - $b['icons'][] = '' . ':smoking' . ''; - -#Sport smileys - - $b['texts'][] = ':basketball'; - $b['icons'][] = '' . ':basketball' . ''; - - $b['texts'][] = ':bowling'; - $b['icons'][] = '' . ':bowling' . ''; - - $b['texts'][] = ':cycling'; - $b['icons'][] = '' . ':cycling' . ''; - - $b['texts'][] = ':darts'; - $b['icons'][] = '' . ':darts' . ''; - - $b['texts'][] = ':fencing'; - $b['icons'][] = '' . ':fencing' . ''; - - $b['texts'][] = ':golf'; - $b['icons'][] = '' . ':golf' . ''; - - $b['texts'][] = ':juggling'; - $b['icons'][] = '' . ':juggling' . ''; - - $b['texts'][] = ':skipping'; - $b['icons'][] = '' . ':skipping' . ''; - - $b['texts'][] = ':archery'; - $b['icons'][] = '' . ':archery' . ''; - - $b['texts'][] = ':football'; - $b['icons'][] = '' . ':football' . ''; - - $b['texts'][] = ':surfing'; - $b['icons'][] = '' . ':surfing' . ''; - - $b['texts'][] = ':snooker'; - $b['icons'][] = '' . ':snooker' . ''; - - $b['texts'][] = ':tennis'; - $b['icons'][] = '' . ':tennis' . ''; - - $b['texts'][] = ':horseriding'; - $b['icons'][] = '' . ':horseriding' . ''; - -#Love smileys - - $b['texts'][] = ':iloveyou'; - $b['icons'][] = '' . ':iloveyou' . ''; - - $b['texts'][] = ':inlove'; - $b['icons'][] = '' . ':inlove' . ''; - - $b['texts'][] = '~love'; - $b['icons'][] = '' . ':love' . ''; - - $b['texts'][] = ':lovebear'; - $b['icons'][] = '' . ':lovebear' . ''; - - $b['texts'][] = ':lovebed'; - $b['icons'][] = '' . ':lovebed' . ''; - - $b['texts'][] = ':loveheart'; - $b['icons'][] = '' . ':loveheart' . ''; - -#Tired/Sleep smileys - - $b['texts'][] = ':countsheep'; - $b['icons'][] = '' . ':countsheep' . ''; - - $b['texts'][] = ':hammock'; - $b['icons'][] = '' . ':hammock' . ''; - - $b['texts'][] = ':pillow'; - $b['icons'][] = '' . ':pillow' . ''; - -#Fight/Flame/Violent smileys - - $b['texts'][] = ':2guns'; - $b['icons'][] = '' . ':2guns' . ''; - - $b['texts'][] = ':alienfight'; - $b['icons'][] = '' . ':alienfight' . ''; - - $b['texts'][] = ':army'; - $b['icons'][] = '' . ':army' . ''; - - $b['texts'][] = ':arrowhead'; - $b['icons'][] = '' . ':arrowhead' . ''; - - $b['texts'][] = ':bfg'; - $b['icons'][] = '' . ':bfg' . ''; - - $b['texts'][] = ':bowman'; - $b['icons'][] = '' . ':bowman' . ''; - - $b['texts'][] = ':chainsaw'; - $b['icons'][] = '' . ':chainsaw' . ''; - - $b['texts'][] = ':crossbow'; - $b['icons'][] = '' . ':crossbow' . ''; - - $b['texts'][] = ':crusader'; - $b['icons'][] = '' . ':crusader' . ''; - - $b['texts'][] = ':dead'; - $b['icons'][] = '' . ':dead' . ''; - - $b['texts'][] = ':hammersplat'; - $b['icons'][] = '' . ':hammersplat' . ''; - - $b['texts'][] = ':lasergun'; - $b['icons'][] = '' . ':lasergun' . ''; - - $b['texts'][] = ':machinegun'; - $b['icons'][] = '' . ':machinegun' . ''; - - $b['texts'][] = ':marine'; - $b['icons'][] = '' . ':marine' . ''; - - $b['texts'][] = ':sabre'; - $b['icons'][] = '' . ':sabre' . ''; - - $b['texts'][] = ':tank'; - $b['icons'][] = '' . ':tank' . ''; - - $b['texts'][] = ':viking'; - $b['icons'][] = '' . ':viking' . ''; - - $b['texts'][] = ':gangs'; - $b['icons'][] = '' . ':gangs' . ''; - - $b['texts'][] = ':acid'; - $b['icons'][] = '' . ':acid' . ''; - -#Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys - - $b['texts'][] = ':alienmonster'; - $b['icons'][] = '' . ':alienmonster' . ''; - - $b['texts'][] = ':barbarian'; - $b['icons'][] = '' . ':barbarian' . ''; - - $b['texts'][] = ':dinosaur'; - $b['icons'][] = '' . ':dinosaur' . ''; - - $b['texts'][] = ':dragon'; - $b['icons'][] = '' . ':dragon' . ''; - - $b['texts'][] = ':draco'; - $b['icons'][] = '' . ':draco' . ''; - - $b['texts'][] = ':ghost'; - $b['icons'][] = '' . ':ghost' . ''; - - $b['texts'][] = ':mummy'; - $b['icons'][] = '' . ':mummy' . ''; - -#Food smileys - - $b['texts'][] = ':apple'; - $b['icons'][] = '' . ':apple' . ''; - - $b['texts'][] = ':broccoli'; - $b['icons'][] = '' . ':brocolli' . ''; - - $b['texts'][] = ':cake'; - $b['icons'][] = '' . ':cake' . ''; - - $b['texts'][] = ':carrot'; - $b['icons'][] = '' . ':carrot' . ''; - - $b['texts'][] = ':popcorn'; - $b['icons'][] = '' . ':popcorn' . ''; - - $b['texts'][] = ':tomato'; - $b['icons'][] = '' . ':tomato' . ''; - - $b['texts'][] = ':banana'; - $b['icons'][] = '' . ':banana' . ''; - - $b['texts'][] = ':cooking'; - $b['icons'][] = '' . ':cooking' . ''; - - $b['texts'][] = ':fryegg'; - $b['icons'][] = '' . ':fryegg' . ''; - -#Happy smileys - - $b['texts'][] = ':cloud9'; - $b['icons'][] = '' . ':cloud9' . ''; - - $b['texts'][] = ':tearsofjoy'; - $b['icons'][] = '' . ':tearsofjoy' . ''; - -#Repsect smileys - - $b['texts'][] = ':bow'; - $b['icons'][] = '' . ':bow' . ''; - - $b['texts'][] = ':bravo'; - $b['icons'][] = '' . ':bravo' . ''; - - $b['texts'][] = ':hailking'; - $b['icons'][] = '' . ':hailking' . ''; - - $b['texts'][] = ':number1'; - $b['icons'][] = '' . ':number1' . ''; - -#Laugh smileys - - $b['texts'][] = ':hahaha'; - $b['icons'][] = '' . ':hahaha' . ''; - - $b['texts'][] = ':loltv'; - $b['icons'][] = '' . ':loltv' . ''; - - $b['texts'][] = ':rofl'; - $b['icons'][] = '' . ':rofl' . ''; - -#Music smileys - - $b['texts'][] = ':dj'; - $b['icons'][] = '' . ':dj' . ''; - - $b['texts'][] = ':drums'; - $b['icons'][] = '' . ':drums' . ''; - - $b['texts'][] = ':elvis'; - $b['icons'][] = '' . ':elivs' . ''; - - $b['texts'][] = ':guitar'; - $b['icons'][] = '' . ':guitar' . ''; - - $b['texts'][] = ':trumpet'; - $b['icons'][] = '' . ':trumpet' . ''; - - $b['texts'][] = ':violin'; - $b['icons'][] = '' . ':violin' . ''; - -#Smileys that used to be in core - - $b['texts'][] = ':headbang'; - $b['icons'][] = '' . ':headbang' . ''; - - $b['texts'][] = ':beard'; - $b['icons'][] = '' . ':beard' . ''; - - $b['texts'][] = ':whitebeard'; - $b['icons'][] = '' . ':whitebeard' . ''; - - $b['texts'][] = ':shaka'; - $b['icons'][] = '' . ':shaka' . ''; - - $b['texts'][] = ':\\.../'; - $b['icons'][] = '' . ':\\.../' . ''; - - $b['texts'][] = ':\\ooo/'; - $b['icons'][] = '' . ':\\ooo/' . ''; - - $b['texts'][] = ':headdesk'; - $b['icons'][] = '' . ':headdesk' . ''; - -#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories - - $b['texts'][] = ':-d'; - $b['icons'][] = '' . ':-d' . ''; - - $b['texts'][] = ':-o'; - $b['icons'][] = '' . ':-o' . ''; - - - - -} diff --git a/twitter/README~ b/twitter/README~ deleted file mode 100755 index 3b8f0e85..00000000 --- a/twitter/README~ +++ /dev/null @@ -1,91 +0,0 @@ -____ Twitter Plugin ____ -By Tobias Diekershoff - tobias.diekershoff(at)gmx.net - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! This addon is currently under development. If you have any problem !! -!! with it, please contact the Author. !! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -With this addon to Friendica you can give your user the possibility to post -their *public* messages to Twitter. The messages will be strapped their rich -context and shortened to 140 characters length if necessary. If shortening of -the message was performed a link will be added to the Tweet pointing to the -original message on your server. - -There is a similar addon for forwarding public messages to -"StatusNet":http://status.net [[StatusNet Plugin]]. - -Online version of this document: http://ur1.ca/35mml - -___ Requirements ___ - -To use this plugin you have to register your Friendica instance as an -_client application_ for Twitter with _read and write_ access, we do not intend -to use Twitter for login. The registration can be done at twitter.com/apps -and you need to have a Twitter account to do so. - -After you registered the application you get an OAuth consumer key / secret -pair that identifies your app, you will need them for configuration. - -The inclusion of a shorturl for the original posting in cases when the -message was longer than 140 characters requires it, that you have *PHP5+* and -*curl* on your server. - -___ Where to find ___ - -In the Friendica git repository /addon/twitter/, this directory contains -all required PHP files (including the Twitter OAuth library [1] by Abraham -Williams, MIT licensed and the Slinky library [2] by Beau Lebens, BSD license), -a CSS file for styling of the user configuration and an image to _Sign in with -Twitter_. - -[1] https://github.com/abraham/twitteroauth -[2] http://dentedreality.com.au/projects/slinky/ - -___ Configuration ___ - -__ Global Configuration __ - -If you enabled an administrator account, please use the admin panel to cofigure -the Twitter relay. If you for any reason prefer to use a configuration file instead -of the admin panels, please refer to the Alternative Configuration below. - -Activate the plugin from the plugins section of your admin panel. When you have -done so, add your consumer key and consumer secret in the settings section of the -plugin page. - -When this is done your user can now configure their Twitter connection at -"Settings -> Plugin Settings" and enable the forwarding of their *public* -messages to Twitter. - -__ Alternative Configuration __ - --To activate this addon add @twitter@ to the list of active addons in your -.htconfig.php file - -$a->config['system']['addon'] = "twitter, ..." - -Afterwards you need to add your OAuth consumer key / secret pair to it by -adding the following two lines - -$a->config['twitter']['consumerkey'] = 'your consumer KEY here'; -$a->config['twitter']['consumersecret'] = 'your consumer SECRET here'; - - -__ User Configuration __ - -When the OAuth consumer informations are correctly placed into the -configuration file and a user visits the "Plugin Settings" page they can now -connect to Twitter. To do so one has to follow the _Sign in with Twitter_ -button (the page will be opened in a new browser window/tab) and get a PIN from -Twitter. This PIN has to be entered on the settings page. After submitting the -PIN the plugin will get OAuth credentials identifying this user from the -Friendica account. - -If this first step was successful the Twitter configuration will be changed -on the "Plugin Settings" page displaying two check boxes. One to enable/disable -the forwarding of *all public* postings to Twitter and one to clear the -personal configuration from the Twitter credentials. - - From 4b384b9345cef316c46a06cace15e79f972d3100 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 6 Apr 2012 10:35:29 +0200 Subject: [PATCH 4/9] SN/Twitter relay updated the README file --- statusnet/README | 33 ++++++++++++++++++++++++++++----- twitter/README | 8 ++++---- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/statusnet/README b/statusnet/README index 32c11c7e..f172f2ce 100755 --- a/statusnet/README +++ b/statusnet/README @@ -42,12 +42,35 @@ ___ Configuration ___ __ Global Configuration __ -If you enabled an administrator account, please use the admin panel to cofigure -the StatusNet relay. +If you have configured an admin account, you can configure this plugin from +the admin panel. First activate it from the plugin section of the panel. +Afterwards you will have a separate configuration page for the plugin, where +you can provide a set of globally available OAuth credentials for different +StatusNet pages which will be available for all users of your server. -To activate this addon add statusnet to the list of active addons in your -.htconfig.php file - $a->config['system']['addon'] = "statusnet, ...". +If you don't use the admin panel, you can configure the relay using the +.htconfig.php file of your friendica installation. To activate the relay add +it's name to the list of activated addons. + + $a->config['system']['addon'] = "statusnet, ..." + +If you want to provide preconfigured StatusNet instances for your user add the +credentials for them by adding + +$a->config['statusnet']['sites'] = array ( + array ('sitename' => 'identi.ca', 'apiurl' => 'https://identi.ca/api/', + 'consumersecret' => 'OAuth Consumer Secret here', 'consumerkey' => 'OAuth + Consumer Key here'), + array ('sitename' => 'Some other Server', 'apiurl' => + 'http://status.example.com/api/', 'consumersecret' => 'OAuth + Consumer Secret here', 'consumerkey' => 'OAuth Consumer Key here') +); + +to the config file. + +Regardless of providing global OAuth credentials for your users or not, they +can always add their own OAuth-Key and -Secret thus enable the relay for any +StatusNet instance they may have an account at. __ User Configuration __ diff --git a/twitter/README b/twitter/README index 3b8f0e85..56dbc7e2 100755 --- a/twitter/README +++ b/twitter/README @@ -47,8 +47,8 @@ ___ Configuration ___ __ Global Configuration __ -If you enabled an administrator account, please use the admin panel to cofigure -the Twitter relay. If you for any reason prefer to use a configuration file instead +If you enabled an administrator account, please use the admin panel to configure +the Twitter relay. If you for any reason prefer to use a configuration file instead of the admin panels, please refer to the Alternative Configuration below. Activate the plugin from the plugins section of your admin panel. When you have @@ -56,12 +56,12 @@ done so, add your consumer key and consumer secret in the settings section of th plugin page. When this is done your user can now configure their Twitter connection at -"Settings -> Plugin Settings" and enable the forwarding of their *public* +"Settings -> Connector Settings" and enable the forwarding of their *public* messages to Twitter. __ Alternative Configuration __ --To activate this addon add @twitter@ to the list of active addons in your +To activate this addon add @twitter@ to the list of active addons in your .htconfig.php file $a->config['system']['addon'] = "twitter, ..." From 75dd08fa736132f512ed7644ab968c9cd4004020 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 6 Apr 2012 14:34:47 +0200 Subject: [PATCH 5/9] Impressum: added optional page footer --- impressum/README | 4 +++- impressum/admin.tpl | 1 + impressum/impressum.css | 4 ++++ impressum/impressum.php | 24 ++++++++++++++++++------ 4 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 impressum/impressum.css diff --git a/impressum/README b/impressum/README index bea55db2..af8f5e0d 100755 --- a/impressum/README +++ b/impressum/README @@ -3,7 +3,7 @@ Impressum Plugin for Friendica Author: Tobias Diekershoff tobias.diekershoff@gmx.net -License: 3-clause BSD license (same as Friendica) +License: 3-clause BSD license About This plugin adds an Impressum block to the /friendica page with informations @@ -29,3 +29,5 @@ following variables in the .htconfig file you can be reached at (optional) * $a->config['impressum']['notes'] additional informations that should be displayed in the Impressum block + * $a->config['impressum']['footer_text'] Text that will be displayed at + the bottom of the pages. diff --git a/impressum/admin.tpl b/impressum/admin.tpl index cfba8df7..849c11f9 100755 --- a/impressum/admin.tpl +++ b/impressum/admin.tpl @@ -3,4 +3,5 @@ {{ inc field_input.tpl with $field=$postal }}{{ endinc }} {{ inc field_input.tpl with $field=$notes }}{{ endinc }} {{ inc field_input.tpl with $field=$email }}{{ endinc }} +{{ inc field_input.tpl with $field=$footer_text }}{{ endinc }}
diff --git a/impressum/impressum.css b/impressum/impressum.css new file mode 100644 index 00000000..ec0b5e57 --- /dev/null +++ b/impressum/impressum.css @@ -0,0 +1,4 @@ +#impressum_footer { + padding-top: 15px; + font-size: 0.8em; +} diff --git a/impressum/impressum.php b/impressum/impressum.php index ce9790bb..c037b9a9 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -2,18 +2,20 @@ /** * Name: Impressum * Description: Plugin to add contact information to the about page (/friendica) - * Version: 1.0 + * Version: 1.1 * Author: Tobias Diekershoff * License: 3-clause BSD license */ function impressum_install() { register_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); + register_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); logger("installed impressum plugin"); } function impressum_uninstall() { unregister_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); + unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); logger("uninstalled impressum plugin"); } function obfuscate_email ($s) { @@ -21,6 +23,13 @@ function obfuscate_email ($s) { $s = str_replace('.','(dot)',$s); return $s; } +function impressum_footer($a, &$b) { + $text = get_config('impressum','footer_text'); + if (! $text == '') { + $a->page['htmlhead'] .= '\r\n'; + $b .= ''; + } +} function impressum_show($a,&$b) { $b .= '

'.t('Impressum').'

'; $owner = get_config('impressum', 'owner'); @@ -56,21 +65,24 @@ function impressum_plugin_admin_post (&$a) { $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : ''); $notes = ((x($_POST, 'notes')) ? (trim($_POST['notes'])) : ''); $email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : ''); + $footer_text = ((x($_POST, 'footer_text')) ? (trim($_POST['footer_text'])) : ''); set_config('impressum','owner',$owner); set_config('impressum','ownerprofile',$ownerprofile); set_config('impressum','postal',$postal); set_config('impressum','email',$email); set_config('impressum','notes',$notes); + set_config('impressum','footer_text',$footer_text); info( t('Settings updated.'). EOL ); } function impressum_plugin_admin (&$a, &$o) { $t = file_get_contents( dirname(__file__). "/admin.tpl" ); $o = replace_macros($t, array( '$submit' => t('Submit'), - '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), ''), - '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), ''), - '$postal' => array('postal', t('Postal Address'), get_config('impressum','postal'), ''), - '$notes' => array('notes', t('Notes'), get_config('impressum','notes'), ''), - '$email' => array('email', t('Email Address'), get_config('impressum','email'), ''), + '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')), + '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')), + '$postal' => array('postal', t('Postal Address'), get_config('impressum','postal'), t('How to contact the operator via snail mail.')), + '$notes' => array('notes', t('Notes'), get_config('impressum','notes'), t('Additional notes that are displayed beneath the contact information.')), + '$email' => array('email', t('Email Address'), get_config('impressum','email'), t('How to contact the operator via email. (will be displayed obfuscated)')), + '$footer_text' => array('footer_text', t('Footer note'), get_config('impressum','footer_text'), t('Text for the footer.')), )); } From 26dec371bbb7d0b141610fdd9f8b061ad1d290fd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 6 Apr 2012 19:37:23 +0200 Subject: [PATCH 6/9] SN/T: since inclusion of the title 2xMax_Char is too short, increasing that --- statusnet/statusnet.php | 4 ++-- twitter/twitter.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 897c5415..13f3f7e2 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -435,9 +435,9 @@ function statusnet_post_hook(&$a,&$b) { // shorten all the links in a 200000 character long essay. if (! $b['title']=='') { $tmp = $b['title'] . ' : '. $b['body']; - $tmp = substr($tmp, 0, 2*$max_char); + $tmp = substr($tmp, 0, 4*$max_char); } else { - $tmp = substr($b['body'], 0, 2*$max_char); + $tmp = substr($b['body'], 0, 3*$max_char); } // if [url=bla][img]blub.png[/img][/url] get blub.png $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp); diff --git a/twitter/twitter.php b/twitter/twitter.php index 006c1615..8a072fa2 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -301,9 +301,9 @@ function twitter_post_hook(&$a,&$b) { // shorten all the links in a 200000 character long essay. if (! $b['title']=='') { $tmp = $b['title'] . ' : '. $b['body']; - $tmp = substr($tmp, 0, 2*$max_char); + $tmp = substr($tmp, 0, 4*$max_char); } else { - $tmp = substr($b['body'], 0, 2*$max_char); + $tmp = substr($b['body'], 0, 3*$max_char); } // if [url=bla][img]blub.png[/img][/url] get blub.png $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp); From f245b1478fb716ac21f3e4aa7184c166d0682e22 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 7 Apr 2012 07:02:55 +0200 Subject: [PATCH 7/9] SN: avoide to send broken last words to SN when shorten a message --- statusnet/statusnet.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 13f3f7e2..62ee8e8b 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -480,7 +480,13 @@ function statusnet_post_hook(&$a,&$b) { $shortlink = short_link( $b['plink'] ); // the new message will be shortened such that "... $shortlink" // will fit into the character limit - $msg = substr($msg, 0, $max_char-strlen($shortlink)-4); + $msg = nl2br(substr($msg, 0, $max_char-strlen($shortlink)-4)); + $msg = str_replace(array('
','
'),' ',$msg); + $e = explode(' ', $msg); + // remove the last word from the cut down message to + // avoid sending cut words to the MicroBlog + array_pop($e); + $msg = implode(' ', $e); $msg .= '... ' . $shortlink; } // and now tweet it :-) From a12d68066bd9b93fe385c8867ad132e8282e1f65 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 7 Apr 2012 07:07:55 +0200 Subject: [PATCH 8/9] Twitter: avooid sending broken words at the end of a Tweet --- twitter/twitter.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 8a072fa2..1dfc7391 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -345,7 +345,13 @@ function twitter_post_hook(&$a,&$b) { $shortlink = short_link( $b['plink'] ); // the new message will be shortened such that "... $shortlink" // will fit into the character limit - $msg = substr($msg, 0, $max_char-strlen($shortlink)-4); + $msg = nl2br(substr($msg, 0, $max_char-strlen($shortlink)-4)); + $msg = str_replace(array('
','
'),' ',$msg); + $e = explode(' ', $msg); + // remove the last word from the cut down message to + // avoid sending cut words to the MicroBlog + array_pop($e); + $msg = implode(' ', $e); $msg .= '... ' . $shortlink; } // and now tweet it :-) From 1a99b8a4ea72dae581ef8b3159e8b54653eaf9ab Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 7 Apr 2012 09:21:49 +0200 Subject: [PATCH 9/9] small change in my contact informations in the addon files --- impressum/README | 1 + impressum/impressum.php | 4 ++-- piwik/README | 8 ++++++++ piwik/piwik.php | 4 ++-- statusnet/README | 1 + statusnet/statusnet.php | 2 +- twitter/README | 1 + twitter/twitter.php | 2 +- 8 files changed, 17 insertions(+), 6 deletions(-) diff --git a/impressum/README b/impressum/README index af8f5e0d..fcf29aaf 100755 --- a/impressum/README +++ b/impressum/README @@ -1,6 +1,7 @@ Impressum Plugin for Friendica Author: Tobias Diekershoff + http://diekershoff.homeunix.net/friendika/profile/tobias tobias.diekershoff@gmx.net License: 3-clause BSD license diff --git a/impressum/impressum.php b/impressum/impressum.php index c037b9a9..76002279 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -3,7 +3,7 @@ * Name: Impressum * Description: Plugin to add contact information to the about page (/friendica) * Version: 1.1 - * Author: Tobias Diekershoff + * Author: Tobias Diekershoff * License: 3-clause BSD license */ @@ -26,7 +26,7 @@ function obfuscate_email ($s) { function impressum_footer($a, &$b) { $text = get_config('impressum','footer_text'); if (! $text == '') { - $a->page['htmlhead'] .= '\r\n'; + $a->page['htmlhead'] .= ''; $b .= ''; } } diff --git a/piwik/README b/piwik/README index e276ccd4..c648a4d1 100755 --- a/piwik/README +++ b/piwik/README @@ -1,6 +1,7 @@ ## Piwik Plugin ## by Tobias Diekershoff + http://diekershoff.homeunix.net/friendika/profile/tobias tobias.diekershoff(at)gmx.net This addon allows you to embed the code necessary for the FLOSS webanalytics @@ -19,6 +20,13 @@ styling the opt-out notice. ### Configuration ### +The easiest way to configure this addon is by activating the admin panels of +your ~friendica server and then enter the needed details on the config page +for the addon. + +If you don't want to use the admin panel, you can configure the addon through +the .htconfig file. + Open the .htconfig.php file and add "piwik" to the list of activated addons. $a->config['system']['addon'] = "piwik, ..." diff --git a/piwik/piwik.php b/piwik/piwik.php index dbb1f45a..3e0d718f 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -3,7 +3,7 @@ * Name: Piwik Analytics * Description: Piwik Analytics Plugin for Friendica * Version: 1.1 - * Author: Tobias Diekershoff + * Author: Tobias Diekershoff * Author: Klaus Weidenbach */ @@ -49,7 +49,7 @@ function piwik_analytics($a,&$b) { * associated CSS file. We just have to tell Friendica to get it * into the page header. */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= ''; /* * Get the configuration variables from the .htconfig file. diff --git a/statusnet/README b/statusnet/README index f172f2ce..df0412d0 100755 --- a/statusnet/README +++ b/statusnet/README @@ -1,5 +1,6 @@ ____ StatusNet Plugin ____ by Tobias Diekershoff + http://diekershoff.homeunix.net/friendika/profile/tobias tobias.diekershoff(at)gmx.net !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 62ee8e8b..c4100e88 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -3,7 +3,7 @@ * Name: StatusNet Connector * Description: Relay public postings to a connected StatusNet account * Version: 1.0.4 - * Author: Tobias Diekershoff + * Author: Tobias Diekershoff */ /* StatusNet Plugin for Friendica diff --git a/twitter/README b/twitter/README index 56dbc7e2..12bb6664 100755 --- a/twitter/README +++ b/twitter/README @@ -1,5 +1,6 @@ ____ Twitter Plugin ____ By Tobias Diekershoff + http://diekershoff.homeunix.net/friendika/profile/tobias tobias.diekershoff(at)gmx.net !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/twitter/twitter.php b/twitter/twitter.php index 1dfc7391..32b4980f 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -3,7 +3,7 @@ * Name: Twitter Connector * Description: Relay public postings to a connected Twitter account * Version: 1.0.3 - * Author: Tobias Diekershoff + * Author: Tobias Diekershoff */