From 18b2afcf0acd084dbcab5f5929045e5973dbb7d0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 15 Dec 2018 05:03:51 -0500
Subject: [PATCH 01/15] [securemail] Remove Smarty  explicit escaping

---
 securemail/templates/admin.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/securemail/templates/admin.tpl b/securemail/templates/admin.tpl
index 9a3c2f32..c23ff2cd 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|escape:'html'}}">{{$submit}}</button>
-                    <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test|escape:'html'}}">{{$test}}</button>
+                    <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>
                 </div>
                 <div class="clear"></div>
             </div>

From a30ea9b062b9788d8af500f4a58d4f212f328cb0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 15 Dec 2018 05:04:20 -0500
Subject: [PATCH 02/15] [various] Add exceptions to Smarty default escaping

---
 advancedcontentfilter/templates/settings.tpl     | 2 +-
 forumdirectory/templates/forumdirectory_item.tpl | 2 +-
 mailstream/templates/mail.tpl                    | 2 +-
 mathjax/templates/settings.tpl                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/advancedcontentfilter/templates/settings.tpl b/advancedcontentfilter/templates/settings.tpl
index a04baf7d..9ae56c3b 100644
--- a/advancedcontentfilter/templates/settings.tpl
+++ b/advancedcontentfilter/templates/settings.tpl
@@ -3,7 +3,7 @@
 	<div id="rules"></div>
 
 	<script>
-		var existingRules = {{$rules}};
+		var existingRules = {{$rules nofilter}};
 
 		var messages = {
 	{{foreach $messages as $key => $value}}
diff --git a/forumdirectory/templates/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl
index 61b165d7..5ffa6405 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}}</dd></dl>{{/if}}
+			{{if $about}}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">{{$about}}</dt><dd class="forumdirectory-copy-data">{{$profile.about nofilter}}</dd></dl>{{/if}}
   		</div>
 	</div>
 </div>
diff --git a/mailstream/templates/mail.tpl b/mailstream/templates/mail.tpl
index a36729ce..526ca4ef 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}}</div>
+<div class="mailstream-item-body">{{$item.body nofilter}}</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/mathjax/templates/settings.tpl b/mathjax/templates/settings.tpl
index 98bdb85e..e26e5a2b 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}}</p>
+	<p>{{$description nofilter}}</p>
 	{{include file="field_checkbox.tpl" field=$mathjax_use}}
 	<div class="clear"></div>
 

From 1fa339736203c76ea377f1ce795cde236ceebd61 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 17 Dec 2018 21:09:09 +0000
Subject: [PATCH 03/15] Leistungsschutzrecht: Optionally suppress pictures

