From bc259cdc441717cce9b52fcd1c554925b843a25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:01:56 +0100
Subject: [PATCH 01/81] added spaces + some curly braces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/security.php |  3 ++-
 include/text.php     | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/security.php b/include/security.php
index b13a507cf..70896992d 100644
--- a/include/security.php
+++ b/include/security.php
@@ -299,8 +299,9 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 			$gs = '<<>>'; // should be impossible to match
 
 			if (is_array($groups) && count($groups)) {
-				foreach ($groups as $g)
+				foreach ($groups as $g) {
 					$gs .= '|<' . intval($g) . '>';
+				}
 			}
 
 			$sql = sprintf(
diff --git a/include/text.php b/include/text.php
index 4c9a8864d..b59ecdbc0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1660,10 +1660,11 @@ function bb_translate_video($s) {
 	$r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER);
 	if ($r) {
 		foreach ($matches as $mtch) {
-			if ((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be')))
-				$s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s);
-			elseif (stristr($mtch[1],'vimeo'))
-				$s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s);
+			if ((stristr($mtch[1], 'youtube')) || (stristr($mtch[1], 'youtu.be'))) {
+				$s = str_replace($mtch[0], '[youtube]' . $mtch[1] . '[/youtube]', $s);
+			} elseif (stristr($mtch[1], 'vimeo')) {
+				$s = str_replace($mtch[0], '[vimeo]' . $mtch[1] . '[/vimeo]', $s);
+			}
 		}
 	}
 	return $s;
@@ -1781,7 +1782,7 @@ function file_tag_file_query($table,$s,$type = 'file') {
 }
 
 // ex. given music,video return <music><video> or [music][video]
-function file_tag_list_to_file($list,$type = 'file') {
+function file_tag_list_to_file($list, $type = 'file') {
 	$tag_list = '';
 	if (strlen($list)) {
 		$list_array = explode(",",$list);
@@ -1803,7 +1804,7 @@ function file_tag_list_to_file($list,$type = 'file') {
 }
 
 // ex. given <music><video>[friends], return music,video or friends
-function file_tag_file_to_list($file,$type = 'file') {
+function file_tag_file_to_list($file, $type = 'file') {
 	$matches = false;
 	$list = '';
 	if ($type == 'file') {
@@ -1853,8 +1854,9 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 		$check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
 
 		foreach ($check_new_tags as $tag) {
-			if (! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket))
+			if (! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket)) {
 				$new_tags[] = $tag;
+			}
 		}
 
 		$filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
@@ -1864,8 +1866,9 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 		$check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
 
 		foreach ($check_deleted_tags as $tag) {
-			if (! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket))
+			if (! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket)) {
 				$deleted_tags[] = $tag;
+			}
 		}
 
 		foreach ($deleted_tags as $key => $tag) {
@@ -1981,9 +1984,10 @@ function is_a_date_arg($s) {
 	if ($i > 1900) {
 		$y = date('Y');
 		if ($i <= $y + 1 && strpos($s, '-') == 4) {
-			$m = intval(substr($s,5));
+			$m = intval(substr($s, 5));
 			if ($m > 0 && $m <= 12)
 				return true;
+			}
 		}
 	}
 	return false;
@@ -2003,6 +2007,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) {
 		preg_match("|^" . $chr . "*|", $lines[$k], $m);
 		$count = strlen($m[0]);
 	}
+
 	for ($k = 0; $k < count($lines); $k++) {
 		$lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]);
 	}

From 5b56f189aec69e8952bc286ebe67ae42f884db53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:07:30 +0100
Subject: [PATCH 02/81] more spaces + some curly spaces added
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/text.php b/include/text.php
index b59ecdbc0..c0edd482b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -452,7 +452,7 @@ function perms2str($p) {
 	if (is_array($p)) {
 		$tmp = $p;
 	} else {
-		$tmp = explode(',',$p);
+		$tmp = explode(',', $p);
 	}
 
 	if (is_array($tmp)) {

From 1de8e31df61c5c37e28cd5edc5439fde0c3b1c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 15:23:30 +0100
Subject: [PATCH 03/81] added spaces + some curly braces + some usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/photos.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index c8dad750d..6fc546454 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1280,8 +1280,9 @@ function photos_content(App $a)
  			}
 		}
 
-		if (count($ph) == 1)
+		if (count($ph) == 1) {
 			$hires = $lores = $ph[0];
+		}
 		if (count($ph) > 1) {
 			if ($ph[1]['scale'] == 2) {
 				// original is 640 or less, we can display it directly
@@ -1319,8 +1320,9 @@ function photos_content(App $a)
 			]);
 		}
 
-		if ($prevlink)
+		if ($prevlink) {
 			$prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
+		}
 
 		$photo = [
 			'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],

From f7ceea7a85beb6c7fd63a2582957ced268b80da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:01:56 +0100
Subject: [PATCH 04/81] added spaces + some curly braces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/conversation.php b/include/conversation.php
index ae12cf482..b52a8873d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -395,7 +395,7 @@ function visible_activity($item) {
 	}
 
 	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
-		if (!($item['self'] && ($item['uid'] == local_user()))) {
+		if (!(x($item, 'self') && ($item['uid'] == local_user()))) {
 			return false;
 		}
 	}

From 1a61cee5a7e20e4f0c170a369dab67d8221c5743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:01:56 +0100
Subject: [PATCH 05/81] added spaces + some curly braces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/text.php b/include/text.php
index c0edd482b..b7f7b5abb 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1830,8 +1830,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 
 	if (!intval($uid)) {
 		return false;
-	}
-	if ($file_old == $file_new) {
+	} elseif ($file_old == $file_new) {
 		return true;
 	}
 

From c7e256f9de8cde263b8c5618d42c892b0cc20693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:07:30 +0100
Subject: [PATCH 06/81] more spaces + some curly spaces added
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/text.php b/include/text.php
index b7f7b5abb..6a11a8b37 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1918,8 +1918,15 @@ function file_tag_save_file($uid, $item, $file)
 	return true;
 }
 
+<<<<<<< HEAD
 function file_tag_unsave_file($uid, $item, $file, $cat = false)
 {
+=======
+function file_tag_unsave_file($uid, $item, $file, $cat = false) {
+	require_once "include/files.php";
+
+	$result = false;
+>>>>>>> more spaces + some curly spaces added
 	if (! intval($uid)) {
 		return false;
 	}

From 09384119b173021effdc5f568da316bff4560a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 15:23:30 +0100
Subject: [PATCH 07/81] added spaces + some curly braces + some usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/text.php b/include/text.php
index 6a11a8b37..b7f7b5abb 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1918,15 +1918,8 @@ function file_tag_save_file($uid, $item, $file)
 	return true;
 }
 
-<<<<<<< HEAD
 function file_tag_unsave_file($uid, $item, $file, $cat = false)
 {
-=======
-function file_tag_unsave_file($uid, $item, $file, $cat = false) {
-	require_once "include/files.php";
-
-	$result = false;
->>>>>>> more spaces + some curly spaces added
 	if (! intval($uid)) {
 		return false;
 	}

From e61b8f667e0db27f9c96b7cbaef1031fd4b5de75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 4 Mar 2017 10:58:33 +0100
Subject: [PATCH 08/81] it is documenation, right? :-)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 {mods => doc/server-config}/readme.txt                        | 0
 {mods => doc/server-config}/sample-Lighttpd.config            | 0
 {mods => doc/server-config}/sample-nginx-reverse-proxy.config | 0
 {mods => doc/server-config}/sample-nginx.config               | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {mods => doc/server-config}/readme.txt (100%)
 rename {mods => doc/server-config}/sample-Lighttpd.config (100%)
 rename {mods => doc/server-config}/sample-nginx-reverse-proxy.config (100%)
 rename {mods => doc/server-config}/sample-nginx.config (100%)

diff --git a/mods/readme.txt b/doc/server-config/readme.txt
similarity index 100%
rename from mods/readme.txt
rename to doc/server-config/readme.txt
diff --git a/mods/sample-Lighttpd.config b/doc/server-config/sample-Lighttpd.config
similarity index 100%
rename from mods/sample-Lighttpd.config
rename to doc/server-config/sample-Lighttpd.config
diff --git a/mods/sample-nginx-reverse-proxy.config b/doc/server-config/sample-nginx-reverse-proxy.config
similarity index 100%
rename from mods/sample-nginx-reverse-proxy.config
rename to doc/server-config/sample-nginx-reverse-proxy.config
diff --git a/mods/sample-nginx.config b/doc/server-config/sample-nginx.config
similarity index 100%
rename from mods/sample-nginx.config
rename to doc/server-config/sample-nginx.config

From 128c9b20e0e567156c19384407772f66fcb174cb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 21 Mar 2017 22:39:53 +0100
Subject: [PATCH 09/81] fixed curly braces + added more

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/photos.php b/mod/photos.php
index 6fc546454..c919527da 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1683,8 +1683,9 @@ function photos_content(App $a)
 		$twist = false;
 		foreach ($r as $rr) {
 			//hide profile photos to others
-			if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos')))
+			if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos'))) {
 				continue;
+			}
 
 			$twist = !$twist;
 

From 77cca70562f7b8dfbc6fa84e65a28ecf66faa875 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 20:48:48 +0100
Subject: [PATCH 10/81] replaced some tabs -> spaces + added curly braces #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index ae2f4b1a0..694502601 100644
--- a/boot.php
+++ b/boot.php
@@ -1076,6 +1076,7 @@ function is_site_admin()
 	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 
 	//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+	/// @TODO This if() + 2 returns can be shrinked into one return
 	if (local_user() && x($a->user, 'email') && x($a->config, 'admin_email') && in_array($a->user['email'], $adminlist)) {
 		return true;
 	}
@@ -1173,7 +1174,7 @@ function random_digits($digits)
 {
 	$rn = '';
 	for ($i = 0; $i < $digits; $i++) {
-		/// @TODO rand() is different to mt_rand() and maybe lesser "random"
+		/// @TODO Avoid rand/mt_rand, when it comes to cryptography, they are generating predictable (seedable) numbers.
 		$rn .= rand(0, 9);
 	}
 	return $rn;
@@ -1187,7 +1188,7 @@ function get_server()
 		$server = "https://dir.friendica.social";
 	}
 
-	return($server);
+	return $server;
 }
 
 function get_temppath()
@@ -1236,7 +1237,7 @@ function get_cachefile($file, $writemode = true)
 	$cache = get_itemcachepath();
 
 	if ((!$cache) || (!is_dir($cache))) {
-		return("");
+		return "";
 	}
 
 	$subfolder = $cache . "/" . substr($file, 0, 2);
@@ -1250,7 +1251,6 @@ function get_cachefile($file, $writemode = true)
 		}
 	}
 
