Merge remote-tracking branch 'upstream/master'

blackout/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2012 Tobias Diekershoff
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

blackout/README.md

@@ -1,11 +1,12 @@
-Name: blackout
+blackout addon
-Description: Blackout your ~friendica node during a given period
+==============
-License: MIT
+* Description: Blackout your ~friendica node during a given period
-Version: 1.0
+* License: [MIT](http://opensource.org/licenses/MIT)
-Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/~tobias>
+* Version: 1.0
+* Author: Tobias Diekershoff
 
 About
-=====
+-----
 
 This plugin will allow you to enter a date/time period during which
 all your ~friendica visitors from the web will be redirected to a page
@@ -21,12 +22,12 @@ the entered time periode and fix typos without having to hack the
 database directly.
 
 Requirements
-============
+-------------
 
-THIS ADDON REQUIRES PHP VERSION 5.3 OR HIGHER.
+**THIS ADDON REQUIRES PHP VERSION 5.3 OR HIGHER.**
 
 License
-=======
+-------
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

buglink/buglink.php

@@ -12,4 +12,4 @@ function buglink_install() { register_hook('page_end', 'addon/buglink/buglink.ph
 
 function buglink_uninstall() { unregister_hook('page_end', 'addon/buglink/buglink.php', 'buglink_active'); }
 
-function buglink_active(&$a,&$b) { $b .= '<div style="position: fixed; bottom: 5px; left: 5px;"><a href="http://bugs.friendica.com" target="_blank" title="' . t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . t('Report Bug') . '" /></a></div>'; } 
+function buglink_active(&$a,&$b) { $b .= '<div style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" title="' . t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . t('Report Bug') . '" /></a></div>'; } 

impressum/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2011-2013 Tobias Diekershoff
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    * copyright notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

impressum/README

@@ -1,34 +0,0 @@
-Impressum Plugin for Friendica
-
-Author: Tobias Diekershoff
-        http://diekershoff.homeunix.net/friendika/profile/tobias
-        tobias.diekershoff@gmx.net
-
-License: 3-clause BSD license
-
-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.
- 
-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
-  * $a->config['impressum']['footer_text']     Text that will be displayed at
-                                               the bottom of the pages.

impressum/README.md

@@ -0,0 +1,38 @@
+Impressum Plugin for Friendica
+==============================
+
+* Author: Tobias Diekershoff
+* License: [3-clause BSD](http://opensource.org/licenses/BSD-3-Clause) license
+  (see the LICENSE file in the addon directory)
+
+About
+-----
+This plugin adds an Impressum (contact) 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 bbcode tags for formatting, like in
+normal friendica postings..
+
+Configuration
+-------------
+Simply fill in the fields in the impressium settings page in the plugins 
+area of your admin panel. For email adresses the "@" symbol will be obfuscated
+in the source of the page to make in harder for harvesting tools.
+
+Manual Configuration
+--------------------
+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
+	$a->config['impressum']['footer_text']     Text that will be displayed at
+	                                           the bottom of the pages.

mathjax/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2011-2013 Tobias Diekershoff
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    * copyright notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

mathjax/README

@@ -1,31 +0,0 @@
-Addon for Friendika to include MathJax (LaTeX math syntax)
-
-This addon lets your users use LaTeX to type mathematical formulas
-within their posts. MathJax takes care about the best method for the
-browser to display the formula and provides compatibility to 99%
-of the modern browsers.
-
-You can either use the MathJax CDN online, thus loading the required javascript
-libraries from the MathJax cloud, or use a local installation of MathJax.
-Please see the plugin settings in the admin panel for configuration possibles.
-If you don't set up a local MathJax instance, leave the configuration untouched
-it will fall back to the MathJax cloud as default value.
-
-If you don't use the admin panel add mathjax to the list of active addons
-
-$a->config['system']['addon'] = [..., mathjax, ...]
-
-To select the source of the included javascript libraries add a line
-
-$a->config['mathjax']['baseurl'] = 'the URL to your MathJax installation';
-
-to your .htconfig.php file. If this line is not there, the addon assumes that
-you want to use the MathJax cloud (CDN).
-
-Please note that your usage of the CDN is governed by the "MathJax CDN Terms of
-Service" see http://www.mathjax.org/download/mathjax-cdn-terms-of-service/
-
-Author:  Tobias Diekershoff
-         http://diekershoff.homeunix.net/friendika/profile/tobias
-         email: tobias.diekershoff@gmx.net
-

mathjax/README.md

@@ -0,0 +1,43 @@
+MathJax Addon
+=============
+
+* Author: Tobias Diekershoff
+* License: [3-clause BSD](http://opensource.org/licenses/BSD-3-Clause) license
+  (see the LICENSE file in the addon directory)
+
+About
+-----
+
+This addon for friendica includes the [MathJax][1] CDN to enable rendering of
+[LaTeX][2] formulae in your friendica postings.
+
+Configuration
+-------------
+All you need to do is provide friendica with the base URL of MathJax. This can
+be either the URL of the CDN of MathJax or your own installation.
+
+In case you want to use the CDN you can try the following URL as a quick start
+
+	http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML
+
+In case you don't want or can use the admin panel of firneidca you can activate
+the addon by adding _mathjax_ to the 
+
+	$a->config['system']['addon']
+
+list in your .htconfig.php file and then providing the base URL after that
+
+	 $a->config['mathjax']['baseurl'] = 'the URL to your MathJax installation';
+
+Usage
+=====
+
+Once the addon is configured you can use LaTeX syntax in your postings to share
+formulae with your contacts. But remember that the formulae are rendered in the
+browser of the user thus your contacts need to activate this addon as well. If
+they don't they will only see the LaTeX syntax in your texts.
+
+Just enclose your equations in $$...$$ pairs like e.g. $$f_c(x)=ax+b$$.
+
+[1]: http://www.mathjax.org/
+[2]: https://en.wikipedia.org/wiki/LaTeX

mathjax/mathjax.php

@@ -72,6 +72,7 @@ function mathjax_plugin_admin (&$a, &$o) {
 	}
 
 	$o = replace_macros( $t, array(
+		'$submit' => t('Submit'),
 		'$baseurl' => array('baseurl', t('MathJax Base URL'), get_config('mathjax','baseurl' ), t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')),
 	));
 }

piwik/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2011-2013 Tobias Diekershoff, Klaus Weidenbach
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    * copyright notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

piwik/README.md

@@ -1,24 +1,24 @@
-## Piwik Plugin ##
+Piwik Plugin
+============
 
-by Tobias Diekershoff 
+by Tobias Diekershoff and Klaus Weidenbach
-   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
 tool Piwik into the Friendica pages.
 
-[Online version of this Document](http://ur1.ca/35m2x)
+Requirements
-
+------------
-### Requirements ###
 
 To use this plugin you need a [piwik](http://piwik.org/) installation.
 
-### Where to find ###
+Where to find
+-------------
 
-In the Friendica git repository `/addon/piwik/piwik.php` and a CSS file for
+In the Friendica addon git repository `/piwik/piwik.php` and a CSS file for
 styling the opt-out notice.
 
-### Configuration ###
+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
@@ -38,20 +38,31 @@ You have to add 4 more configuration variables for the addon:
     $a->config['piwik']['optout'] = true;
     $a->config['piwik']['async'] = false;
 
-The *baseurl* points to your Piwik installation. Use the absolute path,
+Configuration fields
+---------------------
+
+* The *baseurl* points to your Piwik installation. Use the absolute path,
 remember trailing slashes but ignore the protocol (http/s) part of the URL.
-Change the *sideid* parameter to whatever ID you want to use for tracking your
+* Change the *sideid* parameter to whatever ID you want to use for tracking your
-Friendica installation. The *optout* parameter (true|false) defines whether or
+Friendica installation.
+* The *optout* parameter (true|false) defines whether or
 not a short notice about the utilization of Piwik will be displayed on every
 page of your Friendica site (at the bottom of the page with some spacing to the
 other content). Part of the note is a link that allows the visitor to set an
 _opt-out_ cookie which will prevent visits from that user be tracked by piwik.
+* The *async* parameter (true|false) defines whether or not to use asynchronous
+tracking so pages load (or appear to load) faster.
 
 Currently the optional notice states the following:
 
-    This website is tracked using the Piwik analytics tool. If you do not want
+>    This website is tracked using the Piwik analytics tool. If you do not want
-    that your visits are logged this way you can set a cookie to prevent Piwik
+>    that your visits are logged this way you can set a cookie to prevent Piwik
-    from tracking further visits of the site (opt-out).
+>    from tracking further visits of the site (opt-out).
 
-The *async* parameter (true|false) defines whether or not to use asynchronous
+License
-tracking so pages load (or appear to load) faster.
+=======
+
+The _Piwik addon_ is licensed under the [3-clause BSD license][3] see the
+LICENSE file in the addons directory.
+
+[3]: http://opensource.org/licenses/BSD-3-Clause

statusnet/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2011-2013 Tobias Diekershoff, Michael Vogel
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    * copyright notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

statusnet/README

@@ -1,102 +0,0 @@
-____ StatusNet Plugin ____
-by Tobias Diekershoff
-   http://diekershoff.homeunix.net/friendika/profile/tobias
-   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 any StatusNet instance (like identi.ca for example). 
-The messages will be strapped their rich context and shortened to to the character
-limit of the StatusNet instance in question if necessary. If shortening of the
-message was performed a link will be added to the notice pointing to the
-original message on your server.
-
-There is a similar plugin to forward public messages to Twitter: Twitter Plugin.
-
-Online version of this document: http://ur1.ca/35mpb
-
-___ Requirements ___
-
-Due to the distributed nature of the StatusNet network, each user who wishes to
-forward public messages to a StatusNet account has to get the OAuth credentials
-for themselves, which makes this addon a little bit more user unfriendly than
-the Twitter Plugin is. Nothing too geeky though!
-
-The inclusion of a shorturl for the original posting in cases when the message
-was longer than the maximal allowed notice length requires it, that you have
-PHP5+ and curl on your server.
-Where to find
-
-In the Friendica git repository /addon/statusnet/, 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 StatusNet.
-
-[1] https://github.com/abraham/twitteroauth
-[2] http://dentedreality.com.au/projects/slinky
-
-___ Configuration ___
-
-__ Global Configuration __
-
-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.
-
-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 __
-
-When the addon is activated the user has to aquire three things in order to
-connect to the StatusNet account of choice.
- * the base URL for the StatusNet API, for identi.ca this is
-   https://identi.ca/api/
- * OAuth Consumer key & secret
-
-To get the OAuth Consumer key pair the user has to (a) ask her Friendica admin
-if a pair already exists or (b) has to register the Friendica server as a
-client application on the StatusNet server. This can be done from the account
-settings under "Connect -> Connections -> Register an OAuth client application
--> Register a new application".
-
-During the registration of the OAuth client remember the following:
- * there is no callback url
- * register a desktop client
- * with read & write access
- * the Source URL should be the URL of your Friendica server
-
-After the required credentials for the application are stored in the
-configuration you have to actually connect your Friendica account with
-StatusNet. To do so follow the Sign in with StatusNet button, allow the access
-and copy the security code into the plugin configuration. Friendica will then
-try to acquire the final OAuth credentials from the API, if successful the
-plugin settings will allow you to select to post your public messages to your
-StatusNet account.

statusnet/README.md

@@ -0,0 +1,147 @@
+StatusNet Connector
+===================
+Main authors Tobias Diekershoff and Michael Vogel.
+
+With this addon to friendica you can give your user the possibility to post
+their public messages to any StatusNet instance.  The messages will be strapped
+their rich context and shortened to to the character limit of the StatusNet
+instance in question if necessary. If shortening of the message was performed a
+link will be added to the notice pointing to the original message on your
+server.
+
+Requirements
+------------
+
+Due to the distributed nature of the StatusNet network, each user who wishes to
+forward public messages to a StatusNet account has to get the OAuth credentials
+for themselves, which makes this addon a little bit more user unfriendly than
+the Twitter Plugin is. Nothing too geeky though!
+
+The inclusion of a shorturl for the original posting in cases when the message
+was longer than the maximal allowed notice length requires it, that you have
+PHP5+ and curl on your server.
+Where to find
+
+In the friendica addon git repository /statusnet/, 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 StatusNet.
+
+[1]:https://github.com/abraham/twitteroauth
+[2]:http://dentedreality.com.au/projects/slinky
+
+Configuration
+=============
+
+Global Configuration
+--------------------
+
+**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.
+
+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 
+------------------
+
+When the addon is activated the user has to acquire three things in order to
+connect to the StatusNet account of choice.
+
+* the base URL for the StatusNet API, for identi.ca this was https://identi.ca/api/
+* OAuth Consumer key & secret
+
+To get the OAuth Consumer key pair the user has to (a) ask her Friendica admin
+if a pair already exists or (b) has to register the Friendica server as a
+client application on the StatusNet server. This can be done from the account
+settings under "Connect -> Connections -> Register an OAuth client application
+-> Register a new application".
+
+During the registration of the OAuth client remember the following:
+
+* there is no callback URL
+* register a desktop client
+* with read & write access
+* the Source URL should be the URL of your friendica server
+
+After the required credentials for the application are stored in the
+configuration you have to actually connect your friendica account with
+StatusNet. To do so follow the Sign in with StatusNet button, allow the access
+and copy the security code into the plugin configuration. Friendica will then
+try to acquire the final OAuth credentials from the API, if successful the
+plugin settings will allow you to select to post your public messages to your
+StatusNet account.
+
+Mirroring of Public Postings
+----------------------------
+
+To avoid endless loops of public postings that are send to StatusNet and then
+mirrored back into your friendica stream you have to set the _name of the
+application you registered there_ of your friendica node is using to post to
+StatusNet in the .htconfig.php file.
+
+    $a->config['statusnet']['application_name'] = "yourname here";
+ 
+Connector Options for the User
+==============================
+
+* **Allow posting to StatusNet** If you want your _public postings_ being
+  optionally posted to your associated StatusNet account as well, you need to
+  check this box.
+* **Send public postings to StatusNet by default** if you want to have _all_
+  your public postings being send to your StatusNet account you need to check
+  this button as well. Otherwise you have to enable the relay of your postings
+  in the ACL dialog (click the lock button) before posting an entry.
+* **Mirror all posts from statusnet that are no replies or repeated messages**
+  if you want your postings from StatusNet also appear in your friendica
+  postings, check this box. Replies to other people postings, repostings and your own
+  postings that were send from friendica wont be mirrored into your friendica
+  stream.
+* **Shortening method that optimizes the post** by default friendica checks how
+  many characters your StatusNet instance allows you to use for a posting and
+  if a posting is longer then this amount of characters it will shorten the
+  message posted on StatusNet and add a short link back to the original
+  posting. Optionally you can check this box to have the shortening of the
+  message use an optimization algorithm. _TODO add infos how this is
+  optimized_
+* **Send linked #-tags and @-names to StatusNet** if you want your #-tags and
+  @-mentions linked to the friendica network, check this box. If you want to
+  have StatusNet handle these things for the relayed end of the posting chain,
+  uncheck it.
+* **Clear OAuth configuration** if you want to remove the currently associated
+  StatusNet account from your friendica account you have to check this box and
+  then hit the submit button. The saved settings will be deleted and you have
+  to reconfigure the StatusNet connector to be able to relay your public
+  postings to a StatusNet account.
+
+License
+=======
+
+The _StatusNet Connector_ is licensed under the [3-clause BSD license][3] see the
+LICENSE file in the addons directory.
+
+[3]: http://opensource.org/licenses/BSD-3-Clause

statusnet/statusnet.php

@@ -5,24 +5,34 @@
  * Version: 1.0.5
  * Author: Tobias Diekershoff <http://diekershoff.homeunix.net/friendika/profile/tobias>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ *
+ * Copyright (c) 2011-2013 Tobias Diekershoff, Michael Vogel
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *    * copyright notice, this list of conditions and the following disclaimer in
+ *      the documentation and/or other materials provided with the distribution.
+ *    * Neither the name of the <organization> nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
  
-/*   StatusNet Plugin for Friendica
- *
- *   Author: Tobias Diekershoff
- *           tobias.diekershoff@gmx.net
- *
- *   License:3-clause BSD license
- *
- *   Configuration:
- *     To activate the plugin itself add it to the $a->config['system']['addon']
- *     setting. After this, your user can configure their Twitter account settings
- *     from "Settings -> Plugin Settings".
- *
- *     Requirements: PHP5, curl [Slinky library]
- *
- *     Documentation: http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/StatusNet_Plugin
- */
 
 /***
  * We have to alter the TwitterOAuth class a little bit to work with any StatusNet

twitter/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2011-2013 Tobias Diekershoff, Michael Vogel
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    * copyright notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

twitter/README

@@ -1,92 +0,0 @@
-____ Twitter Plugin ____
-By Tobias Diekershoff
-   http://diekershoff.homeunix.net/friendika/profile/tobias
-   tobias.diekershoff(at)gmx.net
-
-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.
-
-The addon can also mirror a users Tweets into the ~friendica wall.
-
-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 an application for your friendica
-instance on Twitter with
-  * read and write access
-  * don't set a callback URL
-  * we do not intend to use Twitter for login
-The registration can be done at twitter.com/apps and you need a Twitter
-account for doing 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 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
-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 -> 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
-.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.
-
-

twitter/README.md

@@ -0,0 +1,140 @@
+Twitter Plugin
+==============
+
+Main authors Tobias Diekershoff and Michael Vogel.
+
+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.
+
+The addon can also mirror a users Tweets into the ~friendica wall.
+
+There is a similar addon for forwarding public messages to
+[StatusNet](http://status.net).
+
+Requirements
+------------
+
+To use this plugin you have to register an application for your friendica
+instance on Twitter with
+* read and write access
+* don't set a callback URL
+* we do not intend to use Twitter for login
+The registration can be done at twitter.com/apps and you need a Twitter
+account for doing 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 addon git repository /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 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
+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 -> 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
+.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';
+
+
+Mirroring of Public Postings
+----------------------------
+
+To avoid endless loops of public postings that are send to Twitter and then
+mirrored back into your friendica stream you have to set the _name of the
+application you registered there_ of your friendica node is using to post to
+Twitter in the .htconfig.php file.
+
+    $a->config['twitter']['application_name'] = "yourname here";
+ 
+Connector Options for the User
+==============================
+
+When the OAuth consumer informations are correctly placed into the
+configuration file and a user visits the "Connector 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.
+
+After this step was successful the user now has the following config options.
+
+* **Allow posting to StatusNet** If you want your _public postings_ being
+  optionally posted to your associated Twitter account as well, you need to
+  check this box.
+* **Send public postings to StatusNet by default** if you want to have _all_
+  your public postings being send to your Twitter account you need to check
+  this button as well. Otherwise you have to enable the relay of your postings
+  in the ACL dialog (click the lock button) before posting an entry.
+* **Mirror all posts from statusnet that are no replies or repeated messages**
+  if you want your postings from Twitter also appear in your friendica
+  postings, check this box. Replies to other people postings, repostings and your own
+  postings that were send from friendica wont be mirrored into your friendica
+  stream.
+* **Shortening method that optimizes the post** by default friendica checks how
+  many characters your Twitter instance allows you to use for a posting and
+  if a posting is longer then this amount of characters it will shorten the
+  message posted on Twitter and add a short link back to the original
+  posting. Optionally you can check this box to have the shortening of the
+  message use an optimization algorithm. _TODO add infos how this is
+  optimized_
+* **Send linked #-tags and @-names to StatusNet** if you want your #-tags and
+  @-mentions linked to the friendica network, check this box. If you want to
+  have Twitter handle these things for the relayed end of the posting chain,
+  uncheck it.
+* **Clear OAuth configuration** if you want to remove the currently associated
+  Twitter account from your friendica account you have to check this box and
+  then hit the submit button. The saved settings will be deleted and you have
+  to reconfigure the Twitter connector to be able to relay your public
+  postings to a Twitter account.
+
+License
+=======
+
+The _StatusNet Connector_ is licensed under the [3-clause BSD license][3] see the
+LICENSE file in the addons directory.
+
+[3]: http://opensource.org/licenses/BSD-3-Clause
+
+

twitter/twitter.php

@@ -5,9 +5,34 @@
  * Version: 1.0.4
  * Author: Tobias Diekershoff <http://diekershoff.homeunix.net/friendika/profile/tobias>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ *
+ * Copyright (c) 2011-2013 Tobias Diekershoff, Michael Vogel
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *    * copyright notice, this list of conditions and the following disclaimer in
+ *      the documentation and/or other materials provided with the distribution.
+ *    * Neither the name of the <organization> nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
-
+ 
-
 /*   Twitter Plugin for Friendica
  *
  *   Author: Tobias Diekershoff

webrtc/README.md

@@ -1,7 +1,7 @@
-Webrtc Plugin
+WebRTC Plugin
-====================
+=============
 
-This is a quick and dirty addon to add a webrtc website as an app. As webrtc
+This is a quick and dirty addon to add a [webrtc][1] website as an app. As webrtc
 advances so rapidly there is s a chance this plugin will be obsolete. Webrtc is
 a new video and audio conferencing tool that is browser to browser
 communication, no need to download specific software for just conferencing.
@@ -12,7 +12,7 @@ between the participants.
 
 If you would like to try this plugin please download one of the following
 either Chrome/Chromium 25 or higher or Firefox 21 or higher. Then test it by
-visiting a known webrtc instance (i.e. https://live.mayfirst.org) create a
+visiting a known webrtc instance (i.e. [live.mayfirst.org](https://live.mayfirst.org)) create a
 room, you should be asked to share your camera and microphone (firefox will let
 you choose one or the other, whereas chrome/chromium asks for both in one
 question).
@@ -20,3 +20,5 @@ question).
 If the test is successful then proceed with copying the webrtc instance you
 would like to use and place it in the config window and save. Now when you
 opent he app it will load the webrtc instance for you to use.
+
+[1]: https://en.wikipedia.org/wiki/WebRTC