---
 leistungsschutzrecht/leistungsschutzrecht.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index 020c3af3..3c9090a1 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -24,22 +24,24 @@ function leistungsschutzrecht_uninstall() {
 }
 
 function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) {
-	if (!isset($siteinfo["url"])) {
+	if (!isset($siteinfo["url"]) || empty($siteinfo['type'])) {
 		return;
 	}
 
+	// Avoid any third party pictures, to avoid copyright issues
+	if (($siteinfo['type'] != 'photo') && 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"]);
 }
 

From bf00f76245703f7b94a4e1f21da69ca142ba1b5d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 17 Dec 2018 21:55:13 +0000
Subject: [PATCH 04/15] Added readme

---
 leistungsschutzrecht/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 leistungsschutzrecht/README.md

diff --git a/leistungsschutzrecht/README.md b/leistungsschutzrecht/README.md
new file mode 100644
index 00000000..7026af53
--- /dev/null
+++ b/leistungsschutzrecht/README.md
@@ -0,0 +1,16 @@
+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,
+	],
+

From 85b5715a44ee7e9b7075bfac5338bf8eadfe9a58 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 26 Dec 2018 00:36:43 -0500
Subject: [PATCH 05/15] Remove require include/*

---
 advancedcontentfilter/advancedcontentfilter.php |  4 ----
 curweather/curweather.php                       |  2 --
 forumdirectory/forumdirectory.php               |  4 ----
 fromgplus/fromgplus.php                         |  4 ----
 ifttt/ifttt.php                                 |  3 ---
 public_server/public_server.php                 |  1 -
 pumpio/pumpio.php                               |  1 -
 statusnet/statusnet.php                         |  8 --------
 testdrive/testdrive.php                         |  2 --
 twitter/twitter.php                             | 10 ----------
 widgets/widget_like.php                         |  2 --
 11 files changed, 41 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index a00f2f07..d06dab51 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -52,10 +52,6 @@ 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/curweather/curweather.php b/curweather/curweather.php
index 9d4d42e7..d1ef63b8 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -9,8 +9,6 @@
  *
  */
 
-require_once 'include/text.php';
-
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 0e2f0fe3..526a35fe 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -20,10 +20,6 @@ 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');
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 35f90ac0..79da93dc 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -23,8 +23,6 @@ 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');
@@ -320,8 +318,6 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-	require_once 'include/items.php';
-
 	$post = "";
 	$quote = "";
 	$pagedata = [];
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 50fa119c..029db9a0 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -7,9 +7,6 @@
  * 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;
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7e09806e..39b3f7fd 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -58,7 +58,6 @@ 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'",
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index fa0365ed..c550d924 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -30,7 +30,6 @@ 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
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 28920dd6..8c9bee5f 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -36,8 +36,6 @@
 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;
@@ -827,8 +825,6 @@ 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.
@@ -1254,8 +1250,6 @@ 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);
@@ -1441,8 +1435,6 @@ 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 = "^\[\]";
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 6daf136e..9489c838 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -61,8 +61,6 @@ 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' ");
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 43269a87..7f37bcaa 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -90,11 +90,6 @@ 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';
 
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
@@ -804,8 +799,6 @@ 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()");
@@ -935,7 +928,6 @@ 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);
@@ -1663,8 +1655,6 @@ 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/widgets/widget_like.php b/widgets/widget_like.php
index 9693d254..56ad1e5b 100644
--- a/widgets/widget_like.php
+++ b/widgets/widget_like.php
@@ -52,8 +52,6 @@ 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" );

From 4674d09b29dfff124a145e2eca3edfc175de1e29 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 26 Dec 2018 11:00:36 +0000
Subject: [PATCH 06/15] Solves PHP warning "Use of undefined constant"

---
 jappixmini/jappixmini.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index e2ef01d2..0ef56aed 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";
 			}
 

From 20d9884b730964cef260249242b56e69f88720a8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 26 Dec 2018 11:04:29 +0000
Subject: [PATCH 07/15] Fixes "Trying to get property 'status' of non-object"

---
 jappixmini/jappixmini.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 0ef56aed..28e238db 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -666,7 +666,7 @@ function jappixmini_cron(App $a, $d)
 
 				// parse answer
 				$answer = json_decode($answer_json);
-				if ($answer->status != "ok") {
+				if (empty($answer->status) || ($answer->status != "ok")) {
 					throw new Exception();
 				}
 

From 62c43ea2f8ebb701cc6342452a264eec13971372 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 27 Dec 2018 21:03:17 -0500
Subject: [PATCH 08/15] [various] Escape global function get_app calls

---
 ifttt/ifttt.php         | 2 +-
 impressum/impressum.php | 2 +-
 widgets/widgets.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 50fa119c..302bc9c1 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -168,7 +168,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/impressum/impressum.php b/impressum/impressum.php
index c5a1c98d..d7cbc6d2 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -33,7 +33,7 @@ function impressum_uninstall() {
 function impressum_module() {
 }
 function impressum_content() {
-    $a = get_app();
+    $a = \get_app();
     $a->internalRedirect('friendica/');
 }
 
diff --git a/widgets/widgets.php b/widgets/widgets.php
index 927d6746..64f6b62f 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);
 }
 

From 6765fec7b12fc54c8077c886d4d170971587032c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 4 Jan 2019 15:23:23 +0000
Subject: [PATCH 09/15] LSR: Show preview pictures of videos (should be legally
 safe)