-	/// @TODO no need to put braces here
 	return $cachepath;
 }
 
@@ -1357,7 +1357,6 @@ function get_spoolpath()
 	return "";
 }
 
-
 if (!function_exists('exif_imagetype')) {
 	function exif_imagetype($file)
 	{
@@ -1395,7 +1394,7 @@ function validate_include(&$file)
 	}
 
 	// Simply return flag
-	return ($valid);
+	return $valid;
 }
 
 function current_load()

From b823708c5039638f0140e7308eba3d4bdab29555 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:26:07 +0100
Subject: [PATCH 11/81] better comment added by @Hypolite

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 00bb91f8d..687fd466c 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1989,11 +1989,9 @@ class DFRN
 		 */
 		if (!DBM::is_result($r)) {
 			// database record did not get created. Quietly give up.
-			killme();
+			return false;
 		}
 
-		$fid = $r[0]["id"];
-
 		$hash = random_string();
 
 		$r = q(

From be3d0a90a5b9915382b1118506d0e2c15ff0b9bb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:33:12 +0100
Subject: [PATCH 12/81] added curely branches + reverted back to old behaviour
 (may come back one day)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 687fd466c..cc6ba0952 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2072,7 +2072,11 @@ class DFRN
 		);
 
 		if (!DBM::is_result($r)) {
+			/*
+			 * @TODO maybe one day:
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
+			killme();
+			*/
 			return false;
 		}
 

From d2d6200669ddce44ead1813d06c855d75aa6706b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:49:05 +0100
Subject: [PATCH 13/81] old behaviour restored

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index cc6ba0952..5c1b7c86f 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2375,7 +2375,11 @@ class DFRN
 					);
 
 					if (!DBM::is_result($r)) {
+						/*
+						 * @TODO maybe one day:
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
+						killme();
+						*/
 						return false;
 					}
 

From d9d60346ff051e1a2e50fb462d9042db3ebbdb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 4 Mar 2017 10:34:46 +0100
Subject: [PATCH 14/81] more usage of dbm::is_result() and sorted a bit
 statements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/admin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/admin.php b/mod/admin.php
index 39416dae5..7eadbb79e 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -917,6 +917,7 @@ function admin_page_site_post(App $a)
 			$upds = implode(", ", $upd);
 
 			$r = q("UPDATE %s SET %s;", $table_name, $upds);
+
 			if (!DBM::is_result($r)) {
 				notice("Failed updating '$table_name': " . dba::errorMessage());
 				goaway('admin/site');

From 85039d41a26a743d8c1faa54bb49863c461e11c3 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:05:53 +0100
Subject: [PATCH 15/81] added more curly braces + spaces for #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/profiles.php b/mod/profiles.php
index 8bb09aa6d..aa991cb4b 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -482,6 +482,7 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
+		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
 			info(L10n::t('Profile updated.') . EOL);
 		}

From 03f283ca36253f38ba3ed476ecec917f1e92b288 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:37:58 +0100
Subject: [PATCH 16/81] fixed comment and explained one

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 5c1b7c86f..3921d31cb 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1989,9 +1989,11 @@ class DFRN
 		 */
 		if (!DBM::is_result($r)) {
 			// database record did not get created. Quietly give up.
-			return false;
+			killme();
 		}
 
+		$fid = $r[0]["id"];
+
 		$hash = random_string();
 
 		$r = q(

From 5ee91330a757bafbad89801dac8a1852af8300e0 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:01:41 +0100
Subject: [PATCH 17/81] removed TODO, one day this all needs refacturizing ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index aa991cb4b..8bb09aa6d 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -482,7 +482,6 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
-		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
 			info(L10n::t('Profile updated.') . EOL);
 		}

From 4d5c61395e5d0f3304b999d86515ccd6808b1ebb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:37:15 +0100
Subject: [PATCH 18/81] PHP5 does not support native type-hints, except `array`
 + used dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 3921d31cb..54bf76870 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -96,7 +96,6 @@ class DFRN
 	 * @param boolean $onlyheader  Output only the header without content? (Default is "no")
 	 *
 	 * @return string DFRN feed entries
-	 * @todo Find proper type-hints
 	 */
 	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
 	{

From fc4d1296e3a4d61a78438c94ad1216cd8b642027 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:46:28 +0100
Subject: [PATCH 19/81] was a bit confusing for me or I was not sleeping to
 much ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 54bf76870..125d41fe6 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2073,11 +2073,7 @@ class DFRN
 		);
 
 		if (!DBM::is_result($r)) {
-			/*
-			 * @TODO maybe one day:
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
-			killme();
-			*/
 			return false;
 		}
 
@@ -2376,11 +2372,7 @@ class DFRN
 					);
 
 					if (!DBM::is_result($r)) {
-						/*
-						 * @TODO maybe one day:
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
-						killme();
-						*/
 						return false;
 					}
 

From 7514a3beb8bddfaeedc2a2f50f8636ec68abfd36 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 14:32:49 +0100
Subject: [PATCH 20/81] rewrote for() loop to foreach() + added curly
 braces/spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/photos.php b/mod/photos.php
index c919527da..8a5649780 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1294,6 +1294,7 @@ function photos_content(App $a)
 		}
 
 		$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+
 		$tools = null;
 		$lock = null;
 

From 8e42e797cccbe44f1b6f7396d8f9607c9e57f9fd Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 15:06:54 +0100
Subject: [PATCH 21/81] Opps, cutted this out by accident ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 8a5649780..32d52c648 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1243,12 +1243,16 @@ function photos_content(App $a)
 		$prevlink = '';
 		$nextlink = '';
 
