From 70b5cefb747d7b89cf180c6cef45e2b01d9bfab5 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 12 Mar 2016 08:06:52 +0100
Subject: [PATCH 01/19] Removed addons that are unsupported for a long time

---
 altpager/altpager.css                       |  14 -
 altpager/altpager.php                       | 108 -----
 altpager/lang/C/messages.po                 |  54 ---
 altpager/lang/ca/strings.php                |  11 -
 altpager/lang/cs/messages.po                |  56 ---
 altpager/lang/cs/strings.php                |  16 -
 altpager/lang/de/messages.po                |  56 ---
 altpager/lang/de/strings.php                |  16 -
 altpager/lang/eo/strings.php                |   7 -
 altpager/lang/es/strings.php                |   9 -
 altpager/lang/fr/messages.po                |  57 ---
 altpager/lang/fr/strings.php                |  16 -
 altpager/lang/is/strings.php                |   7 -
 altpager/lang/it/messages.po                |  56 ---
 altpager/lang/it/strings.php                |  16 -
 altpager/lang/nb-no/strings.php             |   9 -
 altpager/lang/pl/strings.php                |  11 -
 altpager/lang/pt-br/messages.po             |  56 ---
 altpager/lang/pt-br/strings.php             |  16 -
 altpager/lang/ro/messages.po                |  55 ---
 altpager/lang/ro/strings.php                |  16 -
 altpager/lang/ru/strings.php                |   9 -
 altpager/lang/sv/strings.php                |   4 -
 altpager/lang/zh-cn/strings.php             |  11 -
 altpager/templates/admin.tpl                |   3 -
 appnetpost/appnetpost.css                   |  15 -
 appnetpost/appnetpost.php                   | 334 ---------------
 appnetpost/lang/C/messages.po               |  38 --
 appnetpost/lang/cs/messages.po              |  40 --
 appnetpost/lang/cs/strings.php              |  12 -
 appnetpost/lang/de/messages.po              |  40 --
 appnetpost/lang/de/strings.php              |  12 -
 appnetpost/lang/it/messages.po              |  40 --
 appnetpost/lang/it/strings.php              |  12 -
 appnetpost/lang/pt-br/messages.po           |  40 --
 appnetpost/lang/pt-br/strings.php           |  12 -
 appnetpost/lang/ro/messages.po              |  39 --
 appnetpost/lang/ro/strings.php              |  12 -
 page/lang/C/messages.po                     |  54 ---
 page/lang/ca/strings.php                    |  11 -
 page/lang/cs/strings.php                    |  11 -
 page/lang/de/strings.php                    |  11 -
 page/lang/eo/strings.php                    |  11 -
 page/lang/es/strings.php                    |  11 -
 page/lang/fr/strings.php                    |  11 -
 page/lang/is/strings.php                    |  11 -
 page/lang/it/strings.php                    |  11 -
 page/lang/nb-no/strings.php                 |  11 -
 page/lang/pl/strings.php                    |  11 -
 page/lang/pt-br/strings.php                 |  11 -
 page/lang/ru/strings.php                    |  11 -
 page/lang/sv/strings.php                    |   3 -
 page/lang/zh-cn/strings.php                 |  11 -
 page/page.css                               |  13 -
 page/page.php                               | 216 ----------
 privacy_image_cache/README.md               |   4 -
 privacy_image_cache/lang/C/messages.po      |  42 --
 privacy_image_cache/lang/ca/strings.php     |   8 -
 privacy_image_cache/lang/cs/strings.php     |   8 -
 privacy_image_cache/lang/de/strings.php     |   8 -
 privacy_image_cache/lang/eo/strings.php     |   8 -
 privacy_image_cache/lang/es/strings.php     |   8 -
 privacy_image_cache/lang/fr/strings.php     |   8 -
 privacy_image_cache/lang/is/strings.php     |   8 -
 privacy_image_cache/lang/it/strings.php     |   8 -
 privacy_image_cache/lang/nb-no/strings.php  |   8 -
 privacy_image_cache/lang/pl/strings.php     |   8 -
 privacy_image_cache/lang/pt-br/strings.php  |   8 -
 privacy_image_cache/lang/ru/strings.php     |   8 -
 privacy_image_cache/lang/sv/strings.php     |   2 -
 privacy_image_cache/lang/zh-cn/strings.php  |   8 -
 privacy_image_cache/privacy_image_cache.php | 453 --------------------
 72 files changed, 2369 deletions(-)
 delete mode 100755 altpager/altpager.css
 delete mode 100755 altpager/altpager.php
 delete mode 100644 altpager/lang/C/messages.po
 delete mode 100644 altpager/lang/ca/strings.php
 delete mode 100644 altpager/lang/cs/messages.po
 delete mode 100644 altpager/lang/cs/strings.php
 delete mode 100644 altpager/lang/de/messages.po
 delete mode 100644 altpager/lang/de/strings.php
 delete mode 100644 altpager/lang/eo/strings.php
 delete mode 100644 altpager/lang/es/strings.php
 delete mode 100644 altpager/lang/fr/messages.po
 delete mode 100644 altpager/lang/fr/strings.php
 delete mode 100644 altpager/lang/is/strings.php
 delete mode 100644 altpager/lang/it/messages.po
 delete mode 100644 altpager/lang/it/strings.php
 delete mode 100644 altpager/lang/nb-no/strings.php
 delete mode 100644 altpager/lang/pl/strings.php
 delete mode 100644 altpager/lang/pt-br/messages.po
 delete mode 100644 altpager/lang/pt-br/strings.php
 delete mode 100644 altpager/lang/ro/messages.po
 delete mode 100644 altpager/lang/ro/strings.php
 delete mode 100644 altpager/lang/ru/strings.php
 delete mode 100644 altpager/lang/sv/strings.php
 delete mode 100644 altpager/lang/zh-cn/strings.php
 delete mode 100644 altpager/templates/admin.tpl
 delete mode 100644 appnetpost/appnetpost.css
 delete mode 100644 appnetpost/appnetpost.php
 delete mode 100644 appnetpost/lang/C/messages.po
 delete mode 100644 appnetpost/lang/cs/messages.po
 delete mode 100644 appnetpost/lang/cs/strings.php
 delete mode 100644 appnetpost/lang/de/messages.po
 delete mode 100644 appnetpost/lang/de/strings.php
 delete mode 100644 appnetpost/lang/it/messages.po
 delete mode 100644 appnetpost/lang/it/strings.php
 delete mode 100644 appnetpost/lang/pt-br/messages.po
 delete mode 100644 appnetpost/lang/pt-br/strings.php
 delete mode 100644 appnetpost/lang/ro/messages.po
 delete mode 100644 appnetpost/lang/ro/strings.php
 delete mode 100644 page/lang/C/messages.po
 delete mode 100644 page/lang/ca/strings.php
 delete mode 100644 page/lang/cs/strings.php
 delete mode 100644 page/lang/de/strings.php
 delete mode 100644 page/lang/eo/strings.php
 delete mode 100644 page/lang/es/strings.php
 delete mode 100644 page/lang/fr/strings.php
 delete mode 100644 page/lang/is/strings.php
 delete mode 100644 page/lang/it/strings.php
 delete mode 100644 page/lang/nb-no/strings.php
 delete mode 100644 page/lang/pl/strings.php
 delete mode 100644 page/lang/pt-br/strings.php
 delete mode 100644 page/lang/ru/strings.php
 delete mode 100644 page/lang/sv/strings.php
 delete mode 100644 page/lang/zh-cn/strings.php
 delete mode 100644 page/page.css
 delete mode 100755 page/page.php
 delete mode 100644 privacy_image_cache/README.md
 delete mode 100644 privacy_image_cache/lang/C/messages.po
 delete mode 100644 privacy_image_cache/lang/ca/strings.php
 delete mode 100644 privacy_image_cache/lang/cs/strings.php
 delete mode 100644 privacy_image_cache/lang/de/strings.php
 delete mode 100644 privacy_image_cache/lang/eo/strings.php
 delete mode 100644 privacy_image_cache/lang/es/strings.php
 delete mode 100644 privacy_image_cache/lang/fr/strings.php
 delete mode 100644 privacy_image_cache/lang/is/strings.php
 delete mode 100644 privacy_image_cache/lang/it/strings.php
 delete mode 100644 privacy_image_cache/lang/nb-no/strings.php
 delete mode 100644 privacy_image_cache/lang/pl/strings.php
 delete mode 100644 privacy_image_cache/lang/pt-br/strings.php
 delete mode 100644 privacy_image_cache/lang/ru/strings.php
 delete mode 100644 privacy_image_cache/lang/sv/strings.php
 delete mode 100644 privacy_image_cache/lang/zh-cn/strings.php
 delete mode 100644 privacy_image_cache/privacy_image_cache.php