---
 leistungsschutzrecht/leistungsschutzrecht.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index 3c9090a1..b300fd65 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -29,7 +29,7 @@ function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) {
 	}
 
 	// Avoid any third party pictures, to avoid copyright issues
-	if (($siteinfo['type'] != 'photo') && Config::get('leistungsschutzrecht', 'suppress_photos', false)) {
+	if (!in_array($siteinfo['type'], ['photo', 'video']) && Config::get('leistungsschutzrecht', 'suppress_photos', false)) {
 		unset($siteinfo["image"]);
 		unset($siteinfo["images"]);
 	}

From 72b18e34e0a3fecd4ea6462799bc71a199dfe764 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 6 Jan 2019 00:05:20 -0500
Subject: [PATCH 10/15] [twitter] Use original URL for link display

---
 twitter/twitter.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 7f37bcaa..320c1cde 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1221,9 +1221,11 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 					continue;
 				}
 
-				$expanded_url = Network::finalUrl($url->expanded_url);
+				$expanded_url = $url->expanded_url;
 
-				$oembed_data = OEmbed::fetchURL($expanded_url);
+				$final_url = Network::finalUrl($url->expanded_url);
+
+				$oembed_data = OEmbed::fetchURL($final_url);
 
 				if (empty($oembed_data) || empty($oembed_data->type)) {
 					continue;
@@ -1249,7 +1251,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($expanded_url, true, $redirects, 4);
+					$img_str = Network::fetchUrl($final_url, true, $redirects, 4);
 
 					$tempfile = tempnam(get_temppath(), 'cache');
 					file_put_contents($tempfile, $img_str);
@@ -1265,7 +1267,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 
 					if (substr($mime, 0, 6) == 'image/') {
 						$type = 'photo';
-						$body = str_replace($url->url, '[img]' . $expanded_url . '[/img]', $body);
+						$body = str_replace($url->url, '[img]' . $final_url . '[/img]', $body);
 					} else {
 						$type = $oembed_data->type;
 						$footerurl = $expanded_url;

From 44a65c03caa8aad366b1329e39f81b34b38bc264 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 12 Jan 2019 11:09:48 +0100
Subject: [PATCH 11/15] FR translation update advancedcontentfilter THX 
 vladimir N

---
 advancedcontentfilter/lang/fr/messages.po | 57 +++++++++++++----------
 advancedcontentfilter/lang/fr/strings.php | 52 ++++++++++-----------
 2 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/advancedcontentfilter/lang/fr/messages.po b/advancedcontentfilter/lang/fr/messages.po
index 0d76f672..cd1853fd 100644
--- a/advancedcontentfilter/lang/fr/messages.po
+++ b/advancedcontentfilter/lang/fr/messages.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Marie Olive <lacellule101@gmail.com>, 2018
+# vladimir N <lapoubelle111@gmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@ msgstr ""
 "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: Marie Olive <lacellule101@gmail.com>, 2018\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"
@@ -24,7 +25,7 @@ msgstr ""
 #: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
-msgstr "Filtrer par règle:%s"
+msgstr "Filtré par règle:%s"
 
 #: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
@@ -49,6 +50,10 @@ msgid ""
 "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"
@@ -59,58 +64,60 @@ 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 ""
+msgstr "Désactivé"
 
 #: advancedcontentfilter.php:211
 msgid "Enabled"
-msgstr ""
+msgstr "Activé"
 
 #: advancedcontentfilter.php:212
 msgid "Disable this rule"
-msgstr ""
+msgstr "Désactiver cette règle"
 
 #: advancedcontentfilter.php:213
 msgid "Enable this rule"
-msgstr ""
+msgstr "Activer cette règle"
 
 #: advancedcontentfilter.php:214
 msgid "Edit this rule"
-msgstr ""
+msgstr "Modifier cette règle"
 
 #: advancedcontentfilter.php:215
 msgid "Edit the rule"
-msgstr ""
+msgstr "Modifier la règle"
 
 #: advancedcontentfilter.php:216
 msgid "Save this rule"
-msgstr ""
+msgstr "Enregistrer cette règle"
 
 #: advancedcontentfilter.php:217
 msgid "Delete this rule"
-msgstr ""
+msgstr "Supprimer cette règle"
 
 #: advancedcontentfilter.php:218
 msgid "Rule"
-msgstr ""
+msgstr "Règle"
 
 #: advancedcontentfilter.php:219
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #: advancedcontentfilter.php:220
 msgid "Add new rule"
-msgstr ""
+msgstr "Ajouter nouvelle règle"
 
 #: advancedcontentfilter.php:221
 msgid "Rule Name"
-msgstr ""
+msgstr "Nommer règle"
 
 #: advancedcontentfilter.php:222
 msgid "Rule Expression"
-msgstr ""
+msgstr "Expression de règle"
 
 #: advancedcontentfilter.php:223
 msgid ""
@@ -120,42 +127,42 @@ msgstr ""
 
 #: advancedcontentfilter.php:224
 msgid "Cancel"
-msgstr ""
+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 ""
+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 ""
+msgstr "Formulaire token de sécurité invalide, rafraîchissez la page"
 
 #: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
-msgstr ""
+msgstr "Le nom et l'expression de cette règle sont requis"
 
 #: advancedcontentfilter.php:340
 msgid "Rule successfully added"
-msgstr ""
+msgstr "Règle bien ajoutée"
 
 #: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
+msgstr "Cette règle n'existe pas ou ne vous appartient pas"
 
 #: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
-msgstr ""
+msgstr "Règle bien mise à jour"
 
 #: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
-msgstr ""
+msgstr "Règle bien supprimée"
 
 #: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
-msgstr ""
+msgstr "Argument manquant: "
 
 #: advancedcontentfilter.php:406
 #, php-format
@@ -164,4 +171,4 @@ msgstr ""
 
 #: src/middlewares.php:28
 msgid "Method not found"
-msgstr ""
+msgstr "Méthode non trouvée"
diff --git a/advancedcontentfilter/lang/fr/strings.php b/advancedcontentfilter/lang/fr/strings.php
index 5ff20251..208a00a9 100644
--- a/advancedcontentfilter/lang/fr/strings.php
+++ b/advancedcontentfilter/lang/fr/strings.php
@@ -6,36 +6,36 @@ function string_plural_select_fr($n){
 	return ($n > 1);;
 }}
 ;
-$a->strings["Filtered by rule: %s"] = "Filtrer par règle:%s";
+$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>."] = "";
+$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."] = "";
-$a->strings["Disabled"] = "";
-$a->strings["Enabled"] = "";
-$a->strings["Disable this rule"] = "";
-$a->strings["Enable this rule"] = "";
-$a->strings["Edit this rule"] = "";
-$a->strings["Edit the rule"] = "";
-$a->strings["Save this rule"] = "";
-$a->strings["Delete this rule"] = "";
-$a->strings["Rule"] = "";
-$a->strings["Close"] = "";
-$a->strings["Add new rule"] = "";
-$a->strings["Rule Name"] = "";
-$a->strings["Rule Expression"] = "";
+$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"] = "";
-$a->strings["You must be logged in to use this method"] = "";
-$a->strings["Invalid form security token, please refresh the page."] = "";
-$a->strings["The rule name and expression are required."] = "";
-$a->strings["Rule successfully added"] = "";
-$a->strings["Rule doesn't exist or doesn't belong to you."] = "";
-$a->strings["Rule successfully updated"] = "";
-$a->strings["Rule successfully deleted"] = "";
-$a->strings["Missing argument: guid."] = "";
+$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"] = "";
+$a->strings["Method not found"] = "Méthode non trouvée";

From ecd783f33de613ce23f7cef2086eb040df368d09 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 12 Jan 2019 11:11:39 +0100
Subject: [PATCH 12/15] FR translatio update blockem THX  vladimir N

---
 blockem/lang/fr/messages.po |  9 +++++----
 blockem/lang/fr/strings.php | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/blockem/lang/fr/messages.po b/blockem/lang/fr/messages.po
index a089b039..527f1c73 100644
--- a/blockem/lang/fr/messages.po
+++ b/blockem/lang/fr/messages.po
@@ -7,13 +7,14 @@
 # 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-11-13 12:55+0000\n"
-"Last-Translator: Marie Olive <lacellule101@gmail.com>\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"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: blockem.php:54 blockem.php:58
 msgid "Blockem"
-msgstr "Blockem"
+msgstr "Bloquez-les"
 
 #: blockem.php:62
 msgid ""
@@ -41,7 +42,7 @@ msgstr "Sauvegarder les paramètres"
 
 #: blockem.php:81
 msgid "BLOCKEM Settings saved."
-msgstr "Paramètres Blockem sauvegardés."
+msgstr "Paramètres Bloquez-les sauvegardés."
 
 #: blockem.php:143
 #, php-format
diff --git a/blockem/lang/fr/strings.php b/blockem/lang/fr/strings.php
index a4abe2da..cc2d366f 100644
--- a/blockem/lang/fr/strings.php
+++ b/blockem/lang/fr/strings.php
@@ -1,2 +1,17 @@
 <?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.";

From b37c019322049d9c73fe07c0e02e0f9e6721ca56 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 12 Jan 2019 11:13:00 +0100
Subject: [PATCH 13/15] FR translation blackout THX  vladimir N

---
 blackout/lang/fr/messages.po | 7 ++++---
 blackout/lang/fr/strings.php | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/blackout/lang/fr/messages.po b/blackout/lang/fr/messages.po
index 8f241a71..823c3782 100644
--- a/blackout/lang/fr/messages.po
+++ b/blackout/lang/fr/messages.po
@@ -6,13 +6,14 @@
 # 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: 2016-09-24 02:13+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
+"PO-Revision-Date: 2018-12-30 12:31+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"
@@ -26,7 +27,7 @@ msgstr "Sauvegarder les paramètres"
 
 #: blackout.php:100
 msgid "Redirect URL"
-msgstr "Adresse de redirection"
+msgstr "Adresse URL 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 ce184038..ac1890f3 100644
--- a/blackout/lang/fr/strings.php
+++ b/blackout/lang/fr/strings.php
@@ -2,11 +2,12 @@
 
 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 de redirection";
+$a->strings["Redirect URL"] = "Adresse URL 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";

From ffe0ba9c5bac7f3dc46178743fad277da609e3e4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Jan 2019 18:05:37 +0000
Subject: [PATCH 14/15] Avoiding notices

---
 wppost/wppost.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 1cc27976..d481d68f 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -148,19 +148,17 @@ function wppost_settings(&$a,&$s) {
 function wppost_settings_post(&$a,&$b) {
 
 	if(!empty($_POST['wppost-submit'])) {
-
 		PConfig::set(local_user(),'wppost','post',intval($_POST['wppost']));
-		PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
+		PConfig::set(local_user(),'wppost','post_by_default',intval(defaults($_POST, 'wp_bydefault', false)));
 		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($_POST['wp_backlink']));
+		PConfig::set(local_user(),'wppost','backlink',trim(defaults($_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 = 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);
-
 	}
 
 }

From c2c541cb10999c3d215def9a8195f17daaf0bd1b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 18 Jan 2019 06:57:11 +0000
Subject: [PATCH 15/15] Google+ is closing soon, so we remove the first traces

---
 buffer/buffer.php       | 2 +-
 fromgplus/fromgplus.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buffer/buffer.php b/buffer/buffer.php
index 385bdd5b..2e20f4bf 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Buffer Post Connector
- * Description: Post to Buffer (Facebook, Google+, LinkedIn, Twitter)
+ * Description: Post to Buffer (Facebook Pages, LinkedIn, Twitter)
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 79da93dc..b8217fc0 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