-		/// @todo This query is totally bad, the whole functionality has to be changed
-		// The query leads to a really intense used index.
-		// By now we hide it if someone wants to.
+		/*
+		 * @todo This query is totally bad, the whole functionality has to be changed
+		 * The query leads to a really intense used index.
+		 * By now we hide it if someone wants to.
+		 */
 		if (!Config::get('system', 'no_count', false)) {
 			$order_field = defaults($_GET, 'order', '');
 			if ($order_field === 'posted') {
+		if (!Config::get('system', 'no_count', false)) {
+			if ($_GET['order'] === 'posted') {
 				$order = 'ASC';
 			} else {
 				$order = 'DESC';

From 7525b8fefe68a0a8b0027832239912e00de029cb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 2 Apr 2017 21:29:06 +0200
Subject: [PATCH 22/81] Fixes for composer: - ./vendor/ is being prepared by
 executing `utils/composer.phar install`, no   need to have it around -
 converted .gitignore to LF line-ending (more common over the whole project) -
 no need to have them around ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 .gitignore | 117 +++++++++++++++++++++++++----------------------------
 1 file changed, 56 insertions(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e6504184..ecfe4e73c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,56 @@
-favicon.*
-.htconfig.php
-.htpreconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-favicon.*
-home.html
-addon
-*.orig
-*~
-robots.txt
-
-#ignore documentation, it should be newly built
-doc/html
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
-#ignore OSX .DS_Store files
-.DS_Store
-
-/nbproject/private/
-
-#ignore smarty cache
-/view/smarty3/compiled/
-
-#ignore cache folders
-/privacy_image_cache/
-/photo/
-/proxy/
-nbproject
-
-#ignore vagrant dir
-.vagrant/
-
-#ignore local folder
-/local/
-
-#ignore config files from Visual Studio
-/.vs/
-/php_friendica.phpproj
-/php_friendica.sln
-/php_friendica.phpproj.user
-
-#ignore things from transifex-client
-venv/
-
-#ignore Composer dependencies
-/vendor
-/view/asset
-
-#ignore config files from JetBrains
-/.idea
+favicon.*
+.htconfig.php
+.htpreconfig.php
+\#*
+include/jquery-1.4.2.min.js
+*.log
+*.out
+*.version*
+favicon.*
+home.html
+addon
+*~
+robots.txt
+
+#ignore documentation, it should be newly built
+doc/html
+
+#ignore reports, should be generted with every build
+report/
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings
+#ignore OSX .DS_Store files
+.DS_Store
+
+/nbproject/private/
+
+#ignore smarty cache
+/view/smarty3/compiled/
+
+#ignore cache folders
+/privacy_image_cache/
+/photo/
+/proxy/
+nbproject
+
+#ignore vagrant dir
+.vagrant/
+
+#ignore local folder
+/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
+
+#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
+vendor/*

From 61fdc32d2fa89290117d967b59101cfb3165d349 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 5 Apr 2017 22:17:15 +0200
Subject: [PATCH 23/81] Continued a bit: - more spaces added - more curly
 braces added - let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/api.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/api.php b/include/api.php
index 72997dd3a..6f2566b97 100644
--- a/include/api.php
+++ b/include/api.php
@@ -4379,7 +4379,6 @@ function api_fr_photo_create_update($type)
 	throw new InternalServerErrorException("unknown error - this error on uploading or updating a photo should never happen");
 }
 
-
 /**
  * @brief delete a single photo from the database through api
  *

From c3c9a53364201eb838937ae4d08f27872dfd97c0 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 8 Apr 2017 19:05:50 +0200
Subject: [PATCH 24/81] added spaces + curly braces and TODOs for upcoming
 type-hint rewrite. Please note that PHP5 allows 'array' as type-hint already
 (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/conversation.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index b52a8873d..8ae829644 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -116,7 +116,7 @@ function localize_item(&$item) {
 		$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
 	}
 
-	/// @Separted ???
+	/// @TODO Separted ???
 	$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
 	if (activity_match($item['verb'], ACTIVITY_LIKE)
 		|| activity_match($item['verb'], ACTIVITY_DISLIKE)
@@ -162,22 +162,19 @@ function localize_item(&$item) {
 
 		if (activity_match($item['verb'], ACTIVITY_LIKE)) {
 			$bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
 			$bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
 			$bodyverb = L10n::t('%1$s attends %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) {
 			$bodyverb = L10n::t('%1$s doesn\'t attend %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
 			$bodyverb = L10n::t('%1$s attends maybe %2$s\'s %3$s');
 		}
-		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 
+		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 	}
+
 	if (activity_match($item['verb'], ACTIVITY_FRIEND)) {
 
 		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
@@ -304,8 +301,8 @@ function localize_item(&$item) {
 		$item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag );
 
 	}
-	if (activity_match($item['verb'], ACTIVITY_FAVORITE)) {
 
+	if (activity_match($item['verb'], ACTIVITY_FAVORITE)) {
 		if ($item['object-type'] == "") {
 			return;
 		}
@@ -1611,8 +1608,7 @@ function sort_thr_commented(array $a, array $b)
 	return strcmp($b['commented'], $a['commented']);
 }
 
-/// @TODO Add type-hint
-function render_location_dummy($item) {
+function render_location_dummy(array $item) {
 	if ($item['location'] != "") {
 		return $item['location'];
 	}
@@ -1622,8 +1618,7 @@ function render_location_dummy($item) {
 	}
 }
 
-/// @TODO Add type-hint
-function get_responses($conv_responses, $response_verbs, $ob, $item) {
+function get_responses(array $conv_responses, array $response_verbs, $ob, $item) {
 	$ret = [];
 	foreach ($response_verbs as $v) {
 		$ret[$v] = [];

From 337824f649cc2ded7a304765f51e69b7db224805 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 14 Apr 2017 16:59:51 +0200
Subject: [PATCH 25/81] Continued: - added curly braces/spaces - added TODOs
 (type-hints, old-lost code) - more usage of dbm::is_result() - combined some
 if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/items.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/items.php b/include/items.php
index af13898b2..1cfad356c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -274,6 +274,7 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 	$a = get_app();
+	$r = null;
 
 	if (is_array($importer)) {
 		$r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",

From 1c9dc6526fad4fe4ee50d8784a715b61857107a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 17 May 2017 18:28:00 +0200
Subject: [PATCH 26/81] Continued: - added more curly braces - replaced if
 (blaFoo()) { return true; } return false; with return blaFoo(); - added
 spaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/text.php b/include/text.php
index b7f7b5abb..f3b94cd8c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -182,6 +182,7 @@ function autoname($len) {
 			break;
 		}
 	}
+
 	if (substr($word, -1) == 'q') {
 		$word = substr($word, 0, -1);
 	}

From 78ffd5b80f7917dc1f5830d6347797ae0da3ea25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 16 Jul 2017 20:35:42 +0200
Subject: [PATCH 27/81] fixed parser error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/security.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/security.php b/include/security.php
index 70896992d..5d563f324 100644
--- a/include/security.php
+++ b/include/security.php
@@ -275,6 +275,13 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 	 */
 	if ($local_user && $local_user == $owner_id) {
 		$sql = '';
+	/**
+	 * Authenticated visitor. Unless pre-verified,
+	 * check that the contact belongs to this $owner_id
+	 * and load the groups the visitor belongs to.
+	 * If pre-verified, the caller is expected to have already
+	 * done this and passed the groups into this function.
+	 */
 	} elseif ($remote_user) {
 		/*
 		 * Authenticated visitor. Unless pre-verified,

From 35ada999540aceafdc80aa6e5b3f610117c080b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Jul 2017 23:16:54 +0200
Subject: [PATCH 28/81] Opps, added missing curly brace.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/text.php b/include/text.php
index f3b94cd8c..c9ab0b943 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1985,7 +1985,7 @@ function is_a_date_arg($s) {
 		$y = date('Y');
 		if ($i <= $y + 1 && strpos($s, '-') == 4) {
 			$m = intval(substr($s, 5));
-			if ($m > 0 && $m <= 12)
+			if ($m > 0 && $m <= 12) {
 				return true;
 			}
 		}

From 25fd270959d63e585e3dde0085f06e89b4fa6e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Jul 2017 20:04:32 +0200
Subject: [PATCH 29/81] Continued: - added spaces and curly braces - added more
 TODOs as there really more to be done
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 125d41fe6..2a83d6c8a 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -81,7 +81,7 @@ class DFRN
 			$root->appendChild($entry);
 		}
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -221,10 +221,8 @@ class DFRN
 			//$sql_extra .= file_tag_file_query('item',$category,'category');
 		}
 
-		if ($public_feed) {
-			if (! $converse) {
-				$sql_extra .= " AND `contact`.`self` = 1 ";
-			}
+		if ($public_feed && ! $converse) {
+			$sql_extra .= " AND `contact`.`self` = 1 ";
 		}
 
 		$check_date = DateTimeFormat::utc($last_update);
@@ -425,7 +423,7 @@ class DFRN
 
 		$root->appendChild($mail);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -454,7 +452,7 @@ class DFRN
 
 		$root->appendChild($suggest);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -513,7 +511,7 @@ class DFRN
 
 		$root->appendChild($relocate);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -939,7 +937,7 @@ class DFRN
 			$htmlbody = $body;
 
 			if ($item['title'] != "") {
-				$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+				$htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
 			}
 
 			$htmlbody = BBCode::convert($htmlbody, false, 7);
@@ -1066,6 +1064,7 @@ class DFRN
 
 		$tags = Item::getFeedTags($item);
 
+		/// @TODO Combine this with similar below if() block?
 		if (count($tags)) {
 			foreach ($tags as $t) {
 				if (($type != 'html') || ($t[0] != "@")) {
@@ -1575,7 +1574,7 @@ class DFRN
 		// Until now we aren't serving different sizes - but maybe later
 		$avatarlist = [];
 		/// @todo check if "avatar" or "photo" would be the best field in the specification
-		$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
+		$avatars = $xpath->query($element . "/atom:link[@rel='avatar']", $context);
 		foreach ($avatars as $avatar) {
 			$href = "";
 			$width = 0;
@@ -1595,6 +1594,7 @@ class DFRN
 				$avatarlist[$width] = $href;
 			}
 		}
+
 		if (count($avatarlist) > 0) {
 			krsort($avatarlist);
 			$author["avatar"] = current($avatarlist);
@@ -2707,7 +2707,7 @@ class DFRN
 			if (self::updateContent($current, $item, $importer, $entrytype)) {
 				logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
 			} else {
-				logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+				logger("Item " . $item["uri"] . " already existed.", LOGGER_DEBUG);
 			}
 			return;
 		}

From b037b4123b4fe629ee8453aab23f9a5690da09ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Jul 2017 20:19:28 +0200
Subject: [PATCH 30/81] General project change: - cleaned up vendor/ as it is a
 "build" (means being locally recreated)   directory and therefor should *NOT*
 be committed. - updated composer.lock - that is what would be updated now if
 vendor/ would be ignored, instead a lot   files has been changed in vendor/ -
 people running `composer install` regulary will get (with the old way) a
 dirty   working copy (version-controlled files being modified) and then
 cannot update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 composer.lock | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/composer.lock b/composer.lock
index f294c16ef..bc0eba771 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1761,18 +1761,13 @@
             "time": "2018-01-27T08:24:15+00:00"
         },
         {
-            "name": "pear/text_languagedetect",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Text_LanguageDetect.git",
-                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6"
-            },
+            "name": "pear-pear.php.net/Archive_Tar",
+            "version": "1.4.3",
             "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Text_LanguageDetect/zipball/bb9ff6f4970f686fac59081e916b456021fe7ba6",
-                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6",
-                "shasum": ""
+                "type": "file",
+                "url": "https://pear.php.net/get/Archive_Tar-1.4.3.tgz",
+                "reference": null,
+                "shasum": null
             },
             "require-dev": {
                 "phpunit/phpunit": "*"

From a87177661523cafd72670b179217d2ecf472ce05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 26 Jul 2017 19:50:13 +0200
Subject: [PATCH 31/81] LF fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .gitattributes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 4be1c9185..18ba9e075 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-# Disable LF normalization for all files
-* -text
\ No newline at end of file
+# Disable LF normalization for all files
+* -text

From dd6fd32883bb814fe19d92436352204f5e315224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 26 Jul 2017 22:15:24 +0200
Subject: [PATCH 32/81] rewrote based on CR by @Annando, thank you. It is now
 clear to me.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 2a83d6c8a..19a8a7722 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -487,7 +487,6 @@ class DFRN
 			$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
 		}
 
-		unset($rp, $ext);
 
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;

From 3d418dc1fd5d6c7e98993bf86c6375f16e074fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 26 Jul 2017 22:16:29 +0200
Subject: [PATCH 33/81] Windows' CRLF are looking strange under Linux, let's
 get rid of them/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also let's ignore addons/ as it is optional and depend on if the webmaster
wants it or not.

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index ecfe4e73c..26d339477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,9 @@ venv/
 
 #ignore all in 'vendor' as `utils/composer.phar install` will bring it back
 vendor/*
+
+#ignore config files from JetBrains
+/.idea
+
+#ignore addons/ directory
+addons/

From 7a29944836c21cd7355f02126ede4283b30d7322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 11 Oct 2017 22:21:35 +0200
Subject: [PATCH 34/81] Fixes/cleanup: - added missing curly braces (and some
 absent caused parser errors) - <include|require>[_once] are keywords, so
 don't use them as such - removed/added empty lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 bin/daemon.php | 2 +-
 mod/admin.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/daemon.php b/bin/daemon.php
index 6b0e377a3..b51dd392e 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -38,7 +38,7 @@ if (substr($directory, 0, 1) != "/") {
 }
 $directory = realpath($directory."/..");
 
-@include($directory."/.htconfig.php");
+include $directory."/.htconfig.php";
 
 if (!isset($pidfile)) {
 	die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".
diff --git a/mod/admin.php b/mod/admin.php
index 7eadbb79e..d195128a3 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -64,7 +64,7 @@ function admin_post(App $a)
 			case 'addons':
 				if ($a->argc > 2 &&
 					is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) {
-					@include_once("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php");
+					include_once "addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php";
 					if (function_exists($a->argv[2] . '_addon_admin_post')) {
 						$func = $a->argv[2] . '_addon_admin_post';
 						$func($a);
@@ -1922,7 +1922,7 @@ function admin_page_addons(App $a)
 
 		$admin_form = "";
 		if (in_array($addon, $a->addons_admin)) {
-			@require_once("addon/$addon/$addon.php");
+			require_once "addon/$addon/$addon.php";
 			$func = $addon . '_addon_admin';
 			$func($a, $admin_form);
 		}

From a0d03bb311113bf74084107ce129127dbc0d4b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 May 2018 22:26:24 +0200
Subject: [PATCH 35/81] Continued: - renamed .htaccess -> .htaccess-dist and
 ignored .htaccess to allow local   changes - described /nbproject/private/
 ignore (NetBeans IDE's private project data)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .gitignore                  | 5 +++++
 .htaccess => .htaccess-dist | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename .htaccess => .htaccess-dist (96%)

diff --git a/.gitignore b/.gitignore
index 26d339477..12dd3b49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,11 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
+
 #ignore OSX .DS_Store files
 .DS_Store
 
+#ignore NetBeans IDE's private files (at least)
 /nbproject/private/
 
 #ignore smarty cache
@@ -60,3 +62,6 @@ vendor/*
 
 #ignore addons/ directory
 addons/
+
+#Ignore .htaccess as it may contain local changes
+.htaccess
diff --git a/.htaccess b/.htaccess-dist
similarity index 96%
rename from .htaccess
rename to .htaccess-dist
index 2348cdc38..a671cc680 100644
--- a/.htaccess
+++ b/.htaccess-dist
@@ -4,7 +4,7 @@ AddType audio/ogg .oga
 #AddHandler php53-cgi .php
 
 <FilesMatch "\.(out|log)$">
-  <IfModule authz_host_module> 
+  <IfModule authz_host_module>
     #Apache 2.4
     Require all denied
   </IfModule>
@@ -38,4 +38,3 @@ AddType audio/ogg .oga
   RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
 </IfModule>
-

From 058f30d98256512e728753b32f3c412a068a908a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 May 2018 23:07:28 +0200
Subject: [PATCH 36/81] Continued: - ops, did accidently modify composer.lock
 ... :-(
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 composer.lock | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index bc0eba771..f294c16ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1761,13 +1761,18 @@
             "time": "2018-01-27T08:24:15+00:00"
         },
         {
-            "name": "pear-pear.php.net/Archive_Tar",
-            "version": "1.4.3",
+            "name": "pear/text_languagedetect",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Text_LanguageDetect.git",
+                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6"
+            },
             "dist": {
-                "type": "file",
-                "url": "https://pear.php.net/get/Archive_Tar-1.4.3.tgz",
-                "reference": null,
-                "shasum": null
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Text_LanguageDetect/zipball/bb9ff6f4970f686fac59081e916b456021fe7ba6",
+                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6",
+                "shasum": ""
             },
             "require-dev": {
                 "phpunit/phpunit": "*"

From cbe12eba76d90f4498e06138dd8c6f3440d55bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 3 May 2018 02:17:16 +0200
Subject: [PATCH 37/81] Continued: - ops, another rebase-leftover fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/photos.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 32d52c648..15dbad7fa 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1251,8 +1251,6 @@ function photos_content(App $a)
 		if (!Config::get('system', 'no_count', false)) {
 			$order_field = defaults($_GET, 'order', '');
 			if ($order_field === 'posted') {
-		if (!Config::get('system', 'no_count', false)) {
-			if ($_GET['order'] === 'posted') {
 				$order = 'ASC';
 			} else {
 				$order = 'DESC';

From 8b775d48f99e83fc523527ccbfa774b9c927e042 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 2 May 2018 19:26:15 +0000
Subject: [PATCH 38/81] Replace old database queries with the new ones

---
 mod/message.php       | 2 +-
 mod/settings.php      | 2 +-
 src/Protocol/DFRN.php | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/message.php b/mod/message.php
index 6a48eb658..822f5aade 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -148,7 +148,7 @@ function message_content(App $a)
 
 		$cmd = $a->argv[1];
 		if ($cmd === 'drop') {
-			if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+			if (dba::delete('mail', ['id' => $a->argv[2]])) {
 				info(L10n::t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
diff --git a/mod/settings.php b/mod/settings.php
index c7e61cbe3..234731439 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -149,7 +149,7 @@ function settings_post(App $a)
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
 		$key = $_POST['remove'];
-		dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
+		dba::delete('tokens', ['id' => $key]);
 		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 19a8a7722..592444e3c 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2094,6 +2094,8 @@ class DFRN
 			'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
 			'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
 		$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
+
+		// @TODO No dba:update here?
 		dba::update('contact', $fields, $condition);
 
 		Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);

From 3bb5a416f8d6bfe7e6b1de3debe2828d7e50d3cc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 2 May 2018 21:12:48 +0000
Subject: [PATCH 39/81] Some corrections

---
 mod/message.php       | 2 +-
 mod/settings.php      | 2 +-
 src/Protocol/DFRN.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/message.php b/mod/message.php
index 822f5aade..6a48eb658 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -148,7 +148,7 @@ function message_content(App $a)
 
 		$cmd = $a->argv[1];
 		if ($cmd === 'drop') {
-			if (dba::delete('mail', ['id' => $a->argv[2]])) {
+			if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
 				info(L10n::t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
diff --git a/mod/settings.php b/mod/settings.php
index 234731439..c7e61cbe3 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -149,7 +149,7 @@ function settings_post(App $a)
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
 		$key = $_POST['remove'];
-		dba::delete('tokens', ['id' => $key]);
+		dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
 		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 592444e3c..5b748e10d 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2094,6 +2094,7 @@ class DFRN
 			'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
 			'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
 		$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
+		dba::update('contact', $fields, $condition);
 
 		// @TODO No dba:update here?
 		dba::update('contact', $fields, $condition);

From d217d74081f3ccd5bcc403e6f73ab09f218c6729 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 04:43:50 +0000
Subject: [PATCH 40/81] Ensure that the link will be displayed correctly on
 Diaspora

---
 src/Content/Text/BBCode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index c1aca4f6a..34fbc635b 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -965,7 +965,7 @@ class BBCode extends BaseObject
 				}
 
 				if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
-					$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
+					$text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>';
 				} else {
 					$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 

From 002a1d1f548bf427936a839a56556bec81eb914a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 13:03:41 +0000
Subject: [PATCH 41/81] Reshares had been detected falsely so that were
 rejected by Diaspora

---
 src/Content/Text/BBCode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 34fbc635b..c1aca4f6a 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -965,7 +965,7 @@ class BBCode extends BaseObject
 				}
 
 				if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
-					$text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>';
+					$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
 				} else {
 					$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 

From cd7c33713464ddb5346b0598f540584fcc6b0b91 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 17:43:10 +0000
Subject: [PATCH 42/81] Urgent bugfix: Public contacts had been blocked
 automatically when created

---
 src/Network/Probe.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index d31a222f8..569e57381 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -448,7 +448,6 @@ class Probe
 				if (!$old_fields) {
 					$old_fields = true;
 					$fields['blocked'] = false;
-					$fields['pending'] = false;
 				}
 
 				dba::update('contact', $fields, $condition, $old_fields);

From 7e54499856012948fbb80e977428793c32140338 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 18:19:40 +0000
Subject: [PATCH 43/81] "pending" shouldn't be set as well by default ...

---
 src/Network/Probe.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 569e57381..d31a222f8 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -448,6 +448,7 @@ class Probe
 				if (!$old_fields) {
 					$old_fields = true;
 					$fields['blocked'] = false;
+					$fields['pending'] = false;
 				}
 
 				dba::update('contact', $fields, $condition, $old_fields);

From e5c4b0203a326b3ecaf2183c897423b6b3bdcac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 25 Jan 2017 15:59:27 +0100
Subject: [PATCH 44/81] added more curly braces + a bit more usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 5b748e10d..14adecbb2 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -96,6 +96,7 @@ class DFRN
 	 * @param boolean $onlyheader  Output only the header without content? (Default is "no")
 	 *
 	 * @return string DFRN feed entries
+	 * @todo Find proper type-hints
 	 */
 	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
 	{

From bc21bf0ee665a978b027d15acc9ec85755d98b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 15:23:30 +0100
Subject: [PATCH 45/81] added spaces + some curly braces + some usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/_well_known.php | 2 +-
 mod/events.php      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/_well_known.php b/mod/_well_known.php
index 782dc7a1b..fb8df4861 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -52,7 +52,7 @@ function wk_social_relay()
 			$tags[$tag] = $tag;
 		}
 
-		if (Config::get('system', 'relay_user_tags')) {
+		if (get_config('system', 'relay_user_tags')) {
 			$terms = q("SELECT DISTINCT(`term`) FROM `search`");
 
 			foreach ($terms AS $term) {
diff --git a/mod/events.php b/mod/events.php
index cad440f16..bbd6337c3 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -433,6 +433,7 @@ function events_content(App $a) {
 		if (x($_REQUEST, 'location'))    {$orig_event['location']    = $_REQUEST['location'];}
 		if (x($_REQUEST, 'start'))       {$orig_event['start']       = $_REQUEST['start'];}
 		if (x($_REQUEST, 'finish'))      {$orig_event['finish']      = $_REQUEST['finish'];}
+		if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
 
 		$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
 		$a_checked = ((x($orig_event) && $orig_event['adjust'])   ? ' checked="checked" ' : '');

From de50d62b818afb7e1dca6a5bbe60488e4394c704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 16:07:30 +0100
Subject: [PATCH 46/81] more spaces + some curly spaces added
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/text.php b/include/text.php
index c9ab0b943..14379f6ff 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1919,8 +1919,15 @@ function file_tag_save_file($uid, $item, $file)
 	return true;
 }
 
+<<<<<<< HEAD
 function file_tag_unsave_file($uid, $item, $file, $cat = false)
 {
+=======
+function file_tag_unsave_file($uid, $item, $file, $cat = false) {
+	require_once "include/files.php";
+
+	$result = false;
+>>>>>>> more spaces + some curly spaces added
 	if (! intval($uid)) {
 		return false;
 	}

From 47f95855c0e6b53ee15ab6dd9dee37fbef99f97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 15:23:30 +0100
Subject: [PATCH 47/81] added spaces + some curly braces + some usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/text.php b/include/text.php
index 14379f6ff..c9ab0b943 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1919,15 +1919,8 @@ function file_tag_save_file($uid, $item, $file)
 	return true;
 }
 
-<<<<<<< HEAD
 function file_tag_unsave_file($uid, $item, $file, $cat = false)
 {
-=======
-function file_tag_unsave_file($uid, $item, $file, $cat = false) {
-	require_once "include/files.php";
-
-	$result = false;
->>>>>>> more spaces + some curly spaces added
 	if (! intval($uid)) {
 		return false;
 	}

From 116d0ee1e01914aa7783ce92ebc7fa50c5dd11c2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:26:07 +0100
Subject: [PATCH 48/81] better comment added by @Hypolite

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 14adecbb2..1812e3edc 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1988,11 +1988,9 @@ class DFRN
 		 */
 		if (!DBM::is_result($r)) {
 			// database record did not get created. Quietly give up.
-			killme();
+			return false;
 		}
 
-		$fid = $r[0]["id"];
-
 		$hash = random_string();
 
 		$r = q(

From 87bb934f8fb772b316dcc667def1f8ad81d1ecc9 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:33:12 +0100
Subject: [PATCH 49/81] added curely branches + reverted back to old behaviour
 (may come back one day)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1812e3edc..bf4e7423a 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2071,7 +2071,11 @@ class DFRN
 		);
 
 		if (!DBM::is_result($r)) {
+			/*
+			 * @TODO maybe one day:
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
+			killme();
+			*/
 			return false;
 		}
 

From 1fcd4f52e7aaa073d99d240bcf32ff744609fee5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:49:05 +0100
Subject: [PATCH 50/81] old behaviour restored

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index bf4e7423a..ff9c653c8 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2377,7 +2377,11 @@ class DFRN
 					);
 
 					if (!DBM::is_result($r)) {
+						/*
+						 * @TODO maybe one day:
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
+						killme();
+						*/
 						return false;
 					}
 

From 1d15e6867895d6045142df52036af80c381bfc8c Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:05:53 +0100
Subject: [PATCH 51/81] added more curly braces + spaces for #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/profiles.php b/mod/profiles.php
index 8bb09aa6d..aa991cb4b 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -482,6 +482,7 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
+		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
 			info(L10n::t('Profile updated.') . EOL);
 		}

From f5f1650b62c260a08bab55fa60c5ecfcf5c11300 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:37:58 +0100
Subject: [PATCH 52/81] fixed comment and explained one

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index ff9c653c8..1c9238bb8 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1988,9 +1988,11 @@ class DFRN
 		 */
 		if (!DBM::is_result($r)) {
 			// database record did not get created. Quietly give up.
-			return false;
+			killme();
 		}
 
+		$fid = $r[0]["id"];
+
 		$hash = random_string();
 
 		$r = q(

From 7526afcf1325fd0d5d26a84dadd39f626f5275d5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 20:39:00 +0100
Subject: [PATCH 53/81] Continued: - converted multiple single-line comments
 into one multi-line comment (please   stop abusing programming languages!) -
 added more TODO tags for type-hints (upcoming rewrite) - opps, one space was
 only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1c9238bb8..00cae469f 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2108,6 +2108,11 @@ class DFRN
 
 		logger('Contacts are updated.');
 
+		/// @TODO decide to use dbm::is_result() here
+		if ($x === false) {
+			return false;
+		}
+
 		// update items
 		// This is an extreme performance killer
 		Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);

From 657939662775ab08148a54a868b18fc0304f5cd1 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:01:41 +0100
Subject: [PATCH 54/81] removed TODO, one day this all needs refacturizing ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php      | 1 -
 src/Protocol/DFRN.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index aa991cb4b..8bb09aa6d 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -482,7 +482,6 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
-		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
 			info(L10n::t('Profile updated.') . EOL);
 		}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 00cae469f..1f56dfd8d 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2108,7 +2108,7 @@ class DFRN
 
 		logger('Contacts are updated.');
 
-		/// @TODO decide to use dbm::is_result() here
+		/// @TODO WHERE DOES $x COME FROM ???
 		if ($x === false) {
 			return false;
 		}

From ce07c201309d64bbb4eef7a8bc0bb590addccb10 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:37:15 +0100
Subject: [PATCH 55/81] PHP5 does not support native type-hints, except `array`
 + used dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1f56dfd8d..1206268ed 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -96,7 +96,6 @@ class DFRN
 	 * @param boolean $onlyheader  Output only the header without content? (Default is "no")
 	 *
 	 * @return string DFRN feed entries
-	 * @todo Find proper type-hints
 	 */
 	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
 	{

From 11dcb31960555ed43265efb494fd4db3aced37fe Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:46:28 +0100
Subject: [PATCH 56/81] was a bit confusing for me or I was not sleeping to
 much ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 src/Protocol/DFRN.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1206268ed..eb44cb210 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2072,11 +2072,7 @@ class DFRN
 		);
 
 		if (!DBM::is_result($r)) {
-			/*
-			 * @TODO maybe one day:
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
-			killme();
-			*/
 			return false;
 		}
 
@@ -2383,11 +2379,7 @@ class DFRN
 					);
 
 					if (!DBM::is_result($r)) {
-						/*
-						 * @TODO maybe one day:
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
-						killme();
-						*/
 						return false;
 					}
 

From 2fd14eac7068bd842720510fac00ad42d5199c25 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 15:06:54 +0100
Subject: [PATCH 57/81] Opps, cutted this out by accident ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mod/photos.php b/mod/photos.php
index 15dbad7fa..32d52c648 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1251,6 +1251,8 @@ function photos_content(App $a)
 		if (!Config::get('system', 'no_count', false)) {
 			$order_field = defaults($_GET, 'order', '');
 			if ($order_field === 'posted') {
+		if (!Config::get('system', 'no_count', false)) {
+			if ($_GET['order'] === 'posted') {
 				$order = 'ASC';
 			} else {
 				$order = 'DESC';

From cdc24a73ca499b29b8ff2053a3369b5f7139dceb Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 2 Apr 2017 21:29:06 +0200
Subject: [PATCH 58/81] Fixes for composer: - ./vendor/ is being prepared by
 executing `utils/composer.phar install`, no   need to have it around -
 converted .gitignore to LF line-ending (more common over the whole project) -
 no need to have them around ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 12dd3b49e..c31d8c5b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ venv/
 
 #ignore all in 'vendor' as `utils/composer.phar install` will bring it back
 vendor/*
+<<<<<<< HEAD
 
 #ignore config files from JetBrains
 /.idea
@@ -65,3 +66,5 @@ addons/
 
 #Ignore .htaccess as it may contain local changes
 .htaccess
+=======
+>>>>>>> Fixes for composer:

From 3868d830e78c9e3ad5e067c4bd07f4c5cad436c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Jul 2017 20:19:28 +0200
Subject: [PATCH 59/81] General project change: - cleaned up vendor/ as it is a
 "build" (means being locally recreated)   directory and therefor should *NOT*
 be committed. - updated composer.lock - that is what would be updated now if
 vendor/ would be ignored, instead a lot   files has been changed in vendor/ -
 people running `composer install` regulary will get (with the old way) a
 dirty   working copy (version-controlled files being modified) and then
 cannot update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 composer.lock | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/composer.lock b/composer.lock
index f294c16ef..bc0eba771 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1761,18 +1761,13 @@
             "time": "2018-01-27T08:24:15+00:00"
         },
         {
-            "name": "pear/text_languagedetect",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Text_LanguageDetect.git",
-                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6"
-            },
+            "name": "pear-pear.php.net/Archive_Tar",
+            "version": "1.4.3",
             "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Text_LanguageDetect/zipball/bb9ff6f4970f686fac59081e916b456021fe7ba6",
-                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6",
-                "shasum": ""
+                "type": "file",
+                "url": "https://pear.php.net/get/Archive_Tar-1.4.3.tgz",
+                "reference": null,
+                "shasum": null
             },
             "require-dev": {
                 "phpunit/phpunit": "*"

From 15c570495b000fa2cf3a515f896a154feb4ffc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 26 Jul 2017 22:16:29 +0200
Subject: [PATCH 60/81] Windows' CRLF are looking strange under Linux, let's
 get rid of them/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also let's ignore addons/ as it is optional and depend on if the webmaster
wants it or not.

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c31d8c5b5..12dd3b49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@ venv/
 
 #ignore all in 'vendor' as `utils/composer.phar install` will bring it back
 vendor/*
-<<<<<<< HEAD
 
 #ignore config files from JetBrains
 /.idea
@@ -66,5 +65,3 @@ addons/
 
 #Ignore .htaccess as it may contain local changes
 .htaccess
-=======
->>>>>>> Fixes for composer:

From a8e2c3a3ad9825156018b1602ef86353ce693b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 May 2018 23:07:28 +0200
Subject: [PATCH 61/81] Continued: - ops, did accidently modify composer.lock
 ... :-(
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 composer.lock | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index bc0eba771..f294c16ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1761,13 +1761,18 @@
             "time": "2018-01-27T08:24:15+00:00"
         },
         {
-            "name": "pear-pear.php.net/Archive_Tar",
-            "version": "1.4.3",
+            "name": "pear/text_languagedetect",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Text_LanguageDetect.git",
+                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6"
+            },
             "dist": {
-                "type": "file",
-                "url": "https://pear.php.net/get/Archive_Tar-1.4.3.tgz",
-                "reference": null,
-                "shasum": null
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Text_LanguageDetect/zipball/bb9ff6f4970f686fac59081e916b456021fe7ba6",
+                "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6",
+                "shasum": ""
             },
             "require-dev": {
                 "phpunit/phpunit": "*"

From befb080b7087bef18dad623925348749d3debf56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 May 2018 23:13:03 +0200
Subject: [PATCH 62/81] Continued: - moved to Config class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/_well_known.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/_well_known.php b/mod/_well_known.php
index fb8df4861..782dc7a1b 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -52,7 +52,7 @@ function wk_social_relay()
 			$tags[$tag] = $tag;
 		}
 
-		if (get_config('system', 'relay_user_tags')) {
+		if (Config::get('system', 'relay_user_tags')) {
 			$terms = q("SELECT DISTINCT(`term`) FROM `search`");
 
 			foreach ($terms AS $term) {

From 8bc565be744f04c767fd1038c1bf3c07f9e3e55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 3 May 2018 02:17:16 +0200
Subject: [PATCH 63/81] Continued: - ops, another rebase-leftover fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/photos.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 32d52c648..15dbad7fa 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1251,8 +1251,6 @@ function photos_content(App $a)
 		if (!Config::get('system', 'no_count', false)) {
 			$order_field = defaults($_GET, 'order', '');
 			if ($order_field === 'posted') {
-		if (!Config::get('system', 'no_count', false)) {
-			if ($_GET['order'] === 'posted') {
 				$order = 'ASC';
 			} else {
 				$order = 'DESC';

From d54c79a7722e6ca0ef89ae77a47cd44de8bf2725 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 2 May 2018 19:26:15 +0000
Subject: [PATCH 64/81] Replace old database queries with the new ones

---
 mod/message.php       | 2 +-
 mod/settings.php      | 2 +-
 src/Protocol/DFRN.php | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mod/message.php b/mod/message.php
index 6a48eb658..822f5aade 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -148,7 +148,7 @@ function message_content(App $a)
 
 		$cmd = $a->argv[1];
 		if ($cmd === 'drop') {
-			if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+			if (dba::delete('mail', ['id' => $a->argv[2]])) {
 				info(L10n::t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
diff --git a/mod/settings.php b/mod/settings.php
index c7e61cbe3..234731439 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -149,7 +149,7 @@ function settings_post(App $a)
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
 		$key = $_POST['remove'];
-		dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
+		dba::delete('tokens', ['id' => $key]);
 		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index eb44cb210..592444e3c 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2094,7 +2094,6 @@ class DFRN
 			'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
 			'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
 		$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
-		dba::update('contact', $fields, $condition);
 
 		// @TODO No dba:update here?
 		dba::update('contact', $fields, $condition);
@@ -2103,11 +2102,6 @@ class DFRN
 
 		logger('Contacts are updated.');
 
-		/// @TODO WHERE DOES $x COME FROM ???
-		if ($x === false) {
-			return false;
-		}
-
 		// update items
 		// This is an extreme performance killer
 		Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);

From dcfd81e2eec9bde5c30f4738afb0a29b623ee0f6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 2 May 2018 21:12:48 +0000
Subject: [PATCH 65/81] Some corrections

---
 mod/message.php       | 2 +-
 mod/settings.php      | 2 +-
 src/Protocol/DFRN.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/message.php b/mod/message.php
index 822f5aade..6a48eb658 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -148,7 +148,7 @@ function message_content(App $a)
 
 		$cmd = $a->argv[1];
 		if ($cmd === 'drop') {
-			if (dba::delete('mail', ['id' => $a->argv[2]])) {
+			if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
 				info(L10n::t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
diff --git a/mod/settings.php b/mod/settings.php
index 234731439..c7e61cbe3 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -149,7 +149,7 @@ function settings_post(App $a)
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
 		$key = $_POST['remove'];
-		dba::delete('tokens', ['id' => $key]);
+		dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
 		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 592444e3c..5b748e10d 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2094,6 +2094,7 @@ class DFRN
 			'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
 			'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
 		$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
+		dba::update('contact', $fields, $condition);
 
 		// @TODO No dba:update here?
 		dba::update('contact', $fields, $condition);

From f19066c6cff8e0c238fa08aa484f967f5b9b0cc2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 04:43:50 +0000
Subject: [PATCH 66/81] Ensure that the link will be displayed correctly on
 Diaspora

---
 src/Content/Text/BBCode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index c1aca4f6a..34fbc635b 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -965,7 +965,7 @@ class BBCode extends BaseObject
 				}
 
 				if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
-					$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
+					$text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>';
 				} else {
 					$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 

From 72f5b863d8b67cf6aa78b75cc57e6072a3f2e2fb Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 13:03:41 +0000
Subject: [PATCH 67/81] Reshares had been detected falsely so that were
 rejected by Diaspora

---
 src/Content/Text/BBCode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 34fbc635b..c1aca4f6a 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -965,7 +965,7 @@ class BBCode extends BaseObject
 				}
 
 				if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
-					$text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>';
+					$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
 				} else {
 					$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 

From f28301e18fb4524708dc0ecc2c468aaa343dc9af Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 17:43:10 +0000
Subject: [PATCH 68/81] Urgent bugfix: Public contacts had been blocked
 automatically when created

---
 src/Network/Probe.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index d31a222f8..569e57381 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -448,7 +448,6 @@ class Probe
 				if (!$old_fields) {
 					$old_fields = true;
 					$fields['blocked'] = false;
-					$fields['pending'] = false;
 				}
 
 				dba::update('contact', $fields, $condition, $old_fields);

From 17a39340b57e390018a8ed0b53006a9d133e11db Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 3 May 2018 18:19:40 +0000
Subject: [PATCH 69/81] "pending" shouldn't be set as well by default ...

---
 src/Network/Probe.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 569e57381..d31a222f8 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -448,6 +448,7 @@ class Probe
 				if (!$old_fields) {
 					$old_fields = true;
 					$fields['blocked'] = false;
+					$fields['pending'] = false;
 				}
 
 				dba::update('contact', $fields, $condition, $old_fields);

From e0a07d5f277b869213a6fb23089eb6a040e72fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 10 May 2018 13:19:50 +0200
Subject: [PATCH 70/81] Continued: - used x() to make sure the array key is
 there, else an E_NOTICE is triggered - added type-hints where it is safe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/api.php          | 4 ++--
 include/conversation.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/api.php b/include/api.php
index 6f2566b97..f8c384990 100644
--- a/include/api.php
+++ b/include/api.php
@@ -935,7 +935,7 @@ function api_reformat_xml(&$item, &$key)
  *
  * @return string The XML data
  */
-function api_create_xml($data, $root_element)
+function api_create_xml(array $data, $root_element)
 {
 	$childname = key($data);
 	$data2 = array_pop($data);
@@ -960,7 +960,7 @@ function api_create_xml($data, $root_element)
 		$i = 1;
 
 		foreach ($data2 as $item) {
-			$data4[$i++.":".$childname] = $item;
+			$data4[$i++ . ":" . $childname] = $item;
 		}
 
 		$data2 = $data4;
diff --git a/include/conversation.php b/include/conversation.php
index 8ae829644..de3b2aaf4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1609,16 +1609,16 @@ function sort_thr_commented(array $a, array $b)
 }
 
 function render_location_dummy(array $item) {
-	if ($item['location'] != "") {
+	if (x($item, 'location') && !empty($item['location'])) {
 		return $item['location'];
 	}
 
-	if ($item['coord'] != "") {
+	if (x($item, 'coord') && !empty($item['coord'])) {
 		return $item['coord'];
 	}
 }
 
-function get_responses(array $conv_responses, array $response_verbs, $ob, $item) {
+function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
 	$ret = [];
 	foreach ($response_verbs as $v) {
 		$ret[$v] = [];

From 57e668d9e028ad966a04b24f86965f976c55c51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 10 May 2018 14:48:27 +0200
Subject: [PATCH 71/81] Continued: - avoided else() block which reduces code
 complexibility - used more x() - added curly braces - added known type-hints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/conversation.php |  2 +-
 mod/admin.php            |  4 ++--
 mod/subthread.php        | 12 ++++++++----
 mod/tagger.php           | 38 +++++++++++++++++++++-----------------
 src/Model/Event.php      |  4 ++--
 src/Model/Item.php       | 13 ++++++-------
 src/Protocol/DFRN.php    |  2 +-
 src/Protocol/OStatus.php | 11 +++++++----
 8 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index de3b2aaf4..e617eebf3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1120,7 +1120,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 
 			$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
 
-			if (!$item['thr-parent']) {
+			if (!x($item, 'thr-parent')) {
 				$item['thr-parent'] = $item['parent-uri'];
 			}
 
diff --git a/mod/admin.php b/mod/admin.php
index d195128a3..fd7558a8d 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1770,8 +1770,8 @@ function admin_page_users(App $a)
 		$e['page-flags-raw'] = $e['page-flags'];
 		$e['page-flags'] = $page_types[$e['page-flags']];
 
-		$e['account-type-raw'] = ($e['page_flags_raw']==0) ? $e['account-type'] : -1;
-		$e['account-type'] = ($e['page_flags_raw']==0) ? $account_types[$e['account-type']] : "";
+		$e['account-type-raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1;
+		$e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : "";
 
 		$e['register_date'] = Temporal::getRelativeDate($e['register_date']);
 		$e['login_date'] = Temporal::getRelativeDate($e['login_date']);
diff --git a/mod/subthread.php b/mod/subthread.php
index c858f2d1f..df44df6ef 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -63,17 +63,19 @@ function subthread_content(App $a) {
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
 	);
-	if (DBM::is_result($r))
+
+	if (DBM::is_result($r)) {
 		$owner = $r[0];
+	}
 
 	if (! $owner) {
 		logger('like: no owner');
 		return;
 	}
 
-	if (! $remote_owner)
+	if (! $remote_owner) {
 		$remote_owner = $owner;
-
+	}
 
 	$contact = null;
 	// This represents the person posting
@@ -85,8 +87,10 @@ function subthread_content(App $a) {
 			intval($_SESSION['visitor_id']),
 			intval($owner_uid)
 		);
-		if (DBM::is_result($r))
+
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
+		}
 	}
 	if (! $contact) {
 		return;
diff --git a/mod/tagger.php b/mod/tagger.php
index 16195cc33..211e2ffa1 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -159,11 +159,13 @@ EOT;
 	}
 
 	$term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_POST);
-        $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
-                intval($item['id']),
-                dbesc($term)
-        );
-	if((! $blocktags) && $t[0]['tcount']==0 ) {
+
+	$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+		intval($item['id']),
+		dbesc($term)
+	);
+
+	if ((!$blocktags) && $t[0]['tcount'] == 0 ) {
 		q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
 		   intval($item['id']),
 		   $term_objtype,
@@ -176,26 +178,28 @@ EOT;
 
 	// if the original post is on this site, update it.
 
-	$r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1",
+	$r = q("SELECT `tag`,`id`,`uid` FROM `item` WHERE `origin`=1 AND `uri`='%s' LIMIT 1",
 		dbesc($item['uri'])
 	);
+
 	if (DBM::is_result($r)) {
-		$x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
+		$x = q("SELECT `blocktags` FROM `user` WHERE `uid`=%d LIMIT 1",
 			intval($r[0]['uid'])
 		);
-		$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+		$t = q("SELECT COUNT(`tid`) AS `tcount` FROM `term` WHERE `oid`=%d AND `term`='%s'",
 			intval($r[0]['id']),
 			dbesc($term)
 		);
-		if(count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
-			q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
-	                   intval($r[0]['id']),
-	                   $term_objtype,
-	                   TERM_HASHTAG,
-	                   dbesc($term),
-	                   dbesc(System::baseUrl() . '/search?tag=' . $term),
-	                   intval($owner_uid)
-	                );
+
+		if (DBM::is_result($x) && !$x[0]['blocktags'] && $t[0]['tcount'] == 0){
+			q("INSERT INTO term (`oid`, `otype`, `type`, `term`, `url`, `uid`) VALUE (%d, %d, %d, '%s', '%s', %d)",
+				intval($r[0]['id']),
+				$term_objtype,
+				TERM_HASHTAG,
+				dbesc($term),
+				dbesc(System::baseUrl() . '/search?tag=' . $term),
+				intval($owner_uid)
+			);
 		}
 	}
 
diff --git a/src/Model/Event.php b/src/Model/Event.php
index e65e61ee5..db9e2b930 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -803,10 +803,10 @@ class Event extends BaseObject
 	/**
 	 * @brief Format an item array with event data to HTML.
 	 *
-	 * @param arr $item Array with item and event data.
+	 * @param array $item Array with item and event data.
 	 * @return string HTML output.
 	 */
-	public static function getItemHTML($item) {
+	public static function getItemHTML(array $item) {
 		$same_date = false;
 		$finish    = false;
 
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 425f71822..bf1193d70 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1032,8 +1032,9 @@ class Item extends BaseObject
 		}
 
 		// Is this a shadow entry?
-		if ($item['uid'] == 0)
+		if ($item['uid'] == 0) {
 			return;
+		}
 
 		// Is there a shadow parent?
 		if (!dba::exists('item', ['uri' => $item['parent-uri'], 'uid' => 0])) {
@@ -1073,10 +1074,8 @@ class Item extends BaseObject
 
 		// If this was a comment to a Diaspora post we don't get our comment back.
 		// This means that we have to distribute the comment by ourselves.
-		if ($origin) {
-			if (dba::exists('item', ['id' => $parent, 'network' => NETWORK_DIASPORA])) {
-				self::distribute($public_shadow);
-			}
+		if ($origin && dba::exists('item', ['id' => $parent, 'network' => NETWORK_DIASPORA])) {
+			self::distribute($public_shadow);
 		}
 	}
 
@@ -1087,14 +1086,14 @@ class Item extends BaseObject
 	 */
 	private static function addLanguageInPostopts(&$item)
 	{
+		$postopts = "";
+
 		if (!empty($item['postopts'])) {
 			if (strstr($item['postopts'], 'lang=')) {
 				// do not override
 				return;
 			}
 			$postopts = $item['postopts'];
-		} else {
-			$postopts = "";
 		}
 
 		$naked_body = Text\BBCode::toPlaintext($item['body'], false);
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 5b748e10d..d738adecb 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -892,7 +892,7 @@ class DFRN
 	 * @return object XML entry object
 	 * @todo Find proper type-hints
 	 */
-	private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
+	private static function entry($doc, $type, array $item, array $owner, $comment = false, $cid = 0, $single = false)
 	{
 		$mentioned = [];
 
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 8b6939214..8dac2b456 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1948,7 +1948,7 @@ class OStatus
 	 * @param bool   $complete default true
 	 * @return void
 	 */
-	private static function entryFooter($doc, $entry, $item, $owner, $complete = true)
+	private static function entryFooter($doc, $entry, array $item, array $owner, $complete = true)
 	{
 		$mentioned = [];
 
@@ -1988,6 +1988,7 @@ class OStatus
 
 			if (isset($parent_item)) {
 				$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $parent_item);
+
 				if (DBM::is_result($r)) {
 					if ($r['conversation-uri'] != '') {
 						$conversation_uri = $r['conversation-uri'];
@@ -2048,9 +2049,11 @@ class OStatus
 		}
 
 		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
-			XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
-									"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
-									"href" => $owner['url']]);
+			XML::addElement($doc, $entry, "link", "", [
+				"rel" => "mentioned",
+				"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
+				"href" => $owner['url']
+			]);
 		}
 
 		if (!$item["private"]) {

From 94a02f8572ccd2c34d3a92606fda2fc626f79e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 10 May 2018 15:13:08 +0200
Subject: [PATCH 72/81] Continued: - return is a keyword, not a function, so
 don't add braces here
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/api.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/api.php b/include/api.php
index f8c384990..37ee56a3e 100644
--- a/include/api.php
+++ b/include/api.php
@@ -5272,27 +5272,27 @@ function api_in_reply_to($item)
 
 /**
  *
- * @param string $Text
+ * @param string $text
  *
  * @return string
  */
-function api_clean_plain_items($Text)
+function api_clean_plain_items($text)
 {
 	$include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
 
-	$Text = BBCode::cleanPictureLinks($Text);
+	$text = BBCode::cleanPictureLinks($text);
 	$URLSearchString = "^\[\]";
 
-	$Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+	$text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $text);
 
 	if ($include_entities == "true") {
-		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url=$1]$1[/url]', $Text);
+		$text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url=$1]$1[/url]', $text);
 	}
 
 	// Simplify "attachment" element
-	$Text = api_clean_attachments($Text);
+	$text = api_clean_attachments($text);
 
-	return($Text);
+	return $text;
 }
 
 /**

From fe1e7b92f2fa9ed2ef13661f22fd146131fe965d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 04:40:52 +0200
Subject: [PATCH 73/81] Continued: - system,worker_dont_fork may not be set,
 always set default to "false" to   have it properly set as Config::get() may
 one day behave differently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Core/Worker.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index e3d8df45e..8c8e27331 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -688,7 +688,7 @@ class Worker
 			logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
 			// Are there fewer workers running as possible? Then fork a new one.
-			if (!Config::get("system", "worker_dont_fork") && ($queues > ($active + 1)) && ($entries > 1)) {
+			if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {
 				logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
 				self::spawnWorker();
 			}
@@ -1039,7 +1039,7 @@ class Worker
 		}
 
 		$priority = PRIORITY_MEDIUM;
-		$dont_fork = Config::get("system", "worker_dont_fork");
+		$dont_fork = Config::get("system", "worker_dont_fork", false);
 		$created = DateTimeFormat::utcNow();
 
 		$run_parameter = array_shift($args);

From 69ac6feff79158a72fecbaf7c5e9ff8cfb8ff35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 05:36:47 +0200
Subject: [PATCH 74/81] Continued: - you can directly use constant($var)
 instead of this switch()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Protocol/PortableContact.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 672956ffb..50b903fb0 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -1316,20 +1316,8 @@ class PortableContact
 					$version = $data->version;
 					$site_name = $data->site_name;
 					$info = $data->info;
-					$register_policy_str = $data->register_policy;
+					$register_policy = constant($data->register_policy);
 					$platform = $data->platform;
-
-					switch ($register_policy_str) {
-						case "REGISTER_CLOSED":
-							$register_policy = REGISTER_CLOSED;
-							break;
-						case "REGISTER_APPROVE":
-							$register_policy = REGISTER_APPROVE;
-							break;
-						case "REGISTER_OPEN":
-							$register_policy = REGISTER_OPEN;
-							break;
-					}
 				}
 			}
 		}

From 751394fc1dcc3289c4ef1c9ea731c8dd1dda6ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 07:38:53 +0200
Subject: [PATCH 75/81] Redis: - added support for redis server:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

// Required to actually have this cache driver active:
$a->config['system']['cache_driver'] = 'redis';

// ---- OPTIONAL/DEFAULT: ----
$a->config['system']['redis_host'] = '127.0.0.1';
$a->config['system']['redis_port'] = 6379;

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Core/Cache.php                  |  6 +++
 src/Core/Cache/RedisCacheDriver.php | 77 +++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 src/Core/Cache/RedisCacheDriver.php

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index f1d1e11a5..4202db325 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -40,6 +40,12 @@ class Cache extends \Friendica\BaseObject
 
 				self::$driver = new Cache\MemcachedCacheDriver($memcached_hosts);
 				break;
+			case 'redis':
+				$redis_host = Config::get('system', 'redis_host', '127.0.0.1');
+				$redis_port = Config::get('system', 'redis_port', 6379);
+
+				self::$driver = new Cache\RedisCacheDriver($redis_host, $redis_port);
+				break;
 			default:
 				self::$driver = new Cache\DatabaseCacheDriver();
 		}
diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
new file mode 100644
index 000000000..fa98842da
--- /dev/null
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\BaseObject;
+use Friendica\Core\Cache;
+
+/**
+ * Redis Cache Driver. This driver is based on Memcache driver
+ *
+ * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Roland Haeder <roland@mxchange.org>
+ */
+class RedisCacheDriver extends BaseObject implements ICacheDriver
+{
+	/**
+	 * @var Redis
+	 */
+	private $redis;
+
+	public function __construct($redis_host, $redis_port)
+	{
+		if (!class_exists('Redis', false)) {
+			throw new \Exception('Redis class isn\'t available');
+		}
+
+		$this->redis = new \Redis();
+
+		if (!$this->redis->connect($redis_host, $redis_port)) {
+			throw new \Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
+		}
+	}
+
+	public function get($key)
+	{
+		$return = null;
+
+		// We fetch with the hostname as key to avoid problems with other applications
+		$cached = $this->redis->get(self::getApp()->get_hostname() . ':' . $key);
+
+		// @see http://php.net/manual/en/redis.get.php#84275
+		if (is_bool($cached) || is_double($cached) || is_long($cached)) {
+			return $return;
+		}
+
+		$value = @unserialize($cached);
+
+		// Only return a value if the serialized value is valid.
+		// We also check if the db entry is a serialized
+		// boolean 'false' value (which we want to return).
+		if ($cached === serialize(false) || $value !== false) {
+			$return = $value;
+		}
+
+		return $return;
+	}
+
+	public function set($key, $value, $duration = Cache::MONTH)
+	{
+		// We store with the hostname as key to avoid problems with other applications
+		return $this->redis->set(
+			self::getApp()->get_hostname() . ":" . $key,
+			serialize($value),
+			time() + $duration
+		);
+	}
+
+	public function delete($key)
+	{
+		return $this->redis->delete($key);
+	}
+
+	public function clear()
+	{
+		return true;
+	}
+}

From 538760d9daf9c1d9442364da516edba3879aa70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 08:01:16 +0200
Subject: [PATCH 76/81] No direct $a->config['foo'] needed when Config::get()
 is around ...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/Core/PConfig.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index bfa52f5a3..274122ded 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -29,9 +29,7 @@ class PConfig extends BaseObject
 
 	public static function init($uid)
 	{
-		$a = self::getApp();
-
-		if (isset($a->config['system']['config_adapter']) && $a->config['system']['config_adapter'] == 'preload') {
+		if (Config::get('system', 'config_adapter') == 'preload') {
 			self::$adapter = new Config\PreloadPConfigAdapter($uid);
 		} else {
 			self::$adapter = new Config\JITPConfigAdapter($uid);

From bacb7b70f67371b3c9af15ef71aebaf195d1b7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 16:46:58 +0200
Subject: [PATCH 77/81] Cleanups: - added empty lines - removed old-lost
 commented out line
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/api.php | 2 +-
 mod/admin.php   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/api.php b/include/api.php
index 37ee56a3e..ae2f06406 100644
--- a/include/api.php
+++ b/include/api.php
@@ -4517,6 +4517,7 @@ function api_account_update_profile_image($type)
 	} else {
 		throw new InternalServerErrorException('Unsupported filetype');
 	}
+
 	// change specified profile or all profiles to the new resource-id
 	if ($is_default_profile) {
 		$condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], api_user()];
@@ -4530,7 +4531,6 @@ function api_account_update_profile_image($type)
 	Contact::updateSelfFromUserID(api_user(), true);
 
 	// Update global directory in background
-	//$user = api_get_user(get_app());
 	$url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
 	if ($url && strlen(Config::get('system', 'directory'))) {
 		Worker::add(PRIORITY_LOW, "Directory", $url);
diff --git a/mod/admin.php b/mod/admin.php
index fd7558a8d..1d6f1395a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1299,15 +1299,18 @@ function admin_page_site(App $a)
 	$user_names = [];
 	$user_names['---'] = L10n::t('Multi user instance');
 	$users = q("SELECT `username`, `nickname` FROM `user`");
+
 	foreach ($users as $user) {
 		$user_names[$user['nickname']] = $user['username'];
 	}
 
 	/* Banner */
 	$banner = Config::get('system', 'banner');
+
 	if ($banner == false) {
 		$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
 	}
+
 	$banner = htmlspecialchars($banner);
 	$info = Config::get('config', 'info');
 	$info = htmlspecialchars($info);
@@ -1507,9 +1510,12 @@ function admin_page_dbsync(App $a)
 
 	if ($a->argc > 2 && intval($a->argv[2])) {
 		require_once 'update.php';
+
 		$func = 'update_' . intval($a->argv[2]);
+
 		if (function_exists($func)) {
 			$retval = $func();
+
 			if ($retval === UPDATE_FAILED) {
 				$o .= L10n::t("Executing %s failed with error: %s", $func, $retval);
 			} elseif ($retval === UPDATE_SUCCESS) {
@@ -1522,11 +1528,13 @@ function admin_page_dbsync(App $a)
 			$o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "<br />";
 			Config::set('database', $func, 'success');
 		}
+
 		return $o;
 	}
 
 	$failed = [];
 	$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
+
 	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$upd = intval(substr($rr['k'], 7));
@@ -1536,6 +1544,7 @@ function admin_page_dbsync(App $a)
 			$failed[] = $upd;
 		}
 	}
+
 	if (!count($failed)) {
 		$o = replace_macros(get_markup_template('structure_check.tpl'), [
 			'$base' => System::baseUrl(true),

From debcdea82a94afb87858f8bc859545b48f5cf7d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 16:58:40 +0200
Subject: [PATCH 78/81] Continued: - merged 2 if() into one with && - added
 TODO for possible rewrite (avoid "complex" code)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/conversation.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index e617eebf3..e971798c9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -391,10 +391,9 @@ function visible_activity($item) {
 		}
 	}
 
-	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
-		if (!(x($item, 'self') && ($item['uid'] == local_user()))) {
-			return false;
-		}
+	/// @TODO such things are unneccessary code-complexibilities and should be avoided
+	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && !(x($item, 'self') && ($item['uid'] == local_user()))) {
+		return false;
 	}
 
 	return true;

From d0c7ba52572f863a3627f9ef4054935055131ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 May 2018 22:50:09 +0200
Subject: [PATCH 79/81] Fixed parser error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/text.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/text.php b/include/text.php
index c9ab0b943..3f66d379c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1978,18 +1978,22 @@ function protect_sprintf($s) {
 	return str_replace('%', '%%', $s);
 }
 
-
+/// @TODO Rewrite this
 function is_a_date_arg($s) {
 	$i = intval($s);
+
 	if ($i > 1900) {
 		$y = date('Y');
+
 		if ($i <= $y + 1 && strpos($s, '-') == 4) {
 			$m = intval(substr($s, 5));
+
 			if ($m > 0 && $m <= 12) {
 				return true;
 			}
 		}
 	}
+
 	return false;
 }
 

From f34d72c143ebf274c47d7bf21d9d7bf8bca5942f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 14 May 2018 22:25:39 +0200
Subject: [PATCH 80/81] Fixes: - used empty() instead of x() - removed
 superflous count()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/conversation.php | 4 ++--
 include/security.php     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index e971798c9..43f0a445d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -391,8 +391,8 @@ function visible_activity($item) {
 		}
 	}
 
-	/// @TODO such things are unneccessary code-complexibilities and should be avoided
-	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && !(x($item, 'self') && ($item['uid'] == local_user()))) {
+	// @TODO below if() block can be rewritten to a single line: $isVisible = allConditionsHere;
+	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && empty($item['self']) && $item['uid'] == local_user()) {
 		return false;
 	}
 
diff --git a/include/security.php b/include/security.php
index 5d563f324..bcfddf887 100644
--- a/include/security.php
+++ b/include/security.php
@@ -254,6 +254,7 @@ function can_write_wall($owner)
 	return false;
 }
 
+/// @TODO $groups should be array
 function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 {
 	$local_user = local_user();
@@ -305,7 +306,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 		if ($remote_verified) {
 			$gs = '<<>>'; // should be impossible to match
 
-			if (is_array($groups) && count($groups)) {
+			if (is_array($groups)) {
 				foreach ($groups as $g) {
 					$gs .= '|<' . intval($g) . '>';
 				}

From 5a7bcd47258994afa2ba2720d1e80c6b3f87a118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 14 May 2018 22:34:11 +0200
Subject: [PATCH 81/81] Added empty line after if() block (convention)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/photos.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/photos.php b/mod/photos.php
index 15dbad7fa..235acdfc4 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1285,6 +1285,7 @@ function photos_content(App $a)
 		if (count($ph) == 1) {
 			$hires = $lores = $ph[0];
 		}
+
 		if (count($ph) > 1) {
 			if ($ph[1]['scale'] == 2) {
 				// original is 640 or less, we can display it directly