diff --git a/altpager/altpager.css b/altpager/altpager.css
deleted file mode 100755
index 26fb5b6d..00000000
--- a/altpager/altpager.css
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-#altpager-label {
-	float: left;
-	width: 200px;
-	margin-bottom: 25px;
-}
-
-#altpager {
-	float: left;
-}
-
-
diff --git a/altpager/altpager.php b/altpager/altpager.php
deleted file mode 100755
index 78bab432..00000000
--- a/altpager/altpager.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Name: Alternate Pagination
- * Description: Change pagination from using explicit page numbers to simple "newer" and "older" page links. This will speed up page load times.
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * Status: Unsupported
- */
-
-
-function altpager_install() {
-
-	register_hook('plugin_settings', 'addon/altpager/altpager.php', 'altpager_settings');
-	register_hook('plugin_settings_post', 'addon/altpager/altpager.php', 'altpager_settings_post');
-
-	logger("installed altpager");
-}
-
-
-function altpager_uninstall() {
-
-	unregister_hook('plugin_settings', 'addon/altpager/altpager.php', 'altpager_settings');
-	unregister_hook('plugin_settings_post', 'addon/altpager/altpager.php', 'altpager_settings_post');
-
-
-	logger("removed altpager");
-}
-
-
-
-/**
- *
- * Callback from the settings post function.
- * $post contains the $_POST array.
- * We will make sure we've got a valid user account
- * and if so set our configuration setting for this person.
- *
- */
-
-function altpager_settings_post($a,$post) {
-	if(! local_user() || (! x($_POST,'altpager-submit')))
-		return;
-
-	set_pconfig(local_user(),'system','alt_pager',intval($_POST['altpager']));
-	info( t('Altpager settings updated.') . EOL);
-}
-
-
-/**
- *
- * Called from the Plugin Setting form. 
- * Add our own settings info to the page.
- *
- */
-
-
-
-function altpager_settings(&$a,&$s) {
-
-	if(! local_user())
-		return;
-
-	$global = get_config("alt_pager", "global");
-	if($global == 1)
-		return;
-
-	/* Add our stylesheet to the page so we can make our settings look nice */
-
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/altpager/altpager.css' . '" media="all" />' . "\r\n";
-
-	/* Get the current state of our config variable */
-
-	$altpager = get_pconfig(local_user(),'system','alt_pager');
-	if($altpager === false)
-		$altpager = 0;
-
-	$checked = (($altpager) ? ' checked="checked" ' : '');
-	
-	/* Add some HTML to the existing form */
-
-	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('Alternate Pagination Setting') . '</h3>';
-	$s .= '<div id="altpager-wrapper">';
-	$s .= '<label id="altpager-label" for="altpager">' . t('Use links to "newer" and "older" pages in place of page numbers?') . '</label>';
-	$s .= '<input id="altpager-input" type="checkbox" name="altpager" value="1" ' . $checked . '/>';
-	$s .= '</div><div class="clear"></div>';
-
-	/* provide a submit button */
-
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="altpager-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
-
-}
-
-function altpager_plugin_admin(&$a, &$o){
-	$t = get_markup_template( "admin.tpl", "addon/altpager/" );
-	$o = replace_macros($t, array(
-		'$submit' => t('Save Settings'),
-		'$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'),  get_config('alt_pager', 'global') == 1),
-		'$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'),  get_config('alt_pager', 'global') == 0)
-	));
-}
-
-function altpager_plugin_admin_post(&$a){
-	$choice	=	((x($_POST,'altpagerchoice'))		? notags(trim($_POST['altpagerchoice']))	: '');
-	set_config('alt_pager','global',($choice == 1 ? 1 : 0));
-	info( t('Settings updated.'). EOL );
-}
-
diff --git a/altpager/lang/C/messages.po b/altpager/lang/C/messages.po
deleted file mode 100644
index 72ef834e..00000000
--- a/altpager/lang/C/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON altpager
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr ""
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr ""
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr ""
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr ""
-
-#: altpager.php:99
-msgid "Global"
-msgstr ""
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr ""
-
-#: altpager.php:100
-msgid "Individual"
-msgstr ""
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr ""
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr ""
diff --git a/altpager/lang/ca/strings.php b/altpager/lang/ca/strings.php
deleted file mode 100644
index 5d50edec..00000000
--- a/altpager/lang/ca/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "Ajustos de Altpagerr actualitzats.";
-$a->strings["Alternate Pagination Setting"] = "Alternate Pagination Setting";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Emprar enllaç a \"més nova\" i \"més antiga\" pàgina, en lloc de números de pàgina? ";
-$a->strings["Submit"] = "Enviar";
-$a->strings["Global"] = "";
-$a->strings["Force global use of the alternate pager"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Each user chooses whether to use the alternate pager"] = "";
-$a->strings["Settings updated."] = "Ajustos actualitzats.";
diff --git a/altpager/lang/cs/messages.po b/altpager/lang/cs/messages.po
deleted file mode 100644
index 877d0a57..00000000
--- a/altpager/lang/cs/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON altpager
-# Copyright (C)
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-# 
-# Translators:
-# Michal Šupler <msupler@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-07-02 15:15+0000\n"
-"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Nastavení Altpager aktualizováno."
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "Alternate Pagination nastavení"
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?"
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr "Odeslat"
-
-#: altpager.php:99
-msgid "Global"
-msgstr "Globální"
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "Vynutit globální použití alternativního stránkování"
-
-#: altpager.php:100
-msgid "Individual"
-msgstr "Individuálové"
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "Každý uživatel si vybere, zda-li použije alternativní stránkování."
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr "Nastavení aktualizováno."
diff --git a/altpager/lang/cs/strings.php b/altpager/lang/cs/strings.php
deleted file mode 100644
index 6c93ca0b..00000000
--- a/altpager/lang/cs/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_cs")) {
-function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
-}}
-;
-$a->strings["Altpager settings updated."] = "Nastavení Altpager aktualizováno.";
-$a->strings["Alternate Pagination Setting"] = "Alternate Pagination nastavení";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Global"] = "Globální";
-$a->strings["Force global use of the alternate pager"] = "Vynutit globální použití alternativního stránkování";
-$a->strings["Individual"] = "Individuálové";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Každý uživatel si vybere, zda-li použije alternativní stránkování.";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/altpager/lang/de/messages.po b/altpager/lang/de/messages.po
deleted file mode 100644
index dbe1f7de..00000000
--- a/altpager/lang/de/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON altpager
-# Copyright (C)
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-# 
-# Translators:
-# bavatar <tobias.diekershoff@gmx.net>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-24 04:36+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Altpager Einstellungen wurden aktualisiert."
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "Alternative Seitenumbruch Einstellung"
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?"
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr "Senden"
-
-#: altpager.php:99
-msgid "Global"
-msgstr "Global"
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "Erzwinge die Verwendung des \"Alternate Pager\" auf diesem Server"
-
-#: altpager.php:100
-msgid "Individual"
-msgstr "Individuell"
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "Jede/r Nutzer/in kann wählen ob der \"Alternate Pager\" verwendet werden soll"
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr "Einstellungen gespeichert."
diff --git a/altpager/lang/de/strings.php b/altpager/lang/de/strings.php
deleted file mode 100644
index 98a519ff..00000000
--- a/altpager/lang/de/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["Altpager settings updated."] = "Altpager Einstellungen wurden aktualisiert.";
-$a->strings["Alternate Pagination Setting"] = "Alternative Seitenumbruch Einstellung";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?";
-$a->strings["Submit"] = "Senden";
-$a->strings["Global"] = "Global";
-$a->strings["Force global use of the alternate pager"] = "Erzwinge die Verwendung des \"Alternate Pager\" auf diesem Server";
-$a->strings["Individual"] = "Individuell";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Jede/r Nutzer/in kann wählen ob der \"Alternate Pager\" verwendet werden soll";
-$a->strings["Settings updated."] = "Einstellungen gespeichert.";
diff --git a/altpager/lang/eo/strings.php b/altpager/lang/eo/strings.php
deleted file mode 100644
index 11ee2efa..00000000
--- a/altpager/lang/eo/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "Ĝisdatigis Altpager agordojn.";
-$a->strings["Alternate Pagination Setting"] = "Alternativa paĝonumerado agordoj";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Uzi ligilojn al \"pli nova\" kaj \"pli malnova\" paĝoj anstataŭ paĝnombrojn?";
-$a->strings["Submit"] = "Sendi";
-$a->strings["Settings updated."] = "Agordoj ĝisdatigita.";
diff --git a/altpager/lang/es/strings.php b/altpager/lang/es/strings.php
deleted file mode 100644
index 4ea9bc4f..00000000
--- a/altpager/lang/es/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "Configuración de paginador alternativo actualizada.";
-$a->strings["Alternate Pagination Setting"] = "Configuración de paginación alternativa";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "¿Usar \"más nuevo\" y \"más antiguo\" en vez de números en las páginas?";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Global"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Settings updated."] = "Configuración actualizada.";
diff --git a/altpager/lang/fr/messages.po b/altpager/lang/fr/messages.po
deleted file mode 100644
index bc03148b..00000000
--- a/altpager/lang/fr/messages.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# ADDON altpager
-# Copyright (C)
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-# 
-# Translators:
-# Cyboulette <cyboulette58@hotmail.fr>, 2014
-# Jak <jacques@riseup.net>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-12-09 10:57+0000\n"
-"Last-Translator: Jak <jacques@riseup.net>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Les paramètres d'Altpager ont été mis à jour"
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "Paramètre de pagination"
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "Utiliser les liens \"plus récent\" et \"plus ancien\" à la place de la numérotation des pages ?"
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr "Valider"
-
-#: altpager.php:99
-msgid "Global"
-msgstr "Global"
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "Forcer l'utilisation globale des pages alternatives"
-
-#: altpager.php:100
-msgid "Individual"
-msgstr "Individuel"
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "Chaque utilisateur choisi d'utiliser ou non les pages alternatives"
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr "Paramètres sauvegardés"
diff --git a/altpager/lang/fr/strings.php b/altpager/lang/fr/strings.php
deleted file mode 100644
index 325db4d8..00000000
--- a/altpager/lang/fr/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	return ($n > 1);;
-}}
-;
-$a->strings["Altpager settings updated."] = "Les paramètres d'Altpager ont été mis à jour";
-$a->strings["Alternate Pagination Setting"] = "Paramètre de pagination";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Utiliser les liens \"plus récent\" et \"plus ancien\" à la place de la numérotation des pages ?";
-$a->strings["Submit"] = "Valider";
-$a->strings["Global"] = "Global";
-$a->strings["Force global use of the alternate pager"] = "Forcer l'utilisation globale des pages alternatives";
-$a->strings["Individual"] = "Individuel";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Chaque utilisateur choisi d'utiliser ou non les pages alternatives";
-$a->strings["Settings updated."] = "Paramètres sauvegardés";
diff --git a/altpager/lang/is/strings.php b/altpager/lang/is/strings.php
deleted file mode 100644
index 8a576ffe..00000000
--- a/altpager/lang/is/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "";
-$a->strings["Alternate Pagination Setting"] = "";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
-$a->strings["Submit"] = "Senda inn";
-$a->strings["Settings updated."] = "Stillingar uppfærðar";
diff --git a/altpager/lang/it/messages.po b/altpager/lang/it/messages.po
deleted file mode 100644
index 681e9d2c..00000000
--- a/altpager/lang/it/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON altpager
-# Copyright (C)
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-09-10 10:12+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Impostazioni Altpager aggiornate."
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "Impostazioni Paginatore Alternativo"
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "Usa i collegamenti \"nuovi\" e \"vecchi\" al posto dei numeri di pagina?"
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr "Invia"
-
-#: altpager.php:99
-msgid "Global"
-msgstr "Globale"
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "Forza l'uso del paginatore alternativo globalmente"
-
-#: altpager.php:100
-msgid "Individual"
-msgstr "Individuale"
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "Ogni utente può decidere se usare il paginatore alternativo"
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr "Impostazioni aggiornate."
diff --git a/altpager/lang/it/strings.php b/altpager/lang/it/strings.php
deleted file mode 100644
index 9544fcc0..00000000
--- a/altpager/lang/it/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["Altpager settings updated."] = "Impostazioni Altpager aggiornate.";
-$a->strings["Alternate Pagination Setting"] = "Impostazioni Paginatore Alternativo";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Usa i collegamenti \"nuovi\" e \"vecchi\" al posto dei numeri di pagina?";
-$a->strings["Submit"] = "Invia";
-$a->strings["Global"] = "Globale";
-$a->strings["Force global use of the alternate pager"] = "Forza l'uso del paginatore alternativo globalmente";
-$a->strings["Individual"] = "Individuale";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Ogni utente può decidere se usare il paginatore alternativo";
-$a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/altpager/lang/nb-no/strings.php b/altpager/lang/nb-no/strings.php
deleted file mode 100644
index de12fef2..00000000
--- a/altpager/lang/nb-no/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "";
-$a->strings["Alternate Pagination Setting"] = "";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
-$a->strings["Submit"] = "Lagre";
-$a->strings["Global"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Settings updated."] = "Innstillinger oppdatert.";
diff --git a/altpager/lang/pl/strings.php b/altpager/lang/pl/strings.php
deleted file mode 100644
index 7bd150a0..00000000
--- a/altpager/lang/pl/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "";
-$a->strings["Alternate Pagination Setting"] = "";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
-$a->strings["Submit"] = "Potwierdź";
-$a->strings["Global"] = "Ogólne";
-$a->strings["Force global use of the alternate pager"] = "";
-$a->strings["Individual"] = "Indywidualne";
-$a->strings["Each user chooses whether to use the alternate pager"] = "";
-$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
diff --git a/altpager/lang/pt-br/messages.po b/altpager/lang/pt-br/messages.po
deleted file mode 100644
index e4b6724f..00000000
--- a/altpager/lang/pt-br/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON altpager
-# Copyright (C)
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-# 
-# Translators:
-# Sérgio Lima <oigreslima@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 16:15+0000\n"
-"Last-Translator: Sérgio Lima <oigreslima@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/friendica/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Configurações de paginações atualizada."
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "Configurações de Paginação alternativa"
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "Usar links para \"Mais recentes\" e \"Mais antigos\" no lugar do número de páginas?"
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr "Enviar"
-
-#: altpager.php:99
-msgid "Global"
-msgstr "Global"
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "Força uso global da paginação alternativa"
-
-#: altpager.php:100
-msgid "Individual"
-msgstr "Individual"
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "Cada usuário escolhe se usa a paginação alternativa"
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr "Configurações atualizadas."
diff --git a/altpager/lang/pt-br/strings.php b/altpager/lang/pt-br/strings.php
deleted file mode 100644
index e8849660..00000000
--- a/altpager/lang/pt-br/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pt_br")) {
-function string_plural_select_pt_br($n){
-	return ($n > 1);;
-}}
-;
-$a->strings["Altpager settings updated."] = "Configurações de paginações atualizada.";
-$a->strings["Alternate Pagination Setting"] = "Configurações de Paginação alternativa";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Usar links para \"Mais recentes\" e \"Mais antigos\" no lugar do número de páginas?";
-$a->strings["Submit"] = "Enviar";
-$a->strings["Global"] = "Global";
-$a->strings["Force global use of the alternate pager"] = "Força uso global da paginação alternativa";
-$a->strings["Individual"] = "Individual";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Cada usuário escolhe se usa a paginação alternativa";
-$a->strings["Settings updated."] = "Configurações atualizadas.";
diff --git a/altpager/lang/ro/messages.po b/altpager/lang/ro/messages.po
deleted file mode 100644
index 3c48eef2..00000000
--- a/altpager/lang/ro/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON altpager
-# Copyright (C)
-# This file is distributed under the same license as the Friendica altpager addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-07-08 11:39+0000\n"
-"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: altpager.php:46
-msgid "Altpager settings updated."
-msgstr "Configurările Altpager au fost actualizate."
-
-#: altpager.php:83
-msgid "Alternate Pagination Setting"
-msgstr "Configurare Paginație Alternantă"
-
-#: altpager.php:85
-msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
-msgstr "Se utilizează legături pentru paginile \"mai noi\" şi \"mai vechi\", în locul de numerelor de pagină?"
-
-#: altpager.php:91 altpager.php:98
-msgid "Submit"
-msgstr "Trimite"
-
-#: altpager.php:99
-msgid "Global"
-msgstr "Global"
-
-#: altpager.php:99
-msgid "Force global use of the alternate pager"
-msgstr "Se forțează utilizarea globală a paginatorului alternant"
-
-#: altpager.php:100
-msgid "Individual"
-msgstr "Individual"
-
-#: altpager.php:100
-msgid "Each user chooses whether to use the alternate pager"
-msgstr "Fiecare utilizator alege dacă va utiliza paginatorul alternant"
-
-#: altpager.php:107
-msgid "Settings updated."
-msgstr "Configurări actualizate."
diff --git a/altpager/lang/ro/strings.php b/altpager/lang/ro/strings.php
deleted file mode 100644
index cbd818c2..00000000
--- a/altpager/lang/ro/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ro")) {
-function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
-}}
-;
-$a->strings["Altpager settings updated."] = "Configurările Altpager au fost actualizate.";
-$a->strings["Alternate Pagination Setting"] = "Configurare Paginație Alternantă";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Se utilizează legături pentru paginile \"mai noi\" şi \"mai vechi\", în locul de numerelor de pagină?";
-$a->strings["Submit"] = "Trimite";
-$a->strings["Global"] = "Global";
-$a->strings["Force global use of the alternate pager"] = "Se forțează utilizarea globală a paginatorului alternant";
-$a->strings["Individual"] = "Individual";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Fiecare utilizator alege dacă va utiliza paginatorul alternant";
-$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/altpager/lang/ru/strings.php b/altpager/lang/ru/strings.php
deleted file mode 100644
index 8e635d63..00000000
--- a/altpager/lang/ru/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "";
-$a->strings["Alternate Pagination Setting"] = "";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
-$a->strings["Submit"] = "Подтвердить";
-$a->strings["Global"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Settings updated."] = "Настройки обновлены.";
diff --git a/altpager/lang/sv/strings.php b/altpager/lang/sv/strings.php
deleted file mode 100644
index dcd4e821..00000000
--- a/altpager/lang/sv/strings.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$a->strings["Submit"] = "Spara";
-$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
diff --git a/altpager/lang/zh-cn/strings.php b/altpager/lang/zh-cn/strings.php
deleted file mode 100644
index 0b6a1c5d..00000000
--- a/altpager/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "Altpager设置更新了。";
-$a->strings["Alternate Pagination Setting"] = "供替换的分页设置";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "用到「更新」和「更旧」页代替页数？";
-$a->strings["Submit"] = "提交";
-$a->strings["Global"] = "综合";
-$a->strings["Force global use of the alternate pager"] = "让大家用供替换的分页";
-$a->strings["Individual"] = "一个人的";
-$a->strings["Each user chooses whether to use the alternate pager"] = "每用户选择是否用供替换的分页";
-$a->strings["Settings updated."] = "设置跟新了";
diff --git a/altpager/templates/admin.tpl b/altpager/templates/admin.tpl
deleted file mode 100644
index e67afd73..00000000
--- a/altpager/templates/admin.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{include file="field_radio.tpl" field=$global}}
-{{include file="field_radio.tpl" field=$individual}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/appnetpost/appnetpost.css b/appnetpost/appnetpost.css
deleted file mode 100644
index 55365e69..00000000
--- a/appnetpost/appnetpost.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#appnetpost-enable-label, #appnetpost-bydefault-label {
-	float: left;
-	width: 200px;
-	margin-top: 10px;
-}
-
-#appnetpost-checkbox, #appnetpost-bydefault {
-	float: left;
-	margin-top: 10px;
-}
-
-#appnetpost-submit {
-	margin-top: 15px;
-}
diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
deleted file mode 100644
index 0cc10c3e..00000000
--- a/appnetpost/appnetpost.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-
-/**
- * Name: App.net Post
- * Description: Posts to app.net with the help of ifttt.com
- * Version: 0.1
- * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
- * Status: Unsupported
- */
-
-function appnetpost_install() {
-	register_hook('post_local',           'addon/appnetpost/appnetpost.php', 'appnetpost_post_local');
-	register_hook('notifier_normal',      'addon/appnetpost/appnetpost.php', 'appnetpost_send');
-	register_hook('jot_networks',         'addon/appnetpost/appnetpost.php', 'appnetpost_jot_nets');
-	register_hook('connector_settings',      'addon/appnetpost/appnetpost.php', 'appnetpost_settings');
-	register_hook('connector_settings_post', 'addon/appnetpost/appnetpost.php', 'appnetpost_settings_post');
-}
-
-
-function appnetpost_uninstall() {
-	unregister_hook('post_local',       'addon/appnetpost/appnetpost.php', 'appnetpost_post_local');
-	unregister_hook('notifier_normal',  'addon/appnetpost/appnetpost.php', 'appnetpost_send');
-	unregister_hook('jot_networks',     'addon/appnetpost/appnetpost.php', 'appnetpost_jot_nets');
-	unregister_hook('connector_settings',      'addon/appnetpost/appnetpost.php', 'appnetpost_settings');
-	unregister_hook('connector_settings_post', 'addon/appnetpost/appnetpost.php', 'appnetpost_settings_post');
-}
-
-function appnetpost_jot_nets(&$a,&$b) {
-	if(! local_user())
-		return;
-
-	$post = get_pconfig(local_user(),'appnetpost','post');
-	if(intval($post) == 1) {
-		$defpost = get_pconfig(local_user(),'appnetpost','post_by_default');
-		$selected = ((intval($defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="appnetpost_enable"' . $selected . ' value="1" /> '
-			. t('Post to app.net') . '</div>';
-    }
-}
-
-function appnetpost_settings(&$a,&$s) {
-
-	if(! local_user())
-		return;
-
-	/* Add our stylesheet to the page so we can make our settings look nice */
-
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/appnetpost/appnetpost.css' . '" media="all" />' . "\r\n";
-
-	$enabled = get_pconfig(local_user(),'appnetpost','post');
-	$checked = (($enabled) ? ' checked="checked" ' : '');
-
-	$css = (($enabled) ? '' : '-disabled');
-
-	$def_enabled = get_pconfig(local_user(),'appnetpost','post_by_default');
-	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
-
-	$s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
-	$s .= '</span>';
-	$s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
-	$s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
-	$s .= '</span>';
-
-	$s .= '<div id="appnetpost-enable-wrapper">';
-	$s .= '<label id="appnetpost-enable-label" for="appnetpost-checkbox">' . t('Enable App.net Post Plugin') . '</label>';
-	$s .= '<input id="appnetpost-checkbox" type="checkbox" name="appnetpost" value="1" ' . $checked . '/>';
-	$s .= '</div><div class="clear"></div>';
-
-	$s .= '<div id="appnetpost-bydefault-wrapper">';
-	$s .= '<label id="appnetpost-bydefault-label" for="appnetpost-bydefault">' . t('Post to App.net by default') . '</label>';
-	$s .= '<input id="appnetpost-bydefault" type="checkbox" name="appnetpost_bydefault" value="1" ' . $def_checked . '/>';
-	$s .= '</div><div class="clear"></div>';
-
-	/* provide a submit button */
-
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="appnetpost-submit" name="appnetpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
-	$s .= '<p>Register an account at <a href="https://ifttt.com">IFTTT</a> and create a recipe with the following values:';
-	$s .= '<ul><li>If: New feed item (via RSS)</li>';
-	$s .= '<li>Then: Post an update (via app.net)</li>';
-	$s .= '<li>Feed URL: '.$a->get_baseurl().'/appnetpost/'.urlencode($a->user["nickname"]).'</li>';
-	$s .= '<li>Message: {{EntryContent}}</li>';
-	$s .= '<li>Original URL: {{EntryUrl}}</li></ul></div>';
-}
-
-function appnetpost_settings_post(&$a,&$b) {
-
-	if(x($_POST,'appnetpost-submit')) {
-		set_pconfig(local_user(),'appnetpost','post',intval($_POST['appnetpost']));
-		set_pconfig(local_user(),'appnetpost','post_by_default',intval($_POST['appnetpost_bydefault']));
-	}
-}
-
-function appnetpost_post_local(&$a,&$b) {
-
-	if($b['edit'])
-		return;
-
-	if((! local_user()) || (local_user() != $b['uid']))
-		return;
-
-	if($b['private'] || $b['parent'])
-		return;
-
-	$post   = intval(get_pconfig(local_user(),'appnetpost','post'));
-
-	$enable = (($post && x($_REQUEST,'appnetpost_enable')) ? intval($_REQUEST['appnetpost_enable']) : 0);
-
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'appnetpost','post_by_default')))
-		$enable = 1;
-
-	if(!$enable)
-		return;
-
-	if(strlen($b['postopts']))
-		$b['postopts'] .= ',';
-
-	$b['postopts'] .= 'gplus';
-}
-
-function appnetpost_send(&$a,&$b) {
-
-	logger('appnetpost_send: invoked for post '.$b['id']." ".$b['app']);
-
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
-		return;
-
-	if(! strstr($b['postopts'],'gplus'))
-		return;
-
-	if($b['parent'] != $b['id'])
-		return;
-
-	$itemlist = get_pconfig($b["uid"],'appnetpost','itemlist');
-	$items = explode(",", $itemlist);
-
-	$i = 0;
-	$newitems = array($b['id']);
-	foreach ($items AS $item)
-		if ($i++ < 9)
-			$newitems[] = $item;
-
-	$itemlist = implode(",", $newitems);
-
-	logger('appnetpost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
-
-	set_pconfig($b["uid"],'appnetpost','itemlist', $itemlist);
-}
-
-function appnetpost_module() {}
-
-function appnetpost_init() {
-	global $a, $_SERVER;
-
-	$uid = 0;
-
-	if (isset($a->argv[1])) {
-		$uid = (int)$a->argv[1];
-		if ($uid == 0) {
-			$contacts = q("SELECT `username`, `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($a->argv[1]));
-			if ($contacts) {
-				$uid = $contacts[0]["uid"];
-				$nick = $a->argv[1];
-			}
-		} else {
-			$contacts = q("SELECT `username` FROM `user` WHERE `uid`=%d LIMIT 1", intval($uid));
-			$nick = $uid;
-		}
-	}
-
-	header("content-type: application/atom+xml");
-	echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-	echo '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">'."\n";
-	echo "\t".'<title type="html"><![CDATA['.$a->config['sitename'].']]></title>'."\n";
-	if ($uid != 0) {
-		echo "\t".'<subtitle type="html"><![CDATA['.$contacts[0]["username"]."]]></subtitle>\n";
-		echo "\t".'<link rel="self" href="'.$a->get_baseurl().'/appnetpost/'.$nick.'"/>'."\n";
-	} else
-		echo "\t".'<link rel="self" href="'.$a->get_baseurl().'/appnetpost"/>'."\n";
-	echo "\t<id>".$a->get_baseurl()."/</id>\n";
-	echo "\t".'<link rel="alternate" type="text/html" href="'.$a->get_baseurl().'"/>'."\n";
-	echo "\t<updated>".date("c")."</updated>\n"; // To-Do
-	// <rights>Copyright ... </rights>
-	echo "\t".'<generator uri="'.$a->get_baseurl().'">'.$a->config['sitename'].'</generator>'."\n";
-
-	if ($uid != 0) {
-		$itemlist = get_pconfig($uid,'appnetpost','itemlist');
-		$items = explode(",", $itemlist);
-
-		foreach ($items AS $item)
-			appnetpost_feeditem($item, $uid);
-	} else {
-		$items = q("SELECT `id` FROM `item` FORCE INDEX (`received`) WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
-		foreach ($items AS $item)
-			appnetpost_feeditem($item["id"], $uid);
-	}
-	echo "</feed>\n";
-	killme();
-}
-
-function appnetpost_feeditem($pid, $uid) {
-	global $a;
-
-	require_once('include/bbcode.php');
-	require_once("include/html2plain.php");
-	require_once("include/network.php");
-
-	$items = q("SELECT `uri`, `plink`, `author-link`, `author-name`, `created`, `edited`, `id`, `title`, `body` from `item` WHERE id=%d", intval($pid));
-	foreach ($items AS $item) {
-
-		$item['body'] = bb_CleanPictureLinks($item['body']);
-
-		// Looking for the first image
-		$image = '';
-		if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$item['body'],$matches))
-			$image = $matches[3];
-
-		if ($image == '')
-			if(preg_match("/\[img\](.*?)\[\/img\]/is",$item['body'],$matches))
-				$image = $matches[1];
-
-		$multipleimages = (strpos($item['body'], "[img") != strrpos($item['body'], "[img"));
-
-		// When saved into the database the content is sent through htmlspecialchars
-		// That means that we have to decode all image-urls
-		$image = htmlspecialchars_decode($image);
-
-		$link = '';
-		// look for bookmark-bbcode and handle it with priority
-		if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$item['body'],$matches))
-			$link = $matches[1];
-
-		$multiplelinks = (strpos($item['body'], "[bookmark") != strrpos($item['body'], "[bookmark"));
-
-		$body = $item['body'];
-
-		// At first convert the text to html
-		$html = bbcode($body, false, false, 2);
-
-		// Then convert it to plain text
-		$msg = trim(html2plain($html, 0, true));
-		$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
-
-		// If there is no bookmark element then take the first link
-		if ($link == '') {
-			$links = collecturls($html);
-			if (sizeof($links) > 0) {
-				reset($links);
-				$link = current($links);
-			}
-			$multiplelinks = (sizeof($links) > 1);
-
-			if ($multiplelinks) {
-				$html2 = bbcode($msg, false, false);
-				$links2 = collecturls($html2);
-				if (sizeof($links2) > 0) {
-					reset($links2);
-					$link = current($links2);
-					$multiplelinks = (sizeof($links2) > 1);
-				}
-			}
-		}
-
-		$msglink = "";
-		if ($multiplelinks)
-			$msglink = $item["plink"];
-		else if ($link != "")
-			$msglink = $link;
-		else if ($multipleimages)
-			$msglink = $item["plink"];
-		else if ($image != "")
-			$msglink = $image;
-
-		// Fetching the title and add all lines
-		if ($item["title"] != "")
-			$title = $item["title"];
-
-		$lines = explode("\n", $msg);
-		foreach ($lines AS $line)
-			$title .= "\n".$line;
-
-		$max_char = 256;
-
-		$origlink = $msglink;
-
-		if (strlen($msglink) > 20)
-			$msglink = short_link($msglink);
-
-		$title = trim(str_replace($origlink, $msglink, $title));
-
-		if (strlen(trim($title." ".$msglink)) > $max_char) {
-			$title = substr($title, 0, $max_char - (strlen($msglink)));
-			$lastchar = substr($title, -1);
-			$title = substr($title, 0, -1);
-			$pos = strrpos($title, "\n");
-			if ($pos > 0)
-				$title = substr($title, 0, $pos);
-			else if ($lastchar != "\n")
-			$title = substr($title, 0, -3)."...";
-		}
-
-		if (($msglink != "") AND !strstr($title, $msglink))
-			$title = trim($title." ".$msglink);
-		else
-			$title = trim($title);
-
-		if ($title == "")
-			continue;
-
-		//$origlink = original_url($origlink);
-
-		$html = nl2br($title);
-
-		$origlink = $item["plink"];
-		$origlink = htmlspecialchars(html_entity_decode($origlink));
-
-		$title = str_replace("&", "&amp;", $title);
-		//$html = str_replace("&", "&amp;", $html);
-
-		echo "\t".'<entry xmlns="http://www.w3.org/2005/Atom">'."\n";
-		echo "\t\t".'<title type="html" xml:space="preserve"><![CDATA['.$title."]]></title>\n";
-		echo "\t\t".'<link rel="alternate" type="text/html" href="'.$origlink.'" />'."\n";
-		// <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>
-		echo "\t\t<id>".$item["uri"]."</id>\n";
-		echo "\t\t<updated>".date("c", strtotime($item["edited"]))."</updated>\n";
-		echo "\t\t<published>".date("c", strtotime($item["created"]))."</published>\n";
-		echo "\t\t<author>\n\t\t\t<name><![CDATA[".$item["author-name"]."]]></name>\n";
-		echo "\t\t\t<uri>".$item["author-link"]."</uri>\n\t\t</author>\n";
-		//echo '<content type="image/png" src="http://media.example.org/the_beach.png"/>';
-		echo "\t\t".'<content type="html" xml:space="preserve" xml:base="'.$item["plink"].'"><![CDATA['.$html."]]></content>\n";
-		echo "\t</entry>\n";
-	}
-}
diff --git a/appnetpost/lang/C/messages.po b/appnetpost/lang/C/messages.po
deleted file mode 100644
index 4778c497..00000000
--- a/appnetpost/lang/C/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON appnetpost
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica appnetpost addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 11:47+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: appnetpost.php:37
-msgid "Post to app.net"
-msgstr ""
-
-#: appnetpost.php:59 appnetpost.php:63
-msgid "App.net Export"
-msgstr ""
-
-#: appnetpost.php:67
-msgid "Enable App.net Post Plugin"
-msgstr ""
-
-#: appnetpost.php:72
-msgid "Post to App.net by default"
-msgstr ""
-
-#: appnetpost.php:78
-msgid "Save Settings"
-msgstr ""
diff --git a/appnetpost/lang/cs/messages.po b/appnetpost/lang/cs/messages.po
deleted file mode 100644
index 9490c5fb..00000000
--- a/appnetpost/lang/cs/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON appnetpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica appnetpost addon package.
-# 
-# 
-# Translators:
-# Michal Šupler <msupler@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 11:47+0200\n"
-"PO-Revision-Date: 2014-07-02 15:25+0000\n"
-"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: appnetpost.php:37
-msgid "Post to app.net"
-msgstr "Poslat příspěvek na app.net"
-
-#: appnetpost.php:59 appnetpost.php:63
-msgid "App.net Export"
-msgstr "App.net Export"
-
-#: appnetpost.php:67
-msgid "Enable App.net Post Plugin"
-msgstr "Aktivovat App.net Post Plugin"
-
-#: appnetpost.php:72
-msgid "Post to App.net by default"
-msgstr "Defaultně poslat na App.net"
-
-#: appnetpost.php:78
-msgid "Save Settings"
-msgstr "Uložit Nastavení"
diff --git a/appnetpost/lang/cs/strings.php b/appnetpost/lang/cs/strings.php
deleted file mode 100644
index 231a7c63..00000000
--- a/appnetpost/lang/cs/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_cs")) {
-function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
-}}
-;
-$a->strings["Post to app.net"] = "Poslat příspěvek na app.net";
-$a->strings["App.net Export"] = "App.net Export";
-$a->strings["Enable App.net Post Plugin"] = "Aktivovat App.net Post Plugin";
-$a->strings["Post to App.net by default"] = "Defaultně poslat na App.net";
-$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/appnetpost/lang/de/messages.po b/appnetpost/lang/de/messages.po
deleted file mode 100644
index 368b8da7..00000000
--- a/appnetpost/lang/de/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON appnetpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica appnetpost addon package.
-# 
-# 
-# Translators:
-# bavatar <tobias.diekershoff@gmx.net>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 11:47+0200\n"
-"PO-Revision-Date: 2014-07-03 05:42+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: appnetpost.php:37
-msgid "Post to app.net"
-msgstr "Bei app.net veröffentlichen"
-
-#: appnetpost.php:59 appnetpost.php:63
-msgid "App.net Export"
-msgstr "App.net Export"
-
-#: appnetpost.php:67
-msgid "Enable App.net Post Plugin"
-msgstr "Veröffentlichungen bei App.net erlauben"
-
-#: appnetpost.php:72
-msgid "Post to App.net by default"
-msgstr "Standardmäßig bei App.net veröffentlichen"
-
-#: appnetpost.php:78
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
diff --git a/appnetpost/lang/de/strings.php b/appnetpost/lang/de/strings.php
deleted file mode 100644
index 7925d92e..00000000
--- a/appnetpost/lang/de/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["Post to app.net"] = "Bei app.net veröffentlichen";
-$a->strings["App.net Export"] = "App.net Export";
-$a->strings["Enable App.net Post Plugin"] = "Veröffentlichungen bei App.net erlauben";
-$a->strings["Post to App.net by default"] = "Standardmäßig bei App.net veröffentlichen";
-$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/appnetpost/lang/it/messages.po b/appnetpost/lang/it/messages.po
deleted file mode 100644
index 374f17a4..00000000
--- a/appnetpost/lang/it/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON appnetpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica appnetpost addon package.
-# 
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 11:47+0200\n"
-"PO-Revision-Date: 2014-09-10 10:18+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: appnetpost.php:37
-msgid "Post to app.net"
-msgstr "Invia ad app.net"
-
-#: appnetpost.php:59 appnetpost.php:63
-msgid "App.net Export"
-msgstr "Esporta App.net"
-
-#: appnetpost.php:67
-msgid "Enable App.net Post Plugin"
-msgstr "Abilita il plugin di invio ad App.net"
-
-#: appnetpost.php:72
-msgid "Post to App.net by default"
-msgstr "Invia sempre ad App.net"
-
-#: appnetpost.php:78
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
diff --git a/appnetpost/lang/it/strings.php b/appnetpost/lang/it/strings.php
deleted file mode 100644
index a650109f..00000000
--- a/appnetpost/lang/it/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["Post to app.net"] = "Invia ad app.net";
-$a->strings["App.net Export"] = "Esporta App.net";
-$a->strings["Enable App.net Post Plugin"] = "Abilita il plugin di invio ad App.net";
-$a->strings["Post to App.net by default"] = "Invia sempre ad App.net";
-$a->strings["Save Settings"] = "Salva Impostazioni";
diff --git a/appnetpost/lang/pt-br/messages.po b/appnetpost/lang/pt-br/messages.po
deleted file mode 100644
index aa219db3..00000000
--- a/appnetpost/lang/pt-br/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON appnetpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica appnetpost addon package.
-# 
-# 
-# Translators:
-# André Alves <and2099@riseup.net>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 11:47+0200\n"
-"PO-Revision-Date: 2016-01-03 06:26+0000\n"
-"Last-Translator: André Alves <and2099@riseup.net>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: appnetpost.php:37
-msgid "Post to app.net"
-msgstr ""
-
-#: appnetpost.php:59 appnetpost.php:63
-msgid "App.net Export"
-msgstr "Exportar de App.net"
-
-#: appnetpost.php:67
-msgid "Enable App.net Post Plugin"
-msgstr "Habilitar Plugin de publicação App.net"
-
-#: appnetpost.php:72
-msgid "Post to App.net by default"
-msgstr "Postar em App.net por padrão"
-
-#: appnetpost.php:78
-msgid "Save Settings"
-msgstr "Salvar Configurações"
diff --git a/appnetpost/lang/pt-br/strings.php b/appnetpost/lang/pt-br/strings.php
deleted file mode 100644
index c9317ce8..00000000
--- a/appnetpost/lang/pt-br/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pt_br")) {
-function string_plural_select_pt_br($n){
-	return ($n > 1);;
-}}
-;
-$a->strings["Post to app.net"] = "";
-$a->strings["App.net Export"] = "Exportar de App.net";
-$a->strings["Enable App.net Post Plugin"] = "Habilitar Plugin de publicação App.net";
-$a->strings["Post to App.net by default"] = "Postar em App.net por padrão";
-$a->strings["Save Settings"] = "Salvar Configurações";
diff --git a/appnetpost/lang/ro/messages.po b/appnetpost/lang/ro/messages.po
deleted file mode 100644
index dbe56220..00000000
--- a/appnetpost/lang/ro/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON appnetpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica appnetpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 11:47+0200\n"
-"PO-Revision-Date: 2014-07-08 11:41+0000\n"
-"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: appnetpost.php:37
-msgid "Post to app.net"
-msgstr "Postați pe App.net"
-
-#: appnetpost.php:59 appnetpost.php:63
-msgid "App.net Export"
-msgstr "Exportare pe App.net"
-
-#: appnetpost.php:67
-msgid "Enable App.net Post Plugin"
-msgstr "Activare Modul Postare pe App.net"
-
-#: appnetpost.php:72
-msgid "Post to App.net by default"
-msgstr "Postați implicit pe App.net"
-
-#: appnetpost.php:78
-msgid "Save Settings"
-msgstr "Salvare Configurări"
diff --git a/appnetpost/lang/ro/strings.php b/appnetpost/lang/ro/strings.php
deleted file mode 100644
index 176f6c88..00000000
--- a/appnetpost/lang/ro/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ro")) {
-function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
-}}
-;
-$a->strings["Post to app.net"] = "Postați pe App.net";
-$a->strings["App.net Export"] = "Exportare pe App.net";
-$a->strings["Enable App.net Post Plugin"] = "Activare Modul Postare pe App.net";
-$a->strings["Post to App.net by default"] = "Postați implicit pe App.net";
-$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/page/lang/C/messages.po b/page/lang/C/messages.po
deleted file mode 100644
index df5e659b..00000000
--- a/page/lang/C/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON page
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica page addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: page.php:62 page.php:92
-msgid "Forums"
-msgstr ""
-
-#: page.php:77 page.php:111
-msgid "show more"
-msgstr ""
-
-#: page.php:130
-msgid "Forums:"
-msgstr ""
-
-#: page.php:166
-msgid "Page settings updated."
-msgstr ""
-
-#: page.php:195
-msgid "Page Settings"
-msgstr ""
-
-#: page.php:197
-msgid "How many forums to display on sidebar without paging"
-msgstr ""
-
-#: page.php:200
-msgid "Randomise Page/Forum list"
-msgstr ""
-
-#: page.php:203
-msgid "Show pages/forums on profile page"
-msgstr ""
-
-#: page.php:211
-msgid "Submit"
-msgstr ""
diff --git a/page/lang/ca/strings.php b/page/lang/ca/strings.php
deleted file mode 100644
index 38b7c8b0..00000000
--- a/page/lang/ca/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Forums";
-$a->strings["show more"] = "Mostrar més";
-$a->strings["Forums:"] = "Fòrums:";
-$a->strings["Page settings updated."] = "Actualitzats els ajustos de pàgina.";
-$a->strings["Page Settings"] = "Ajustos de pàgina";
-$a->strings["How many forums to display on sidebar without paging"] = "Quants fòrums per mostrar a la barra lateral per pàgina";
-$a->strings["Randomise Page/Forum list"] = "Aleatoritza la llista de Pàgina/Fòrum";
-$a->strings["Show pages/forums on profile page"] = "Mostra pàgines/fòrums a la pàgina de perfil";
-$a->strings["Submit"] = "Enviar";
diff --git a/page/lang/cs/strings.php b/page/lang/cs/strings.php
deleted file mode 100644
index b439a088..00000000
--- a/page/lang/cs/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Fóra";
-$a->strings["show more"] = "zobrazit více";
-$a->strings["Forums:"] = "Fóra:";
-$a->strings["Page settings updated."] = "Nastavení stránky aktualizováno.";
-$a->strings["Page Settings"] = "Nastavení stránky";
-$a->strings["How many forums to display on sidebar without paging"] = "Kolik diskuzních fór zobrazit v bočním panelu bez použití stránkování";
-$a->strings["Randomise Page/Forum list"] = "Náhodný stránka/fórum seznam";
-$a->strings["Show pages/forums on profile page"] = "Zobrazit stránky/fóra na profilové stránce";
-$a->strings["Submit"] = "Odeslat";
diff --git a/page/lang/de/strings.php b/page/lang/de/strings.php
deleted file mode 100644
index f2941b70..00000000
--- a/page/lang/de/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Foren";
-$a->strings["show more"] = "mehr anzeigen";
-$a->strings["Forums:"] = "Foren:";
-$a->strings["Page settings updated."] = "Seiteneinstellungen aktualisiert.";
-$a->strings["Page Settings"] = "Seiteneinstellungen";
-$a->strings["How many forums to display on sidebar without paging"] = "Wie viele Foren sollen in der Seitenleiste ohne Umblättern angezeigt werden";
-$a->strings["Randomise Page/Forum list"] = "Zufällige Seiten/Foren Liste";
-$a->strings["Show pages/forums on profile page"] = "Foren/Seiten auf der Profilseite anzeigen";
-$a->strings["Submit"] = "Senden";
diff --git a/page/lang/eo/strings.php b/page/lang/eo/strings.php
deleted file mode 100644
index 42577c87..00000000
--- a/page/lang/eo/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Forumoj";
-$a->strings["show more"] = "montri pli";
-$a->strings["Forums:"] = "Forumoj:";
-$a->strings["Page settings updated."] = "Paĝajn agordojn ĝisdatigita.";
-$a->strings["Page Settings"] = "Paĝaj Agordoj";
-$a->strings["How many forums to display on sidebar without paging"] = "Montri tiom da forumoj en la flanka strio sen paĝigo";
-$a->strings["Randomise Page/Forum list"] = "Hazardigi la liston de Paĝoj/Forumoj";
-$a->strings["Show pages/forums on profile page"] = "Montri paĝojn/forumojn sur la profilpaĝo";
-$a->strings["Submit"] = "Sendi";
diff --git a/page/lang/es/strings.php b/page/lang/es/strings.php
deleted file mode 100644
index cea7dd08..00000000
--- a/page/lang/es/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Foros";
-$a->strings["show more"] = "ver más";
-$a->strings["Forums:"] = "Foros:";
-$a->strings["Page settings updated."] = "Configuración de la página actualizada";
-$a->strings["Page Settings"] = "Configuración de la página";
-$a->strings["How many forums to display on sidebar without paging"] = "¿Cuántos foros se mostrarán en la barra lateral?";
-$a->strings["Randomise Page/Forum list"] = "Lista de Página/Foro al azar";
-$a->strings["Show pages/forums on profile page"] = "Mostrar páginas/foros en tu perfil";
-$a->strings["Submit"] = "Envíar";
diff --git a/page/lang/fr/strings.php b/page/lang/fr/strings.php
deleted file mode 100644
index d6410064..00000000
--- a/page/lang/fr/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Forums";
-$a->strings["show more"] = "montrer plus";
-$a->strings["Forums:"] = "Forums:";
-$a->strings["Page settings updated."] = "Paramètres des pages mis à jour.";
-$a->strings["Page Settings"] = "Paramètres des pages";
-$a->strings["How many forums to display on sidebar without paging"] = "Nombre de forums à afficher sur la barre de côté sans changer de page";
-$a->strings["Randomise Page/Forum list"] = "Rendre aléatoire la liste des pages/forums";
-$a->strings["Show pages/forums on profile page"] = "Montrer les forums sur le profil";
-$a->strings["Submit"] = "Envoyer";
diff --git a/page/lang/is/strings.php b/page/lang/is/strings.php
deleted file mode 100644
index 10b01f34..00000000
--- a/page/lang/is/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "";
-$a->strings["show more"] = "sýna meira";
-$a->strings["Forums:"] = "";
-$a->strings["Page settings updated."] = "";
-$a->strings["Page Settings"] = "";
-$a->strings["How many forums to display on sidebar without paging"] = "";
-$a->strings["Randomise Page/Forum list"] = "";
-$a->strings["Show pages/forums on profile page"] = "";
-$a->strings["Submit"] = "Senda inn";
diff --git a/page/lang/it/strings.php b/page/lang/it/strings.php
deleted file mode 100644
index f7ed7377..00000000
--- a/page/lang/it/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Forum";
-$a->strings["show more"] = "mostra di più";
-$a->strings["Forums:"] = "Forum:";
-$a->strings["Page settings updated."] = "";
-$a->strings["Page Settings"] = "";
-$a->strings["How many forums to display on sidebar without paging"] = "";
-$a->strings["Randomise Page/Forum list"] = "";
-$a->strings["Show pages/forums on profile page"] = "Mostra pagine/forum sulla pagina profilo";
-$a->strings["Submit"] = "Invia";
diff --git a/page/lang/nb-no/strings.php b/page/lang/nb-no/strings.php
deleted file mode 100644
index baf7655e..00000000
--- a/page/lang/nb-no/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "";
-$a->strings["show more"] = "";
-$a->strings["Forums:"] = "";
-$a->strings["Page settings updated."] = "";
-$a->strings["Page Settings"] = "";
-$a->strings["How many forums to display on sidebar without paging"] = "";
-$a->strings["Randomise Page/Forum list"] = "";
-$a->strings["Show pages/forums on profile page"] = "";
-$a->strings["Submit"] = "Lagre";
diff --git a/page/lang/pl/strings.php b/page/lang/pl/strings.php
deleted file mode 100644
index 4677d64e..00000000
--- a/page/lang/pl/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Fora";
-$a->strings["show more"] = "Pokaż więcej";
-$a->strings["Forums:"] = "";
-$a->strings["Page settings updated."] = "Zaktualizowano ustawienia strony.";
-$a->strings["Page Settings"] = "Ustawienia strony";
-$a->strings["How many forums to display on sidebar without paging"] = "";
-$a->strings["Randomise Page/Forum list"] = "";
-$a->strings["Show pages/forums on profile page"] = "";
-$a->strings["Submit"] = "Potwierdź";
diff --git a/page/lang/pt-br/strings.php b/page/lang/pt-br/strings.php
deleted file mode 100644
index 3d035e33..00000000
--- a/page/lang/pt-br/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Fóruns";
-$a->strings["show more"] = "exibir mais";
-$a->strings["Forums:"] = "Fóruns:";
-$a->strings["Page settings updated."] = "As configurações da página foram atualizadas.";
-$a->strings["Page Settings"] = "Configurações da página";
-$a->strings["How many forums to display on sidebar without paging"] = "";
-$a->strings["Randomise Page/Forum list"] = "";
-$a->strings["Show pages/forums on profile page"] = "";
-$a->strings["Submit"] = "Enviar";
diff --git a/page/lang/ru/strings.php b/page/lang/ru/strings.php
deleted file mode 100644
index 0d428acb..00000000
--- a/page/lang/ru/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "Форумы";
-$a->strings["show more"] = "показать больше";
-$a->strings["Forums:"] = "";
-$a->strings["Page settings updated."] = "";
-$a->strings["Page Settings"] = "";
-$a->strings["How many forums to display on sidebar without paging"] = "";
-$a->strings["Randomise Page/Forum list"] = "";
-$a->strings["Show pages/forums on profile page"] = "";
-$a->strings["Submit"] = "Подтвердить";
diff --git a/page/lang/sv/strings.php b/page/lang/sv/strings.php
deleted file mode 100644
index 3ec569a7..00000000
--- a/page/lang/sv/strings.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$a->strings["Submit"] = "Spara";
diff --git a/page/lang/zh-cn/strings.php b/page/lang/zh-cn/strings.php
deleted file mode 100644
index 653d605d..00000000
--- a/page/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$a->strings["Forums"] = "论坛";
-$a->strings["show more"] = "看多";
-$a->strings["Forums:"] = "评坛：";
-$a->strings["Page settings updated."] = "页设置更新了";
-$a->strings["Page Settings"] = "页设置";
-$a->strings["How many forums to display on sidebar without paging"] = "多少评坛要在工具栏上表示无分页";
-$a->strings["Randomise Page/Forum list"] = "把页／评坛单洗牌";
-$a->strings["Show pages/forums on profile page"] = "表示页／评坛在简介页";
-$a->strings["Submit"] = "提交";
diff --git a/page/page.css b/page/page.css
deleted file mode 100644
index 0c0fe3cd..00000000
--- a/page/page.css
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-#page-settings-label, #page-random-label, #page-profile-label {
-	float: left;
-	width: 200px;
-	margin-bottom: 25px;
-}
-
-#page-max-pages, #page-random, #page-profile {
-	float: left;
-}
-
diff --git a/page/page.php b/page/page.php
deleted file mode 100755
index f81b0114..00000000
--- a/page/page.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Name: Page
- * Description: This addon is now deprecated.  Administrators should switch to forumlist instead.  Developers should also add any functionality to forumlist instead of here.
- * Version: 1.0
- * Author: Mike Macgirvin <mike@macgirvin.com>
- * based on pages plugin by
- * Author: Michael Vogel <ike@piratenpartei.de>
- * Status: Unsupported
- *
- */
-
-function page_install() {
-	register_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
-	register_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
-	register_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
-	register_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced');
-
-}
-
-function page_uninstall() {
-	unregister_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
-	unregister_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
-	unregister_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
-	unregister_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced');
-
-	// remove only - obsolete
-	unregister_hook('page_end', 'addon/page/page.php', 'page_page_end');
-}
-
-
-function page_getpage($uid,$showhidden = true,$randomise = false) {
-
-
-	$pagelist = array();
-
-	$order = (($showhidden) ? '' : " and hidden = 0 ");
-	$order .= (($randomise) ? ' order by rand() ' : ' order by name asc ');
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro` FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			and blocked = 0 and hidden = 0 and pending = 0 and archive = 0
-			$order ",
-			intval($uid)
-	);
-
-	$page = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$page[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	}
-	return($page);
-}
-
-function page_page_end($a,&$b) {
-	// Only move on if if it's the "network" module and there is a logged on user
-	if (($a->module != "network") OR ($a->user['uid'] == 0))
-		return;
-
-	$page = '<div id="page-sidebar" class="widget">
-			<div class="title tool">
-			<h3>'.t("Forums").'</h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-
-	$contacts = page_getpage($a->user['uid']);
-
-	$total_shown = 0;
-	$more = false;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="_blank">'.
-				$contact["name"]."</a></li>";
-		$total_shown ++;
-		if($total_shown == 6) {
-			$more = true;
-			$page .= '</ul><div id="hide-comments-page-widget" class="fakelink" onclick="showHideComments(\'page-widget\');" >' . t('show more') 
-				. '</div><div id="collapsed-comments-page-widget" style="display: none;" ><ul>';
-		} 
-	}
-	if($more)
-		$page .= '</div>';
-	$page .= "</ul></div></div>";
-	if (sizeof($contacts) > 0)
-		$a->page['aside'] = $page . $a->page['aside'];
-}
-
-function page_network_mod_init($a,$b) {
-
-	$page = '<div id="page-sidebar" class="widget">
-			<div class="title tool">
-			<h3>'.t("Forums").'</h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$show_total = intval(get_pconfig(local_user(),'page','max_pages'));
-	if($show_total === false)
-		$show_total = 6;
-	$randomise = intval(get_pconfig(local_user(),'page','randomise'));
-
-	$contacts = page_getpage($a->user['uid'],true,$randomise);
-
-	$total_shown = 0;
-	$more = false;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="_blank">'.
-				$contact["name"]."</a></li>";
-		$total_shown ++;
-		if(($show_total) && ($total_shown == $show_total)) {
-			$more = true;
-			$page .= '</ul><div id="hide-comments-page-widget" class="fakelink" onclick="showHideComments(\'page-widget\');" >' . t('show more') 
-				. '</div><div id="collapsed-comments-page-widget" style="display: none;" ><ul>';
-		} 
-	}
-	if($more)
-		$page .= '</div>';
-	$page .= "</ul></div></div>";
-	if (sizeof($contacts) > 0)
-		$a->page['aside'] = $page . $a->page['aside'];
-}
-
-
-function page_profile_advanced($a,&$b) {
-
-	$profile = intval(get_pconfig($a->profile['profile_uid'],'page','show_on_profile'));
-	if(! $profile)
-		return;
-
-	$page = '<div id="page-profile">
-			<div class="title">'.t("Forums:").'</div>
-			<div id="profile-page-list">';
-
-	// place holder in case somebody wants configurability
-	$show_total = 9999;
-
-	$randomise = true;
-
-	$contacts = page_getpage($a->user['uid'],false,$randomise);
-
-	$total_shown = 0;
-	$more = false;
-
-	foreach($contacts as $contact) {
-		$page .= micropro($contact,false,'page-profile-advanced');
-		$total_shown ++;
-		if($total_shown == $show_total)
-			break;
-	}
-	$page .= '</div></div><div class="clear"></div>';
-
-	if(count($contacts) > 0)
-		$b .= $page;
-
-}
-
-
-
-function page_plugin_settings_post($a,$post) {
-	if(! local_user() || (! x($_POST,'page-settings-submit')))
-		return;
-
-	set_pconfig(local_user(),'page','max_pages',intval($_POST['page_max_pages']));
-	set_pconfig(local_user(),'page','randomise',intval($_POST['page_random']));
-	set_pconfig(local_user(),'page','show_on_profile',intval($_POST['page_profile']));
-
-	info( t('Page settings updated.') . EOL);
-}
-
-
-function page_plugin_settings(&$a,&$s) {
-
-	if(! local_user())
-		return;
-
-	/* Add our stylesheet to the page so we can make our settings look nice */
-
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/page/page.css' . '" media="all" />' . "\r\n";
-
-	/* Get the current state of our config variable */
-
-	$max_pages = get_pconfig(local_user(),'page','max_pages');
-	if($max_pages === false)
-		$max_pages = 6;
-
-	$randomise = intval(get_pconfig(local_user(),'page','randomise'));
-	$randomise_checked = (($randomise) ? ' checked="checked" ' : '');
-
-	$profile = intval(get_pconfig(local_user(),'page','show_on_profile'));
-	$profile_checked = (($profile) ? ' checked="checked" ' : '');
-	
-	
-	/* Add some HTML to the existing form */
-
-	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('Page Settings') . '</h3>';
-	$s .= '<div id="page-settings-wrapper">';
-	$s .= '<label id="page-settings-label" for="page-max-pages">' . t('How many forums to display on sidebar without paging') . '</label>';
-	$s .= '<input id="page-max-pages" type="text" name="page_max_pages" value="' . intval($max_pages) . '" ' . '/>';
-	$s .= '<div class="clear"></div>';
-	$s .= '<label id="page-random-label" for="page-random">' . t('Randomise Page/Forum list') . '</label>';
-	$s .= '<input id="page-random" type="checkbox" name="page_random" value="1" ' . $randomise_checked . '/>';
-	$s .= '<div class="clear"></div>';
-	$s .= '<label id="page-profile-label" for="page-profile">' . t('Show pages/forums on profile page') . '</label>';
-	$s .= '<input id="page-profile" type="checkbox" name="page_profile" value="1" ' . $profile_checked . '/>';
-	$s .= '<div class="clear"></div>';
-
-	$s .= '</div>';
-
-	/* provide a submit button */
-
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="page-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
-
-}
-
-
diff --git a/privacy_image_cache/README.md b/privacy_image_cache/README.md
deleted file mode 100644
index 63970d3d..00000000
--- a/privacy_image_cache/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Once activated, this addon acs as a proxy between the user and external image resources.
-If external images are to be shown, like avatars or embedded images, the server retrieves the image and the local link is sent to the user.
-By using this proxy, the server hosting the original image cannot retrieve personal information of the user like the IP address, User Agent or Cookies.
-However, the remote server will be able to track the IP address of the server hosting the friendica installation.
\ No newline at end of file
diff --git a/privacy_image_cache/lang/C/messages.po b/privacy_image_cache/lang/C/messages.po
deleted file mode 100644
index 325cb61a..00000000
--- a/privacy_image_cache/lang/C/messages.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# ADDON privacy_image_cache
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica privacy_image_cache addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: privacy_image_cache.php:364
-msgid "Lifetime of the cache (in hours)"
-msgstr ""
-
-#: privacy_image_cache.php:367
-msgid "Save"
-msgstr ""
-
-#: privacy_image_cache.php:369
-msgid "Cache Statistics"
-msgstr ""
-
-#: privacy_image_cache.php:372
-msgid "Number of items"
-msgstr ""
-
-#: privacy_image_cache.php:374
-msgid "Size of the cache"
-msgstr ""
-
-#: privacy_image_cache.php:376
-msgid "Delete the whole cache"
-msgstr ""
diff --git a/privacy_image_cache/lang/ca/strings.php b/privacy_image_cache/lang/ca/strings.php
deleted file mode 100644
index 2edee39f..00000000
--- a/privacy_image_cache/lang/ca/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Temps de vida de la caché (en hores)";
-$a->strings["Save"] = "Guardar";
-$a->strings["Cache Statistics"] = "Estadístiques de la caché";
-$a->strings["Number of items"] = "Nombre d'elements";
-$a->strings["Size of the cache"] = "Mida de la caché";
-$a->strings["Delete the whole cache"] = "Esborra tota la cachè";
diff --git a/privacy_image_cache/lang/cs/strings.php b/privacy_image_cache/lang/cs/strings.php
deleted file mode 100644
index 87be7041..00000000
--- a/privacy_image_cache/lang/cs/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Životnost vyrovnávací paměti (v hodinách)";
-$a->strings["Save"] = "Uložit";
-$a->strings["Cache Statistics"] = "Statistika vyrovnávací paměti";
-$a->strings["Number of items"] = "Počet položek";
-$a->strings["Size of the cache"] = "Velikost vyrovnávací paměti";
-$a->strings["Delete the whole cache"] = "Vymazat celou vyrovnávací paměť";
diff --git a/privacy_image_cache/lang/de/strings.php b/privacy_image_cache/lang/de/strings.php
deleted file mode 100644
index 5b7a303c..00000000
--- a/privacy_image_cache/lang/de/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)";
-$a->strings["Save"] = "Speichern";
-$a->strings["Cache Statistics"] = "Cache Statistik";
-$a->strings["Number of items"] = "Anzahl der Einträge";
-$a->strings["Size of the cache"] = "Größe des Caches";
-$a->strings["Delete the whole cache"] = "Cache leeren";
diff --git a/privacy_image_cache/lang/eo/strings.php b/privacy_image_cache/lang/eo/strings.php
deleted file mode 100644
index 55363b7d..00000000
--- a/privacy_image_cache/lang/eo/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Vivodaŭro de kaŝmemoro (horoj)";
-$a->strings["Save"] = "Konservi";
-$a->strings["Cache Statistics"] = "Statistikoj pri kaŝmemoro";
-$a->strings["Number of items"] = "Kvanto da eroj";
-$a->strings["Size of the cache"] = "Grando de la kaŝmemoro";
-$a->strings["Delete the whole cache"] = "Forviŝi la kaŝmemoron";
diff --git a/privacy_image_cache/lang/es/strings.php b/privacy_image_cache/lang/es/strings.php
deleted file mode 100644
index 41431578..00000000
--- a/privacy_image_cache/lang/es/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Vida útil de la caché (en horas)";
-$a->strings["Save"] = "Guardar";
-$a->strings["Cache Statistics"] = "Estadísticas de la caché";
-$a->strings["Number of items"] = "Número de ítems";
-$a->strings["Size of the cache"] = "Tamaño de la caché";
-$a->strings["Delete the whole cache"] = "Borrar toda la caché";
diff --git a/privacy_image_cache/lang/fr/strings.php b/privacy_image_cache/lang/fr/strings.php
deleted file mode 100644
index 76379fed..00000000
--- a/privacy_image_cache/lang/fr/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Durée de vie du cache (en heures)";
-$a->strings["Save"] = "Sauver";
-$a->strings["Cache Statistics"] = "Statistiques du cache";
-$a->strings["Number of items"] = "Nombre d'éléments";
-$a->strings["Size of the cache"] = "Taille du cache";
-$a->strings["Delete the whole cache"] = "Vider le cache";
diff --git a/privacy_image_cache/lang/is/strings.php b/privacy_image_cache/lang/is/strings.php
deleted file mode 100644
index 84741a91..00000000
--- a/privacy_image_cache/lang/is/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "";
-$a->strings["Save"] = "Vista";
-$a->strings["Cache Statistics"] = "Tölfræði skyndiminnis";
-$a->strings["Number of items"] = "Fjöldi færslna";
-$a->strings["Size of the cache"] = "Stærð skyndiminnis";
-$a->strings["Delete the whole cache"] = "Eyða öllu í skyndiminni";
diff --git a/privacy_image_cache/lang/it/strings.php b/privacy_image_cache/lang/it/strings.php
deleted file mode 100644
index de9740f2..00000000
--- a/privacy_image_cache/lang/it/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "";
-$a->strings["Save"] = "Salva";
-$a->strings["Cache Statistics"] = "";
-$a->strings["Number of items"] = "";
-$a->strings["Size of the cache"] = "";
-$a->strings["Delete the whole cache"] = "";
diff --git a/privacy_image_cache/lang/nb-no/strings.php b/privacy_image_cache/lang/nb-no/strings.php
deleted file mode 100644
index 51ebef55..00000000
--- a/privacy_image_cache/lang/nb-no/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "";
-$a->strings["Save"] = "Lagre";
-$a->strings["Cache Statistics"] = "";
-$a->strings["Number of items"] = "";
-$a->strings["Size of the cache"] = "";
-$a->strings["Delete the whole cache"] = "";
diff --git a/privacy_image_cache/lang/pl/strings.php b/privacy_image_cache/lang/pl/strings.php
deleted file mode 100644
index 8d90ebfc..00000000
--- a/privacy_image_cache/lang/pl/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "";
-$a->strings["Save"] = "Zapisz";
-$a->strings["Cache Statistics"] = "";
-$a->strings["Number of items"] = "Numery elementów";
-$a->strings["Size of the cache"] = "";
-$a->strings["Delete the whole cache"] = "";
diff --git a/privacy_image_cache/lang/pt-br/strings.php b/privacy_image_cache/lang/pt-br/strings.php
deleted file mode 100644
index 4f814886..00000000
--- a/privacy_image_cache/lang/pt-br/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "Tempo de vida do cache (em horas)";
-$a->strings["Save"] = "Salvar";
-$a->strings["Cache Statistics"] = "Estatísticas do cache";
-$a->strings["Number of items"] = "Número de itens";
-$a->strings["Size of the cache"] = "Tamanho do cache";
-$a->strings["Delete the whole cache"] = "Excluir o cache inteiro";
diff --git a/privacy_image_cache/lang/ru/strings.php b/privacy_image_cache/lang/ru/strings.php
deleted file mode 100644
index 5806a615..00000000
--- a/privacy_image_cache/lang/ru/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "";
-$a->strings["Save"] = "Сохранить";
-$a->strings["Cache Statistics"] = "";
-$a->strings["Number of items"] = "";
-$a->strings["Size of the cache"] = "";
-$a->strings["Delete the whole cache"] = "";
diff --git a/privacy_image_cache/lang/sv/strings.php b/privacy_image_cache/lang/sv/strings.php
deleted file mode 100644
index ab4fa67a..00000000
--- a/privacy_image_cache/lang/sv/strings.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-
diff --git a/privacy_image_cache/lang/zh-cn/strings.php b/privacy_image_cache/lang/zh-cn/strings.php
deleted file mode 100644
index b48e784c..00000000
--- a/privacy_image_cache/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$a->strings["Lifetime of the cache (in hours)"] = "缓存期（小时）";
-$a->strings["Save"] = "保存";
-$a->strings["Cache Statistics"] = "缓存统计";
-$a->strings["Number of items"] = "项目数量";
-$a->strings["Size of the cache"] = "缓存尺寸";
-$a->strings["Delete the whole cache"] = "删除全缓存";
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
deleted file mode 100644
index 8a303e7b..00000000
--- a/privacy_image_cache/privacy_image_cache.php
+++ /dev/null
@@ -1,453 +0,0 @@
-<?php
-
-/**
- * Name: Privacy Image Cache
- * Version: 0.1
- * Author: Tobias Hößl <https://github.com/CatoTH/>
- * Status: Unsupported
- */
-
-define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day
-
-require_once('include/security.php');
-require_once("include/Photo.php");
-
-function privacy_image_cache_install() {
-    register_hook('prepare_body', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_prepare_body_hook');
- //   register_hook('bbcode',       'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
-    register_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook');
-    register_hook('ping_xmlize',  'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook');
-    register_hook('cron',         'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron');
-}
-
-
-function privacy_image_cache_uninstall() {
-    unregister_hook('prepare_body', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_prepare_body_hook');
-    unregister_hook('bbcode',       'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
-    unregister_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook');
-    unregister_hook('ping_xmlize',  'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook');
-    unregister_hook('cron',         'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron');
-}
-
-
-function privacy_image_cache_module() {}
-
-function privacy_image_cache_init() {
-	global $a, $_SERVER;
-
-	// The code needs to be reworked, it is too complicated
-	//
-	// it is doing the following:
-	// 1. If a folder "privacy_image_cache" exists and is writeable, then use this for caching
-	// 2. If a cache path is defined, use this
-	// 3. If everything else failed, cache into the database
-
-	if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-		header('HTTP/1.1 304 Not Modified');
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-		header('Etag: '.$_SERVER['HTTP_IF_NONE_MATCH']);
-		header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
-		header("Cache-Control: max-age=31536000");
-		if(function_exists('header_remove')) {
-			header_remove('Last-Modified');
-			header_remove('Expires');
-			header_remove('Cache-Control');
-		}
-		exit;
-	}
-
-	if(function_exists('header_remove')) {
-		header_remove('Pragma');
-		header_remove('pragma');
-	}
-
-	$thumb = false;
-	$size = 1024;
-
-	// If the cache path isn't there, try to create it
-	if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"))
-		if (is_writable($_SERVER["DOCUMENT_ROOT"]))
-			mkdir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache");
-
-	// Checking if caching into a folder in the webroot is activated and working
-	$direct_cache = (is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache") AND is_writable($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"));
-
-	// Look for filename in the arguments
-	if (isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) {
-		if (isset($a->argv[3]))
-			$url = $a->argv[3];
-		elseif (isset($a->argv[2]))
-			$url = $a->argv[2];
-		else
-			$url = $a->argv[1];
-
-		//$thumb = (isset($a->argv[3]) and ($a->argv[3] == "thumb"));
-		if (isset($a->argv[3]) and ($a->argv[3] == "thumb"))
-			$size = 200;
-
-		// thumb, small, medium and large.
-		if (substr($url, -6) == ":thumb")
-			$size = 150;
-		if (substr($url, -6) == ":small")
-			$size = 340;
-		if (substr($url, -7) == ":medium")
-			$size = 600;
-		if (substr($url, -6) == ":large")
-			$size = 1024;
-
-		$pos = strrpos($url, "=.");
-		if ($pos)
-			$url = substr($url, 0, $pos+1);
-
-		$url = str_replace(array(".jpg", ".jpeg", ".gif", ".png"), array("","","",""), $url);
-
-		$url = base64_decode(strtr($url, '-_', '+/'), true);
-
-		if ($url)
-			$_REQUEST['url'] = $url;
-	}
-
-	if (!$direct_cache) {
-		$urlhash = 'pic:' . sha1($_REQUEST['url']);
-		// Double encoded url - happens with Diaspora
-		$urlhash2 = 'pic:' . sha1(urldecode($_REQUEST['url']));
-
-		$cachefile = get_cachefile(hash("md5", $_REQUEST['url']));
-		if ($cachefile != '') {
-			if (file_exists($cachefile)) {
-				$img_str = file_get_contents($cachefile);
-				$mime = image_type_to_mime_type(exif_imagetype($cachefile));
-
-				header("Content-type: $mime");
-				header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-				header('Etag: "'.md5($img_str).'"');
-				header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
-				header("Cache-Control: max-age=31536000");
-
-				// reduce quality - if it isn't a GIF
-				if ($mime != "image/gif") {
-					$img = new Photo($img_str, $mime);
-					if($img->is_valid()) {
-						$img_str = $img->imageString();
-					}
-				}
-
-				echo $img_str;
-				killme();
-			}
-		}
-	} else
-		$cachefile = "";
-
-	$valid = true;
-
-	if (!$direct_cache AND ($cachefile == "")) {
-		$r = q("SELECT * FROM `photo` WHERE `resource-id` in ('%s', '%s') LIMIT 1", $urlhash, $urlhash2);
-		if (count($r)) {
-        		$img_str = $r[0]['data'];
-			$mime = $r[0]["desc"];
-			if ($mime == "") $mime = "image/jpeg";
-		}
-	} else
-		$r = array();
-
-	if (!count($r)) {
-		// It shouldn't happen but it does - spaces in URL
-		$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
-		$redirects = 0;
-		$img_str = fetch_url($_REQUEST['url'],true, $redirects, 10);
-
-		$tempfile = tempnam(get_temppath(), "cache");
-		file_put_contents($tempfile, $img_str);
-		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
-		unlink($tempfile);
-
-		// If there is an error then return a blank image
-		if ((substr($a->get_curl_code(), 0, 1) == "4") or (!$img_str)) {
-			$img_str = file_get_contents("images/blank.png");
-			$mime = "image/png";
-			$cachefile = ""; // Clear the cachefile so that the dummy isn't stored
-			$valid = false;
-			$img = new Photo($img_str, "image/png");
-			if($img->is_valid()) {
-				$img->scaleImage(10);
-				$img_str = $img->imageString();
-			}
-		} else if (($mime != "image/jpeg") AND !$direct_cache AND ($cachefile == "")) {
-			$image = @imagecreatefromstring($img_str);
-
-			if($image === FALSE) die();
-
-			q("INSERT INTO `photo`
-			( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `desc`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
-			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' )",
-				0, 0, get_guid(), dbesc($urlhash),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc(basename(dbesc($_REQUEST["url"]))),
-				dbesc(''),
-				intval(imagesy($image)),
-				intval(imagesx($image)),
-				$mime,
-				dbesc($img_str),
-				100,
-				intval(0),
-				dbesc(''), dbesc(''), dbesc(''), dbesc('')
-			);
-
-		} else {
-			$img = new Photo($img_str, $mime);
-			if($img->is_valid()) {
-				if (!$direct_cache AND ($cachefile == ""))
-					$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
-
-				//if ($thumb) {
-				//	$img->scaleImage(200); // Test
-				//	$img_str = $img->imageString();
-				//}
-			}
-			//$mime = "image/jpeg";
-		}
-	}
-
-	// reduce quality - if it isn't a GIF
-	if ($mime != "image/gif") {
-		$img = new Photo($img_str, $mime);
-		if($img->is_valid()) {
-			//$img->scaleImage(1024); // Test
-			$img->scaleImage($size);
-			$img_str = $img->imageString();
-		}
-	}
-
-	// If there is a real existing directory then put the cache file there
-	// advantage: real file access is really fast
-	// Otherwise write in cachefile
-	if ($valid AND $direct_cache)
-		file_put_contents($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache/".privacy_image_cache_cachename($_REQUEST['url'], true), $img_str);
-	elseif ($cachefile != '')
-		file_put_contents($cachefile, $img_str);
-
-	header("Content-type: $mime");
-
-	// Only output the cache headers when the file is valid
-	if ($valid) {
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-		header('Etag: "'.md5($img_str).'"');
-		header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
-		header("Cache-Control: max-age=31536000");
-	}
-
-	echo $img_str;
-
-	killme();
-}
-
-function privacy_image_cache_cachename($url, $writemode = false) {
-	global $_SERVER;
-
-	$pos = strrpos($url, ".");
-	if ($pos) {
-		$extension = strtolower(substr($url, $pos+1));
-		$pos = strpos($extension, "?");
-		if ($pos)
-			$extension = substr($extension, 0, $pos);
-	}
-
-	$basepath = $_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache";
-
-	$path = substr(hash("md5", $url), 0, 2);
-
-	if (is_dir($basepath) and $writemode)
-		if (!is_dir($basepath."/".$path)) {
-			mkdir($basepath."/".$path);
-			chmod($basepath."/".$path, 0777);
-		}
-
-	$path .= "/".strtr(base64_encode($url), '+/', '-_');
-
-	$extensions = array("jpg", "jpeg", "gif", "png");
-
-	if (in_array($extension, $extensions))
-		$path .= ".".$extension;
-
-	return($path);
-}
-
-/**
- * @param $url string
- * @return boolean
- */
-function privacy_image_cache_is_local_image($url) {
-	if ($url[0] == '/') return true;
-
-	if (strtolower(substr($url, 0, 5)) == "data:") return true;
-
-	// Check if the cached path would be longer than 255 characters - apache doesn't like it
-	if (is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache")) {
-		$cachedurl = get_app()->get_baseurl()."/privacy_image_cache/". privacy_image_cache_cachename($url);
-		if (strlen($url) > 150)
-			return true;
-	}
-
-	// links normalised - bug #431
-	$baseurl = normalise_link(get_app()->get_baseurl());
-	$url = normalise_link($url);
-	return (substr($url, 0, strlen($baseurl)) == $baseurl);
-}
-
-/**
- * @param array $matches
- * @return string
- */
-function privacy_image_cache_img_cb($matches) {
-
-	// if the picture seems to be from another picture cache then take the original source
-	$queryvar = privacy_image_cache_parse_query($matches[2]);
-	if (($queryvar['url'] != "") AND (substr($queryvar['url'], 0, 4) == "http"))
-		$matches[2] = urldecode($queryvar['url']);
-
-	// if fetching facebook pictures don't fetch the thumbnail but the big one
-	//if (((strpos($matches[2], ".fbcdn.net/") OR strpos($matches[2], "/fbcdn-photos-"))) and (substr($matches[2], -6) == "_s.jpg"))
-	//	$matches[2] = substr($matches[2], 0, -6)."_n.jpg";
-
-	// following line changed per bug #431
-	if (privacy_image_cache_is_local_image($matches[2]))
-		return $matches[1] . $matches[2] . $matches[3];
-
-	//return $matches[1] . get_app()->get_baseurl() . "/privacy_image_cache/?url=" . addslashes(rawurlencode(htmlspecialchars_decode($matches[2]))) . $matches[3];
-
-	return $matches[1].get_app()->get_baseurl()."/privacy_image_cache/". privacy_image_cache_cachename(htmlspecialchars_decode($matches[2])).$matches[3];
-}
-
-/**
- * @param App $a
- * @param string $o
- */
-function privacy_image_cache_prepare_body_hook(&$a, &$o) {
-	$o["html"] = preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o["html"]);
-}
-
-/**
- * @param App $a
- * @param string $o
- * Function disabled because the plugin moved
- */
-function privacy_image_cache_bbcode_hook(&$a, &$o) {
-	//$o = preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o);
-}
-
-
-/**
- * @param App $a
- * @param string $o
- */
-function privacy_image_cache_display_item_hook(&$a, &$o) {
-    if (isset($o["output"])) {
-        if (isset($o["output"]["thumb"]) && !privacy_image_cache_is_local_image($o["output"]["thumb"]))
-            $o["output"]["thumb"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["thumb"]);
-        if (isset($o["output"]["author-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["author-avatar"]))
-            $o["output"]["author-avatar"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["author-avatar"]);
-        if (isset($o["output"]["owner-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["owner-avatar"]))
-            $o["output"]["owner-avatar"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["owner-avatar"]);
-        if (isset($o["output"]["owner_photo"]) && !privacy_image_cache_is_local_image($o["output"]["owner_photo"]))
-            $o["output"]["owner_photo"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["output"]["owner_photo"]);
-    }
-}
-
-
-/**
- * @param App $a
- * @param string $o
- */
-function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
-	if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"]))
-		$o["photo"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($o["photo"]);
-        //$o["photo"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["photo"])));
-}
-
-
-/**
- * @param App $a
- * @param null|object $b
- */
-function privacy_image_cache_cron(&$a = null, &$b = null) {
-    $cachetime = get_config('privacy_image_cache','cache_time');
-    if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
-
-    $last = get_config('pi_cache','last_delete');
-    $time = time();
-    if ($time < ($last + 3600)) return;
-
-    logger("Purging old Cache of the Privacy Image Cache", LOGGER_DEBUG);
-    q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
-
-    clear_cache($a->get_basepath(), $a->get_basepath()."/privacy_image_cache");
-
-    set_config('pi_cache', 'last_delete', $time);
-}
-
-/**
- * @param App $a
- * @param null|object $o
- */
-function privacy_image_cache_plugin_admin(&$a, &$o){
-
-
-    $o = '<input type="hidden" name="form_security_token" value="' . get_form_security_token("picsave") . '">';
-
-    $cachetime = get_config('privacy_image_cache','cache_time');
-    if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
-    $cachetime_h = Ceil($cachetime / 3600);
-
-    $o .= '<label for="pic_cachetime">' . t('Lifetime of the cache (in hours)') . '</label>
-        <input id="pic_cachetime" name="cachetime" type="text" value="' . escape_tags($cachetime_h) . '"><br style="clear: both;">';
-
-    $o .= '<input type="submit" name="save" value="' . t('Save') . '">';
-
-    $o .= '<h4>' . t('Cache Statistics') . '</h4>';
-
-    $num = q('SELECT COUNT(*) num, SUM(LENGTH(data)) size FROM `photo` WHERE `uid`=0 AND `contact-id`=0 AND `resource-id` LIKE "pic:%%"');
-    $o .= '<label for="statictics_num">' . t('Number of items') . '</label><input style="color: gray;" id="statistics_num" disabled value="' . escape_tags($num[0]['num']) . '"><br style="clear: both;">';
-    $size = Ceil($num[0]['size'] / (1024 * 1024));
-    $o .= '<label for="statictics_size">' . t('Size of the cache') . '</label><input style="color: gray;" id="statistics_size" disabled value="' . $size . ' MB"><br style="clear: both;">';
-
-    $o .= '<input type="submit" name="delete_all" value="' . t('Delete the whole cache') . '">';
-}
-
-
-/**
- * @param App $a
- * @param null|object $o
- */
-function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
-    check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave');
-
-    if (isset($_REQUEST['save'])) {
-        $cachetime_h = IntVal($_REQUEST['cachetime']);
-        if ($cachetime_h < 1) $cachetime_h = 1;
-        set_config('privacy_image_cache','cache_time', $cachetime_h * 3600);
-    }
-    if (isset($_REQUEST['delete_all'])) {
-        q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
-    }
-}
-
-function privacy_image_cache_parse_query($var) {
-	/**
-	 *  Use this function to parse out the query array element from
-	 *  the output of parse_url().
-	*/
-	$var  = parse_url($var, PHP_URL_QUERY);
-	$var  = html_entity_decode($var);
-	$var  = explode('&', $var);
-	$arr  = array();
-
-	foreach($var as $val) {
-		$x          = explode('=', $val);
-		$arr[$x[0]] = $x[1];
-	}
-
-	unset($val, $x, $var);
-	return $arr;
-}

From 4c0914712a8153c3bd6732556bcb87cc300785d5 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 12 Mar 2016 08:12:19 +0100
Subject: [PATCH 02/19] encode the degree for the translation

---
 curweather/curweather.php     |  2 +-
 curweather/lang/C/messages.po | 58 +++++++++++++++++------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/curweather/curweather.php b/curweather/curweather.php
index e28cc2b3..e416ba67 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -173,7 +173,7 @@ function curweather_plugin_settings(&$a,&$s) {
 		'$noappidtext' => $noappidtext,
 		'$info' => t('Enter either the name of your location or the zip code.'),
 		'$curweather_loc' => array( 'curweather_loc', t('Your Location'), $curweather_loc, t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ),
-		'$curweather_units' => array( 'curweather_units', t('Units'), $curweather_units, t('select if the temperatur should be displayed in °C or °F'), array('metric'=>'°C', 'imperial'=>'°F')),
+		'$curweather_units' => array( 'curweather_units', t('Units'), $curweather_units, t('select if the temperatur should be displayed in &deg;C or &deg;F'), array('metric'=>'°C', 'imperial'=>'°F')),
 		'$enabled' => array( 'curweather_enable', t('Show weather data'), $enable, '')
 	    ));
 	return;
diff --git a/curweather/lang/C/messages.po b/curweather/lang/C/messages.po
index b2ed6e5e..cee9c343 100644
--- a/curweather/lang/C/messages.po
+++ b/curweather/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-13 18:46+0200\n"
+"POT-Creation-Date: 2016-03-12 08:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,114 +17,114 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: curweather.php:30
+#: curweather.php:31
 msgid "Error fetching weather data.\\nError was: "
 msgstr ""
 
-#: curweather.php:103 curweather.php:163
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr ""
 
-#: curweather.php:109
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr ""
 
-#: curweather.php:110
+#: curweather.php:119
 msgid "Pressure"
 msgstr ""
 
-#: curweather.php:111
+#: curweather.php:120
 msgid "Wind"
 msgstr ""
 
-#: curweather.php:112
+#: curweather.php:121
 msgid "Last Updated"
 msgstr ""
 
-#: curweather.php:113
+#: curweather.php:122
 msgid "Data by"
 msgstr ""
 
-#: curweather.php:114
+#: curweather.php:123
 msgid "Show on map"
 msgstr ""
 
-#: curweather.php:119
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr ""
 
-#: curweather.php:121
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr ""
 
-#: curweather.php:137
+#: curweather.php:146
 msgid "Current Weather settings updated."
 msgstr ""
 
-#: curweather.php:152
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to optain one."
 msgstr ""
 
-#: curweather.php:162 curweather.php:191
+#: curweather.php:171 curweather.php:200
 msgid "Save Settings"
 msgstr ""
 
-#: curweather.php:163
+#: curweather.php:172
 msgid "Settings"
 msgstr ""
 
-#: curweather.php:165
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr ""
 
-#: curweather.php:166
+#: curweather.php:175
 msgid "Your Location"
 msgstr ""
 
-#: curweather.php:166
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr ""
 
-#: curweather.php:167
+#: curweather.php:176
 msgid "Units"
 msgstr ""
 
-#: curweather.php:167
-msgid "select if the temperatur should be displayed in °C or °F"
+#: curweather.php:176
+msgid "select if the temperatur should be displayed in &deg;C or &deg;F"
 msgstr ""
 
-#: curweather.php:168
+#: curweather.php:177
 msgid "Show weather data"
 msgstr ""
 
-#: curweather.php:181
+#: curweather.php:190
 msgid "Curweather settings saved."
 msgstr ""
 
-#: curweather.php:192
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr ""
 
-#: curweather.php:192
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr ""
 
-#: curweather.php:192
+#: curweather.php:201
 msgid "no cache"
 msgstr ""
 
-#: curweather.php:192
+#: curweather.php:201
 msgid "minutes"
 msgstr ""
 
-#: curweather.php:193
+#: curweather.php:202
 msgid "Your APPID"
 msgstr ""
 
-#: curweather.php:193
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr ""

From a73286c0d08a4d43a148eeb09886069efbbddc07 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 18 Mar 2016 21:09:03 +0100
Subject: [PATCH 03/19] DE update strings for curweather

---
 curweather/lang/de/messages.po | 69 +++++++++++++++++-----------------
 curweather/lang/de/strings.php |  2 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/curweather/lang/de/messages.po b/curweather/lang/de/messages.po
index 4aa5782d..d8650b79 100644
--- a/curweather/lang/de/messages.po
+++ b/curweather/lang/de/messages.po
@@ -4,130 +4,131 @@
 # 
 # 
 # Translators:
-# Abrax <webmaster@a-zwenkau.de>, 2014
+# Andreas H., 2014
+# Oliver <post@toktan.org>, 2016
 # bavatar <tobias.diekershoff@gmx.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-13 18:46+0200\n"
-"PO-Revision-Date: 2015-07-19 10:07+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://www.transifex.com/p/friendica/language/de/)\n"
+"POT-Creation-Date: 2016-03-12 08:10+0100\n"
+"PO-Revision-Date: 2016-03-17 21:22+0000\n"
+"Last-Translator: Oliver <post@toktan.org>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: curweather.php:30
+#: curweather.php:31
 msgid "Error fetching weather data.\\nError was: "
 msgstr "Fehler beim abrufen der Wetterdaten.\\nDie Fehlermeldung lautet:"
 
-#: curweather.php:103 curweather.php:163
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Aktuelles Wetter"
 
-#: curweather.php:109
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Relative Luftfeuchtigkeit"
 
-#: curweather.php:110
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Luftdruck"
 
-#: curweather.php:111
+#: curweather.php:120
 msgid "Wind"
 msgstr "Wind"
 
-#: curweather.php:112
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Letzte Aktualisierung"
 
-#: curweather.php:113
+#: curweather.php:122
 msgid "Data by"
 msgstr "Daten von"
 
-#: curweather.php:114
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Karte anzeigen"
 
-#: curweather.php:119
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Es gab ein Problem beim Abrufen der Wetterdaten. Aber werf doch mal einen Blick"
 
-#: curweather.php:121
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "auf OpenWeatherMap"
 
-#: curweather.php:137
+#: curweather.php:146
 msgid "Current Weather settings updated."
 msgstr "Einstellungen des Aktuellen Wetter Addons aktualisiert."
 
-#: curweather.php:152
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to optain one."
 msgstr "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird."
 
-#: curweather.php:162 curweather.php:191
+#: curweather.php:171 curweather.php:200
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: curweather.php:163
+#: curweather.php:172
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: curweather.php:165
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Gib entweder den Namen oder die PLZ deines Ortes ein."
 
-#: curweather.php:166
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Deinen Standort festlegen"
 
-#: curweather.php:166
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identifikator deines Standorts (Name oder Postleitzahl), z.B. <em>Berlin,DE</em> oder <em>14476,DE</em>."
 
-#: curweather.php:167
+#: curweather.php:176
 msgid "Units"
 msgstr "Einheiten"
 
-#: curweather.php:167
-msgid "select if the temperatur should be displayed in °C or °F"
-msgstr "wähle ob die Temperatur in °C oder °F angezeigt werden soll"
+#: curweather.php:176
+msgid "select if the temperatur should be displayed in &deg;C or &deg;F"
+msgstr "wähle ob die Temperatur in &deg;C oder &deg;F angezeigt werden soll"
 
-#: curweather.php:168
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Zeige Wetter Daten"
 
-#: curweather.php:181
+#: curweather.php:190
 msgid "Curweather settings saved."
 msgstr "Curweather Einstellungen gespeichert."
 
-#: curweather.php:192
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr "Cache Intervall"
 
-#: curweather.php:192
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Wie lange sollen die Wetter Daten gecached werden? Wähle einen für deinen OpenWeatherMap Account passende Einstellung."
 
-#: curweather.php:192
+#: curweather.php:201
 msgid "no cache"
 msgstr "kein Cache"
 
-#: curweather.php:192
+#: curweather.php:201
 msgid "minutes"
 msgstr "Minuten"
 
-#: curweather.php:193
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Deine APPID"
 
-#: curweather.php:193
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Der API Schlüssel von OpenWeatherMap"
diff --git a/curweather/lang/de/strings.php b/curweather/lang/de/strings.php
index be177e7a..24d93056 100644
--- a/curweather/lang/de/strings.php
+++ b/curweather/lang/de/strings.php
@@ -23,7 +23,7 @@ $a->strings["Enter either the name of your location or the zip code."] = "Gib en
 $a->strings["Your Location"] = "Deinen Standort festlegen";
 $a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identifikator deines Standorts (Name oder Postleitzahl), z.B. <em>Berlin,DE</em> oder <em>14476,DE</em>.";
 $a->strings["Units"] = "Einheiten";
-$a->strings["select if the temperatur should be displayed in °C or °F"] = "wähle ob die Temperatur in °C oder °F angezeigt werden soll";
+$a->strings["select if the temperatur should be displayed in &deg;C or &deg;F"] = "wähle ob die Temperatur in &deg;C oder &deg;F angezeigt werden soll";
 $a->strings["Show weather data"] = "Zeige Wetter Daten";
 $a->strings["Curweather settings saved."] = "Curweather Einstellungen gespeichert.";
 $a->strings["Caching Interval"] = "Cache Intervall";

From 3239c375fbd7fb00575d18ad793d280453df2e5b Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 10 Apr 2016 20:06:19 +0200
Subject: [PATCH 04/19] Fromgplus: Add location and coordinates to posts

---
 fromgplus/fromgplus.php | 49 ++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index e0fdc705..d3365e71 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -129,7 +129,7 @@ function fromgplus_cron($a,$b) {
 	set_config('fromgplus','last_poll', time());
 }
 
-function fromgplus_post($a, $uid, $source, $body, $location) {
+function fromgplus_post($a, $uid, $source, $body, $location, $coord) {
 
 	//$uid = 2;
 
@@ -164,6 +164,7 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
 	$_REQUEST['title'] = $title;
 	$_REQUEST['body'] = $body;
 	$_REQUEST['location'] = $location;
+	$_REQUEST['coord'] = $coord;
 
 	if (($_REQUEST['title'] == "") AND ($_REQUEST['body'] == "")) {
 	        logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
@@ -416,7 +417,6 @@ function fromgplus_fetch($a, $uid) {
 
 	$result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
 	//$result = file_get_contents("google.txt");
-	//$result = file_get_contents("addon/fromgplus/album.txt");
 	//file_put_contents("google.txt", $result);
 
 	$activities = json_decode($result);
@@ -463,14 +463,23 @@ function fromgplus_fetch($a, $uid) {
 					if (is_array($item->object->attachments))
 						$post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false);
 
-					// geocode, placeName
-					if (isset($item->address))
-						$location = $item->address;
-					else
-						$location = "";
+					$coord = "";
+					$location = "";
+					if (isset($item->location)) {
+						if (isset($item->location->address->formatted))
+							$location = $item->location->address->formatted;
 
-					//fromgplus_post($a, $uid, "Google+", $post, $location);
-					fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+						if (isset($item->location->displayName))
+							$location = $item->location->displayName;
+
+						if (isset($item->location->position->latitude) AND
+							isset($item->location->position->longitude))
+							$coord = $item->location->position->latitude." ".$item->location->position->longitude;
+
+					} elseif (isset($item->address))
+						$location = $item->address;
+
+					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord);
 
 					break;
 
@@ -505,13 +514,23 @@ function fromgplus_fetch($a, $uid) {
 							$post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true));
 					}
 
-					if (isset($item->address))
-						$location = $item->address;
-					else
-						$location = "";
+					$coord = "";
+					$location = "";
+					if (isset($item->location)) {
+						if (isset($item->location->address->formatted))
+							$location = $item->location->address->formatted;
 
-					//fromgplus_post($a, $uid, "Google+", $post, $location);
-					fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+						if (isset($item->location->displayName))
+							$location = $item->location->displayName;
+
+						if (isset($item->location->position->latitude) AND
+							isset($item->location->position->longitude))
+							$coord = $item->location->position->latitude." ".$item->location->position->longitude;
+
+					} elseif (isset($item->address))
+						$location = $item->address;
+
+					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord);
 					break;
 			}
 		}

From 16315e876f392c2c76e579c22da4c5ce803f6fb5 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 14 Apr 2016 01:28:04 +0200
Subject: [PATCH 05/19] showmore: add css classes to elements

---
 showmore/showmore.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 9a136c7f..a9d8334f 100755
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -121,9 +121,9 @@ function showmore_prepare_body(&$a,&$b) {
 
 	if($found) {
 		$rnd = random_string(8);
-		$b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ".
-				'<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
-				'<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
+		$b['html'] = '<span id="showmore-teaser-'.$rnd.'" class="showmore-teaser" style="display: block;">'.$shortened." ".
+				'<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
+				'<div id="showmore-'.$rnd.'" class="showmore-content" style="display: none;">'.$b['html'].'</div>';
 	}
 }
 

From a7a5d9b9aa4c9496b3bddf4aa626243b68d93bde Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 22 Apr 2016 17:42:52 +0200
Subject: [PATCH 06/19] ES translation thx TupambaeNet

---
 blackout/lang/es/messages.po | 52 ++++++++++++++++++++++++++++++
 blackout/lang/es/strings.php | 17 ++++++++--
 blockem/lang/es/messages.po  | 53 ++++++++++++++++++++++++++++++
 blockem/lang/es/strings.php  | 25 +++++++++------
 diaspora/lang/es/messages.po | 62 ++++++++++++++++++++++++++++++++++++
 diaspora/lang/es/strings.php | 17 ++++++++++
 nsfw/lang/es/messages.po     | 59 ++++++++++++++++++++++++++++++++++
 nsfw/lang/es/strings.php     | 25 +++++++++------
 webrtc/lang/es/messages.po   | 59 ++++++++++++++++++++++++++++++++++
 webrtc/lang/es/strings.php   | 15 +++++++++
 10 files changed, 361 insertions(+), 23 deletions(-)
 create mode 100644 blackout/lang/es/messages.po
 create mode 100644 blockem/lang/es/messages.po
 create mode 100644 diaspora/lang/es/messages.po
 create mode 100644 diaspora/lang/es/strings.php
 create mode 100644 nsfw/lang/es/messages.po
 create mode 100644 webrtc/lang/es/messages.po
 create mode 100644 webrtc/lang/es/strings.php

diff --git a/blackout/lang/es/messages.po b/blackout/lang/es/messages.po
new file mode 100644
index 00000000..0c54bd88
--- /dev/null
+++ b/blackout/lang/es/messages.po
@@ -0,0 +1,52 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+# Tupambae.org, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-04-18 19:20+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blackout.php:99
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: blackout.php:100
+msgid "Redirect URL"
+msgstr "Redirigir URL"
+
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "todos los visitantes de la web serán redirigidos a esta dirección."
+
+#: blackout.php:101
+msgid "Begin of the Blackout"
+msgstr "Inicio del apagón."
+
+#: blackout.php:101
+msgid ""
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "formato es <em>YYYY</em> año, <em>MM</em> mes, <em>DD</em> día, <em>hh</em> hora y <em>mm</em> minuto"
+
+#: blackout.php:102
+msgid "End of the Blackout"
+msgstr "Fin del apagón."
+
+#: blackout.php:108
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "La fecha de final del apagón es antes de la fecha de inicio, deberías arreglar esto."
diff --git a/blackout/lang/es/strings.php b/blackout/lang/es/strings.php
index 2394f48b..867a8c9b 100644
--- a/blackout/lang/es/strings.php
+++ b/blackout/lang/es/strings.php
@@ -1,3 +1,14 @@
-<?php
-
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["Redirect URL"] = "Redirigir URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "todos los visitantes de la web serán redirigidos a esta dirección.";
+$a->strings["Begin of the Blackout"] = "Inicio del apagón.";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formato es <em>YYYY</em> año, <em>MM</em> mes, <em>DD</em> día, <em>hh</em> hora y <em>mm</em> minuto";
+$a->strings["End of the Blackout"] = "Fin del apagón.";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La fecha de final del apagón es antes de la fecha de inicio, deberías arreglar esto.";
diff --git a/blockem/lang/es/messages.po b/blockem/lang/es/messages.po
new file mode 100644
index 00000000..c2e1091f
--- /dev/null
+++ b/blockem/lang/es/messages.po
@@ -0,0 +1,53 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Tupambae.org, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-04-18 19:27+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:53 blockem.php:57
+msgid "\"Blockem\""
+msgstr "\"Bloquealos\""
+
+#: blockem.php:61
+msgid "Comma separated profile URLS to block"
+msgstr "URLS separados por coma para bloquear."
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "Configuración de BLOQUEALOS guardado."
+
+#: blockem.php:142
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "%s bloqueado - click para abrir/cerrar"
+
+#: blockem.php:197
+msgid "Unblock Author"
+msgstr "Desbloquear autor"
+
+#: blockem.php:199
+msgid "Block Author"
+msgstr "Bloquear autor"
+
+#: blockem.php:231
+msgid "blockem settings updated"
+msgstr "configuración de BLOQUEALOS actualizado"
diff --git a/blockem/lang/es/strings.php b/blockem/lang/es/strings.php
index 874d6d7f..3e4ab383 100644
--- a/blockem/lang/es/strings.php
+++ b/blockem/lang/es/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "Configuración de \"Blockem\"";
-$a->strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear";
-$a->strings["Submit"] = "Envíar";
-$a->strings["BLOCKEM Settings saved."] = "Configuracion Blockem guardada.";
-$a->strings["Blocked %s - Click to open/close"] = "%s bloqueado. Pulsa aquí para mostrar/ocultar";
-$a->strings["Unblock Author"] = "Desbloquear Autor";
-$a->strings["Block Author"] = "Bloquear Autor";
-$a->strings["blockem settings updated"] = "Configuración de Blockem actualizada";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Bloquealos\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS separados por coma para bloquear.";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["BLOCKEM Settings saved."] = "Configuración de BLOQUEALOS guardado.";
+$a->strings["Blocked %s - Click to open/close"] = "%s bloqueado - click para abrir/cerrar";
+$a->strings["Unblock Author"] = "Desbloquear autor";
+$a->strings["Block Author"] = "Bloquear autor";
+$a->strings["blockem settings updated"] = "configuración de BLOQUEALOS actualizado";
diff --git a/diaspora/lang/es/messages.po b/diaspora/lang/es/messages.po
new file mode 100644
index 00000000..16ce4539
--- /dev/null
+++ b/diaspora/lang/es/messages.po
@@ -0,0 +1,62 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+# Tupambae.org, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-04-18 19:36+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: diaspora.php:37
+msgid "Post to Diaspora"
+msgstr "Publicar hacia Diaspora*"
+
+#: diaspora.php:142
+msgid ""
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "No se puede ingresar a tu cuenta de Diaspora*. Por favor verificar nombre de usuario, contraseña y asegura de usar la dirección completa, incluyendo https.. ."
+
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Exportar a Diaspora*"
+
+#: diaspora.php:163
+msgid "Enable Diaspora Post Plugin"
+msgstr "Habilitar publicar a traves de Diaspora* plugin."
+
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Nombre de usuario de Diaspora*."
+
+#: diaspora.php:173
+msgid "Diaspora password"
+msgstr "Contraseña Diaspora*"
+
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "URL sitio Diaspora*"
+
+#: diaspora.php:183
+msgid "Post to Diaspora by default"
+msgstr "Publicar hacia Diaspora* como estándar."
+
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "La publicación hacia Diaspora* fallo, puesto en espera para nuevo intento."
diff --git a/diaspora/lang/es/strings.php b/diaspora/lang/es/strings.php
new file mode 100644
index 00000000..b3251898
--- /dev/null
+++ b/diaspora/lang/es/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Diaspora"] = "Publicar hacia Diaspora*";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "No se puede ingresar a tu cuenta de Diaspora*. Por favor verificar nombre de usuario, contraseña y asegura de usar la dirección completa, incluyendo https.. .";
+$a->strings["Diaspora Export"] = "Exportar a Diaspora*";
+$a->strings["Enable Diaspora Post Plugin"] = "Habilitar publicar a traves de Diaspora* plugin.";
+$a->strings["Diaspora username"] = "Nombre de usuario de Diaspora*.";
+$a->strings["Diaspora password"] = "Contraseña Diaspora*";
+$a->strings["Diaspora site URL"] = "URL sitio Diaspora*";
+$a->strings["Post to Diaspora by default"] = "Publicar hacia Diaspora* como estándar.";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["Diaspora post failed. Queued for retry."] = "La publicación hacia Diaspora* fallo, puesto en espera para nuevo intento.";
diff --git a/nsfw/lang/es/messages.po b/nsfw/lang/es/messages.po
new file mode 100644
index 00000000..45659825
--- /dev/null
+++ b/nsfw/lang/es/messages.po
@@ -0,0 +1,59 @@
+# ADDON nsfw
+# Copyright (C)
+# This file is distributed under the same license as the Friendica nsfw addon package.
+# 
+# 
+# Translators:
+# Tupambae.org, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-04-18 19:53+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: nsfw.php:78
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr "Configuración \"No apto para trabajar\" (Filtro genérico de contenido)"
+
+#: nsfw.php:80
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Este plugin se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido."
+
+#: nsfw.php:81
+msgid "Enable Content filter"
+msgstr "Habilitar filtro de contenido"
+
+#: nsfw.php:84
+msgid "Comma separated list of keywords to hide"
+msgstr "Lista de palabras claves separadas por coma para colapsar el contenido correspondiente."
+
+#: nsfw.php:88
+msgid "Submit"
+msgstr "Enviar"
+
+#: nsfw.php:89
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Utiliza /expresión/ para proveer expresiones regulares."
+
+#: nsfw.php:105
+msgid "NSFW Settings saved."
+msgstr "Configuración NSFW guardada."
+
+#: nsfw.php:157
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Click aquí para abrir/cerrar"
diff --git a/nsfw/lang/es/strings.php b/nsfw/lang/es/strings.php
index a2f7cae0..54fb2688 100644
--- a/nsfw/lang/es/strings.php
+++ b/nsfw/lang/es/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"Not Safe For Work\" (Filtro de contenido de carácter general)";
-$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este complemento busca las palabras clave que especifiques y oculta cualquier comentario que contenga dichas claves, para que no aparezcan en momentos inoportunos, como por ejemplo, material sexual. Se considera de buena educación y correcto etiquetar los desnudos con #NSFW.  Este filtro puede servir para filtrar otro contenido, así que te puede servir como un filtro de carácter general, escogiendo las palabras clave adecuadas.";
-$a->strings["Enable Content filter"] = "Activar el filtro de contenido";
-$a->strings["Comma separated list of keywords to hide"] = "Palabras clave para ocultar, lista separada por comas";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Use /expression/ to provide regular expressions"] = "Usa /expresión/ para proporcionar expresiones regulares";
-$a->strings["NSFW Settings saved."] = "Configuración NSFW guardada.";
-$a->strings["%s - Click to open/close"] = "%s - Pulsa aquí para abrir/cerrar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"No apto para trabajar\" (Filtro genérico de contenido)";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este plugin se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido.";
+$a->strings["Enable Content filter"] = "Habilitar filtro de contenido";
+$a->strings["Comma separated list of keywords to hide"] = "Lista de palabras claves separadas por coma para colapsar el contenido correspondiente.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Use /expression/ to provide regular expressions"] = "Utiliza /expresión/ para proveer expresiones regulares.";
+$a->strings["NSFW Settings saved."] = "Configuración NSFW guardada.";
+$a->strings["%s - Click to open/close"] = "%s - Click aquí para abrir/cerrar";
diff --git a/webrtc/lang/es/messages.po b/webrtc/lang/es/messages.po
new file mode 100644
index 00000000..ae877e03
--- /dev/null
+++ b/webrtc/lang/es/messages.po
@@ -0,0 +1,59 @@
+# ADDON webrtc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica webrtc addon package.
+# 
+# 
+# Translators:
+# Tupambae.org, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2016-04-18 19:15+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: webrtc.php:20
+msgid "WebRTC Videochat"
+msgstr "WebRTC Videochat"
+
+#: webrtc.php:26
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: webrtc.php:27
+msgid "WebRTC Base URL"
+msgstr "WebRTC URL Base"
+
+#: webrtc.php:27
+msgid ""
+"Page your users will create a WebRTC chat room on. For example you could use"
+" https://live.mayfirst.org ."
+msgstr "Pagina donde el usuario creara una habitación de chat.\nPor ejemplo podría usar https://live.mayfirst.org ."
+
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Ajustes actualizados."
+
+#: webrtc.php:47
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: webrtc.php:48
+msgid ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC es una herramienta de vídeo conferencia que funciona con Firefox (versión 21 y arriba) y Chrome/Chromium (versión 25 y arriba). "
+
+#: webrtc.php:50
+msgid ""
+"Please contact your friendica admin and send a reminder to configure the "
+"WebRTC addon."
+msgstr "Por favor contacta a tu administrador de friendica y envíale un recordatorio para configurar el accesorio (addon) WebRTC."
diff --git a/webrtc/lang/es/strings.php b/webrtc/lang/es/strings.php
new file mode 100644
index 00000000..7c79f35d
--- /dev/null
+++ b/webrtc/lang/es/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["WebRTC Base URL"] = "WebRTC URL Base";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Pagina donde el usuario creara una habitación de chat.\nPor ejemplo podría usar https://live.mayfirst.org .";
+$a->strings["Settings updated."] = "Ajustes actualizados.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC es una herramienta de vídeo conferencia que funciona con Firefox (versión 21 y arriba) y Chrome/Chromium (versión 25 y arriba). ";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Por favor contacta a tu administrador de friendica y envíale un recordatorio para configurar el accesorio (addon) WebRTC.";

From 86a2de815c474fd1830198a6b4f668137b41381e Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Tue, 3 May 2016 19:32:18 +0200
Subject: [PATCH 07/19] Initial commit

---
 LICENSE   | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |   2 +
 2 files changed, 663 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..dbbe3558
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..162f368e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# frio-hovercard
+friendica hovercard addon for the frio theme

From 6ef16de4006b70159920d570c02cde275121b4ab Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 5 May 2016 20:59:29 +0200
Subject: [PATCH 08/19] hovercard for the frio theme (initial commit)

---
 frio_hovercard.php      | 140 ++++++++++++++++++++++++++++++++++++++++
 templates/hovercard.tpl |  39 +++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 frio_hovercard.php
 create mode 100644 templates/hovercard.tpl

diff --git a/frio_hovercard.php b/frio_hovercard.php
new file mode 100644
index 00000000..9ddb4ce3
--- /dev/null
+++ b/frio_hovercard.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * Name: Frio Hovercard
+ * Description: Hovercard addon for the frio theme
+ * Version: 0.1
+ * Author: Rabuzarus <https://github.com/rabuzarus>
+ * License: GNU AFFERO GENERAL PUBLIC LICENSE (Version 3)
+ */
+
+require_once("include/socgraph.php");
+require_once("include/Contact.php");
+
+function frio_hovercard_install() {
+	logger("installed frio-hovercard");
+}
+
+function frio_hovercard_uninstall() {
+	logger("uninstalled frio-hovercard");
+}
+function frio_hovercard_module() {
+	return;
+}
+function frio_hovercard_content() {
+	$profileurl	=	(x($_REQUEST,'profileurl')	? $_REQUEST['profileurl']	: "");
+	$datatype	=	(x($_REQUEST,'datatype')	?$_REQUEST['datatype']		: "json");
+
+	// Get out if the system doesn't have public access allowed
+	if(intval(get_config('system','block_public')))
+		http_status_exit(401);
+
+	// Return the raw content of the template. We use this to make templates usable for js functions.
+	// Look at hovercard.js (function getHoverCardTemplate()).
+	// This part should be moved in it's own module. Maybe we could make more templates accessabel.
+	// (We need to discuss possible security lacks before doing this)
+	if ($datatype == "tpl") {
+		$templatecontent = get_template_content("hovercard.tpl", "addon/frio_hovercard/");
+		return $templatecontent;
+	}
+
+	// If a contact is connected the url is internally changed to "redir/CID". We need the pure url to search for
+	// the contact. So we strip out the contact id from the internal url and look in the contact table for
+	// the real url (nurl)
+	if(local_user() && strpos($profileurl, "redir/") === 0) {
+		$cid = intval(substr($profileurl, 6));
+		$r = q("SELECT `nurl`, `self`  FROM `contact` WHERE `id` = '%d' LIMIT 1", intval($cid));
+		$profileurl = ($r[0]["nurl"] ? $r[0]["nurl"] : "");
+		$self = ($r[0]["self"] ? $r[0]["self"] : "");
+	}
+
+	// if it's the url containing https it should be converted to http
+	$nurl = normalise_link(clean_contact_url($profileurl));
+	if($nurl) {
+		// Search for contact data
+		$contact = get_contact_details_by_url($nurl);
+
+		// Get_contact_details_by_url() doesn't provide the nurl but we 
+		// need it for the photo_menu, so we copy it to the contact array
+		if (!isset($contact["nurl"]))
+			$contact["nurl"] = $nurl;
+	}
+
+	if(!is_array($contact))
+		return;
+
+	// Get the photo_menu - the menu if possible contact actions
+	$actions = contact_photo_menu($contact);
+
+
+	// Move the contact data to the profile array so we can deliver it to
+	// 
+	$profile = array(
+		'name' => $contact["name"],
+		'nick'	=> $contact["nick"],
+		'addr'	=> (($contact["addr"] != "") ? $contact["addr"] : $contact["url"]),
+		'thumb' => proxy_url($contact["photo"], false, PROXY_SIZE_THUMB),
+		'url' => ($cid ? ("redir/".$cid) : zrl($contact["url"])),
+//		'alias' => $contact["alias"],
+		'location' => $contact["location"],
+		'gender' => $contact["gender"],
+		'about' => $contact["about"],
+		'network' => format_network_name($contact["network"]),
+		'tags' => intval($contact["keywords"]),
+//		'nsfw' => intval($contact["nsfw"]),
+//		'server_url' => $contact["server_url"],
+		'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]),
+//		'generation' => $contact["generation"],
+		'account_type' => ($contact['community'] ? t("Forum") : ""),
+		'actions' => $actions,
+	);
+
+	if($datatype == "html") {
+		$t = get_markup_template("hovercard.tpl", "addon/frio_hovercard/");
+
+		$o = replace_macros($t, array(
+			'$profile' => $profile,
+		));
+
+		return $o;
+
+	} else {
+		json_return_and_die($profile);
+	}
+}
+
+/**
+ * @brief Get the raw content of a template file
+ * 
+ * @param string $template The name of the template
+ * @param string $root Directory of the template
+ * 
+ * @return string|bool Output the raw content if existent, otherwise false
+ */
+function get_template_content($template, $root = "") {
+	// We load the whole template system to get the filename.
+	// Maybe we can do it a little bit smarter if I get time.
+	$t = get_markup_template($template, $root);
+	$filename = $t->filename;
+
+	// Get the content of the template file
+	if(file_exists($filename)) {
+		$content = file_get_contents($filename);
+
+		return $content;
+	}
+
+	return false;
+}
+
+
+function save_this_query() {
+    $contacts = q("SELECT * FROM `gcontact`
+					WHERE ((NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
+					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
+					(`gcontact`.`addr` = '%s' OR `gcontact`.`nurl` = '%s')
+						LIMIT 1",
+					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+					dbesc(escape_tags($url)) 
+			);
+}
diff --git a/templates/hovercard.tpl b/templates/hovercard.tpl
new file mode 100644
index 00000000..d206ae62
--- /dev/null
+++ b/templates/hovercard.tpl
@@ -0,0 +1,39 @@
+<div class="basic-content" >
+	<div class="hover-card-details">
+		<div class="hover-card-header left-align">
+			<div class="hover-card-pic left-align">
+				<span class="image-wrapper medium">
+					<a href="{{$profile.url}}" title="{{$profile.name}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}"></a>
+				</span>
+			</div>
+			<div class="hover-card-content">
+				<div class="profile-entry-name">
+					<h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}
+				</div>
+				<div class="profile-details">
+					<span class="profile-addr">{{$profile.addr}}</span>
+					{{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}
+				</div>
+				{{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}}
+	
+			</div>
+			<div class="hover-card-actions  right-aligned">
+				{{* here are the differnt actions like privat message, poke, delete and so on *}}
+				{{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}
+				<div class="hover-card-actions-social">
+					{{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.pm.1}}')" title="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
+					{{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.poke.1}}')" title="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
+				</div>
+				<div class="hover-card-actions-connection">
+					{{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+					{{if $profile.actions.drop}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.drop.1}}" title="{{$profile.actions.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
+					{{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
+				</div>
+			</div>
+		</div>
+
+		<div class="clearfix"></div>
+
+	</div>
+</div>
+{{if $profile.tags}}<div class="hover-card-footer">{{$profile.tags}}</div>{{/if}}
\ No newline at end of file

From 93ca995bb299ddf669347d8cfd76e3f4870387ca Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 5 May 2016 21:33:14 +0200
Subject: [PATCH 09/19] Provide some further informations at the README

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 162f368e..854d5611 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,12 @@
 # frio-hovercard
 friendica hovercard addon for the frio theme
+
+This addon provides a hovercard for firendicas frio theme.
+**It not intended to use the plugin without the frio theme or vice versa.
+
+It's a sample implementation how friendica could provide json userdata for
+the hovercard. Ideally we should implement something like a profile data api endpoint like 
+it is done in diaspora & gnu social. This would search at the foreign server for the requested data.
+We could also think about supporting requesting the api of diaspora  and gnu social.
+
+At the present state the data comes from the own contact and gcontact table

From 6e2ed86758cc325fba5c7057e6553e80892d1ec7 Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Fri, 6 May 2016 16:07:53 +0200
Subject: [PATCH 10/19] poke: fix poke dialog - js tests now if there is
 already a questionmark in the url

---
 frio_hovercard.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/frio_hovercard.php b/frio_hovercard.php
index 9ddb4ce3..ef1175ae 100644
--- a/frio_hovercard.php
+++ b/frio_hovercard.php
@@ -75,6 +75,7 @@ function frio_hovercard_content() {
 		'addr'	=> (($contact["addr"] != "") ? $contact["addr"] : $contact["url"]),
 		'thumb' => proxy_url($contact["photo"], false, PROXY_SIZE_THUMB),
 		'url' => ($cid ? ("redir/".$cid) : zrl($contact["url"])),
+		'nurl' => $contact["nurl"], // We additionaly strore the nurl as identifier
 //		'alias' => $contact["alias"],
 		'location' => $contact["location"],
 		'gender' => $contact["gender"],
@@ -126,15 +127,3 @@ function get_template_content($template, $root = "") {
 
 	return false;
 }
-
-
-function save_this_query() {
-    $contacts = q("SELECT * FROM `gcontact`
-					WHERE ((NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-					(`gcontact`.`addr` = '%s' OR `gcontact`.`nurl` = '%s')
-						LIMIT 1",
-					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-					dbesc(escape_tags($url)) 
-			);
-}

From f6403049f6a59bf11edcb07495f1c12bb8dd9683 Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Fri, 6 May 2016 16:08:59 +0200
Subject: [PATCH 11/19] revert because of wrong description

---
 frio_hovercard.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/frio_hovercard.php b/frio_hovercard.php
index ef1175ae..9ddb4ce3 100644
--- a/frio_hovercard.php
+++ b/frio_hovercard.php
@@ -75,7 +75,6 @@ function frio_hovercard_content() {
 		'addr'	=> (($contact["addr"] != "") ? $contact["addr"] : $contact["url"]),
 		'thumb' => proxy_url($contact["photo"], false, PROXY_SIZE_THUMB),
 		'url' => ($cid ? ("redir/".$cid) : zrl($contact["url"])),
-		'nurl' => $contact["nurl"], // We additionaly strore the nurl as identifier
 //		'alias' => $contact["alias"],
 		'location' => $contact["location"],
 		'gender' => $contact["gender"],
@@ -127,3 +126,15 @@ function get_template_content($template, $root = "") {
 
 	return false;
 }
+
+
+function save_this_query() {
+    $contacts = q("SELECT * FROM `gcontact`
+					WHERE ((NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
+					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
+					(`gcontact`.`addr` = '%s' OR `gcontact`.`nurl` = '%s')
+						LIMIT 1",
+					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+					dbesc(escape_tags($url)) 
+			);
+}

From e6e44e02e0ca91e7f3a53cd386ae2da3c7a6128c Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Fri, 6 May 2016 16:36:05 +0200
Subject: [PATCH 12/19] commit nurl in the result to have an identifier + some
 cleanup

---
 frio_hovercard.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/frio_hovercard.php b/frio_hovercard.php
index 9ddb4ce3..ef1175ae 100644
--- a/frio_hovercard.php
+++ b/frio_hovercard.php
@@ -75,6 +75,7 @@ function frio_hovercard_content() {
 		'addr'	=> (($contact["addr"] != "") ? $contact["addr"] : $contact["url"]),
 		'thumb' => proxy_url($contact["photo"], false, PROXY_SIZE_THUMB),
 		'url' => ($cid ? ("redir/".$cid) : zrl($contact["url"])),
+		'nurl' => $contact["nurl"], // We additionaly strore the nurl as identifier
 //		'alias' => $contact["alias"],
 		'location' => $contact["location"],
 		'gender' => $contact["gender"],
@@ -126,15 +127,3 @@ function get_template_content($template, $root = "") {
 
 	return false;
 }
-
-
-function save_this_query() {
-    $contacts = q("SELECT * FROM `gcontact`
-					WHERE ((NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-					(`gcontact`.`addr` = '%s' OR `gcontact`.`nurl` = '%s')
-						LIMIT 1",
-					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-					dbesc(escape_tags($url)) 
-			);
-}

From 2b40687e36a69ebdfa4f5117da7858e9789bfccd Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Tue, 10 May 2016 00:31:57 +0200
Subject: [PATCH 13/19] hovercard: output template as clean text

---
 frio_hovercard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frio_hovercard.php b/frio_hovercard.php
index ef1175ae..5daf0428 100644
--- a/frio_hovercard.php
+++ b/frio_hovercard.php
@@ -35,7 +35,8 @@ function frio_hovercard_content() {
 	// (We need to discuss possible security lacks before doing this)
 	if ($datatype == "tpl") {
 		$templatecontent = get_template_content("hovercard.tpl", "addon/frio_hovercard/");
-		return $templatecontent;
+		echo $templatecontent;
+		killme();
 	}
 
 	// If a contact is connected the url is internally changed to "redir/CID". We need the pure url to search for

From 22d567a28e1ac82223b520d43af916b50cf04678 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Tue, 10 May 2016 17:11:51 +0200
Subject: [PATCH 14/19] prevent that contact actions are shown to not logged in
 users

---
 frio_hovercard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frio_hovercard.php b/frio_hovercard.php
index 5daf0428..b565e1ac 100644
--- a/frio_hovercard.php
+++ b/frio_hovercard.php
@@ -65,7 +65,8 @@ function frio_hovercard_content() {
 		return;
 
 	// Get the photo_menu - the menu if possible contact actions
-	$actions = contact_photo_menu($contact);
+	if(local_user())
+		$actions = contact_photo_menu($contact);
 
 
 	// Move the contact data to the profile array so we can deliver it to

From aee1165eb1390dafc7e3cedd8683b994ba629551 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 15 May 2016 23:18:18 +0200
Subject: [PATCH 15/19] Pumpio: Posted videos look better now

---
 pumpio/pumpio.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 1702971c..a11e50bd 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -449,15 +449,6 @@ function pumpio_send(&$a,&$b) {
 
 		$content = bbcode($b['body'], false, false, 4);
 
-		// Enhance the way, videos are displayed
-		$content = preg_replace('/<a href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
-		$content = preg_replace('/<a href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-		$content = preg_replace('/<a href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-		$content = preg_replace('/<a href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-
-		$URLSearchString = "^\[\]";
-		$content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content);
-
 		$params = array();
 
 		$params["verb"] = "post";
@@ -1261,6 +1252,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	$postarray['plink'] = $post->object->url;
 	$postarray['app'] = $post->generator->displayName;
 	$postarray['body'] = html2bbcode($post->object->content);
+	$postarray['object'] = json_encode($post);
 
 	if ($post->object->fullImage->url != "")
 		$postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];

From edcc9f3246e8ac38e579b3a97f25b5abfe269ae6 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 25 May 2016 08:25:27 +0200
Subject: [PATCH 16/19] mark frio hovercard addon as experimental

---
 experimental | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 experimental

diff --git a/experimental b/experimental
new file mode 100644
index 00000000..e69de29b

From 9db0338d5c449275f30030c6a9ea4664a19f31e2 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 25 May 2016 08:28:28 +0200
Subject: [PATCH 17/19] small README polish

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 854d5611..7db489ba 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 friendica hovercard addon for the frio theme
 
 This addon provides a hovercard for firendicas frio theme.
-**It not intended to use the plugin without the frio theme or vice versa.
+
+**It not intended to use the plugin without the frio theme or vice versa.**
 
 It's a sample implementation how friendica could provide json userdata for
 the hovercard. Ideally we should implement something like a profile data api endpoint like 

From 1866ccd76aa08344489f615fe529a190dd49514d Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 25 May 2016 08:43:45 +0200
Subject: [PATCH 18/19] README: Add link to commit history

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7db489ba..db22a325 100644
--- a/README.md
+++ b/README.md
@@ -11,3 +11,5 @@ it is done in diaspora & gnu social. This would search at the foreign server for
 We could also think about supporting requesting the api of diaspora  and gnu social.
 
 At the present state the data comes from the own contact and gcontact table
+
+[original commit history](https://github.com/rabuzarus/frio_hovercard/commits/master)

From 128b116f25c4e14eb2b2262be90ee9dcb9c888c8 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 25 May 2016 11:03:46 +0200
Subject: [PATCH 19/19] preparing file structure for pr for friendica addon
 repository

---
 LICENSE => frio_hovercard/LICENSE                       | 0
 README.md => frio_hovercard/README.md                   | 0
 experimental => frio_hovercard/experimental             | 0
 frio_hovercard.php => frio_hovercard/frio_hovercard.php | 0
 {templates => frio_hovercard/templates}/hovercard.tpl   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE => frio_hovercard/LICENSE (100%)
 rename README.md => frio_hovercard/README.md (100%)
 rename experimental => frio_hovercard/experimental (100%)
 rename frio_hovercard.php => frio_hovercard/frio_hovercard.php (100%)
 rename {templates => frio_hovercard/templates}/hovercard.tpl (100%)

diff --git a/LICENSE b/frio_hovercard/LICENSE
similarity index 100%
rename from LICENSE
rename to frio_hovercard/LICENSE
diff --git a/README.md b/frio_hovercard/README.md
similarity index 100%
rename from README.md
rename to frio_hovercard/README.md
diff --git a/experimental b/frio_hovercard/experimental
similarity index 100%
rename from experimental
rename to frio_hovercard/experimental
diff --git a/frio_hovercard.php b/frio_hovercard/frio_hovercard.php
similarity index 100%
rename from frio_hovercard.php
rename to frio_hovercard/frio_hovercard.php
diff --git a/templates/hovercard.tpl b/frio_hovercard/templates/hovercard.tpl
similarity index 100%
rename from templates/hovercard.tpl
rename to frio_hovercard/templates/hovercard.tpl