diff --git a/README.md b/README.md
index 08451b6d..deffa2a5 100644
--- a/README.md
+++ b/README.md
@@ -2,26 +2,33 @@ Addons for Friendica
 ====================
 
 This repository is a collection of addons for the [Friendica Social Communications Server](https://github.com/friendica/friendica).
-You can add these addons to the /addon directory of your Friendica installation do extend the functionality of your node.
+You can add these addons to the /addon directory of your Friendica installation
+do extend the functionality of your node.
 
-After uploading the addons to your server, you need to activate the desired addons in the Admin panel. Addons not activated have no effect on your node.
+After uploading the addons to your server, you need to activate the desired addons
+in the Admin panel. Addons not activated have no effect on your node.
 
-You can find more addons in the [Friendica Addon listing](https://addons.friendo.ca) in cases the addon developers have choosen not to include them here.
+You can find more addons in the [Friendica Addon listing](https://addons.friendo.ca)
+in cases the addon developers have choosen not to include them here.
 
-## Connectors
+Connectors
+----------
 
-Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/master/doc/Connectors.md) for various other networks (e.g. Twitter, pump.io, Google+) that are needed for communication when the protocol is not supported by Friendica core (DFRN, OStatus and Diaspora).
+Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/master/doc/Connectors.md) for various other networks
+(e.g. Twitter, pump.io, Google+) that are needed for communication when the
+protocoll is not supported by Friendica core (DFRN, OStatus and Diaspora).
 
-For communication with contacts in networks supporting those (e.g. GNU social, Diaspora and red#matrix) you just need to access the page configuration in the Admin panel and enable them. For networks where communication is only possible the API access to a remote account, you need to activate the fitting connectors.
+For communication with contacts in networks supporting those (e.g. GNU social,
+Diaspora and red#matrix) you just need to access the page configuration in the
+Admin panel and enable them. For networks where communication is only possible
+the API access to a remote account, you need to activate the fitting connectors.
 
-## Development
+Development
+-----------
 
-The addon interface of Friendica is very flexible and powerful, so if you are missing functionality, your chances are high it may be added with an addon.
-See the [documentation](https://github.com/friendica/friendica/blob/master/doc/Addons.md) for more information on the addon development.
+The addon interface of Friendica is very flexible and powerful, so if you are
+missing functionality, your chances are high it may be added with an addon.
+See the [documentation](https://github.com/friendica/friendica/blob/master/doc/Addons.md) for more informations on the addon development.
 
-## Translation
-
-Addons can be translated like any other part of Friendica.
-Translation for addons is done at [the Transifex Friendica page](https://www.transifex.com/Friendica/friendica/dashboard/).
-
-Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/master/doc/translations.md#addon).
+Addons can be translated like any other part of Friendica. Translations for the
+addons included in this repository are done at the [Transifex project](https://www.transifex.com/projects/p/friendica/) for Friendica.
diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index d06dab51..a00f2f07 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -52,6 +52,10 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\ExpressionLanguage;
 
+require_once 'boot.php';
+require_once 'include/conversation.php';
+require_once 'include/dba.php';
+
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 function advancedcontentfilter_install()
diff --git a/advancedcontentfilter/lang/fr/messages.po b/advancedcontentfilter/lang/fr/messages.po
deleted file mode 100644
index cd1853fd..00000000
--- a/advancedcontentfilter/lang/fr/messages.po
+++ /dev/null
@@ -1,174 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Marie Olive <lacellule101@gmail.com>, 2018
-# vladimir N <lapoubelle111@gmail.com>, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-17 04:04+0200\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: vladimir N <lapoubelle111@gmail.com>, 2018\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: advancedcontentfilter.php:134
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Filtré par règle:%s"
-
-#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
-msgid "Advanced Content Filter"
-msgstr "Filtre avancé de contenu"
-
-#: advancedcontentfilter.php:203
-msgid "Back to Addon Settings"
-msgstr "Retour aux paramètres de l'extension"
-
-#: advancedcontentfilter.php:205
-msgid "Add a Rule"
-msgstr "Ajouter une règle"
-
-#: advancedcontentfilter.php:206
-msgid "Help"
-msgstr "Aide"
-
-#: advancedcontentfilter.php:207
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the <a href=\"advancedcontentfilter/help\">help page</a>."
-msgstr ""
-"Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de "
-"contenu. Les règles portent un nom et contiennent une expression arbitraire "
-"qui sera appliquée aux données du post. Pour une liste complète des "
-"opérations disponibles, voyez la page d'aide"
-
-#: advancedcontentfilter.php:208
-msgid "Your rules"
-msgstr "Vos règles"
-
-#: advancedcontentfilter.php:209
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-"
-"dessus près du titre"
-
-#: advancedcontentfilter.php:210
-msgid "Disabled"
-msgstr "Désactivé"
-
-#: advancedcontentfilter.php:211
-msgid "Enabled"
-msgstr "Activé"
-
-#: advancedcontentfilter.php:212
-msgid "Disable this rule"
-msgstr "Désactiver cette règle"
-
-#: advancedcontentfilter.php:213
-msgid "Enable this rule"
-msgstr "Activer cette règle"
-
-#: advancedcontentfilter.php:214
-msgid "Edit this rule"
-msgstr "Modifier cette règle"
-
-#: advancedcontentfilter.php:215
-msgid "Edit the rule"
-msgstr "Modifier la règle"
-
-#: advancedcontentfilter.php:216
-msgid "Save this rule"
-msgstr "Enregistrer cette règle"
-
-#: advancedcontentfilter.php:217
-msgid "Delete this rule"
-msgstr "Supprimer cette règle"
-
-#: advancedcontentfilter.php:218
-msgid "Rule"
-msgstr "Règle"
-
-#: advancedcontentfilter.php:219
-msgid "Close"
-msgstr "Fermer"
-
-#: advancedcontentfilter.php:220
-msgid "Add new rule"
-msgstr "Ajouter nouvelle règle"
-
-#: advancedcontentfilter.php:221
-msgid "Rule Name"
-msgstr "Nommer règle"
-
-#: advancedcontentfilter.php:222
-msgid "Rule Expression"
-msgstr "Expression de règle"
-
-#: advancedcontentfilter.php:223
-msgid ""
-"<p>Examples:</p><ul><li><pre>author_link == "
-"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Cancel"
-msgstr "Annuler"
-
-#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
-#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
-msgid "You must be logged in to use this method"
-msgstr "Vous devez être connecté pour utiliser cette méthode"
-
-#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
-#: advancedcontentfilter.php:379
-msgid "Invalid form security token, please refresh the page."
-msgstr "Formulaire token de sécurité invalide, rafraîchissez la page"
-
-#: advancedcontentfilter.php:328
-msgid "The rule name and expression are required."
-msgstr "Le nom et l'expression de cette règle sont requis"
-
-#: advancedcontentfilter.php:340
-msgid "Rule successfully added"
-msgstr "Règle bien ajoutée"
-
-#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "Cette règle n'existe pas ou ne vous appartient pas"
-
-#: advancedcontentfilter.php:369
-msgid "Rule successfully updated"
-msgstr "Règle bien mise à jour"
-
-#: advancedcontentfilter.php:390
-msgid "Rule successfully deleted"
-msgstr "Règle bien supprimée"
-
-#: advancedcontentfilter.php:400
-msgid "Missing argument: guid."
-msgstr "Argument manquant: "
-
-#: advancedcontentfilter.php:406
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:28
-msgid "Method not found"
-msgstr "Méthode non trouvée"
diff --git a/advancedcontentfilter/lang/fr/strings.php b/advancedcontentfilter/lang/fr/strings.php
deleted file mode 100644
index 208a00a9..00000000
--- a/advancedcontentfilter/lang/fr/strings.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	return ($n > 1);;
-}}
-;
-$a->strings["Filtered by rule: %s"] = "Filtré par règle:%s";
-$a->strings["Advanced Content Filter"] = "Filtre avancé de contenu";
-$a->strings["Back to Addon Settings"] = "Retour aux paramètres de l'extension";
-$a->strings["Add a Rule"] = "Ajouter une règle";
-$a->strings["Help"] = "Aide";
-$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de contenu. Les règles portent un nom et contiennent une expression arbitraire qui sera appliquée aux données du post. Pour une liste complète des opérations disponibles, voyez la page d'aide";
-$a->strings["Your rules"] = "Vos règles";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-dessus près du titre";
-$a->strings["Disabled"] = "Désactivé";
-$a->strings["Enabled"] = "Activé";
-$a->strings["Disable this rule"] = "Désactiver cette règle";
-$a->strings["Enable this rule"] = "Activer cette règle";
-$a->strings["Edit this rule"] = "Modifier cette règle";
-$a->strings["Edit the rule"] = "Modifier la règle";
-$a->strings["Save this rule"] = "Enregistrer cette règle";
-$a->strings["Delete this rule"] = "Supprimer cette règle";
-$a->strings["Rule"] = "Règle";
-$a->strings["Close"] = "Fermer";
-$a->strings["Add new rule"] = "Ajouter nouvelle règle";
-$a->strings["Rule Name"] = "Nommer règle";
-$a->strings["Rule Expression"] = "Expression de règle";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "";
-$a->strings["Cancel"] = "Annuler";
-$a->strings["You must be logged in to use this method"] = "Vous devez être connecté pour utiliser cette méthode";
-$a->strings["Invalid form security token, please refresh the page."] = "Formulaire token de sécurité invalide, rafraîchissez la page";
-$a->strings["The rule name and expression are required."] = "Le nom et l'expression de cette règle sont requis";
-$a->strings["Rule successfully added"] = "Règle bien ajoutée";
-$a->strings["Rule doesn't exist or doesn't belong to you."] = "Cette règle n'existe pas ou ne vous appartient pas";
-$a->strings["Rule successfully updated"] = "Règle bien mise à jour";
-$a->strings["Rule successfully deleted"] = "Règle bien supprimée";
-$a->strings["Missing argument: guid."] = "Argument manquant: ";
-$a->strings["Unknown post with guid: %s"] = "";
-$a->strings["Method not found"] = "Méthode non trouvée";
diff --git a/advancedcontentfilter/templates/settings.tpl b/advancedcontentfilter/templates/settings.tpl
index 9ae56c3b..a04baf7d 100644
--- a/advancedcontentfilter/templates/settings.tpl
+++ b/advancedcontentfilter/templates/settings.tpl
@@ -3,7 +3,7 @@
 	<div id="rules"></div>
 
 	<script>
-		var existingRules = {{$rules nofilter}};
+		var existingRules = {{$rules}};
 
 		var messages = {
 	{{foreach $messages as $key => $value}}
diff --git a/blackout/lang/fr/messages.po b/blackout/lang/fr/messages.po
index 823c3782..8f241a71 100644
--- a/blackout/lang/fr/messages.po
+++ b/blackout/lang/fr/messages.po
@@ -6,14 +6,13 @@
 # Translators:
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# vladimir N <lapoubelle111@gmail.com>, 2018
 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: 2018-12-30 12:31+0000\n"
-"Last-Translator: vladimir N <lapoubelle111@gmail.com>\n"
+"PO-Revision-Date: 2016-09-24 02:13+0000\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +26,7 @@ msgstr "Sauvegarder les paramètres"
 
 #: blackout.php:100
 msgid "Redirect URL"
-msgstr "Adresse URL de redirection"
+msgstr "Adresse de redirection"
 
 #: blackout.php:100
 msgid "all your visitors from the web will be redirected to this URL"
diff --git a/blackout/lang/fr/strings.php b/blackout/lang/fr/strings.php
index ac1890f3..ce184038 100644
--- a/blackout/lang/fr/strings.php
+++ b/blackout/lang/fr/strings.php
@@ -2,12 +2,11 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
 	return ($n > 1);;
 }}
 ;
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["Redirect URL"] = "Adresse URL de redirection";
+$a->strings["Redirect URL"] = "Adresse de redirection";
 $a->strings["all your visitors from the web will be redirected to this URL"] = "Tous vos visiteurs venant du web seront redirigés vers cette URL.";
 $a->strings["Begin of the Blackout"] = "Début du blackout";
 $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"] = "Le format est <em>YYYY</em> année, <em>MM</em> mois, <em>DD</em> jour, <em>hh</em> heure and <em>mm</em> minute";
diff --git a/blackout/lang/sv/messages.po b/blackout/lang/sv/messages.po
index af391856..2bb3aba4 100644
--- a/blackout/lang/sv/messages.po
+++ b/blackout/lang/sv/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Jonatan Nyberg, 2017
-# Tim Stahel <transifex@swedneck.xyz>, 2018
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
 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: 2018-11-13 12:35+0000\n"
-"Last-Translator: Tim Stahel <transifex@swedneck.xyz>\n"
+"PO-Revision-Date: 2017-02-13 20:15+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,28 +25,28 @@ msgstr "Spara inställningar"
 
 #: blackout.php:100
 msgid "Redirect URL"
-msgstr "Omdirigera URL"
+msgstr ""
 
 #: blackout.php:100
 msgid "all your visitors from the web will be redirected to this URL"
-msgstr "alla dina besökare från webben kommer omdirigeras till denna URL"
+msgstr ""
 
 #: blackout.php:101
 msgid "Begin of the Blackout"
-msgstr "Start av blackouten"
+msgstr ""
 
 #: 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 "format är <em>ÅÅÅÅ</em> år, <em>MM</em> månad, <em>DD</em> dag, <em>hh</em> timma och <em>mm</em> minut"
+msgstr ""
 
 #: blackout.php:102
 msgid "End of the Blackout"
-msgstr "Slut av blackouten"
+msgstr ""
 
 #: blackout.php:108
 msgid ""
 "The end-date is prior to the start-date of the blackout, you should fix "
 "this."
-msgstr "Slutdatumet är före startdatumet för blackouten, du borde fixa detta."
+msgstr ""
diff --git a/blackout/lang/sv/strings.php b/blackout/lang/sv/strings.php
index 2a008cca..f467211a 100644
--- a/blackout/lang/sv/strings.php
+++ b/blackout/lang/sv/strings.php
@@ -2,14 +2,13 @@
 
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
-	$n = intval($n);
 	return ($n != 1);;
 }}
 ;
 $a->strings["Save Settings"] = "Spara inställningar";
-$a->strings["Redirect URL"] = "Omdirigera URL";
-$a->strings["all your visitors from the web will be redirected to this URL"] = "alla dina besökare från webben kommer omdirigeras till denna URL";
-$a->strings["Begin of the Blackout"] = "Start av blackouten";
-$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"] = "format är <em>ÅÅÅÅ</em> år, <em>MM</em> månad, <em>DD</em> dag, <em>hh</em> timma och <em>mm</em> minut";
-$a->strings["End of the Blackout"] = "Slut av blackouten";
-$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Slutdatumet är före startdatumet för blackouten, du borde fixa detta.";
+$a->strings["Redirect URL"] = "";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "";
+$a->strings["Begin of the Blackout"] = "";
+$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"] = "";
+$a->strings["End of the Blackout"] = "";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "";
diff --git a/blockem/blockem.php b/blockem/blockem.php
index fbba29f4..2a5fd8b6 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Util\Strings;
 
 function blockem_install()
 {
@@ -101,7 +100,7 @@ function blockem_enotify_store(App $a, array &$b)
 				continue;
 			}
 
-			if (Strings::compareLink($b['url'], $word)) {
+			if (link_compare($b['url'], $word)) {
 				$found = true;
 				break;
 			}
@@ -134,7 +133,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data)
 	$found = false;
 
 	foreach ($profiles_array as $word) {
-		if (Strings::compareLink($hook_data['item']['author-link'], trim($word))) {
+		if (link_compare($hook_data['item']['author-link'], trim($word))) {
 			$found = true;
 			break;
 		}
@@ -193,7 +192,7 @@ function blockem_item_photo_menu(App $a, array &$b)
 
 	if (!empty($a->data['blockem'])) {
 		foreach($a->data['blockem'] as $bloke) {
-			if (Strings::compareLink($bloke,$author)) {
+			if (link_compare($bloke,$author)) {
 				$blocked = true;
 				break;
 			}
@@ -232,7 +231,7 @@ function blockem_init(App $a)
 
 		if (count($arr)) {
 			foreach ($arr as $x) {
-				if (!Strings::compareLink(trim($x), trim($_GET['unblock']))) {
+				if (!link_compare(trim($x), trim($_GET['unblock']))) {
 					$newarr[] = $x;
 				}
 			}
diff --git a/blockem/lang/fr/messages.po b/blockem/lang/fr/messages.po
deleted file mode 100644
index 527f1c73..00000000
--- a/blockem/lang/fr/messages.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# Marie Olive <lacellule101@gmail.com>, 2018
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-# vladimir N <lapoubelle111@gmail.com>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
-"PO-Revision-Date: 2018-12-30 12:33+0000\n"
-"Last-Translator: vladimir N <lapoubelle111@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/Friendica/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"
-
-#: blockem.php:54 blockem.php:58
-msgid "Blockem"
-msgstr "Bloquez-les"
-
-#: blockem.php:62
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Cache le contenu de l'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique."
-
-#: blockem.php:63
-msgid "Comma separated profile URLS:"
-msgstr "URLs de profil séparées par des virgules:"
-
-#: blockem.php:67
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr "Paramètres Bloquez-les sauvegardés."
-
-#: blockem.php:143
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Utilisateur filtré:%s"
-
-#: blockem.php:202
-msgid "Unblock Author"
-msgstr "Débloquer l'Auteur"
-
-#: blockem.php:204
-msgid "Block Author"
-msgstr "Bloquer l'Auteur"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "Réglages Blockem mis à jour."
diff --git a/blockem/lang/fr/strings.php b/blockem/lang/fr/strings.php
index cc2d366f..b9f31180 100644
--- a/blockem/lang/fr/strings.php
+++ b/blockem/lang/fr/strings.php
@@ -1,17 +1,10 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	return ($n > 1);;
-}}
-;
-$a->strings["Blockem"] = "Bloquez-les";
-$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Cache le contenu de l'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique.";
-$a->strings["Comma separated profile URLS:"] = "URLs de profil séparées par des virgules:";
-$a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["BLOCKEM Settings saved."] = "Paramètres Bloquez-les sauvegardés.";
-$a->strings["Filtered user: %s"] = "Utilisateur filtré:%s";
-$a->strings["Unblock Author"] = "Débloquer l'Auteur";
-$a->strings["Block Author"] = "Bloquer l'Auteur";
-$a->strings["blockem settings updated"] = "Réglages Blockem mis à jour.";
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Réglages de Blockem";
+$a->strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["BLOCKEM Settings saved."] = "Réglages Blockem sauvés.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloqué %s - Cliquez pour ouvrir/fermer";
+$a->strings["Unblock Author"] = "Débloquer l'auteur";
+$a->strings["Block Author"] = "Bloquer l'auteur";
+$a->strings["blockem settings updated"] = "Réglages blockem sauvés";
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 3faba1ca..496a47c8 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -17,7 +17,6 @@ use Friendica\Util\XML;
 
 function blogger_install()
 {
-	Addon::registerHook('hook_fork',               'addon/blogger/blogger.php', 'blogger_hook_fork');
 	Addon::registerHook('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
 	Addon::registerHook('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
 	Addon::registerHook('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
@@ -27,7 +26,6 @@ function blogger_install()
 
 function blogger_uninstall()
 {
-	Addon::unregisterHook('hook_fork',               'addon/blogger/blogger.php', 'blogger_hook_fork');
 	Addon::unregisterHook('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
 	Addon::unregisterHook('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
 	Addon::unregisterHook('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
@@ -132,21 +130,6 @@ function blogger_settings_post(App $a, array &$b)
 	}
 }
 
-function blogger_hook_fork(App &$a, array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'blogger') || ($post['parent'] != $post['id'])) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
 function blogger_post_local(App $a, array &$b)
 {
 	// This can probably be changed to allow editing by pointing to a different API endpoint
@@ -165,7 +148,7 @@ function blogger_post_local(App $a, array &$b)
 
 	$bl_post   = intval(PConfig::get(local_user(), 'blogger', 'post'));
 
-	$bl_enable = (($bl_post && !empty($_REQUEST['blogger_enable'])) ? intval($_REQUEST['blogger_enable']) : 0);
+	$bl_enable = (($bl_post && x($_REQUEST, 'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) {
 		$bl_enable = 1;
diff --git a/blogger/lang/fr/messages.po b/blogger/lang/fr/messages.po
index 119fcb56..497bf0be 100644
--- a/blogger/lang/fr/messages.po
+++ b/blogger/lang/fr/messages.po
@@ -4,16 +4,14 @@
 # 
 # 
 # Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# Marie Olive <lacellule101@gmail.com>, 2018
-# RyDroid <inactive+RyDroid@transifex.com>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 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: 2018-11-13 12:44+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
+"PO-Revision-Date: 2015-08-30 17:07+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +25,11 @@ msgstr "Poster sur Blogger"
 
 #: blogger.php:74 blogger.php:78
 msgid "Blogger Export"
-msgstr "Export Blogger"
+msgstr ""
 
 #: blogger.php:82
 msgid "Enable Blogger Post Addon"
-msgstr "Activer l'extension de publication Blogger"
+msgstr "Activer le connecteur Blogger"
 
 #: blogger.php:87
 msgid "Blogger username"
@@ -47,7 +45,7 @@ msgstr "URL de l'API de Blogger"
 
 #: blogger.php:102
 msgid "Post to Blogger by default"
-msgstr "Poster sur Blogger par défaut"
+msgstr ""
 
 #: blogger.php:108
 msgid "Save Settings"
@@ -55,4 +53,4 @@ msgstr "Sauvegarder les paramètres"
 
 #: blogger.php:178
 msgid "Post from Friendica"
-msgstr "Publier depuis Friendica"
+msgstr ""
diff --git a/blogger/lang/fr/strings.php b/blogger/lang/fr/strings.php
index a1500c11..89a429ae 100644
--- a/blogger/lang/fr/strings.php
+++ b/blogger/lang/fr/strings.php
@@ -2,16 +2,15 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
 	return ($n > 1);;
 }}
 ;
 $a->strings["Post to blogger"] = "Poster sur Blogger";
-$a->strings["Blogger Export"] = "Export Blogger";
-$a->strings["Enable Blogger Post Addon"] = "Activer l'extension de publication Blogger";
+$a->strings["Blogger Export"] = "";
+$a->strings["Enable Blogger Post Addon"] = "Activer le connecteur Blogger";
 $a->strings["Blogger username"] = "Nom d'utilisateur Blogger";
 $a->strings["Blogger password"] = "Mot de passe Blogger";
 $a->strings["Blogger API URL"] = "URL de l'API de Blogger";
-$a->strings["Post to Blogger by default"] = "Poster sur Blogger par défaut";
+$a->strings["Post to Blogger by default"] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["Post from Friendica"] = "Publier depuis Friendica";
+$a->strings["Post from Friendica"] = "";
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 2e20f4bf..bb9af8ab 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Buffer Post Connector
- * Description: Post to Buffer (Facebook Pages, LinkedIn, Twitter)
+ * Description: Post to Buffer (Facebook, Google+, LinkedIn, Twitter)
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
@@ -19,11 +19,9 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\ItemContent;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Strings;
 
 function buffer_install()
 {
-	Addon::registerHook('hook_fork',            'addon/buffer/buffer.php', 'buffer_hook_fork');
 	Addon::registerHook('post_local',           'addon/buffer/buffer.php', 'buffer_post_local');
 	Addon::registerHook('notifier_normal',      'addon/buffer/buffer.php', 'buffer_send');
 	Addon::registerHook('jot_networks',         'addon/buffer/buffer.php', 'buffer_jot_nets');
@@ -33,7 +31,6 @@ function buffer_install()
 
 function buffer_uninstall()
 {
-	Addon::unregisterHook('hook_fork',               'addon/buffer/buffer.php', 'buffer_hook_fork');
 	Addon::unregisterHook('post_local',              'addon/buffer/buffer.php', 'buffer_post_local');
 	Addon::unregisterHook('notifier_normal',         'addon/buffer/buffer.php', 'buffer_send');
 	Addon::unregisterHook('jot_networks',            'addon/buffer/buffer.php', 'buffer_jot_nets');
@@ -86,8 +83,8 @@ function buffer_addon_admin(App $a, &$o)
 
 function buffer_addon_admin_post(App $a)
 {
-	$client_id     = (!empty($_POST['client_id'])     ? Strings::escapeTags(trim($_POST['client_id']))     : '');
-	$client_secret = (!empty($_POST['client_secret']) ? Strings::escapeTags(trim($_POST['client_secret'])) : '');
+	$client_id     = ((!empty($_POST['client_id']))     ? notags(trim($_POST['client_id']))     : '');
+	$client_secret = ((!empty($_POST['client_secret'])) ? notags(trim($_POST['client_secret'])) : '');
 
 	Config::set('buffer', 'client_id'    , $client_id);
 	Config::set('buffer', 'client_secret', $client_secret);
@@ -268,21 +265,6 @@ function buffer_post_local(App $a, array &$b)
 	$b['postopts'] .= 'buffer';
 }
 
-function buffer_hook_fork(&$a, &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'buffer') || ($post['parent'] != $post['id'])) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
 function buffer_send(App $a, array &$b)
 {
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
diff --git a/buffer/lang/fr/messages.po b/buffer/lang/fr/messages.po
index 716f5397..3362afe7 100644
--- a/buffer/lang/fr/messages.po
+++ b/buffer/lang/fr/messages.po
@@ -5,16 +5,15 @@
 # 
 # Translators:
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# Marie Olive <lacellule101@gmail.com>, 2018
-# RyDroid <inactive+RyDroid@transifex.com>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 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: 2018-11-13 12:56+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
+"PO-Revision-Date: 2016-09-24 03:03+0000\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +63,7 @@ msgstr "Authentifier votre connexion à Buffer"
 
 #: buffer.php:146
 msgid "Enable Buffer Post Addon"
-msgstr "Activer l'extension de publication Buffer"
+msgstr "Activer le connecteur Buffer"
 
 #: buffer.php:151
 msgid "Post to Buffer by default"
diff --git a/buffer/lang/fr/strings.php b/buffer/lang/fr/strings.php
index f7d97493..f86822c5 100644
--- a/buffer/lang/fr/strings.php
+++ b/buffer/lang/fr/strings.php
@@ -2,7 +2,6 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
 	return ($n > 1);;
 }}
 ;
@@ -16,7 +15,7 @@ $a->strings["return to the connector page"] = "revenir à la page du connecteur"
 $a->strings["Post to Buffer"] = "Publier sur Buffer";
 $a->strings["Buffer Export"] = "Export Buffer";
 $a->strings["Authenticate your Buffer connection"] = "Authentifier votre connexion à Buffer";
-$a->strings["Enable Buffer Post Addon"] = "Activer l'extension de publication Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Activer le connecteur Buffer";
 $a->strings["Post to Buffer by default"] = "Publier sur Buffer par défaut";
 $a->strings["Check to delete this preset"] = "Cocher pour supprimer ce préréglage";
 $a->strings["Posts are going to all accounts that are enabled by default:"] = "Les posts sont envoyés à tous les comptes activés par défault:";
diff --git a/curweather/curweather.php b/curweather/curweather.php
index d1ef63b8..85fd4a60 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -9,6 +9,8 @@
  *
  */
 
+require_once 'include/text.php';
+
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
@@ -116,7 +118,7 @@ function curweather_network_mod_init(App $a, &$b)
 	$rpt = PConfig::get(local_user(), 'curweather', 'curweather_loc');
 
 	// Set the language to the browsers language or default and use metric units
-	$lang = defaults($_SESSION, 'language', Config::get('system', 'language'));
+	$lang = (!empty($_SESSION['language']) ? $_SESSION['language'] : Config::get('system', 'language'));
 	$units = PConfig::get( local_user(), 'curweather', 'curweather_units');
 	$appid = Config::get('curweather', 'appid');
 	$cachetime = intval(Config::get('curweather', 'cachetime'));
diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index 67bc63df..8b8811ec 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -136,7 +136,7 @@ class Diaspora_Connection {
 		} elseif (!empty($m[1])) {
 			$token = $m[1];
 		}
-		return !empty($token) ? $token : false;
+		return (!empty($token)) ? $token : false;
 	}
 
 	private function readJsonResponse($response) {
@@ -165,14 +165,14 @@ class Diaspora_Connection {
 		$this->doHttpRequest('/bookmarklet');
 		$m = [];
 		preg_match('/"aspects"\:(\[.+?\])/', $this->last_http_result->response, $m);
-		return !empty($m[1]) ? json_decode($m[1]) : false;
+		return (!empty($m[1])) ? json_decode($m[1]) : false;
 	}
 
 	public function getServices() {
 		$this->doHttpRequest('/bookmarklet');
 		$m = [];
 		preg_match('/"configured_services"\:(\[.+?\])/', $this->last_http_result->response, $m);
-		return !empty($m[1]) ? json_decode($m[1]) : false;
+		return (!empty($m[1])) ? json_decode($m[1]) : false;
 	}
 
 	public function getNotifications($notification_type = '', $show = '') {
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index b36b2774..03793310 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -21,7 +21,6 @@ use Friendica\Model\Queue;
 
 function diaspora_install()
 {
-	Addon::registerHook('hook_fork',               'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
 	Addon::registerHook('post_local',              'addon/diaspora/diaspora.php', 'diaspora_post_local');
 	Addon::registerHook('notifier_normal',         'addon/diaspora/diaspora.php', 'diaspora_send');
 	Addon::registerHook('jot_networks',            'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
@@ -32,7 +31,6 @@ function diaspora_install()
 
 function diaspora_uninstall()
 {
-	Addon::unregisterHook('hook_fork',               'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
 	Addon::unregisterHook('post_local',              'addon/diaspora/diaspora.php', 'diaspora_post_local');
 	Addon::unregisterHook('notifier_normal',         'addon/diaspora/diaspora.php', 'diaspora_send');
 	Addon::unregisterHook('jot_networks',            'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
@@ -255,21 +253,6 @@ function diaspora_settings_post(App $a, &$b)
 	}
 }
 
-function diaspora_hook_fork(&$a, &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'diaspora') || ($post['parent'] != $post['id'])) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
 function diaspora_post_local(App $a, array &$b)
 {
 	if ($b['edit']) {
@@ -286,7 +269,7 @@ function diaspora_post_local(App $a, array &$b)
 
 	$diaspora_post   = intval(PConfig::get(local_user(),'diaspora','post'));
 
-	$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
+	$diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) {
 		$diaspora_enable = 1;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index cceb3ca0..28ae2d97 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -137,7 +137,7 @@ function dwpost_post_local(App $a, array &$b)
 
 	$dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
 
-	$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
+	$dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) {
 		$dw_enable = 1;
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 526a35fe..1c88dfaf 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -17,9 +17,12 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
+require_once 'boot.php';
+require_once 'include/dba.php';
+require_once 'include/text.php';
+
 function forumdirectory_install()
 {
 	Addon::registerHook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
@@ -69,9 +72,9 @@ function forumdirectory_content(App $a)
 	Nav::setSelected('directory');
 
 	if (!empty($a->data['search'])) {
-		$search = Strings::escapeTags(trim($a->data['search']));
+		$search = notags(trim($a->data['search']));
 	} else {
-		$search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+		$search = ((!empty($_GET['search'])) ? notags(trim(rawurldecode($_GET['search']))) : '');
 	}
 
 	$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
diff --git a/forumdirectory/templates/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl
index 5ffa6405..61b165d7 100644
--- a/forumdirectory/templates/forumdirectory_item.tpl
+++ b/forumdirectory/templates/forumdirectory_item.tpl
@@ -36,7 +36,7 @@
 			</div>
 		</div>
 	  	<div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-{{$id}}" >
-			{{if $about}}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">{{$about}}</dt><dd class="forumdirectory-copy-data">{{$profile.about nofilter}}</dd></dl>{{/if}}
+			{{if $about}}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">{{$about}}</dt><dd class="forumdirectory-copy-data">{{$profile.about}}</dd></dl>{{/if}}
   		</div>
 	</div>
 </div>
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index e0ede735..f2b0f1fc 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -30,7 +30,7 @@ function fromapp_uninstall()
 
 function fromapp_settings_post($a, $post)
 {
-	if (!local_user() || empty($_POST['fromapp-submit'])) {
+	if (!local_user() || (! x($_POST, 'fromapp-submit'))) {
 		return;
 	}
 
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index b8217fc0..860438d8 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -4,7 +4,7 @@
  * Description: Imports posts from a Google+ account and repeats them
  * Version: 0.1
  * Author: Michael Vogel <ike@piratenpartei.de>
- * Status: unsupported
+ *
  */
 
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
@@ -23,6 +23,8 @@ use Friendica\Model\Item;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
+require_once 'include/text.php';
+
 function fromgplus_install() {
 	Addon::registerHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
 	Addon::registerHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
@@ -87,9 +89,9 @@ function fromgplus_addon_settings_post(&$a,&$b) {
 
 	if (!empty($_POST['fromgplus-submit'])) {
 		PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
-		$enable = (!empty($_POST['fromgplus-enable']) ? intval($_POST['fromgplus-enable']) : 0);
+		$enable = (x($_POST,'fromgplus-enable') ? intval($_POST['fromgplus-enable']) : 0);
 		PConfig::set(local_user(),'fromgplus','enable', $enable);
-		$keywords = (!empty($_POST['fromgplus-keywords']) ? intval($_POST['fromgplus-keywords']) : 0);
+		$keywords = (x($_POST, 'fromgplus-keywords') ? intval($_POST['fromgplus-keywords']) : 0);
 		PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
 
 		if (!$enable)
@@ -111,7 +113,7 @@ function fromgplus_addon_admin(&$a, &$o)
 
 function fromgplus_addon_admin_post(&$a)
 {
-	$key = (!empty($_POST['key']) ? trim($_POST['key']) : '');
+	$key = ((x($_POST, 'key')) ? trim($_POST['key']) : '');
 	Config::set('fromgplus', 'key', $key);
 	info(L10n::t('Settings updated.'). EOL);
 }
@@ -318,6 +320,8 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
+	require_once 'include/items.php';
+
 	$post = "";
 	$quote = "";
 	$pagedata = [];
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index abb33abb..1a0b9daa 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -12,7 +12,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 
 function geocoordinates_install()
 {
@@ -100,10 +99,10 @@ function geocoordinates_addon_admin(&$a, &$o)
 
 function geocoordinates_addon_admin_post(&$a)
 {
-	$api_key  = (!empty($_POST['api_key']) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
+	$api_key  = ((x($_POST, 'api_key')) ? notags(trim($_POST['api_key']))   : '');
 	Config::set('geocoordinates', 'api_key', $api_key);
 
-	$language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
+	$language  = ((x($_POST, 'language')) ? notags(trim($_POST['language']))   : '');
 	Config::set('geocoordinates', 'language', $language);
 	info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/geonames/README.md b/geonames/README.md
index 443ddf3f..ba90dc5d 100644
--- a/geonames/README.md
+++ b/geonames/README.md
@@ -7,10 +7,9 @@ Use Geonames service to resolve nearest populated location for given latitude, l
 
 ## Installation
 
-Pre-requisite: Register a username at geonames.org and set in `config/addon.config.php`
+Pre-requisite: Register a username at geonames.org and set in config/addon.ini.php
 
-    'geonames' => [
-        'username' => 'your_username'
-    ],
+    [geonames]
+    username = your_username
 
 Also visit http://geonames.org/manageaccount and enable access to the free web services.
\ No newline at end of file
diff --git a/geonames/config/geonames.config.php b/geonames/config/geonames.config.php
deleted file mode 100644
index 6af3634e..00000000
--- a/geonames/config/geonames.config.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'geonames' => [
-		//username (String)
-		//The geonames.org API username
-		'username' => '',
-	],
-];
diff --git a/geonames/config/geonames.ini.php b/geonames/config/geonames.ini.php
new file mode 100644
index 00000000..280e7a93
--- /dev/null
+++ b/geonames/config/geonames.ini.php
@@ -0,0 +1,12 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[geonames]
+; username (String)
+; The geonames.org API username
+username =
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/geonames/geonames.php b/geonames/geonames.php
index 91a466fc..709e015b 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,7 +7,7 @@
  *
  *
  * Pre-requisite: Register a username at geonames.org
- * and set in config/addon.config.php
+ * and set in config/addon.ini.php
  *
  * [geonames]
  * username = your_username
@@ -78,7 +78,7 @@ function geonames_uninstall() {
 
 function geonames_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/geonames.config.php');
+	$a->loadConfigFile(__DIR__. '/config/geonames.ini.php');
 }
 
 function geonames_post_hook($a, &$item) {
@@ -150,7 +150,7 @@ function geonames_post_hook($a, &$item) {
  */
 
 function geonames_addon_admin_post($a,$post) {
-	if(! local_user() || empty($_POST['geonames-submit']))
+	if(! local_user() || (! x($_POST,'geonames-submit')))
 		return;
 	PConfig::set(local_user(),'geonames','enable',intval($_POST['geonames']));
 
diff --git a/gnot/gnot.php b/gnot/gnot.php
index f3a50705..3cab8539 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -44,7 +44,7 @@ function gnot_uninstall() {
  */
 
 function gnot_settings_post($a,$post) {
-	if(! local_user() || empty($_POST['gnot-submit']))
+	if(! local_user() || (! x($_POST,'gnot-submit')))
 		return;
 
 	PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot']));
diff --git a/gravatar/README.md b/gravatar/README.md
index 02b9bfd2..b8ca8244 100644
--- a/gravatar/README.md
+++ b/gravatar/README.md
@@ -30,19 +30,15 @@ Gravatar lets users self-rate their images to be used at appropriate audiences.
 See more information at [Gravatar][1].
 
 ## Alternative Configuration
-Open the `config/local.config.php` file and add "gravatar" to the list of activated addons:
+Open the config/local.ini.php file and add "gravatar" to the list of activated addons:
 
-	'system' => [
-		...
-		'addon' => '...,gravatar'
-		...
-	]
+        [system]
+		addon = ...,gravatar
 
-You can add two configuration variables for the addon to the `config/addon.config.php` file:
+You can add two configuration variables for the addon to the config/addon.ini.php file:
 
-    'gravatar' => [
-        'default_avatar' => 'identicon',
-        'rating' => 'g',
-    ],
+        [gravatar]
+		default_avatar = identicon
+        rating = g
 
 [1]: http://www.gravatar.com/site/implement/images/ "See documentation at Gravatar for more information"
diff --git a/gravatar/config/gravatar.config.php b/gravatar/config/gravatar.config.php
deleted file mode 100644
index 75bab4fc..00000000
--- a/gravatar/config/gravatar.config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'gravatar' => [
-		// default_avatar (String)
-		// If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
-		// You can choose between these presets:
-		// - gravatar : default static Gravatar logo
-		// - mm       : (mystery-man) a static image
-		// - identicon: a generated geometric pattern based on email hash
-		// - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
-		// - wavatar  : faces with different features and backgrounds based on email hash
-		// - retro    : 8-bit arcade-styled pixelated faces based on email hash
-		'default_avatar' => 'gravatar',
-
-		// rating (String)
-		// Gravatar lets users self-rate their images to be used at appropriate audiences.
-		// Choose which are appropriate for your friendica site:
-		// - g : suitable for display on all wesites with any audience type
-		// - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence
-		// - r : may contain such things as harsh profanity, intense violence, nudity, or hard drug use
-		// - x : may contain hardcore sexual imagery or extremely disurbing violence
-		'rating' => 'g',
-	],
-];
diff --git a/gravatar/config/gravatar.ini.php b/gravatar/config/gravatar.ini.php
new file mode 100644
index 00000000..a07005a3
--- /dev/null
+++ b/gravatar/config/gravatar.ini.php
@@ -0,0 +1,28 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[gravatar]
+; default_avatar (String)
+; If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
+; You can choose between these presets:
+; - gravatar : default static Gravatar logo
+; - mm       : (mystery-man) a static image
+; - identicon: a generated geometric pattern based on email hash
+; - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
+; - wavatar  : faces with different features and backgrounds based on email hash
+; - retro    : 8-bit arcade-styled pixelated faces based on email hash
+default_avatar = gravatar
+
+; rating (String)
+; Gravatar lets users self-rate their images to be used at appropriate audiences.
+; Choose which are appropriate for your friendica site:
+; - g : suitable for display on all wesites with any audience type
+; - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence
+; - r : may contain such things as harsh profanity, intense violence, nudity, or hard drug use
+; - x : may contain hardcore sexual imagery or extremely disurbing violence
+rating = g
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index fea06270..d0d54689 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -15,7 +15,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\Security;
-use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -39,7 +38,7 @@ function gravatar_uninstall() {
 
 function gravatar_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/gravatar.config.php');
+	$a->loadConfigFile(__DIR__. '/config/gravatar.ini.php');
 }
 
 /**
@@ -122,8 +121,8 @@ function gravatar_addon_admin (&$a, &$o) {
 function gravatar_addon_admin_post (&$a) {
 	BaseModule::checkFormSecurityToken('gravatarsave');
 
-	$default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
-	$rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g');
+	$default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
+	$rating = ((x($_POST, 'rating')) ? notags(trim($_POST['rating'])) : 'g');
 	Config::set('gravatar', 'default_avatar', $default_avatar);
 	Config::set('gravatar', 'rating', $rating);
 	info(L10n::t('Gravatar settings updated.') .EOL);
diff --git a/gravatar/lang/fr/messages.po b/gravatar/lang/fr/messages.po
index 7df0f511..8bc2f977 100644
--- a/gravatar/lang/fr/messages.po
+++ b/gravatar/lang/fr/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Marie Olive <lacellule101@gmail.com>, 2018
-# RyDroid <inactive+RyDroid@transifex.com>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 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: 2018-11-13 12:05+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
+"PO-Revision-Date: 2015-08-30 17:12+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +25,7 @@ msgstr "image de profil générique"
 
 #: gravatar.php:72
 msgid "random geometric pattern"
-msgstr "Schéma géométrique aléatoire "
+msgstr ""
 
 #: gravatar.php:73
 msgid "monster face"
diff --git a/gravatar/lang/fr/strings.php b/gravatar/lang/fr/strings.php
index bc062845..02d59c6a 100644
--- a/gravatar/lang/fr/strings.php
+++ b/gravatar/lang/fr/strings.php
@@ -2,12 +2,11 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
 	return ($n > 1);;
 }}
 ;
 $a->strings["generic profile image"] = "image de profil générique";
-$a->strings["random geometric pattern"] = "Schéma géométrique aléatoire ";
+$a->strings["random geometric pattern"] = "";
 $a->strings["monster face"] = "";
 $a->strings["computer generated face"] = "visage généré par ordinateur";
 $a->strings["retro arcade style face"] = "";
diff --git a/group_text/group_text.php b/group_text/group_text.php
index cf56dbec..76bb03fd 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -40,7 +40,7 @@ function group_text_uninstall() {
  */
 
 function group_text_settings_post($a,$post) {
-	if(! local_user() || empty($_POST['group_text-submit']))
+	if(! local_user() || (! x($_POST,'group_text-submit')))
 		return;
 	PConfig::set(local_user(),'system','groupedit_image_limit',intval($_POST['group_text']));
 
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index d7eb5109..a5838c04 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -7,6 +7,9 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 require_once 'mod/item.php';
+require_once 'include/items.php';
+require_once 'include/text.php';
+
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -15,7 +18,6 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
-use Friendica\Util\Strings;
 
 function ifttt_install()
 {
@@ -48,7 +50,7 @@ function ifttt_settings(App $a, &$s)
 	$key = PConfig::get(local_user(), 'ifttt', 'key');
 
 	if (!$key) {
-		$key = Strings::getRandomHex(20);
+		$key = random_string(20);
 		PConfig::set(local_user(), 'ifttt', 'key', $key);
 	}
 
@@ -87,7 +89,7 @@ function ifttt_settings(App $a, &$s)
 
 function ifttt_settings_post()
 {
-	if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) {
+	if (x($_POST, 'ifttt-submit') && isset($_POST['ifttt-rekey'])) {
 		PConfig::delete(local_user(), 'ifttt', 'key');
 	}
 }
@@ -165,7 +167,7 @@ function ifttt_post(App $a)
 
 function ifttt_message($uid, $item)
 {
-	$a = \get_app();
+	$a = get_app();
 
 	$_SESSION['authenticated'] = true;
 	$_SESSION['uid'] = $uid;
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index dcb8f4bf..d2a3071e 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -108,7 +108,7 @@ function ijpost_settings(&$a, &$s)
 
 function ijpost_settings_post(&$a, &$b)
 {
-	if (!empty($_POST['ijpost-submit'])) {
+	if (x($_POST, 'ijpost-submit')) {
 		PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost']));
 		PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault']));
 		PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
@@ -134,7 +134,7 @@ function ijpost_post_local(&$a, &$b)
 
 	$ij_post   = intval(PConfig::get(local_user(), 'ijpost', 'post'));
 
-	$ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0);
+	$ij_enable = (($ij_post && x($_REQUEST, 'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) {
 		$ij_enable = 1;
diff --git a/impressum/README.md b/impressum/README.md
index ca78d9a0..0d0aa51c 100644
--- a/impressum/README.md
+++ b/impressum/README.md
@@ -16,14 +16,13 @@ Simply fill in the fields in the impressium settings page in the addons area of
 
 Manual Configuration
 --------------------
-If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/addon.config.php` file
+If you for any reason you prefer to use a configuration file instead, you can set the following variables in the config/addon.ini.php file
 
-	'impressum' => [
-        'owner' => '',           This is the Name of the Operator
-        'ownerprofile' => '',    This is an optional Friendica account where the above owner name will link to
-        'email' => '',           A contact email address (optional)
-                                 Will be displayed slightly obfuscated as name(at)example(dot)com
-        'postal' => '',          Should contain a postal address where you can be reached at (optional)
-        'notes' => '',           Additional informations that should be displayed in the Impressum block
-        'footer_text' => '',     Text that will be displayed at the bottom of the pages.
-    ],
+	[impressum]
+	owner =           this is the Name of the Operator
+	ownerprofile =    this is an optional Friendica account where the above owner name will link to
+	email =           a contact email address (optional)
+					  will be displayed slightly obfuscated as name(at)example(dot)com
+	postal =          should contain a postal address where you can be reached at (optional)
+	notes =           additional informations that should be displayed in the Impressum block
+	footer_text =     Text that will be displayed at the bottom of the pages.
diff --git a/impressum/config/impressum.config.php b/impressum/config/impressum.config.php
deleted file mode 100644
index 9fe672fc..00000000
--- a/impressum/config/impressum.config.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'impressum' => [
-		// owner (String)
-		// This is the Name of the Operator
-		'owner' => '',
-
-		// ownerprofile (String)
-		// This is an optional Friendica account where the above owner name will link to
-		'ownerprofile' => '',
-
-		// email (String)
-		// A contact email address (optional)
-		// Will be displayed slightly obfuscated as name(at)example(dot)com
-		'email' => '',
-
-		// postal (String)
-		// Should contain a postal address where you can be reached at (optional)
-		'postal' => '',
-
-		// notes (String)
-		// Additional informations that should be displayed in the Impressum block
-		'notes' => '',
-
-		// footer_text (String)
-		// Text that will be displayed at the bottom of the pages.
-		'footer_text' => '',
-	],
-];
diff --git a/impressum/config/impressum.ini.php b/impressum/config/impressum.ini.php
new file mode 100644
index 00000000..1de4468c
--- /dev/null
+++ b/impressum/config/impressum.ini.php
@@ -0,0 +1,33 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[impressum]
+; owner (String)
+; This is the Name of the Operator
+owner =
+
+; ownerprofile (String)
+; This is an optional Friendica account where the above owner name will link to
+ownerprofile =
+
+; email (String)
+; A contact email address (optional)
+; Will be displayed slightly obfuscated as name(at)example(dot)com
+email =
+
+; postal (String)
+; Should contain a postal address where you can be reached at (optional)
+postal =
+
+; notes (String)
+; Additional informations that should be displayed in the Impressum block
+notes =
+
+; footer_text (String)
+; Text that will be displayed at the bottom of the pages.
+footer_text =
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/impressum/impressum.php b/impressum/impressum.php
index d7cbc6d2..0efe5c3c 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -14,7 +14,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Strings;
 
 function impressum_install() {
 	Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
@@ -33,7 +32,7 @@ function impressum_uninstall() {
 function impressum_module() {
 }
 function impressum_content() {
-    $a = \get_app();
+    $a = get_app();
     $a->internalRedirect('friendica/');
 }
 
@@ -54,7 +53,7 @@ function impressum_footer($a, &$b) {
 
 function impressum_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/impressum.config.php');
+	$a->loadConfigFile(__DIR__. '/config/impressum.ini.php');
 }
 
 function impressum_show($a,&$b) {
@@ -87,12 +86,12 @@ function impressum_show($a,&$b) {
 }
 
 function impressum_addon_admin_post (&$a) {
-    $owner = (!empty($_POST['owner']) ? Strings::escapeTags(trim($_POST['owner'])) : '');
-    $ownerprofile = (!empty($_POST['ownerprofile']) ? Strings::escapeTags(trim($_POST['ownerprofile'])) : '');
-    $postal = (!empty($_POST['postal']) ? (trim($_POST['postal'])) : '');
-    $notes = (!empty($_POST['notes']) ? (trim($_POST['notes'])) : '');
-    $email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : '');
-    $footer_text = (!empty($_POST['footer_text']) ? (trim($_POST['footer_text'])) : '');
+    $owner = ((x($_POST, 'owner')) ? notags(trim($_POST['owner'])) : '');
+    $ownerprofile = ((x($_POST, 'ownerprofile')) ? notags(trim($_POST['ownerprofile'])) : '');
+    $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : '');
+    $notes = ((x($_POST, 'notes')) ? (trim($_POST['notes'])) : '');
+    $email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : '');
+    $footer_text = ((x($_POST, 'footer_text')) ? (trim($_POST['footer_text'])) : '');
     Config::set('impressum','owner',strip_tags($owner));
     Config::set('impressum','ownerprofile',strip_tags($ownerprofile));
     Config::set('impressum','postal',strip_tags($postal));
diff --git a/irc/irc.php b/irc/irc.php
index 2677dc75..4804fb6f 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -109,7 +109,7 @@ function irc_content(&$a) {
 	if($autochans)
 		$channels = $autochans;
 	else
-		$channels = defaults($_GET, 'channels', 'friendica');
+		$channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica');
 
 /* add the chatroom frame and some html */
   $o .= <<< EOT
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 28e238db..e2ef01d2 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -203,8 +203,8 @@ function jappixmini_init()
 			killme();
 		}
 
-		$encrypt_func = 'openssl_public_encrypt';
-		$decrypt_func = 'openssl_public_decrypt';
+		$encrypt_func = openssl_public_encrypt;
+		$decrypt_func = openssl_public_decrypt;
 		$key = $r[0]["pubkey"];
 	} else if ($role == "prv") {
 		$r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
@@ -212,8 +212,8 @@ function jappixmini_init()
 			killme();
 		}
 
-		$encrypt_func = 'openssl_private_encrypt';
-		$decrypt_func = 'openssl_private_decrypt';
+		$encrypt_func = openssl_private_encrypt;
+		$decrypt_func = openssl_private_decrypt;
 		$key = $r[0]["prvkey"];
 	} else {
 		killme();
@@ -606,14 +606,14 @@ function jappixmini_cron(App $a, $d)
 			$dfrn_id = $contact_row["dfrn-id"];
 			if ($dfrn_id) {
 				$key = $contact_row["pubkey"];
-				$encrypt_func = 'openssl_public_encrypt';
-				$decrypt_func = 'openssl_public_decrypt';
+				$encrypt_func = openssl_public_encrypt;
+				$decrypt_func = openssl_public_decrypt;
 				$role = "prv";
 			} else {
 				$dfrn_id = $contact_row["issued-id"];
 				$key = $contact_row["prvkey"];
-				$encrypt_func = 'openssl_private_encrypt';
-				$decrypt_func = 'openssl_private_decrypt';
+				$encrypt_func = openssl_private_encrypt;
+				$decrypt_func = openssl_private_decrypt;
 				$role = "pub";
 			}
 
@@ -666,7 +666,7 @@ function jappixmini_cron(App $a, $d)
 
 				// parse answer
 				$answer = json_decode($answer_json);
-				if (empty($answer->status) || ($answer->status != "ok")) {
+				if ($answer->status != "ok") {
 					throw new Exception();
 				}
 
diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 2203c9bf..d4f0ec1e 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -183,7 +183,7 @@ function js_upload_post_file(&$a,&$b) {
 function js_upload_post_end(&$a,&$b) {
 
 Logger::log('upload_post_end');
-	if(!empty($a->data['upload_jsonresponse'])) {
+	if(x($a->data,'upload_jsonresponse')) {
 		echo $a->data['upload_jsonresponse'];
 		killme();
 	}
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 512ac840..8cc8f697 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -79,7 +79,7 @@ function langfilter_addon_settings_post(App $a, &$b)
 
 	if (!empty($_POST['langfilter-settings-submit'])) {
 		PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
-		$enable = (!empty($_POST['langfilter_enable']) ? intval($_POST['langfilter_enable']) : 0);
+		$enable = (x($_POST, 'langfilter_enable') ? intval($_POST['langfilter_enable']) : 0);
 		$disable = 1 - $enable;
 		PConfig::set(local_user(), 'langfilter', 'disable', $disable);
 		$minconfidence = 0 + $_POST['langfilter_minconfidence'];
diff --git a/ldapauth/README b/ldapauth/README
new file mode 100644
index 00000000..03e8b0d4
--- /dev/null
+++ b/ldapauth/README
@@ -0,0 +1,38 @@
+Authenticate a user against an LDAP directory
+Useful for Windows Active Directory and other LDAP-based organisations
+to maintain a single password across the organisation.
+Optionally authenticates only if a member of a given group in the directory.
+
+By default, the person must have registered with Friendica using the normal registration
+procedures in order to have a Friendica user record, contact, and profile.
+However, it's possible with an option to automate the creation of a Friendica basic account.
+
+Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
+ldap.conf file to the signing cert for your LDAP server.
+
+The configuration options for this module may be set in the config/addon.ini.php file
+e.g.:
+
+	[ldapauth]
+	// ldap hostname server - required
+	ldap_server = host.example.com
+	// dn to search users - required
+	ldap_searchdn = ou=users,dc=example,dc=com
+	// attribute to find username - required
+	ldap_userattr = uid
+
+	// admin dn - optional - only if ldap server dont have anonymous access
+	ldap_binddn = cn=admin,dc=example,dc=com
+	// admin password - optional - only if ldap server dont have anonymous access
+	ldap_bindpw = password
+
+	// for create Friendica account if user exist in ldap
+	//     required an email and a simple (beautiful) nickname on user ldap object
+	//   active account creation - optional - default none
+	ldap_autocreateaccount = true
+	//   attribute to get email - optional - default : 'mail'
+	ldap_autocreateaccount_emailattribute = mail
+	//   attribute to get nickname - optional - default : 'givenName'
+	ldap_autocreateaccount_nameattribute = givenName
+
+...etc.
diff --git a/ldapauth/README.md b/ldapauth/README.md
deleted file mode 100644
index f37bb9d5..00000000
--- a/ldapauth/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-Authenticate a user against an LDAP directory
-===
-
-Useful for Windows Active Directory and other LDAP-based organisations
-to maintain a single password across the organisation.
-Optionally authenticates only if a member of a given group in the directory.
-
-By default, the person must have registered with Friendica using the normal registration
-procedures in order to have a Friendica user record, contact, and profile.
-However, it's possible with an option to automate the creation of a Friendica basic account.
-
-Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
-ldap.conf file to the signing cert for your LDAP server.
-
-The configuration options for this module may be set in the `config/addon.config.php` file
-e.g.:
-
-	'ldapauth' => [
-        // ldap hostname server - required
-        'ldap_server' => '',
-
-        // admin dn - optional - only if ldap server dont have anonymous access
-        'ldap_binddn' => '',
-
-        // admin password - optional - only if ldap server dont have anonymous access
-        'ldap_bindpw' => '',
-
-        // dn to search users - required
-        'ldap_searchdn' => '',
-
-        // attribute to find username - required
-        'ldap_userattr' => '',
-
-        // DN of the group whose member can auth on Friendica - optional
-        'ldap_group' => '',
-
-        // To create Friendica account if user exists in ldap
-        // Requires an email and a simple (beautiful) nickname on user ldap object
-        // active account creation - optional - default true
-        'ldap_autocreateaccount' => true,
-
-        // attribute to get email - optional - default : 'mail'
-        'ldap_autocreateaccount_emailattribute' => 'mail',
-
-        // attribute to get nickname - optional - default : 'givenName'
-        'ldap_autocreateaccount_nameattribute' => 'givenName',
-    ],
-
-...etc.
diff --git a/ldapauth/config/ldapauth.config.php b/ldapauth/config/ldapauth.config.php
deleted file mode 100644
index e89a2b55..00000000
--- a/ldapauth/config/ldapauth.config.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'ldapauth' => [
-		// ldap_server (String)
-		// ldap hostname server - required
-		// Example: ldap_server = host.example.com
-		'ldap_server' => '',
-
-		// ldap_binddn (String)
-		// admin dn - optional - only if ldap server dont have anonymous access
-		// Example: ldap_binddn = cn=admin,dc=example,dc=com
-		'ldap_binddn' => '',
-
-		// ldap_bindpw (String)
-		// admin password - optional - only if ldap server dont have anonymous access
-		'ldap_bindpw' => '',
-
-		// ldap_searchdn (String)
-		// dn to search users - required
-		// Example: ldap_searchdn = ou=users,dc=example,dc=com
-		'ldap_searchdn' => '',
-
-		// ldap_userattr (String)
-		// attribute to find username - required
-		// Example: ldap_userattr = uid
-		'ldap_userattr' => '',
-
-		// ldap_group (String)
-		// DN of the group whose member can auth on Friendica - optional
-		'ldap_group' => '',
-
-		// ldap_autocreateaccount (Boolean)
-		// To create Friendica account if user exists in ldap
-		// Requires an email and a simple (beautiful) nickname on user ldap object
-		// active account creation - optional - default true
-		'ldap_autocreateaccount' => true,
-
-		// ldap_autocreateaccount_emailattribute (String)
-		// attribute to get email - optional - default : 'mail'
-		'ldap_autocreateaccount_emailattribute' => 'mail',
-
-		// ldap_autocreateaccount_nameattribute (String)
-		// attribute to get nickname - optional - default : 'givenName'
-		'ldap_autocreateaccount_nameattribute' => 'givenName',
-	],
-];
diff --git a/ldapauth/config/ldapauth.ini.php b/ldapauth/config/ldapauth.ini.php
new file mode 100644
index 00000000..d707550b
--- /dev/null
+++ b/ldapauth/config/ldapauth.ini.php
@@ -0,0 +1,50 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[ldapauth]
+; ldap_server (String)
+; ldap hostname server - required
+; Example: ldap_server = host.example.com
+ldap_server =
+
+; ldap_binddn (String)
+; admin dn - optional - only if ldap server dont have anonymous access
+; Example: ldap_binddn = cn=admin,dc=example,dc=com
+ldap_binddn =
+
+; ldap_bindpw (String)
+; admin password - optional - only if ldap server dont have anonymous access
+ldap_bindpw =
+
+; ldap_searchdn (String)
+; dn to search users - required
+; Example: ldap_searchdn = ou=users,dc=example,dc=com
+ldap_searchdn =
+
+; ldap_userattr (String)
+; attribute to find username - required
+; Example: ldap_userattr = uid
+ldap_userattr =
+
+; ldap_group (String)
+; DN of the group whose member can auth on Friendica - optional
+ldap_group =
+
+; ldap_autocreateaccount (Boolean)
+; for create Friendica account if user exist in ldap
+;	required an email and a simple (beautiful) nickname on user ldap object
+; active account creation - optional - default none
+ldap_autocreateaccount = true
+
+; ldap_autocreateaccount_emailattribute (String)
+; attribute to get email - optional - default : 'mail'
+ldap_autocreateaccount_emailattribute = mail
+
+; ldap_autocreateaccount_nameattribute (String)
+; attribute to get nickname - optional - default : 'givenName'
+ldap_autocreateaccount_nameattribute = givenName
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 77d963c0..eb8cafc4 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -26,7 +26,7 @@
  * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
  * ldap.conf file to the signing cert for your LDAP server.
  *
- * The configuration options for this module may be set in the config/addon.config.php file
+ * The configuration options for this module may be set in the config/addon.ini.php file
  * e.g.:
  *
  * [ldapauth]
@@ -72,7 +72,7 @@ function ldapauth_uninstall()
 
 function ldapauth_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/ldapauth.config.php');
+	$a->loadConfigFile(__DIR__. '/config/ldapauth.ini.php');
 }
 
 function ldapauth_hook_authenticate($a, &$b)
diff --git a/leistungsschutzrecht/README.md b/leistungsschutzrecht/README.md
deleted file mode 100644
index 7026af53..00000000
--- a/leistungsschutzrecht/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Leistungsschutzrecht Addon
-==========================
-
-Main author Michael Vogel
-
-This addon handles legal problems with the German link tax, named "Leistungsschutzrecht" by shortening preview texts.
-Additionally it is possibly to suppress preview pictures completely to avoid any legal problems.
-
-## configuration
-
-If you want to suppress pictures in previews, add this to your global `config/addon.config.php`:
-
-	'leistungsschutzrecht' => [
-		'suppress_photos' => true,
-	],
-
diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index b300fd65..020c3af3 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -24,24 +24,22 @@ function leistungsschutzrecht_uninstall() {
 }
 
 function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) {
-	if (!isset($siteinfo["url"]) || empty($siteinfo['type'])) {
+	if (!isset($siteinfo["url"])) {
 		return;
 	}
 
-	// Avoid any third party pictures, to avoid copyright issues
-	if (!in_array($siteinfo['type'], ['photo', 'video']) && Config::get('leistungsschutzrecht', 'suppress_photos', false)) {
-		unset($siteinfo["image"]);
-		unset($siteinfo["images"]);
-	}
-
 	if (!leistungsschutzrecht_is_member_site($siteinfo["url"])) {
 		return;
 	}
 
+	//$siteinfo["title"] = $siteinfo["url"];
+
 	if (!empty($siteinfo["text"])) {
 		$siteinfo["text"] = leistungsschutzrecht_cuttext($siteinfo["text"]);
 	}
 
+	unset($siteinfo["image"]);
+	unset($siteinfo["images"]);
 	unset($siteinfo["keywords"]);
 }
 
diff --git a/libertree/libertree.php b/libertree/libertree.php
index d5aa97e5..0804476c 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -6,7 +6,6 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -15,25 +14,22 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
 
-function libertree_install()
-{
-	Addon::registerHook('hook_fork',            'addon/libertree/libertree.php', 'libertree_hook_fork');
-	Addon::registerHook('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
-	Addon::registerHook('notifier_normal',      'addon/libertree/libertree.php', 'libertree_send');
-	Addon::registerHook('jot_networks',         'addon/libertree/libertree.php', 'libertree_jot_nets');
-	Addon::registerHook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
-	Addon::registerHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+function libertree_install() {
+    Addon::registerHook('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
+    Addon::registerHook('notifier_normal',      'addon/libertree/libertree.php', 'libertree_send');
+    Addon::registerHook('jot_networks',         'addon/libertree/libertree.php', 'libertree_jot_nets');
+    Addon::registerHook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+    Addon::registerHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+
+}
+function libertree_uninstall() {
+    Addon::unregisterHook('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
+    Addon::unregisterHook('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
+    Addon::unregisterHook('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
+    Addon::unregisterHook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+    Addon::unregisterHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
 }
 
-function libertree_uninstall()
-{
-	Addon::unregisterHook('hook_fork',        'addon/libertree/libertree.php', 'libertree_hook_fork');
-	Addon::unregisterHook('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
-	Addon::unregisterHook('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
-	Addon::unregisterHook('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
-	Addon::unregisterHook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
-	Addon::unregisterHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
-}
 
 function libertree_jot_nets(&$a,&$b) {
     if(! local_user())
@@ -111,7 +107,7 @@ function libertree_settings(&$a,&$s) {
 
 function libertree_settings_post(&$a,&$b) {
 
-	if(!empty($_POST['libertree-submit'])) {
+	if(x($_POST,'libertree-submit')) {
 
 		PConfig::set(local_user(),'libertree','post',intval($_POST['libertree']));
 		PConfig::set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
@@ -122,21 +118,6 @@ function libertree_settings_post(&$a,&$b) {
 
 }
 
-function libertree_hook_fork(App &$a, array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'libertree') || ($post['parent'] != $post['id'])) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
 function libertree_post_local(&$a,&$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
@@ -155,7 +136,7 @@ function libertree_post_local(&$a,&$b) {
 
 	$ltree_post   = intval(PConfig::get(local_user(),'libertree','post'));
 
-	$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
+	$ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(),'libertree','post_by_default'))) {
 		$ltree_enable = 1;
diff --git a/libravatar/README.md b/libravatar/README.md
index bcc0f824..33c3679c 100644
--- a/libravatar/README.md
+++ b/libravatar/README.md
@@ -23,18 +23,14 @@ If no avatar was found for an email Libravatar can create some pseudo-random gen
 See examples at [Libravatar][1].
 
 ## Alternative Configuration
-Open the `config/local.config.php` file and add "libravatar" to the list of activated addons:
+Open the config/local.ini.php file and add "libravatar" to the list of activated addons:
 
-    'system' => [
-        ...
-        'addon' => '...,libravatar'
-        ...
-    ]
+        [system]
+		addon = ...,libravatar
 
-You can add one configuration variables for the addon to the `config/addon.config.php` file:
+You can add one configuration variables for the addon to the config/addon.ini.php file:
 
-    'libravatar' => [
-        'default_avatar' => 'identicon',
-    ],
+        [libravatar]
+		default_avatar = identicon
 
 [1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information"
diff --git a/libravatar/config/libravatar.config.php b/libravatar/config/libravatar.config.php
deleted file mode 100644
index 7f4f50f6..00000000
--- a/libravatar/config/libravatar.config.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'libravatar' => [
-		// default_avatar (String)
-		// If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
-		// You can choose between these presets:
-		// - mm       : (mystery-man) a static image
-		// - identicon: a generated geometric pattern based on email hash
-		// - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
-		// - wavatar  : faces with different features and backgrounds based on email hash
-		// - retro    : 8-bit arcade-styled pixelated faces based on email hash
-		'default_avatar' => 'identicon',
-	],
-];
diff --git a/libravatar/config/libravatar.ini.php b/libravatar/config/libravatar.ini.php
new file mode 100644
index 00000000..e3631204
--- /dev/null
+++ b/libravatar/config/libravatar.ini.php
@@ -0,0 +1,18 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[libravatar]
+; default_avatar (String)
+; If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
+; You can choose between these presets:
+; - mm       : (mystery-man) a static image
+; - identicon: a generated geometric pattern based on email hash
+; - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
+; - wavatar  : faces with different features and backgrounds based on email hash
+; - retro    : 8-bit arcade-styled pixelated faces based on email hash
+default_avatar = identicon
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index d6ccb718..39f77a56 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -15,7 +15,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\Security;
-use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -39,7 +38,7 @@ function libravatar_uninstall()
 
 function libravatar_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/libravatar.config.php');
+	$a->loadConfigFile(__DIR__. '/config/libravatar.ini.php');
 }
 
 /**
@@ -125,7 +124,7 @@ function libravatar_addon_admin_post(&$a)
 {
 	BaseModule::checkFormSecurityToken('libravatarrsave');
 
-	$default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+	$default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
 	Config::set('libravatar', 'default_avatar', $default_avatar);
 	info(L10n::t('Libravatar settings updated.') .EOL);
 }
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index dc0c0fd6..c60af03c 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -105,7 +105,7 @@ function ljpost_settings(&$a,&$s) {
 
 function ljpost_settings_post(&$a,&$b) {
 
-	if(!empty($_POST['ljpost-submit'])) {
+	if(x($_POST,'ljpost-submit')) {
 
 		PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
 		PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
@@ -131,7 +131,7 @@ function ljpost_post_local(&$a,&$b) {
 
     $lj_post   = intval(PConfig::get(local_user(),'ljpost','post'));
 
-	$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
+	$lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
 
 	if($b['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
 		$lj_enable = 1;
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 6b693f6c..1d2a4917 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -86,7 +86,7 @@ function mailstream_addon_admin(&$a,&$o) {
 }
 
 function mailstream_addon_admin_post ($a) {
-	if (!empty($_POST['frommail'])) {
+	if (x($_POST, 'frommail')) {
 		Config::set('mailstream', 'frommail', $_POST['frommail']);
 	}
 }
diff --git a/mailstream/templates/mail.tpl b/mailstream/templates/mail.tpl
index 526ca4ef..a36729ce 100644
--- a/mailstream/templates/mail.tpl
+++ b/mailstream/templates/mail.tpl
@@ -3,7 +3,7 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<div class="mailstream-item-body">{{$item.body nofilter}}</div>
+<div class="mailstream-item-body">{{$item.body}}</div>
 {{if $item.plink}}
 <div>{{$upstream}}: <a class="mailstream-item-plink" href="{{$item.plink}}">{{$item.plink}}</a><div>
 <div>{{$local}}: <a class="mailstream-item-url" href="{{$item.url}}">{{$item.url}}</a></div>
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index 1da12dc8..0ce63013 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -6,7 +6,6 @@
  * Version: 1.0
  * Author: Hypolite Petovan
  * Author: Roland Haeder
- * Status: Unsupported
  */
 
 use Friendica\App;
diff --git a/mathjax/README.md b/mathjax/README.md
index f5a0388f..19407e86 100644
--- a/mathjax/README.md
+++ b/mathjax/README.md
@@ -21,19 +21,15 @@ In case you want to use the CDN you can try the following URL as a quick start
 	http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML
 
 In case you don't want or can use the admin panel of Friendica you can activate
-the addon by adding _mathjax_ to the list in your `config/local.config.php` file
+the addon by adding _mathjax_ to the list in your config/local.ini.php file
 
-    'system' => [
-        ...
-        'addon' => '...,mathjax'
-        ...
-    ]
+	[system]
+	addon = ...,mathjax
 
-and then providing the base URL after that in the `config/addon.config.php` file
+and then providing the base URL after that in the config/addon.ini.php file
 
-	'mathjax' => [
-		'baseurl' => '[the URL to your MathJax installation]',
-	],
+	[mathjax]
+	baseurl = [the URL to your MathJax installation];
 
 Usage
 =====
diff --git a/mathjax/templates/settings.tpl b/mathjax/templates/settings.tpl
index e26e5a2b..98bdb85e 100644
--- a/mathjax/templates/settings.tpl
+++ b/mathjax/templates/settings.tpl
@@ -6,7 +6,7 @@
 	<span class="fakelink" onclick="openClose('settings_mathjax_expanded'); openClose('settings_mathjax_inflated');">
 		<h3>{{$title}}</h3>
 	</span>
-	<p>{{$description nofilter}}</p>
+	<p>{{$description}}</p>
 	{{include file="field_checkbox.tpl" field=$mathjax_use}}
 	<div class="clear"></div>
 
diff --git a/morechoice/lang/de/messages.po b/morechoice/lang/de/messages.po
index d8615315..4f1bc2d4 100644
--- a/morechoice/lang/de/messages.po
+++ b/morechoice/lang/de/messages.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the Friendica morechoice addon package.
 # 
 # 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
-# Vinzenz Vietzke <vinz@vinzv.de>, 2018
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-07 15:04+0200\n"
-"PO-Revision-Date: 2018-08-07 18:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vinzenz Vietzke <vinz@vinzv.de>, 2018\n"
 "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/morechoice/lang/fr/messages.po b/morechoice/lang/fr/messages.po
deleted file mode 100644
index 31ee975e..00000000
--- a/morechoice/lang/fr/messages.po
+++ /dev/null
@@ -1,342 +0,0 @@
-# ADDON morechoice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica morechoice addon package.
-# 
-# 
-# Translators:
-# Marie Olive <lacellule101@gmail.com>, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-07 15:04+0200\n"
-"PO-Revision-Date: 2018-08-07 18:18+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>, 2018\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: morechoice.php:34
-msgid "Androgyne"
-msgstr "Androgyne"
-
-#: morechoice.php:35
-msgid "Bear"
-msgstr "Ours"
-
-#: morechoice.php:36
-msgid "Bigender"
-msgstr "Bigenre"
-
-#: morechoice.php:37
-msgid "Cross dresser"
-msgstr ""
-
-#: morechoice.php:38
-msgid "Drag queen"
-msgstr "drag queen"
-
-#: morechoice.php:39
-msgid "Eunuch"
-msgstr "eunuque"
-
-#: morechoice.php:40
-msgid "Faux queen"
-msgstr ""
-
-#: morechoice.php:41
-msgid "Gender fluid"
-msgstr "genre fluide"
-
-#: morechoice.php:42
-msgid "Kathoey"
-msgstr ""
-
-#: morechoice.php:43
-msgid "Lady"
-msgstr ""
-
-#: morechoice.php:44
-msgid "Lipstick lesbian"
-msgstr ""
-
-#: morechoice.php:45
-msgid "Metrosexual"
-msgstr "métrosexuel"
-
-#: morechoice.php:46
-msgid "Monk"
-msgstr "moine"
-
-#: morechoice.php:47
-msgid "Nun"
-msgstr "religieuse"
-
-#: morechoice.php:48
-msgid "Soft butch"
-msgstr ""
-
-#: morechoice.php:49
-msgid "Stone femme"
-msgstr ""
-
-#: morechoice.php:50
-msgid "Tomboy"
-msgstr ""
-
-#: morechoice.php:51
-msgid "Transman"
-msgstr "homme trans"
-
-#: morechoice.php:52
-msgid "Transwoman"
-msgstr "femme trans"
-
-#: morechoice.php:53
-msgid "Transvesti"
-msgstr "travesti"
-
-#: morechoice.php:54
-msgid "Trigender"
-msgstr "trigenre"
-
-#: morechoice.php:55
-msgid "Can't remember"
-msgstr "Ne se rappelle pas"
-
-#: morechoice.php:56
-msgid "Hard to tell these days"
-msgstr "Difficile à dire en ce moment"
-
-#: morechoice.php:60
-msgid "Girls with big tits"
-msgstr "Filles à gros seins"
-
-#: morechoice.php:61
-msgid "Millionaires"
-msgstr "Millionnaires"
-
-#: morechoice.php:62
-msgid "Guys with big schlongs"
-msgstr ""
-
-#: morechoice.php:63
-msgid "Easy women"
-msgstr "Femmes faciles"
-
-#: morechoice.php:64
-msgid "People with impaired mobility"
-msgstr "Personnes à mobilité réduite"
-
-#: morechoice.php:65
-msgid "Amputees"
-msgstr "Amputés"
-
-#: morechoice.php:66
-msgid "Statues, mannequins and immobility"
-msgstr ""
-
-#: morechoice.php:67
-msgid "Pain"
-msgstr "Douleur"
-
-#: morechoice.php:68
-msgid "Trans men"
-msgstr "Hommes trans"
-
-#: morechoice.php:69
-msgid "Older women"
-msgstr ""
-
-#: morechoice.php:70
-msgid "Asphyxiation"
-msgstr ""
-
-#: morechoice.php:71
-msgid "In public"
-msgstr ""
-
-#: morechoice.php:72
-msgid "In danger"
-msgstr ""
-
-#: morechoice.php:73
-msgid "Pretending to be male"
-msgstr ""
-
-#: morechoice.php:74
-msgid "Pretending to be female"
-msgstr ""
-
-#: morechoice.php:75
-msgid "Breats"
-msgstr ""
-
-#: morechoice.php:76
-msgid "Scat"
-msgstr ""
-
-#: morechoice.php:77
-msgid "Crying"
-msgstr ""
-
-#: morechoice.php:78
-msgid "Nappies/Diapers"
-msgstr ""
-
-#: morechoice.php:79
-msgid "Trees"
-msgstr ""
-
-#: morechoice.php:80
-msgid "Vomit"
-msgstr ""
-
-#: morechoice.php:81
-msgid "Murder"
-msgstr ""
-
-#: morechoice.php:82
-msgid "Fat people"
-msgstr ""
-
-#: morechoice.php:83
-msgid "Feet"
-msgstr ""
-
-#: morechoice.php:84
-msgid "Covered in insects"
-msgstr ""
-
-#: morechoice.php:85
-msgid "Turning a human being into furniture"
-msgstr ""
-
-#: morechoice.php:86
-msgid "Elderly people"
-msgstr ""
-
-#: morechoice.php:87
-msgid "Transgender people"
-msgstr ""
-
-#: morechoice.php:88
-msgid "Criminals"
-msgstr ""
-
-#: morechoice.php:89
-msgid "Stealing"
-msgstr ""
-
-#: morechoice.php:90
-msgid "Breast milk"
-msgstr ""
-
-#: morechoice.php:91
-msgid "Immersing genitals in liquids"
-msgstr ""
-
-#: morechoice.php:92
-msgid "Giants"
-msgstr ""
-
-#: morechoice.php:93
-msgid "Masochism"
-msgstr ""
-
-#: morechoice.php:94
-msgid "Cars"
-msgstr ""
-
-#: morechoice.php:95
-msgid "Menstruation"
-msgstr ""
-
-#: morechoice.php:96
-msgid "Mucus"
-msgstr ""
-
-#: morechoice.php:97
-msgid "Obscene language"
-msgstr ""
-
-#: morechoice.php:98
-msgid "Noses"
-msgstr ""
-
-#: morechoice.php:99
-msgid "Navels"
-msgstr ""
-
-#: morechoice.php:100
-msgid "Corpses"
-msgstr ""
-
-#: morechoice.php:101
-msgid "Smells"
-msgstr ""
-
-#: morechoice.php:102
-msgid "Buttocks"
-msgstr ""
-
-#: morechoice.php:103
-msgid "Nonliving objects"
-msgstr ""
-
-#: morechoice.php:104
-msgid "Sleeping people"
-msgstr ""
-
-#: morechoice.php:105
-msgid "Urination"
-msgstr ""
-
-#: morechoice.php:106
-msgid "Eating people"
-msgstr ""
-
-#: morechoice.php:107
-msgid "Being eaten"
-msgstr ""
-
-#: morechoice.php:108
-msgid "Animals"
-msgstr ""
-
-#: morechoice.php:109
-msgid "I'd rather just have some chocolate"
-msgstr ""
-
-#: morechoice.php:113
-msgid "Married to my job"
-msgstr ""
-
-#: morechoice.php:114
-msgid "Polygamist"
-msgstr ""
-
-#: morechoice.php:115
-msgid "Half married"
-msgstr ""
-
-#: morechoice.php:116
-msgid "Living in the past"
-msgstr ""
-
-#: morechoice.php:117
-msgid "Pretending to be over my ex"
-msgstr ""
-
-#: morechoice.php:118
-msgid "Hurt in the past"
-msgstr ""
-
-#: morechoice.php:119
-msgid "Wallowing in self-pity"
-msgstr ""
diff --git a/morechoice/lang/fr/strings.php b/morechoice/lang/fr/strings.php
deleted file mode 100644
index 7d57e3be..00000000
--- a/morechoice/lang/fr/strings.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	return ($n > 1);;
-}}
-;
-$a->strings["Androgyne"] = "Androgyne";
-$a->strings["Bear"] = "Ours";
-$a->strings["Bigender"] = "Bigenre";
-$a->strings["Cross dresser"] = "";
-$a->strings["Drag queen"] = "drag queen";
-$a->strings["Eunuch"] = "eunuque";
-$a->strings["Faux queen"] = "";
-$a->strings["Gender fluid"] = "genre fluide";
-$a->strings["Kathoey"] = "";
-$a->strings["Lady"] = "";
-$a->strings["Lipstick lesbian"] = "";
-$a->strings["Metrosexual"] = "métrosexuel";
-$a->strings["Monk"] = "moine";
-$a->strings["Nun"] = "religieuse";
-$a->strings["Soft butch"] = "";
-$a->strings["Stone femme"] = "";
-$a->strings["Tomboy"] = "";
-$a->strings["Transman"] = "homme trans";
-$a->strings["Transwoman"] = "femme trans";
-$a->strings["Transvesti"] = "travesti";
-$a->strings["Trigender"] = "trigenre";
-$a->strings["Can't remember"] = "Ne se rappelle pas";
-$a->strings["Hard to tell these days"] = "Difficile à dire en ce moment";
-$a->strings["Girls with big tits"] = "Filles à gros seins";
-$a->strings["Millionaires"] = "Millionnaires";
-$a->strings["Guys with big schlongs"] = "";
-$a->strings["Easy women"] = "Femmes faciles";
-$a->strings["People with impaired mobility"] = "Personnes à mobilité réduite";
-$a->strings["Amputees"] = "Amputés";
-$a->strings["Statues, mannequins and immobility"] = "";
-$a->strings["Pain"] = "Douleur";
-$a->strings["Trans men"] = "Hommes trans";
-$a->strings["Older women"] = "";
-$a->strings["Asphyxiation"] = "";
-$a->strings["In public"] = "";
-$a->strings["In danger"] = "";
-$a->strings["Pretending to be male"] = "";
-$a->strings["Pretending to be female"] = "";
-$a->strings["Breats"] = "";
-$a->strings["Scat"] = "";
-$a->strings["Crying"] = "";
-$a->strings["Nappies/Diapers"] = "";
-$a->strings["Trees"] = "";
-$a->strings["Vomit"] = "";
-$a->strings["Murder"] = "";
-$a->strings["Fat people"] = "";
-$a->strings["Feet"] = "";
-$a->strings["Covered in insects"] = "";
-$a->strings["Turning a human being into furniture"] = "";
-$a->strings["Elderly people"] = "";
-$a->strings["Transgender people"] = "";
-$a->strings["Criminals"] = "";
-$a->strings["Stealing"] = "";
-$a->strings["Breast milk"] = "";
-$a->strings["Immersing genitals in liquids"] = "";
-$a->strings["Giants"] = "";
-$a->strings["Masochism"] = "";
-$a->strings["Cars"] = "";
-$a->strings["Menstruation"] = "";
-$a->strings["Mucus"] = "";
-$a->strings["Obscene language"] = "";
-$a->strings["Noses"] = "";
-$a->strings["Navels"] = "";
-$a->strings["Corpses"] = "";
-$a->strings["Smells"] = "";
-$a->strings["Buttocks"] = "";
-$a->strings["Nonliving objects"] = "";
-$a->strings["Sleeping people"] = "";
-$a->strings["Urination"] = "";
-$a->strings["Eating people"] = "";
-$a->strings["Being eaten"] = "";
-$a->strings["Animals"] = "";
-$a->strings["I'd rather just have some chocolate"] = "";
-$a->strings["Married to my job"] = "";
-$a->strings["Polygamist"] = "";
-$a->strings["Half married"] = "";
-$a->strings["Living in the past"] = "";
-$a->strings["Pretending to be over my ex"] = "";
-$a->strings["Hurt in the past"] = "";
-$a->strings["Wallowing in self-pity"] = "";
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 4c0cfc3b..73ae176c 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Util\Strings;
 
 function newmemberwidget_install()
 {
@@ -54,8 +53,8 @@ function newmemberwidget_network_mod_init ($a, $b)
 
 function newmemberwidget_addon_admin_post(&$a)
 {
-	$ft = (!empty($_POST['freetext']) ? trim($_POST['freetext']) : "");
-	$lsn = (!empty($_POST['localsupportname']) ? Strings::escapeTags(trim($_POST['localsupportname'])) : "");
+	$ft = ((x($_POST, 'freetext')) ? trim($_POST['freetext']) : "");
+	$lsn = ((x($_POST, 'localsupportname')) ? notags(trim($_POST['localsupportname'])) : "");
 	$gs = intval($_POST['linkglobalsupport']);
 	$ls = intval($_POST['linklocalsupport']);
 	Config::set('newmemberwidget', 'freetext',           trim($ft));
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 51c426cc..ea6712f1 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -54,7 +54,7 @@ function notifyall_post(App $a)
 		$sender_name = '"' . L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename) . '"';
 	}
 
-	if (!Config::get('config', 'sender_email')) {
+	if (! x(Config::get('config', 'sender_email'))) {
 		$sender_email = 'noreply@' . $a->getHostName();
 	} else {
 		$sender_email = Config::get('config', 'sender_email');
diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index adba95c5..6f747ca9 100644
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -25,7 +25,7 @@ function notimeline_uninstall()
 
 function notimeline_settings_post($a, $post)
 {
-	if (!local_user() || empty($_POST['notimeline-submit'])) {
+	if (!local_user() || (!x($_POST, 'notimeline-submit'))) {
 		return;
 	}
 
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 9836a056..77d172ce 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -103,7 +103,7 @@ function nsfw_addon_settings_post(&$a, &$b)
 
 	if (!empty($_POST['nsfw-submit'])) {
 		PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
-		$enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0);
+		$enable = (x($_POST, 'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
 		$disable = 1 - $enable;
 		PConfig::set(local_user(), 'nsfw', 'disable', $disable);
 		info(L10n::t('NSFW Settings saved.') . EOL);
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 5bdc264c..9e22b0ea 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -37,7 +37,7 @@ function numfriends_uninstall() {
  *
  */
 function numfriends_settings_post($a,$post) {
-	if(! local_user() || empty($_POST['numfriends-submit']))
+	if(! local_user() || (! x($_POST,'numfriends-submit')))
 		return;
 
 	PConfig::set(local_user(),'system','display_friend_count',intval($_POST['numfriends']));
diff --git a/openstreetmap/README.md b/openstreetmap/README
similarity index 64%
rename from openstreetmap/README.md
rename to openstreetmap/README
index d8709a18..48402e29 100644
--- a/openstreetmap/README.md
+++ b/openstreetmap/README
@@ -1,12 +1,10 @@
-OpenStreetMap Addon
-===
-
-	by Mike Macgirvin
-	   Klaus Weidenbach
+ ____ OpenStreetMap Addon ____
+by Mike Macgirvin
+   Klaus Weidenbach
 
 This addon allows you to use OpenStreetMap for displaying locations.
 
-## Requirements
+___ Requirements ___
 
 To use this addon you need a tile Server that provides the maps.
 OpenStreetMap data is free for everyone to use. Their tile servers are not.
@@ -16,7 +14,7 @@ You can run your own tile server or choose one from their list of public
 tile servers: http://wiki.openstreetmap.org/wiki/TMS
 Support the OpenStreetMap community and share the load.
 
-## Configuration
+___ Configuration ___
 
 If you for any reason prefer to use a configuration file instead
 of the admin panels, please refer to the Alternative Configuration below.
@@ -32,28 +30,21 @@ level on the map in the Default Zoom box.  1 will show the whole world and 18 is
 zoom level available.
 
 
-## Alternative Configuration
+___ Alternative Configuration ___
 
-Open the `config/local.config.php` file and add "openstreetmap" to the list of activated addons.
+Open the config/local.ini.php file and add "openstreetmap" to the list of activated
+addons.
 
-     'system' => [
-         ...
-         'addon' => '...,openstreetmap'
-         ...
-     ]
+    [system]
+	addon = ...,openstreetmap
 
-You can set configuration variables for the addon in the `config/addon.config.php` file:
+You can change two configuration variables for the addon in the config/addon.ini.php file:
 
-	'openstreetmap' => [
-		'tmsserver' => 'https://www.openstreetmap.org',
-		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
-		'zoom' => 16,
-		'marker' => 0,
-	],
+	[openstreetmap]
+	tmsserver = https://www.openstreetmap.org
+    zoom = 18
 
 The *tmsserver* points to the tile server you want to use. Use the full URL,
 with protocol (http/s) and trailing slash. You can configure the default zoom
 level on the map with *zoom*. 1 will show the whole world and 18 is the highest
-zoom level available.
-
-Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys.
\ No newline at end of file
+zoom level available.
\ No newline at end of file
diff --git a/openstreetmap/config/openstreetmap.config.php b/openstreetmap/config/openstreetmap.config.php
deleted file mode 100644
index e9252ca5..00000000
--- a/openstreetmap/config/openstreetmap.config.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'openstreetmap' => [
-		// tmsserver (String)
-		// This points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash.
-		'tmsserver' => 'https://www.openstreetmap.org',
-
-		// nomserver (String)
-		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
-
-		// zoom (Integer)
-		// The default zoom level on the map.
-		// 1 will show the whole world and 18 is the highest zoom level available.
-		'zoom' => 16,
-
-		// marker (Integer)
-		'marker' => 0,
-	],
-];
diff --git a/openstreetmap/config/openstreetmap.ini.php b/openstreetmap/config/openstreetmap.ini.php
new file mode 100644
index 00000000..986843b4
--- /dev/null
+++ b/openstreetmap/config/openstreetmap.ini.php
@@ -0,0 +1,23 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[openstreetmap]
+; tmsserver (String)
+; This points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash.
+tmsserver = https://www.openstreetmap.org
+
+; nomserver (String)
+nomserver = https://nominatim.openstreetmap.org/search.php
+
+; zoom (Integer)
+; The default zoom level on the map.
+; 1 will show the whole world and 18 is the highest zoom level available.
+zoom = 16
+
+; marker (Integer)
+marker = 0
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index e4863e9b..68edf8bf 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -16,7 +16,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
 const OSM_NOM = 'https://nominatim.openstreetmap.org/search.php';
@@ -49,7 +48,7 @@ function openstreetmap_uninstall()
 
 function openstreetmap_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/openstreetmap.config.php');
+	$a->loadConfigFile(__DIR__. '/config/openstreetmap.ini.php');
 }
 
 function openstreetmap_alterheader($a, &$navHtml)
@@ -177,7 +176,7 @@ function openstreetmap_generate_map(&$a, &$b)
 		$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
 	}
 
-	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? Strings::escapeHtml($b['location']) : L10n::t('View Larger')) . '</a>';
+	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a>';
 	if (empty($b['mode'])) {
 		$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
 				'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
diff --git a/piwik/README.md b/piwik/README.md
index 9b35cc4b..44d906b6 100644
--- a/piwik/README.md
+++ b/piwik/README.md
@@ -20,24 +20,20 @@ Configuration
 
 The easiest way to configure this addon is by activating the admin panels of your ~friendica server and then enter the needed details on the config page for the addon.
 
-If you don't want to use the admin panel, you can configure the addon through the `config/local.config.php` file.
+If you don't want to use the admin panel, you can configure the addon through the config/local.ini.php file.
 
-Open the `config/local.config.php` file and add "piwik" to the list of activated addons.
+Open the config/local.ini.php file and add "piwik" to the list of activated addons.
 
-    'system' => [
-        ...
-        'addon' => '...,piwik'
-        ...
-    ]
+    [system]
+    addon = ...,piwik
 
-You can change 4 more configuration variables for the addon in the `config/addon.config.php` file:
+You can change 4 more configuration variables for the addon in the config/addon.ini.php file:
 
-	'piwik' => [
-        'baseurl' => 'example.com/piwik/',
-        'sideid' => 1,
-        'optout' => true,
-        'async' => false,
-    ],
+    [piwik]
+    baseurl = example.com/piwik/
+    sideid = 1
+    optout = true
+    async = false
 
 Configuration fields
 ---------------------
diff --git a/piwik/config/piwik.config.php b/piwik/config/piwik.config.php
deleted file mode 100644
index 7543097c..00000000
--- a/piwik/config/piwik.config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'piwik' => [
-		// baseurl (String)
-		// This URL points to your Piwik installation.
-		// Use the absolute path, remember trailing slashes but ignore the protocol (http/s) part of the URL.
-		// Example: baseurl = example.com/piwik/
-		'baseurl' => '',
-
-		// siteid (Integer)
-		// Change the *sideid* parameter to whatever ID you want to use for tracking your Friendica installation.
-		'sideid' => '',
-
-		// optout (Boolean)
-		// This defines whether or not a short notice about the utilization of Piwik will be displayed on every
-		// page of your Friendica site (at the bottom of the page with some spacing to the other content).
-		// Part of the note is a link that allows the visitor to set an opt-out cookie which will prevent visits
-		// from that user be tracked by Piwik.
-		'optout' => true,
-
-		// async (Boolean)
-		// This defines whether or not to use asynchronous tracking so pages load (or appear to load) faster.
-		'async' => false,
-	],
-];
diff --git a/piwik/config/piwik.ini.php b/piwik/config/piwik.ini.php
new file mode 100644
index 00000000..b66c69c6
--- /dev/null
+++ b/piwik/config/piwik.ini.php
@@ -0,0 +1,29 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[piwik]
+; baseurl (String)
+; This URL points to your Piwik installation.
+; Use the absolute path, remember trailing slashes but ignore the protocol (http/s) part of the URL.
+; Example: baseurl = example.com/piwik/
+baseurl =
+
+; siteid (Integer)
+; Change the *sideid* parameter to whatever ID you want to use for tracking your Friendica installation.
+sideid =
+
+; optout (Boolean)
+; This defines whether or not a short notice about the utilization of Piwik will be displayed on every
+; page of your Friendica site (at the bottom of the page with some spacing to the other content).
+; Part of the note is a link that allows the visitor to set an opt-out cookie which will prevent visits
+; from that user be tracked by Piwik.
+optout = true
+
+; async (Boolean)
+; This defines whether or not to use asynchronous tracking so pages load (or appear to load) faster.
+async = false
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 3e3144fb..77755236 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -16,7 +16,7 @@
  *
  *   Configuration:
  *     Use the administration panel to configure the Piwik tracking addon, or
- *     in case you don't use this add the following lines to your config/addon.config.php
+ *     in case you don't use this add the following lines to your config/addon.ini.php
  *     file:
  *
  *     [piwik]
@@ -35,7 +35,6 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Util\Strings;
 
 function piwik_install() {
 	Addon::registerHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
@@ -53,7 +52,7 @@ function piwik_uninstall() {
 
 function piwik_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/piwik.config.php');
+	$a->loadConfigFile(__DIR__. '/config/piwik.ini.php');
 }
 
 function piwik_analytics($a,&$b) {
@@ -66,7 +65,7 @@ function piwik_analytics($a,&$b) {
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
 
 	/*
-	 *   Get the configuration variables from the config/addon.config.php file.
+	 *   Get the configuration variables from the config/addon.ini.php file.
 	 */
 	$baseurl = Config::get('piwik', 'baseurl');
 	$siteid  = Config::get('piwik', 'siteid');
@@ -108,10 +107,10 @@ function piwik_addon_admin (&$a, &$o) {
 	]);
 }
 function piwik_addon_admin_post (&$a) {
-	$url = (!empty($_POST['baseurl']) ? Strings::escapeTags(trim($_POST['baseurl'])) : '');
-	$id = (!empty($_POST['siteid']) ? trim($_POST['siteid']) : '');
-	$optout = (!empty($_POST['optout']) ? trim($_POST['optout']) : '');
-	$async = (!empty($_POST['async']) ? trim($_POST['async']) : '');
+	$url = ((x($_POST, 'baseurl')) ? notags(trim($_POST['baseurl'])) : '');
+	$id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
+	$optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
+	$async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
 	Config::set('piwik', 'baseurl', $url);
 	Config::set('piwik', 'siteid', $id);
 	Config::set('piwik', 'optout', $optout);
diff --git a/public_server/README.md b/public_server/README.md
index fecc38ba..7ba002e8 100644
--- a/public_server/README.md
+++ b/public_server/README.md
@@ -6,21 +6,20 @@ Public Server is a Friendica addon which implements automatic account & post exp
 
 This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE ADDON.
 
-    'public_server' => [
-        // When an account is created on the site, it is given a hard expiration date of. 0 to disable.
-        'expiredays' => 0,
-        // Set the default days for posts to expire here. 0 to disable.
-        'expireposts' => 0,
-        // Remove users who have never logged in after nologin days. 0 to disable.
-        'nologin' => 0,
-        // Remove users who last logged in over flagusers days ago. 0 to disable.
-        'flagusers' => 0,
-        // For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
-        'flagposts' => 0,
-        'flagpostsexpire' => 0,
-    ],
+    [public_server]
+	; When an account is created on the site, it is given a hard expiration date of
+    expiredays = 30
+    ; Set the default days for posts to expire here
+    expireposts = 30
+    ; Remove users who have never logged in after nologin days
+    nologin = 30
+    ; Remove users who last logged in over flagusers days ago
+    flagusers = 146
+    ; For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire
+    flagposts = 90
+    flagpostsexpire = 146
 
-Set these in your `config/addon.config.php` file. By default nothing is defined in case the addon is activated accidentally.
+Set these in your config/addon.ini.php file. By default nothing is defined in case the addon is activated accidentally.
 They can be ommitted or set to 0 to disable each option.
 The default values are those used by friendica.eu, change these as desired.
 
diff --git a/public_server/config/public_server.config.php b/public_server/config/public_server.config.php
deleted file mode 100644
index 47ad4107..00000000
--- a/public_server/config/public_server.config.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'public_server' => [
-		// expiredays (Integer)
-		// When an account is created on the site, it is given a hard expiration date of. 0 to disable.
-		'expiredays' => 0,
-
-		// expireposts (Integer)
-		// Set the default days for posts to expire here. 0 to disable.
-		'expireposts' => 0,
-
-		// nologin (Integer)
-		// Remove users who have never logged in after nologin days. 0 to disable.
-		'nologin' => 0,
-
-		// flagusers (Integer)
-		// Remove users who last logged in over flagusers days ago. 0 to disable.
-		'flagusers' => 0,
-
-		// flagposts (Integer)
-		// flagpostsexpire (Integer)
-		// For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
-		'flagposts' => 0,
-		'flagpostsexpire' => 0,
-	],
-];
diff --git a/public_server/config/public_server.ini.php b/public_server/config/public_server.ini.php
new file mode 100644
index 00000000..79b2ef46
--- /dev/null
+++ b/public_server/config/public_server.ini.php
@@ -0,0 +1,30 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[public_server]
+; expiredays (Integer)
+; When an account is created on the site, it is given a hard expiration date of
+expiredays =
+
+; expireposts (Integer)
+; Set the default days for posts to expire here
+expireposts =
+
+; nologin (Integer)
+; Remove users who have never logged in after nologin days
+nologin =
+
+; flagusers (Integer)
+; Remove users who last logged in over flagusers days ago
+flagusers =
+
+; flagposts (Integer)
+; flagpostsexpire (Integer)
+; For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire
+flagposts =
+flagpostsexpire =
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 39b3f7fd..3421dcc1 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -15,7 +15,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
 
 function public_server_install()
 {
@@ -37,7 +36,7 @@ function public_server_uninstall()
 
 function public_server_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
+	$a->loadConfigFile(__DIR__. '/config/public_server.ini.php');
 }
 
 function public_server_register_account($a, $b)
@@ -58,6 +57,7 @@ function public_server_cron($a, $b)
 {
 	Logger::log("public_server: cron start");
 
+	require_once('include/enotify.php');
 	$r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
 		`account_expires_on` > '%s' AND
 		`expire_notification_sent` <= '%s'",
@@ -123,8 +123,8 @@ function public_server_cron($a, $b)
 
 function public_server_enotify(&$a, &$b)
 {
-	if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
-		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
+	if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
+		&& x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
 		$b['itemlink'] = $a->getBaseURL();
 		$b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
 		$b['subject'] = L10n::t('Your Friendica account is about to expire.');
@@ -147,12 +147,12 @@ function public_server_login($a, $b)
 function public_server_addon_admin_post(&$a)
 {
 	BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-	$expiredays = (!empty($_POST['expiredays']) ? Strings::escapeTags(trim($_POST['expiredays'])) : '');
-	$expireposts = (!empty($_POST['expireposts']) ? Strings::escapeTags(trim($_POST['expireposts'])) : '');
-	$nologin = (!empty($_POST['nologin']) ? Strings::escapeTags(trim($_POST['nologin'])) : '');
-	$flagusers = (!empty($_POST['flagusers']) ? Strings::escapeTags(trim($_POST['flagusers'])) : '');
-	$flagposts = (!empty($_POST['flagposts']) ? Strings::escapeTags(trim($_POST['flagposts'])) : '');
-	$flagpostsexpire = (!empty($_POST['flagpostsexpire']) ? Strings::escapeTags(trim($_POST['flagpostsexpire'])) : '');
+	$expiredays = (x($_POST, 'expiredays') ? notags(trim($_POST['expiredays'])) : '');
+	$expireposts = (x($_POST, 'expireposts') ? notags(trim($_POST['expireposts'])) : '');
+	$nologin = (x($_POST, 'nologin') ? notags(trim($_POST['nologin'])) : '');
+	$flagusers = (x($_POST, 'flagusers') ? notags(trim($_POST['flagusers'])) : '');
+	$flagposts = (x($_POST, 'flagposts') ? notags(trim($_POST['flagposts'])) : '');
+	$flagpostsexpire = (x($_POST, 'flagpostsexpire') ? notags(trim($_POST['flagpostsexpire'])) : '');
 	Config::set('public_server', 'expiredays', $expiredays);
 	Config::set('public_server', 'expireposts', $expireposts);
 	Config::set('public_server', 'nologin', $nologin);
diff --git a/pumpio/README.md b/pumpio/README.md
index 33137984..9fb01055 100644
--- a/pumpio/README.md
+++ b/pumpio/README.md
@@ -1,11 +1,6 @@
-To let the connector work properly you should define an application name in `config/addon.config.php`:
+To let the connector work properly you should define an application name in config/addon.ini.php:
 
-	'pumpio' => [
-		'application_name' => '',
-		// Displays forwarded posts like "wall-to-wall" posts.
-		'wall-to-wall_share' => false,
-		// Given in minutes
-		'poll_interval' => 5,
-	],
+[pumpio]
+application_name = Name of you site
 
 This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
diff --git a/pumpio/config/pumpio.config.php b/pumpio/config/pumpio.config.php
deleted file mode 100644
index 4f3dc460..00000000
--- a/pumpio/config/pumpio.config.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'pumpio' => [
-		// application_name (String)
-		// To let the connector work properly you should define an application name.
-		// This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
-		'application_name' => '',
-
-		// wall-to-wall_share (Boolean)
-		// Displays forwarded posts like "wall-to-wall" posts.
-		'wall-to-wall_share' => false,
-
-		// poll_interval (Integer)
-		// Given in minutes
-		'poll_interval' => 5,
-	],
-];
diff --git a/pumpio/config/pumpio.ini.php b/pumpio/config/pumpio.ini.php
new file mode 100644
index 00000000..cd5e732c
--- /dev/null
+++ b/pumpio/config/pumpio.ini.php
@@ -0,0 +1,21 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[pumpio]
+; application_name (String)
+; To let the connector work properly you should define an application name.
+; This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
+application_name =
+
+; wall-to-wall_share (Boolean)
+; Displays forwarded posts like "wall-to-wall" posts.
+wall-to-wall_share = false
+
+; poll_interval (Integer)
+; Given in minutes
+poll_interval = 5
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index c550d924..6d3fe62d 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -25,11 +25,11 @@ use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
+require_once 'include/enotify.php';
 require_once "mod/share.php";
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
@@ -37,7 +37,6 @@ define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 function pumpio_install()
 {
 	Addon::registerHook('load_config',          'addon/pumpio/pumpio.php', 'pumpio_load_config');
-	Addon::registerHook('hook_fork',            'addon/pumpio/pumpio.php', 'hook_fork');
 	Addon::registerHook('post_local',           'addon/pumpio/pumpio.php', 'pumpio_post_local');
 	Addon::registerHook('notifier_normal',      'addon/pumpio/pumpio.php', 'pumpio_send');
 	Addon::registerHook('jot_networks',         'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
@@ -51,7 +50,6 @@ function pumpio_install()
 function pumpio_uninstall()
 {
 	Addon::unregisterHook('load_config',      'addon/pumpio/pumpio.php', 'pumpio_load_config');
-	Addon::unregisterHook('hook_fork',        'addon/pumpio/pumpio.php', 'pumpio_hook_fork');
 	Addon::unregisterHook('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
 	Addon::unregisterHook('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
 	Addon::unregisterHook('jot_networks',     'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
@@ -379,43 +377,7 @@ function pumpio_settings_post(App $a, array &$b)
 
 function pumpio_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/pumpio.config.php');
-}
-
-function pumpio_hook_fork(App $a, array &$b)
-{
-        if ($b['name'] != 'notifier_normal') {
-                return;
-        }
-
-        $post = $b['data'];
-
-        // Deleting and editing is not supported by the addon (deleting could, but isn't by now)
-        if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
-                $b['execute'] = false;
-                return;
-        }
-
-        // if post comes from pump.io don't send it back
-	if ($post['app'] == "pump.io") {
-                $b['execute'] = false;
-                return;
-        }
-
-        if (PConfig::get($post['uid'], 'pumpio', 'import')) {
-                // Don't fork if it isn't a reply to a pump.io post
-                if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
-                        Logger::log('No pump.io parent found for item ' . $post['id']);
-                        $b['execute'] = false;
-                        return;
-                }
-        } else {
-                // Comments are never exported when we don't import the pumpio timeline
-                if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) {
-                        $b['execute'] = false;
-                        return;
-                }
-        }
+	$a->loadConfigFile(__DIR__. '/config/pumpio.ini.php');
 }
 
 function pumpio_post_local(App $a, array &$b)
@@ -916,11 +878,11 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 
 	$contactid = 0;
 
-	if (Strings::compareLink($post->actor->url, $own_id)) {
+	if (link_compare($post->actor->url, $own_id)) {
 		$contactid = $self[0]['id'];
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-			DBA::escape(Strings::normaliseLink($post->actor->url)),
+			DBA::escape(normalise_link($post->actor->url)),
 			intval($uid)
 		);
 
@@ -968,14 +930,14 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 
 	$contactid = 0;
 
-	if (Strings::compareLink($post->actor->url, $own_id)) {
+	if (link_compare($post->actor->url, $own_id)) {
 		$contactid = $self[0]['id'];
 		$post->actor->displayName = $self[0]['name'];
 		$post->actor->url = $self[0]['url'];
 		$post->actor->image->url = $self[0]['photo'];
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-			DBA::escape(Strings::normaliseLink($post->actor->url)),
+			DBA::escape(normalise_link($post->actor->url)),
 			intval($uid)
 		);
 
@@ -1054,7 +1016,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
-		intval($uid), DBA::escape(Strings::normaliseLink($contact->url)));
+		intval($uid), DBA::escape(normalise_link($contact->url)));
 
 	if (!DBA::isResult($r)) {
 		// create contact record
@@ -1065,7 +1027,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 			intval($uid),
 			DBA::escape(DateTimeFormat::utcNow()),
 			DBA::escape($contact->url),
-			DBA::escape(Strings::normaliseLink($contact->url)),
+			DBA::escape(normalise_link($contact->url)),
 			DBA::escape(str_replace("acct:", "", $contact->id)),
 			DBA::escape(''),
 			DBA::escape($contact->id), // What is it for?
@@ -1082,7 +1044,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 		);
 
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
-			DBA::escape(Strings::normaliseLink($contact->url)),
+			DBA::escape(normalise_link($contact->url)),
 			intval($uid)
 			);
 
@@ -1202,7 +1164,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 	} else {
 		$contact_id = pumpio_get_contact($uid, $post->actor, true);
 
-		if (Strings::compareLink($post->actor->url, $own_id)) {
+		if (link_compare($post->actor->url, $own_id)) {
 			$contact_id = $self[0]['id'];
 			$post->actor->displayName = $self[0]['name'];
 			$post->actor->url = $self[0]['url'];
@@ -1210,7 +1172,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 		} elseif ($contact_id == 0) {
 			// Take an existing contact, the contact of the note or - as a fallback - the id of the user
 			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-				DBA::escape(Strings::normaliseLink($post->actor->url)),
+				DBA::escape(normalise_link($post->actor->url)),
 				intval($uid)
 			);
 
@@ -1218,7 +1180,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 				$contact_id = $r[0]['id'];
 			} else {
 				$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-					DBA::escape(Strings::normaliseLink($post->actor->url)),
+					DBA::escape(normalise_link($post->actor->url)),
 					intval($uid)
 				);
 
@@ -1391,7 +1353,7 @@ function pumpio_fetchinbox(App $a, $uid)
 		return;
 	}
 
-	if (!empty($user->items)) {
+	if ($user->items) {
 		$posts = array_reverse($user->items);
 
 		if (count($posts)) {
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 623d4172..91c2b4ce 100644
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -13,7 +13,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Util\Strings;
 
 function remote_permissions_install() {
 	Addon::registerHook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
@@ -58,7 +57,7 @@ function remote_permissions_settings(&$a,&$o) {
 }
 
 function remote_permissions_settings_post($a,$post) {
-	if(! local_user() || empty($_POST['remote-perms-submit']))
+	if(! local_user() || (! x($_POST,'remote-perms-submit')))
 		return;
 
 	PConfig::set(local_user(),'remote_perms','show',intval($_POST['remote-perms']));
@@ -207,7 +206,7 @@ function remote_permissions_addon_admin(&$a, &$o){
 }
 
 function remote_permissions_addon_admin_post(&$a){
-	$choice	=	(!empty($_POST['remotepermschoice'])		? Strings::escapeTags(trim($_POST['remotepermschoice']))	: '');
+	$choice	=	((x($_POST,'remotepermschoice'))		? notags(trim($_POST['remotepermschoice']))	: '');
 	Config::set('remote_perms','global',($choice == 1 ? 1 : 0));
 	info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 10a2b298..90251788 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -92,7 +92,7 @@ function securemail_settings_post(App &$a, array &$b){
 
     if ($_POST['securemail-submit']) {
         PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
-        $enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
+        $enable = ((x($_POST, 'securemail-enable')) ? 1 : 0);
         PConfig::set(local_user(), 'securemail', 'enable', $enable);
         info(L10n::t('Secure Mail Settings saved.') . EOL);
 
@@ -150,7 +150,7 @@ function securemail_settings_post(App &$a, array &$b){
  * @see App
  */
 function securemail_emailer_send_prepare(App &$a, array &$b) {
-    if (empty($b['uid'])) {
+    if (!x($b, 'uid')) {
         return;
     }
 
@@ -164,7 +164,7 @@ function securemail_emailer_send_prepare(App &$a, array &$b) {
     $public_key_ascii = PConfig::get($uid, 'securemail', 'pkey');
 
     preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches);
-    $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1];
+    $marker = (empty($matches[1])) ? 'MESSAGE' : $matches[1];
     $public_key = OpenPGP::unarmor($public_key_ascii, $marker);
 
     $key = OpenPGP_Message::parse($public_key);
diff --git a/securemail/templates/admin.tpl b/securemail/templates/admin.tpl
index c23ff2cd..9a3c2f32 100644
--- a/securemail/templates/admin.tpl
+++ b/securemail/templates/admin.tpl
@@ -16,8 +16,8 @@
                 {{include file="field_textarea.tpl" field=$publickey}}
 
                 <div class="form-group pull-right settings-submit-wrapper" >
-                    <button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-                    <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button>
+                    <button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                    <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test|escape:'html'}}">{{$test}}</button>
                 </div>
                 <div class="clear"></div>
             </div>
diff --git a/showmore/showmore.php b/showmore/showmore.php
index a7b5979b..8fc9cc91 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -10,7 +10,6 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Util\Strings;
 
 function showmore_install()
 {
@@ -71,7 +70,7 @@ function showmore_addon_settings_post(&$a, &$b)
 
 	if (!empty($_POST['showmore-submit'])) {
 		PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
-		$enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0);
+		$enable = (x($_POST, 'showmore-enable') ? intval($_POST['showmore-enable']) : 0);
 		$disable = 1-$enable;
 		PConfig::set(local_user(), 'showmore', 'disable', $disable);
 		info(L10n::t('Show More Settings saved.') . EOL);
@@ -132,7 +131,7 @@ function showmore_prepare_body(\Friendica\App $a, &$hook_data)
 	}
 
 	if ($found) {
-		$rnd = Strings::getRandomHex(8);
+		$rnd = random_string(8);
 		$hook_data['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 . '\');" >' . L10n::t('show more') . '</span></span>' .
 			'<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;">' . $hook_data['html'] . '</div>';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 8c9bee5f..e07a6e73 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -36,6 +36,8 @@
 define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
+require_once 'include/enotify.php';
+
 use CodebirdSN\CodebirdSN;
 use Friendica\App;
 use Friendica\Content\OEmbed;
@@ -58,7 +60,6 @@ use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 
 function statusnet_install()
 {
@@ -66,7 +67,6 @@ function statusnet_install()
 	Addon::registerHook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
 	Addon::registerHook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
 	Addon::registerHook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
-	Addon::registerHook('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork');
 	Addon::registerHook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	Addon::registerHook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	Addon::registerHook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
@@ -80,7 +80,6 @@ function statusnet_uninstall()
 	Addon::unregisterHook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
 	Addon::unregisterHook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
 	Addon::unregisterHook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
-	Addon::unregisterHook('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork');
 	Addon::unregisterHook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	Addon::unregisterHook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	Addon::unregisterHook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
@@ -121,7 +120,7 @@ function statusnet_settings_post(App $a, $post)
 		return;
 	}
 	// don't check GNU Social settings if GNU Social submit button is not clicked
-	if (empty($_POST['statusnet-submit'])) {
+	if (!x($_POST, 'statusnet-submit')) {
 		return;
 	}
 
@@ -393,47 +392,6 @@ function statusnet_settings(App $a, &$s)
 	$s .= '</div><div class="clear"></div>';
 }
 
-function statusnet_hook_fork(App $a, array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	// Deleting and editing is not supported by the addon
-	if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
-		$b['execute'] = false;
-		return;
-	}
-
-	// if post comes from GNU Social don't send it back
-	if ($post['extid'] == Protocol::STATUSNET) {
-		$b['execute'] = false;
-		return;
-	}
-
-	if ($post['app'] == 'StatusNet') {
-		$b['execute'] = false;
-		return;
-	}
-
-	if (PConfig::get($post['uid'], 'statusnet', 'import')) {
-		// Don't fork if it isn't a reply to a GNU Social post
-		if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::STATUSNET])) {
-			Logger::log('No GNU Social parent found for item ' . $post['id']);
-			$b['execute'] = false;
-			return;
-		}
-	} else {
-		// Comments are never exported when we don't import the GNU Social timeline
-		if (!strstr($post['postopts'], 'statusnet') || ($post['parent'] != $post['id']) || $post['private']) {
-			$b['execute'] = false;
-			return;
-		}
-	}
-}
-
 function statusnet_post_local(App $a, &$b)
 {
 	if ($b['edit']) {
@@ -445,7 +403,7 @@ function statusnet_post_local(App $a, &$b)
 	}
 
 	$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
-	$statusnet_enable = (($statusnet_post && !empty($_REQUEST['statusnet_enable'])) ? intval($_REQUEST['statusnet_enable']) : 0);
+	$statusnet_enable = (($statusnet_post && x($_REQUEST, 'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
 
 	// if API is used, default to the chosen settings
 	if ($b['api_source'] && intval(PConfig::get(local_user(), 'statusnet', 'post_by_default'))) {
@@ -665,12 +623,12 @@ function statusnet_addon_admin_post(App $a)
 		}
 		$secret = trim($_POST['secret'][$id]);
 		$key = trim($_POST['key'][$id]);
-		//$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
+		//$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):'');
 		if ($sitename != "" &&
 			$apiurl != "" &&
 			$secret != "" &&
 			$key != "" &&
-			empty($_POST['delete'][$id])) {
+			!x($_POST['delete'][$id])) {
 
 			$sites[] = [
 				'sitename' => $sitename,
@@ -825,6 +783,8 @@ function statusnet_fetchtimeline(App $a, $uid)
 	$lastid  = PConfig::get($uid, 'statusnet', 'lastid');
 
 	require_once 'mod/item.php';
+	require_once 'include/items.php';
+
 	//  get the application name for the SN app
 	//  1st try personal config, then system config and fallback to the
 	//  hostname of the node if neither one is set.
@@ -925,7 +885,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 
 function statusnet_address($contact)
 {
-	$hostname = Strings::normaliseLink($contact->statusnet_profile_url);
+	$hostname = normalise_link($contact->statusnet_profile_url);
 	$nickname = $contact->screen_name;
 
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
@@ -947,7 +907,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 		"location" => $contact->location, "about" => $contact->description,
 		"addr" => statusnet_address($contact), "generation" => 3]);
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET));
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(normalise_link($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET));
 
 	if (!DBA::isResult($r) && !$create_user) {
 		return 0;
@@ -967,9 +927,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 			intval($uid),
 			DBA::escape(DateTimeFormat::utcNow()),
 			DBA::escape($contact->statusnet_profile_url),
-			DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
+			DBA::escape(normalise_link($contact->statusnet_profile_url)),
 			DBA::escape(statusnet_address($contact)),
-			DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
+			DBA::escape(normalise_link($contact->statusnet_profile_url)),
 			DBA::escape(''),
 			DBA::escape(''),
 			DBA::escape($contact->name),
@@ -1041,7 +1001,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 				DBA::escape(DateTimeFormat::utcNow()),
 				DBA::escape(DateTimeFormat::utcNow()),
 				DBA::escape($contact->statusnet_profile_url),
-				DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
+				DBA::escape(normalise_link($contact->statusnet_profile_url)),
 				DBA::escape(statusnet_address($contact)),
 				DBA::escape($contact->name),
 				DBA::escape($contact->screen_name),
@@ -1250,6 +1210,8 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 
 	Logger::log("statusnet_fetchhometimeline: Fetching for user " . $uid, Logger::DEBUG);
 
+	require_once 'include/items.php';
+
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$own_contact = statusnet_fetch_own_contact($a, $uid);
@@ -1435,6 +1397,8 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 
 function statusnet_convertmsg(App $a, $body, $no_tags = false)
 {
+	require_once "include/items.php";
+
 	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
 
 	$URLSearchString = "^\[\]";
@@ -1526,7 +1490,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
 			if ($mtch[1] == "#") {
 				// Replacing the hash tags that are directed to the GNU Social server with internal links
 				$snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
-				$frdchash = '#[url=' . $a->getBaseURL() . '/search?tag=' . $mtch[3] . ']' . $mtch[3] . '[/url]';
+				$frdchash = '#[url=' . $a->getBaseURL() . '/search?tag=' . rawurlencode($mtch[3]) . ']' . $mtch[3] . '[/url]';
 				$body = str_replace($snhash, $frdchash, $body);
 
 				$str_tags .= $frdchash;
@@ -1559,7 +1523,7 @@ function statusnet_fetch_own_contact(App $a, $uid)
 		// Fetching user data
 		$user = $connection->get('account/verify_credentials');
 
-		PConfig::set($uid, 'statusnet', 'own_url', Strings::normaliseLink($user->statusnet_profile_url));
+		PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
 
 		$contact_id = statusnet_fetch_contact($uid, $user, true);
 	} else {
diff --git a/superblock/superblock.php b/superblock/superblock.php
index 895f1ec6..8e42d473 100644
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -9,7 +9,6 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Util\Strings;
 
 function superblock_install()
 {
@@ -89,7 +88,7 @@ function superblock_enotify_store(&$a,&$b) {
 				continue;
 			}
 
-			if (Strings::compareLink($b['url'], $word)) {
+			if (link_compare($b['url'], $word)) {
 				$found = true;
 				break;
 			}
@@ -135,7 +134,7 @@ function superblock_item_photo_menu(&$a, &$b)
 	$author = $b['item']['author-link'];
 	if (!empty($a->data['superblock'])) {
 		foreach ($a->data['superblock'] as $bloke) {
-			if (Strings::compareLink($bloke, $author)) {
+			if (link_compare($bloke, $author)) {
 				$blocked = true;
 				break;
 			}
diff --git a/testdrive/README.md b/testdrive/README.md
index 59512aef..ad9414eb 100644
--- a/testdrive/README.md
+++ b/testdrive/README.md
@@ -6,11 +6,10 @@ Testdrive is a Friendica addon which implements automatic account expiration so
 
 When an account is created on the site, it is given a hard expiration date of
 
-	'testdrive' => [
-		'expiredays' => 30,
-	],
+	[testdrive]
+	expiredays = 30
 
-Set this in your `config/addon.config.php` file to allow a 30 day test drive period.
+Set this in your config/addon.ini.php file to allow a 30 day test drive period.
 By default no expiration period is defined in case the addon is activated accidentally.
 
 There is no opportunity to extend an expired account using this addon.
diff --git a/testdrive/config/testdrive.config.php b/testdrive/config/testdrive.config.php
deleted file mode 100644
index c10acf82..00000000
--- a/testdrive/config/testdrive.config.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'testdrive' => [
-		// expiredays (Integer)
-		// When an account is created on the site, it is given a hard expiration date of this many days. 0 to disable.
-		'expiredays' => 0,
-	],
-];
diff --git a/testdrive/config/testdrive.ini.php b/testdrive/config/testdrive.ini.php
new file mode 100644
index 00000000..8d3f8632
--- /dev/null
+++ b/testdrive/config/testdrive.ini.php
@@ -0,0 +1,12 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[testdrive]
+; expiredays (Integer)
+; When an account is created on the site, it is given a hard expiration date of this many days.
+expiredays =
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 9489c838..2a656928 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -37,7 +37,7 @@ function testdrive_uninstall() {
 
 function testdrive_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/testdrive.config.php');
+	$a->loadConfigFile(__DIR__. '/config/testdrive.ini.php');
 }
 
 function testdrive_globaldir_update($a,&$b) {
@@ -61,6 +61,8 @@ function testdrive_register_account($a,$b) {
 
 
 function testdrive_cron($a,$b) {
+	require_once('include/enotify.php');
+
 	$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and
 		expire_notification_sent = '0000-00-00 00:00:00' ");
 
@@ -95,8 +97,8 @@ function testdrive_cron($a,$b) {
 }
 
 function testdrive_enotify(&$a, &$b) {
-    if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
-		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
+    if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
+		&& x($b['params'], 'system_type') && $b['params']['system_type'] === 'testdrive_expire') {
         $b['itemlink'] = $a->getBaseURL();
         $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
         $b['subject'] = L10n::t('Your Friendica test account is about to expire.');
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 2d4bd1a3..bac11634 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -18,11 +18,9 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Util\Strings;
 
 function tumblr_install()
 {
-	Addon::registerHook('hook_fork',               'addon/tumblr/tumblr.php', 'tumblr_hook_fork');
 	Addon::registerHook('post_local',              'addon/tumblr/tumblr.php', 'tumblr_post_local');
 	Addon::registerHook('notifier_normal',         'addon/tumblr/tumblr.php', 'tumblr_send');
 	Addon::registerHook('jot_networks',            'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
@@ -32,7 +30,6 @@ function tumblr_install()
 
 function tumblr_uninstall()
 {
-	Addon::unregisterHook('hook_fork',               'addon/tumblr/tumblr.php', 'tumblr_hook_fork');
 	Addon::unregisterHook('post_local',              'addon/tumblr/tumblr.php', 'tumblr_post_local');
 	Addon::unregisterHook('notifier_normal',         'addon/tumblr/tumblr.php', 'tumblr_send');
 	Addon::unregisterHook('jot_networks',            'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
@@ -86,8 +83,8 @@ function tumblr_addon_admin(App $a, &$o)
 
 function tumblr_addon_admin_post(App $a)
 {
-	$consumer_key    =       (!empty($_POST['consumer_key'])      ? Strings::escapeTags(trim($_POST['consumer_key']))   : '');
-	$consumer_secret =       (!empty($_POST['consumer_secret'])   ? Strings::escapeTags(trim($_POST['consumer_secret'])): '');
+	$consumer_key    =       ((!empty($_POST['consumer_key']))      ? notags(trim($_POST['consumer_key']))   : '');
+	$consumer_secret =       ((!empty($_POST['consumer_secret']))   ? notags(trim($_POST['consumer_secret'])): '');
 
 	Config::set('tumblr', 'consumer_key',$consumer_key);
 	Config::set('tumblr', 'consumer_secret',$consumer_secret);
@@ -301,21 +298,6 @@ function tumblr_settings_post(App $a, array &$b)
 	}
 }
 
-function tumblr_hook_fork(&$a, &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'tumblr') || ($post['parent'] != $post['id'])) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
 function tumblr_post_local(App $a, array &$b)
 {
 	// This can probably be changed to allow editing by pointing to a different API endpoint
diff --git a/twitter/README.md b/twitter/README.md
index f1f87541..357180cc 100644
--- a/twitter/README.md
+++ b/twitter/README.md
@@ -16,21 +16,13 @@ After the registration please enter the values for "Consumer Key" and "Consumer
 
 ## Alternative configuration
 
-Open the `config/local.config.php` file and add "twitter" to the list of activated addons:
+Add your key pair to your global config/addon.ini.php.
 
-    'system' => [
-        ...
-        'addon' => '...,twitter'
-        ...
-    ]
-
-Add your key pair to your global `config/addon.config.php`.
-
-	'twitter' => [
-		'consumerkey' => 'your consumer_key here',
-		'consumersecret' => 'your consumer_secret here',
-	],
+    [twitter]
+    consumerkey = your consumer_key here
+    consumersecret = your consumer_secret here
 
+To activate the addon itself add it to the [system] addon setting.
 After this, users can configure their Twitter account settings from "Settings -> Addon Settings".
 
 ## License
diff --git a/twitter/config/twitter.config.php b/twitter/config/twitter.config.php
deleted file mode 100644
index e39de2f9..00000000
--- a/twitter/config/twitter.config.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
-
-return [
-	'twitter' => [
-		// consumerkey (String)
-		// OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
-		'consumerkey' => '',
-
-		// consumersecret (String)
-		// OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
-		'consumersecret' => '',
-	],
-];
diff --git a/twitter/config/twitter.ini.php b/twitter/config/twitter.ini.php
new file mode 100644
index 00000000..5359fd6d
--- /dev/null
+++ b/twitter/config/twitter.ini.php
@@ -0,0 +1,16 @@
+<?php return <<<INI
+
+; Warning: Don't change this file! It only holds the default config values for this addon.
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
+
+[twitter]
+; consumerkey (String)
+; OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
+consumerkey =
+
+; consumersecret (String)
+; OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
+consumersecret =
+
+INI;
+//Keep this line
\ No newline at end of file
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 320c1cde..e8e6c5c5 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -48,14 +48,13 @@
  *     we do not need "Twitter as login". When you've registered the app you get the
  *     OAuth Consumer key and secret pair for your application/site.
  *
- *     Add this key pair to your global config/addon.config.php or use the admin panel.
+ *     Add this key pair to your global config/addon.ini.php or use the admin panel.
  *
- *     	'twitter' => [
- * 		    'consumerkey' => '',
- *  		'consumersecret' => '',
- *      ],
+ *     [twitter]
+ *     consumerkey = your consumer_key here
+ *     consumersecret = your consumer_secret here
  *
- *     To activate the addon itself add it to the system.addon
+ *     To activate the addon itself add it to the [system] addon
  *     setting. After this, your user can configure their Twitter account settings
  *     from "Settings -> Addon Settings".
  *
@@ -66,7 +65,6 @@ use Abraham\TwitterOAuth\TwitterOAuth;
 use Abraham\TwitterOAuth\TwitterOAuthException;
 use Friendica\App;
 use Friendica\Content\OEmbed;
-use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -88,7 +86,11 @@ use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
+
+require_once 'boot.php';
+require_once 'include/dba.php';
+require_once 'include/enotify.php';
+require_once 'include/text.php';
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
@@ -100,7 +102,6 @@ function twitter_install()
 	Addon::registerHook('load_config'            , __FILE__, 'twitter_load_config');
 	Addon::registerHook('connector_settings'     , __FILE__, 'twitter_settings');
 	Addon::registerHook('connector_settings_post', __FILE__, 'twitter_settings_post');
-	Addon::registerHook('hook_fork'              , __FILE__, 'twitter_hook_fork');
 	Addon::registerHook('post_local'             , __FILE__, 'twitter_post_local');
 	Addon::registerHook('notifier_normal'        , __FILE__, 'twitter_post_hook');
 	Addon::registerHook('jot_networks'           , __FILE__, 'twitter_jot_nets');
@@ -118,7 +119,6 @@ function twitter_uninstall()
 	Addon::unregisterHook('load_config'            , __FILE__, 'twitter_load_config');
 	Addon::unregisterHook('connector_settings'     , __FILE__, 'twitter_settings');
 	Addon::unregisterHook('connector_settings_post', __FILE__, 'twitter_settings_post');
-	Addon::unregisterHook('hook_fork'              , __FILE__, 'twitter_hook_fork');
 	Addon::unregisterHook('post_local'             , __FILE__, 'twitter_post_local');
 	Addon::unregisterHook('notifier_normal'        , __FILE__, 'twitter_post_hook');
 	Addon::unregisterHook('jot_networks'           , __FILE__, 'twitter_jot_nets');
@@ -137,7 +137,7 @@ function twitter_uninstall()
 
 function twitter_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/twitter.config.php');
+	$a->loadConfigFile(__DIR__ . '/config/twitter.ini.php');
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)
@@ -389,47 +389,6 @@ function twitter_settings(App $a, &$s)
 	$s .= '</div><div class="clear"></div>';
 }
 
-function twitter_hook_fork(App $a, array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	// Deleting and editing is not supported by the addon (deleting could, but isn't by now)
-	if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
-		$b['execute'] = false;
-		return;
-	}
-
-	// if post comes from twitter don't send it back
-	if ($post['extid'] == Protocol::TWITTER) {
-		$b['execute'] = false;
-		return;
-	}
-
-	if ($post['app'] == 'Twitter') {
-		$b['execute'] = false;
-		return;
-	}
-
-	if (PConfig::get($post['uid'], 'twitter', 'import')) {
-		// Don't fork if it isn't a reply to a twitter post
-		if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::TWITTER])) {
-			Logger::log('No twitter parent found for item ' . $post['id']);
-			$b['execute'] = false;
-			return;
-		}
-	} else {
-		// Comments are never exported when we don't import the twitter timeline
-		if (!strstr($post['postopts'], 'twitter') || ($post['parent'] != $post['id']) || $post['private']) {
-			$b['execute'] = false;
-			return;
-		}
-        }
-}
-
 function twitter_post_local(App $a, array &$b)
 {
 	if ($b['edit']) {
@@ -441,7 +400,7 @@ function twitter_post_local(App $a, array &$b)
 	}
 
 	$twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
-	$twitter_enable = (($twitter_post && !empty($_REQUEST['twitter_enable'])) ? intval($_REQUEST['twitter_enable']) : 0);
+	$twitter_enable = (($twitter_post && x($_REQUEST, 'twitter_enable')) ? intval($_REQUEST['twitter_enable']) : 0);
 
 	// if API is used, default to the chosen settings
 	if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
@@ -698,8 +657,8 @@ function twitter_post_hook(App $a, array &$b)
 
 function twitter_addon_admin_post(App $a)
 {
-	$consumerkey    = !empty($_POST['consumerkey'])    ? Strings::escapeTags(trim($_POST['consumerkey']))    : '';
-	$consumersecret = !empty($_POST['consumersecret']) ? Strings::escapeTags(trim($_POST['consumersecret'])) : '';
+	$consumerkey    = x($_POST, 'consumerkey')    ? notags(trim($_POST['consumerkey']))    : '';
+	$consumersecret = x($_POST, 'consumersecret') ? notags(trim($_POST['consumersecret'])) : '';
 	Config::set('twitter', 'consumerkey', $consumerkey);
 	Config::set('twitter', 'consumersecret', $consumersecret);
 	info(L10n::t('Settings updated.') . EOL);
@@ -799,6 +758,8 @@ function twitter_expire(App $a)
 	}
 	DBA::close($r);
 
+	require_once "include/items.php";
+
 	Logger::log('twitter_expire: expire_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
@@ -928,6 +889,7 @@ function twitter_fetchtimeline(App $a, $uid)
 	$has_picture = false;
 
 	require_once 'mod/item.php';
+	require_once 'include/items.php';
 	require_once 'mod/share.php';
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
@@ -1096,7 +1058,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 		// create contact record
 		$fields['uid'] = $uid;
 		$fields['created'] = DateTimeFormat::utcNow();
-		$fields['nurl'] = Strings::normaliseLink($url);
+		$fields['nurl'] = normalise_link($url);
 		$fields['alias'] = 'twitter::' . $data->id_str;
 		$fields['poll'] = 'twitter::' . $data->id_str;
 		$fields['rel'] = Contact::FRIEND;
@@ -1193,7 +1155,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 	$tags_arr = [];
 
 	foreach ($item->entities->hashtags AS $hashtag) {
-		$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]';
+		$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . rawurlencode($hashtag->text) . ']' . $hashtag->text . '[/url]';
 		$tags_arr['#' . $hashtag->text] = $url;
 		$body = str_replace('#' . $hashtag->text, $url, $body);
 	}
@@ -1221,11 +1183,9 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 					continue;
 				}
 
-				$expanded_url = $url->expanded_url;
+				$expanded_url = Network::finalUrl($url->expanded_url);
 
-				$final_url = Network::finalUrl($url->expanded_url);
-
-				$oembed_data = OEmbed::fetchURL($final_url);
+				$oembed_data = OEmbed::fetchURL($expanded_url);
 
 				if (empty($oembed_data) || empty($oembed_data->type)) {
 					continue;
@@ -1251,7 +1211,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 				} elseif ($oembed_data->type != 'link') {
 					$body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body);
 				} else {
-					$img_str = Network::fetchUrl($final_url, true, $redirects, 4);
+					$img_str = Network::fetchUrl($expanded_url, true, $redirects, 4);
 
 					$tempfile = tempnam(get_temppath(), 'cache');
 					file_put_contents($tempfile, $img_str);
@@ -1267,7 +1227,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 
 					if (substr($mime, 0, 6) == 'image/') {
 						$type = 'photo';
-						$body = str_replace($url->url, '[img]' . $final_url . '[/img]', $body);
+						$body = str_replace($url->url, '[img]' . $expanded_url . '[/img]', $body);
 					} else {
 						$type = $oembed_data->type;
 						$footerurl = $expanded_url;
@@ -1304,7 +1264,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 	}
 
 	// it seems as if the entities aren't always covering all mentions. So the rest will be checked here
-	$tags = BBCode::getTags($body);
+	$tags = get_tags($body);
 
 	if (count($tags)) {
 		foreach ($tags as $tag) {
@@ -1326,7 +1286,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 				}
 
 				$basetag = str_replace('_', ' ', substr($tag, 1));
-				$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
+				$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
 				$body = str_replace($tag, $url, $body);
 				$tags_arr['#' . $basetag] = $url;
 			} elseif (strpos($tag, '@') === 0) {
@@ -1657,6 +1617,8 @@ function twitter_fetchhometimeline(App $a, $uid)
 		$application_name = $a->getHostName();
 	}
 
+	require_once 'include/items.php';
+
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 	try {
diff --git a/viewsrc/lang/fr/messages.po b/viewsrc/lang/fr/messages.po
deleted file mode 100644
index 722f7c6d..00000000
--- a/viewsrc/lang/fr/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# Marie Olive <lacellule101@gmail.com>, 2018
-# 
-#, 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: 2018-03-20 07:26+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>, 2018\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: viewsrc.php:39
-msgid "View Source"
-msgstr "Voir source"
diff --git a/viewsrc/lang/fr/strings.php b/viewsrc/lang/fr/strings.php
index a4abe2da..dd234a70 100644
--- a/viewsrc/lang/fr/strings.php
+++ b/viewsrc/lang/fr/strings.php
@@ -1,2 +1,3 @@
-<?php
-
+<?php
+
+$a->strings["View Source"] = "Voir la source";
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index 61bacfcd..d8c7d8a2 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -10,7 +10,6 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Util\Strings;
 
 function webrtc_install() {
         Addon::registerHook('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu');
@@ -33,7 +32,7 @@ function webrtc_addon_admin (&$a, &$o) {
 	]);
 }
 function webrtc_addon_admin_post (&$a) {
-        $url = (!empty($_POST['webrtcurl']) ? Strings::escapeTags(trim($_POST['webrtcurl'])) : '');
+        $url = ((x($_POST, 'webrtcurl')) ? notags(trim($_POST['webrtcurl'])) : '');
 	    Config::set('webrtc', 'webrtcurl', $url);
 	    info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/widgets/widget_like.php b/widgets/widget_like.php
index 56ad1e5b..9693d254 100644
--- a/widgets/widget_like.php
+++ b/widgets/widget_like.php
@@ -52,6 +52,8 @@ function like_widget_content(&$a, $conf){
 	$dislikes = $r[0]['c'];
 
 
+	require_once("include/conversation.php");
+
 	$o = "";
 
 #	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
diff --git a/widgets/widgets.php b/widgets/widgets.php
index 64f6b62f..927d6746 100644
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -77,7 +77,7 @@ function widgets_module() {
 }
 
 function _abs_url($s){
-	$a = \get_app();
+	$a = get_app();
 	return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
 }
 
diff --git a/windowsphonepush/lang/fr/messages.po b/windowsphonepush/lang/fr/messages.po
index b03b65aa..b1b9a65c 100644
--- a/windowsphonepush/lang/fr/messages.po
+++ b/windowsphonepush/lang/fr/messages.po
@@ -4,16 +4,15 @@
 # 
 # 
 # Translators:
-# Marie Olive <lacellule101@gmail.com>, 2018
 # Tubuntu <tubuntu@testimonium.be>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-26 15:02+0100\n"
-"PO-Revision-Date: 2018-11-13 12:57+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"PO-Revision-Date: 2014-10-31 13:52+0000\n"
+"Last-Translator: Tubuntu <tubuntu@testimonium.be>\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"
@@ -30,7 +29,7 @@ msgstr "Paramètres WindowsPhonePush"
 
 #: windowsphonepush.php:117
 msgid "Enable WindowsPhonePush Addon"
-msgstr "Activer l'extension WindowsPhonePush"
+msgstr "Activer le greffon WindowsPhonePush"
 
 #: windowsphonepush.php:122
 msgid "Push text of new item"
diff --git a/windowsphonepush/lang/fr/strings.php b/windowsphonepush/lang/fr/strings.php
index a23fabb1..bff0edb3 100644
--- a/windowsphonepush/lang/fr/strings.php
+++ b/windowsphonepush/lang/fr/strings.php
@@ -2,12 +2,11 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
 	return ($n > 1);;
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "Paramètres WindowsPhonePush mis à jour";
 $a->strings["WindowsPhonePush Settings"] = "Paramètres WindowsPhonePush";
-$a->strings["Enable WindowsPhonePush Addon"] = "Activer l'extension WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Addon"] = "Activer le greffon WindowsPhonePush";
 $a->strings["Push text of new item"] = "Pousse le texte du nouvel élément";
 $a->strings["Save Settings"] = "Sauvegarde des paramètres";
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index a6c9aa9b..5ae0c3f3 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -82,7 +82,7 @@ function windowsphonepush_module()
  */
 function windowsphonepush_settings_post($a, $post)
 {
-	if (!local_user() || empty($_POST['windowsphonepush-submit'])) {
+	if (!local_user() || (!x($_POST, 'windowsphonepush-submit'))) {
 		return;
 	}
 	$enable = intval($_POST['windowsphonepush']);
diff --git a/wppost/wppost.php b/wppost/wppost.php
index d481d68f..41aa240f 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -15,48 +14,42 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-function wppost_install()
-{
-	Addon::registerHook('hook_fork',            'addon/wppost/wppost.php', 'wppost_hook_fork');
-	Addon::registerHook('post_local',           'addon/wppost/wppost.php', 'wppost_post_local');
-	Addon::registerHook('notifier_normal',      'addon/wppost/wppost.php', 'wppost_send');
-	Addon::registerHook('jot_networks',         'addon/wppost/wppost.php', 'wppost_jot_nets');
-	Addon::registerHook('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
-	Addon::registerHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
-}
+function wppost_install() {
+    Addon::registerHook('post_local',           'addon/wppost/wppost.php', 'wppost_post_local');
+    Addon::registerHook('notifier_normal',      'addon/wppost/wppost.php', 'wppost_send');
+    Addon::registerHook('jot_networks',         'addon/wppost/wppost.php', 'wppost_jot_nets');
+    Addon::registerHook('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
+    Addon::registerHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
 
-function wppost_uninstall()
-{
-	Addon::unregisterHook('hook_fork',        'addon/wppost/wppost.php', 'wppost_hook_fork');
-	Addon::unregisterHook('post_local',       'addon/wppost/wppost.php', 'wppost_post_local');
-	Addon::unregisterHook('notifier_normal',  'addon/wppost/wppost.php', 'wppost_send');
-	Addon::unregisterHook('jot_networks',     'addon/wppost/wppost.php', 'wppost_jot_nets');
-	Addon::unregisterHook('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
-	Addon::unregisterHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
+}
+function wppost_uninstall() {
+    Addon::unregisterHook('post_local',       'addon/wppost/wppost.php', 'wppost_post_local');
+    Addon::unregisterHook('notifier_normal',  'addon/wppost/wppost.php', 'wppost_send');
+    Addon::unregisterHook('jot_networks',     'addon/wppost/wppost.php', 'wppost_jot_nets');
+    Addon::unregisterHook('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
+    Addon::unregisterHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
 
 	// obsolete - remove
-	Addon::unregisterHook('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
-	Addon::unregisterHook('addon_settings',  'addon/wppost/wppost.php', 'wppost_settings');
-	Addon::unregisterHook('addon_settings_post',  'addon/wppost/wppost.php', 'wppost_settings_post');
+    Addon::unregisterHook('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
+    Addon::unregisterHook('addon_settings',  'addon/wppost/wppost.php', 'wppost_settings');
+    Addon::unregisterHook('addon_settings_post',  'addon/wppost/wppost.php', 'wppost_settings_post');
+
 }
 
 
-function wppost_jot_nets(&$a, &$b)
-{
-	if (!local_user()) {
-		return;
-	}
+function wppost_jot_nets(&$a,&$b) {
+    if(! local_user())
+        return;
 
-	$wp_post = PConfig::get(local_user(), 'wppost', 'post');
-	if (intval($wp_post) == 1) {
-		$wp_defpost = PConfig::get(local_user(),'wppost','post_by_default');
-		$selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
-			. L10n::t('Post to Wordpress') . '</div>';
-	}
+    $wp_post = PConfig::get(local_user(),'wppost','post');
+    if(intval($wp_post) == 1) {
+        $wp_defpost = PConfig::get(local_user(),'wppost','post_by_default');
+        $selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
+        $b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
+            . L10n::t('Post to Wordpress') . '</div>';
+    }
 }
 
 
@@ -147,37 +140,24 @@ function wppost_settings(&$a,&$s) {
 
 function wppost_settings_post(&$a,&$b) {
 
-	if(!empty($_POST['wppost-submit'])) {
+	if(x($_POST,'wppost-submit')) {
+
 		PConfig::set(local_user(),'wppost','post',intval($_POST['wppost']));
-		PConfig::set(local_user(),'wppost','post_by_default',intval(defaults($_POST, 'wp_bydefault', false)));
+		PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
 		PConfig::set(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
 		PConfig::set(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
 		PConfig::set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
-		PConfig::set(local_user(),'wppost','backlink',trim(defaults($_POST, 'wp_backlink', '')));
+		PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
 		PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
-		$wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text']));
+		$wp_backlink_text = notags(trim($_POST['wp_backlink_text']));
 		$wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
 		$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
 		PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
+
 	}
 
 }
 
-function wppost_hook_fork(&$a, &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'wppost') || ($post['parent'] != $post['id'])) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
 function wppost_post_local(&$a, &$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
@@ -196,7 +176,7 @@ function wppost_post_local(&$a, &$b) {
 
 	$wp_post   = intval(PConfig::get(local_user(),'wppost','post'));
 
-	$wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
+	$wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0);
 
 	if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) {
 		$wp_enable = 1;
@@ -216,8 +196,8 @@ function wppost_post_local(&$a, &$b) {
 
 
 
-function wppost_send(&$a, &$b)
-{
+function wppost_send(&$a,&$b) {
+
 	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
 	}
@@ -238,7 +218,7 @@ function wppost_send(&$a, &$b)
 	}
 
 	$wp_username = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_username'));
-	$wp_password = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_password'));
+	$wp_password = XML::escape(PConfig::get($b['uid'], 'wppost',' wp_password'));
 	$wp_blog = PConfig::get($b['uid'],'wppost','wp_blog');
 	$wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text');
 	if ($wp_backlink_text == '') {
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 51ad2c90..d80abb64 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Util\Strings;
 
 function xmpp_install()
 {
@@ -99,7 +98,7 @@ function xmpp_addon_settings(App $a, &$s)
 function xmpp_login()
 {
 	if (empty($_SESSION['allow_api'])) {
-		$password = Strings::getRandomHex(16);
+		$password = random_string(16);
 		PConfig::set(local_user(), 'xmpp', 'password', $password);
 	}
 }
@@ -117,8 +116,8 @@ function xmpp_addon_admin(App $a, &$o)
 
 function xmpp_addon_admin_post()
 {
-	$bosh_proxy = (!empty($_POST['bosh_proxy']) ? trim($_POST['bosh_proxy']) : '');
-	$central_userbase = (!empty($_POST['central_userbase']) ? intval($_POST['central_userbase']) : false);
+	$bosh_proxy = ((!empty($_POST['bosh_proxy'])) ? trim($_POST['bosh_proxy']) : '');
+	$central_userbase = ((!empty($_POST['central_userbase'])) ? intval($_POST['central_userbase']) : false);
 
 	Config::set('xmpp', 'bosh_proxy', $bosh_proxy);
 	Config::set('xmpp', 'central_userbase', $central_userbase);
@@ -162,11 +161,11 @@ function xmpp_converse(App $a)
 		$password = PConfig::get(local_user(), "xmpp", "password", '', true);
 
 		if ($password == "") {
-			$password = Strings::getRandomHex(16);
+			$password = random_string(16);
 			PConfig::set(local_user(), "xmpp", "password", $password);
 		}
 
-		$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . Strings::getRandomHex(5);
+		$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . random_string(5);
 
 		$auto_login = "auto_login: true,
 			authentication: 'login',