From 3065d1c40afec3bef9c5b82a10672a5746fc2915 Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Wed, 17 Oct 2018 21:05:45 +0200
Subject: [PATCH 1/9] Add Link promt in comment + only add URL instead of
 attachement via parse_url

---
 mod/parse_url.php                          |  5 +++
 view/theme/frio/js/textedit.js             | 49 ++++++++++++++++++++++
 view/theme/frio/templates/comment_item.tpl |  2 +-
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 40eddc3bd..a68f405de 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -92,6 +92,11 @@ function parse_url_content(App $a)
 		}
 	}
 
+	if(!empty($_GET['isComment'])) {
+		echo $br . '[url]' . $url . '[/url]';
+		exit();
+	}
+
 	$template = '[bookmark=%s]%s[/bookmark]%s';
 
 	$arr = ['url' => $url, 'text' => ''];
diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index ad5f95023..551298b72 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -2,6 +2,55 @@
  * @brief The file contains functions for text editing and commenting
  */
 
+function initComment(callback) {
+    if (typeof callback != "undefined") {
+        callback();
+    }
+}
+
+function commentGetLink(id) {
+    reply = prompt("Please enter a link URL:");
+    if(reply && reply.length) {
+        reply = bin2hex(reply);
+        $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
+            addcommenttext(data, id);
+        });
+    }
+}
+
+function addcommenttext(data, id) {
+    // get the textfield
+    var textfield = document.getElementById("comment-edit-text-" + id);
+    // check if the textfield does have the default-value
+    commentOpenUI(textfield, id);
+    // save already existent content
+    var currentText = $("#comment-edit-text-" + id).val();
+    //insert the data as new value
+    textfield.value = currentText + data;
+    autosize.update($("#comment-edit-text-" + id));
+}
+
+function commentlinkdrop(event, id) {
+    var reply = event.dataTransfer.getData("text/uri-list");
+    event.target.textContent = reply;
+    event.preventDefault();
+    if(reply && reply.length) {
+        reply = bin2hex(reply);
+        $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
+            if (!editor) $("comment-edit-text-" + id).val("");
+            initComment(function(){
+                addcommenttext(data, id);
+            });
+        });
+    }
+}
+
+function commentlinkdropper(event) {
+    var linkFound = event.dataTransfer.types.contains("text/uri-list");
+    if(linkFound)
+        event.preventDefault();
+}
+
 
 function insertFormatting(BBcode, id) {
 	var tmpStr = $("#comment-edit-text-" + id).val();
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 8d90394d5..a9b85d3e7 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -38,7 +38,7 @@
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
+					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" ondragenter="return commentlinkdrop(event, {{$id}});" ondragover="return commentlinkdrop(event, {{$id}});" ondrop="commentlinkdropper(event);" onclick="commentGetLink({{$id}});">
 						<i class="fa fa-link"></i>
 					</button>
 				</li>

From d0c43c559758e3d71005b539956092ee46ca630e Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Tue, 23 Oct 2018 19:50:19 +0200
Subject: [PATCH 2/9] Add prompt for link and media in comment + remove video
 symbol

---
 mod/parse_url.php                          |  2 +-
 src/Object/Post.php                        |  3 +--
 view/theme/frio/js/textedit.js             | 11 +----------
 view/theme/frio/templates/comment_item.tpl |  6 ------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/mod/parse_url.php b/mod/parse_url.php
index a68f405de..61c681d72 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -92,7 +92,7 @@ function parse_url_content(App $a)
 		}
 	}
 
-	if(!empty($_GET['isComment'])) {
+	if (!empty($_GET['isComment'])) {
 		echo $br . '[url]' . $url . '[/url]';
 		exit();
 	}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 48ffe65b7..0ec6aca0d 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -799,8 +799,7 @@ class Post extends BaseObject
 				'$edquote'     => L10n::t('Quote'),
 				'$edcode'      => L10n::t('Code'),
 				'$edimg'       => L10n::t('Image'),
-				'$edurl'       => L10n::t('Link'),
-				'$edvideo'     => L10n::t('Video'),
+				'$edurl'       => L10n::t('Link or Media'),
 				'$preview'     => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? L10n::t('Preview') : ''),
 				'$indent'      => $indent,
 				'$sourceapp'   => L10n::t($a->sourcename),
diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 551298b72..f9f4ff37f 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -2,12 +2,6 @@
  * @brief The file contains functions for text editing and commenting
  */
 
-function initComment(callback) {
-    if (typeof callback != "undefined") {
-        callback();
-    }
-}
-
 function commentGetLink(id) {
     reply = prompt("Please enter a link URL:");
     if(reply && reply.length) {
@@ -37,10 +31,7 @@ function commentlinkdrop(event, id) {
     if(reply && reply.length) {
         reply = bin2hex(reply);
         $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
-            if (!editor) $("comment-edit-text-" + id).val("");
-            initComment(function(){
-                addcommenttext(data, id);
-            });
+			addcommenttext(data, id);
         });
     }
 }
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index a9b85d3e7..4fa6421b5 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -42,12 +42,6 @@
 						<i class="fa fa-link"></i>
 					</button>
 				</li>
-				<li>
-					<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" aria-label="{{$edvideo}}" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
-						<i class="fa fa-video-camera"></i>
-					</button>
-				</li>
-
 				<li>
 					<button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
 						<i class="fa fa-underline"></i>

From ee006bdc187739ff64887117100d3621215beb6b Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Tue, 23 Oct 2018 20:12:53 +0200
Subject: [PATCH 3/9] Code Standards

---
 view/theme/frio/js/textedit.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index f9f4ff37f..3bfec8cfe 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -28,7 +28,7 @@ function commentlinkdrop(event, id) {
     var reply = event.dataTransfer.getData("text/uri-list");
     event.target.textContent = reply;
     event.preventDefault();
-    if(reply && reply.length) {
+    if (reply && reply.length) {
         reply = bin2hex(reply);
         $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
 			addcommenttext(data, id);
@@ -38,8 +38,9 @@ function commentlinkdrop(event, id) {
 
 function commentlinkdropper(event) {
     var linkFound = event.dataTransfer.types.contains("text/uri-list");
-    if(linkFound)
+    if (linkFound) {
         event.preventDefault();
+    }
 }
 
 

From d2b5f77be9c8acb9f6898e65ea4592e747f2ea5c Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Wed, 24 Oct 2018 16:20:10 +0200
Subject: [PATCH 4/9] Add multimedia link for jot + enables hover text in jot +
 autosize in when paste link + renaming / Code Standards

---
 include/conversation.php                   | 18 ++++++++--------
 mod/parse_url.php                          | 10 +++++----
 src/Object/Post.php                        | 16 +++++++++++----
 view/js/main.js                            |  2 +-
 view/theme/frio/js/textedit.js             | 24 +++++++++++-----------
 view/theme/frio/templates/comment_item.tpl |  7 ++++++-
 view/theme/frio/templates/jot-header.tpl   | 16 +++++++++++++--
 view/theme/frio/templates/jot.tpl          |  5 ++---
 8 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 43854bb40..0362e9a44 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1082,9 +1082,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 		'$geotag'    => $geotag,
 		'$nickname'  => $x['nickname'],
 		'$ispublic'  => L10n::t('Visible to <strong>everybody</strong>'),
-		'$linkurl'   => L10n::t('Please enter a link URL:'),
-		'$vidurl'    => L10n::t("Please enter a video link/URL:"),
-		'$audurl'    => L10n::t("Please enter an audio link/URL:"),
+		'$linkurl'   => L10n::t('Please enter a image/video/audio/webpage URL:'),
 		'$term'      => L10n::t('Tag term:'),
 		'$fileas'    => L10n::t('Save to Folder:'),
 		'$whereareu' => L10n::t('Where are you right now?'),
@@ -1128,12 +1126,14 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 		'$shortupload'  => L10n::t('upload photo'),
 		'$attach'       => L10n::t('Attach file'),
 		'$shortattach'  => L10n::t('attach file'),
-		'$weblink'      => L10n::t('Insert web link'),
-		'$shortweblink' => L10n::t('web link'),
-		'$video'        => L10n::t('Insert video link'),
-		'$shortvideo'   => L10n::t('video link'),
-		'$audio'        => L10n::t('Insert audio link'),
-		'$shortaudio'   => L10n::t('audio link'),
+		'$edbold'       => L10n::t('Bold'),
+		'$editalic'     => L10n::t('Italic'),
+		'$eduline'      => L10n::t('Underline'),
+		'$edquote'      => L10n::t('Quote'),
+		'$edcode'       => L10n::t('Code'),
+		'$edimg'        => L10n::t('Image'),
+		'$edurl'        => L10n::t('Link'),
+		'$edattach'     => L10n::t('Link or Media'),
 		'$setloc'       => L10n::t('Set your location'),
 		'$shortsetloc'  => L10n::t('set location'),
 		'$noloc'        => L10n::t('Clear browser location'),
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 61c681d72..331ebf262 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -92,10 +92,6 @@ function parse_url_content(App $a)
 		}
 	}
 
-	if (!empty($_GET['isComment'])) {
-		echo $br . '[url]' . $url . '[/url]';
-		exit();
-	}
 
 	$template = '[bookmark=%s]%s[/bookmark]%s';
 
@@ -128,6 +124,12 @@ function parse_url_content(App $a)
 
 	unset($siteinfo['keywords']);
 
+	// Bypass attachment if parse url for a comment
+	if (!empty($_GET['noAttachment'])) {
+		echo $br . '[url=' . $url . ']' . $siteinfo['title'] . '[/url]';
+		exit();
+	}
+
 	// Format it as BBCode attachment
 	$info = add_page_info_data($siteinfo);
 
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 0ec6aca0d..e8bc29ac0 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -157,7 +157,7 @@ class Post extends BaseObject
 			if ($item["event-id"] != 0) {
 				$edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")];
 			} else {
-				$edpost = ["editpost/" . $item['id'] . "/" . base64_encode($a->cmd), L10n::t("Edit")];
+				$edpost = ["editpost/" . $item['id'], L10n::t("Edit")];
 			}
 			$dropping = in_array($item['uid'], [0, local_user()]);
 		} else {
@@ -209,7 +209,13 @@ class Post extends BaseObject
 
 		$author = ['uid' => 0, 'id' => $item['author-id'],
 			'network' => $item['author-network'], 'url' => $item['author-link']];
-		$profile_link = Contact::magicLinkbyContact($author);
+
+		if (local_user() || remote_user()) {
+			$profile_link = Contact::magicLinkbyContact($author);
+		} else {
+			$profile_link = $item['author-link'];
+		}
+
 		if (strpos($profile_link, 'redir/') === 0) {
 			$sparkle = ' sparkle';
 		}
@@ -765,7 +771,7 @@ class Post extends BaseObject
 			 * Hmmm, code depending on the presence of a particular addon?
 			 * This should be better if done by a hook
 			 */
-			if (in_array('qcomment', $a->addons)) {
+			if (Addon::isEnabled('qcomment')) {
 				$qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null);
 				$qcomment = (($qc) ? explode("\n", $qc) : null);
 			}
@@ -799,7 +805,9 @@ class Post extends BaseObject
 				'$edquote'     => L10n::t('Quote'),
 				'$edcode'      => L10n::t('Code'),
 				'$edimg'       => L10n::t('Image'),
-				'$edurl'       => L10n::t('Link or Media'),
+				'$edurl'       => L10n::t('Link'),
+				'$edattach'    => L10n::t('Link or Media'),
+				'$prompttext'  => L10n::t('Please enter a image/video/audio/webpage URL:'),
 				'$preview'     => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? L10n::t('Preview') : ''),
 				'$indent'      => $indent,
 				'$sourceapp'   => L10n::t($a->sourcename),
diff --git a/view/js/main.js b/view/js/main.js
index 7e726248d..b2c469a6d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -24,7 +24,7 @@ function openClose(theID) {
 }
 
 function openMenu(theID) {
-	var el = document.getElementById(theID)
+	var el = document.getElementById(theID);
 
 	if (el) {
 		el.style.display = "block";
diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 3bfec8cfe..5074c3009 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -2,17 +2,17 @@
  * @brief The file contains functions for text editing and commenting
  */
 
-function commentGetLink(id) {
-    reply = prompt("Please enter a link URL:");
+function commentGetLink(id,prompttext) {
+    reply = prompt(prompttext);
     if(reply && reply.length) {
-        reply = bin2hex(reply);
-        $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
-            addcommenttext(data, id);
-        });
-    }
+		reply = bin2hex(reply);
+		$.get('parse_url?noAttachment=1&binurl=' + reply, function(data) {
+			addCommentText(data, id);
+		});
+	}
 }
 
-function addcommenttext(data, id) {
+function addCommentText(data, id) {
     // get the textfield
     var textfield = document.getElementById("comment-edit-text-" + id);
     // check if the textfield does have the default-value
@@ -24,19 +24,19 @@ function addcommenttext(data, id) {
     autosize.update($("#comment-edit-text-" + id));
 }
 
-function commentlinkdrop(event, id) {
+function commentLinkDrop(event, id) {
     var reply = event.dataTransfer.getData("text/uri-list");
     event.target.textContent = reply;
     event.preventDefault();
     if (reply && reply.length) {
         reply = bin2hex(reply);
-        $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
-			addcommenttext(data, id);
+        $.get('parse_url?noAttachment=1&binurl=' + reply, function(data) {
+			addCommentText(data, id);
         });
     }
 }
 
-function commentlinkdropper(event) {
+function commentLinkDropper(event) {
     var linkFound = event.dataTransfer.types.contains("text/uri-list");
     if (linkFound) {
         event.preventDefault();
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 4fa6421b5..4ef5f2caa 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -38,10 +38,15 @@
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" ondragenter="return commentlinkdrop(event, {{$id}});" ondragover="return commentlinkdrop(event, {{$id}});" ondrop="commentlinkdropper(event);" onclick="commentGetLink({{$id}});">
+					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
 						<i class="fa fa-link"></i>
 					</button>
 				</li>
+				<li>
+					<button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
+						<i class="fa fa-paperclip"></i>
+					</button>
+				</li>
 				<li>
 					<button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
 						<i class="fa fa-underline"></i>
diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index 81921598a..8289692f3 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -127,14 +127,20 @@
 	}
 
 	function jotGetLink() {
+		var currentText = $("#profile-jot-text").val();
+		var noAttachment = '';
 		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			if (currentText.includes("[attachment") && currentText.includes("[/attachment]")) {
+				noAttachment = '&noAttachment=1';
+			}
+			$.get('parse_url?binurl=' + reply + noAttachment, function(data) {
 				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
+			autosize.update($("#profile-jot-text"));
 		}
 	}
 
@@ -182,18 +188,23 @@
 
 	function linkdrop(event) {
 		var reply = event.dataTransfer.getData("text/uri-list");
+		var noAttachment = '';
 		event.target.textContent = reply;
 		event.preventDefault();
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			if (currentText.includes("[attachment") && currentText.includes("[/attachment]")) {
+				noAttachment = '&noAttachment=1';
+			}
+			$.get('parse_url?binurl=' + reply + noAttachment, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
 					$('#profile-rotator').hide();
 				});
 			});
+			autosize.update($("#profile-jot-text"));
 		}
 	}
 
@@ -261,6 +272,7 @@
 		var currentText = $("#profile-jot-text").val();
 		//insert the data as new value
 		textfield.value = currentText + data;
+		autosize.update($("#profile-jot-text"));
 	}
 
 	{{$geotag}}
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 14f383ac8..46d0351d9 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -97,9 +97,8 @@
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormattingToPost('i');"><i class="fa fa-italic"></i></button></li>
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film" aria-hidden="true"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music" aria-hidden="true"></i></button></li>
+						<li role="presentation"><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
+						<li role="presentation"><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
 						<li role="presentation"><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
 						<!-- TODO: waiting for a better placement
 						<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>

From 6cd17f222949c2eac476d5f558982c11733728e9 Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Wed, 24 Oct 2018 18:09:54 +0200
Subject: [PATCH 5/9] Code Standard: indent + renaming function in camelcase

---
 view/theme/frio/js/textedit.js           | 6 +++---
 view/theme/frio/templates/jot-header.tpl | 4 ++--
 view/theme/frio/templates/jot.tpl        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 5074c3009..bf68d0f5d 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -2,9 +2,9 @@
  * @brief The file contains functions for text editing and commenting
  */
 
-function commentGetLink(id,prompttext) {
-    reply = prompt(prompttext);
-    if(reply && reply.length) {
+function commentGetLink(id, prompttext) {
+	reply = prompt(prompttext);
+	if(reply && reply.length) {
 		reply = bin2hex(reply);
 		$.get('parse_url?noAttachment=1&binurl=' + reply, function(data) {
 			addCommentText(data, id);
diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index 8289692f3..73c7690f6 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -180,13 +180,13 @@
 		$("#jot-popup").show();
 	}
 
-	function linkdropper(event) {
+	function linkDropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
 		if(linkFound)
 			event.preventDefault();
 	}
 
-	function linkdrop(event) {
+	function linkDrop(event) {
 		var reply = event.dataTransfer.getData("text/uri-list");
 		var noAttachment = '';
 		event.target.textContent = reply;
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 46d0351d9..b5c061b75 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -98,7 +98,7 @@
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
 						<li role="presentation"><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
-						<li role="presentation"><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
+						<li role="presentation"><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkDropper(event);" ondragover="return linkDropper(event);" ondrop="linkDrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
 						<li role="presentation"><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
 						<!-- TODO: waiting for a better placement
 						<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>

From 48535c0959bfee33304e40f89b898e03be379841 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 24 Oct 2018 20:16:14 +0200
Subject: [PATCH 6/9] Bugfixing redirects

- Adding App->redirect if both redirects are possible
---
 mod/randprof.php     |  6 +-----
 mod/redir.php        |  8 ++++----
 src/App.php          | 18 ++++++++++++++++++
 src/Module/Magic.php | 12 ++----------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/mod/randprof.php b/mod/randprof.php
index 055b3dcbe..9377f88af 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -15,11 +15,7 @@ function randprof_init(App $a)
 	if ($x) {
 		$link = Contact::magicLink($x);
 		// @TODO making the return of magicLink save to use either externalRedirect or internalRedirect
-		if (filter_var($link, FILTER_VALIDATE_URL)) {
-			System::externalRedirect($link);
-		} else {
-			$a->internalRedirect($link);
-		}
+		$a->redirect($link);
 	}
 
 	$a->internalRedirect('profile');
diff --git a/mod/redir.php b/mod/redir.php
index ad42bc8ab..5ba8276ee 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -36,7 +36,7 @@ function redir_init(App $a) {
 			|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
 			|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
 		{
-			System::externalRedirect(defaults($url, $contact_url));
+			$a->redirect(defaults($url, $contact_url));
 		}
 
 		if ($contact['uid'] == 0 && local_user()) {
@@ -52,7 +52,7 @@ function redir_init(App $a) {
 				// Local user is already authenticated.
 				$target_url = defaults($url, $contact_url);
 				logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-				System::externalRedirect($target_url);
+				$a->redirect($target_url);
 			}
 		}
 
@@ -73,7 +73,7 @@ function redir_init(App $a) {
 						// Remote user is already authenticated.
 						$target_url = defaults($url, $contact_url);
 						logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-						System::externalRedirect($target_url);
+						$a->redirect($target_url);
 					}
 				}
 			}
@@ -121,7 +121,7 @@ function redir_init(App $a) {
 		}
 
 		logger('redirecting to ' . $url, LOGGER_DEBUG);
-		System::externalRedirect($url);
+		$a->redirect($url);
 	}
 
 	notice(L10n::t('Contact not found.'));
diff --git a/src/App.php b/src/App.php
index f24a4cffa..a0558fedc 100644
--- a/src/App.php
+++ b/src/App.php
@@ -8,6 +8,7 @@ use Detection\MobileDetect;
 use DOMDocument;
 use DOMXPath;
 use Exception;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 
@@ -2006,4 +2007,21 @@ class App
 		$redirectTo = $this->getBaseURL($ssl) . '/' . ltrim($toUrl, '/');
 		Core\System::externalRedirect($redirectTo);
 	}
+
+	/**
+	 * Redirects to another URL in case
+	 * Should only be used if it isn't clear if the URL is either internal or external
+	 *
+	 * @param string $toUrl The target URL
+	 *
+	 */
+	public function redirect($toUrl)
+	{
+		if (filter_var($toUrl, FILTER_VALIDATE_URL))
+		{
+			System::externalRedirect($toUrl);
+		} else {
+			$this->internalRedirect($toUrl);
+		}
+	}
 }
diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 1d7cb715e..1da03b9c1 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -43,11 +43,7 @@ class Magic extends BaseModule
 		if (!$cid) {
 			logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG);
 			// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-			if (filter_var($dest, FILTER_VALIDATE_URL)) {
-				System::externalRedirect($dest);
-			} else {
-				$a->internalRedirect($dest);
-			}
+			$a->redirect($dest);
 		}
 		$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
@@ -117,10 +113,6 @@ class Magic extends BaseModule
 		}
 
 		// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-		if (filter_var($dest, FILTER_VALIDATE_URL)) {
-			System::externalRedirect($dest);
-		} else {
-			$a->internalRedirect($dest);
-		}
+		$a->redirect($dest);
 	}
 }

From 310d49b82a3dd6d5a688f291c51d86c02e0100c9 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 24 Oct 2018 20:24:22 +0200
Subject: [PATCH 7/9] removed use Friendica\Core\System again

---
 src/App.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/App.php b/src/App.php
index a0558fedc..7a579036c 100644
--- a/src/App.php
+++ b/src/App.php
@@ -8,7 +8,6 @@ use Detection\MobileDetect;
 use DOMDocument;
 use DOMXPath;
 use Exception;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 
@@ -2019,7 +2018,7 @@ class App
 	{
 		if (filter_var($toUrl, FILTER_VALIDATE_URL))
 		{
-			System::externalRedirect($toUrl);
+			Core\System::externalRedirect($toUrl);
 		} else {
 			$this->internalRedirect($toUrl);
 		}

From 99a33b733513f9534426e523fdab43e0c600eb2b Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 24 Oct 2018 20:44:19 +0200
Subject: [PATCH 8/9] Code standards

---
 mod/randprof.php | 1 -
 src/App.php      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mod/randprof.php b/mod/randprof.php
index 9377f88af..d0b3c4ef8 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -14,7 +14,6 @@ function randprof_init(App $a)
 
 	if ($x) {
 		$link = Contact::magicLink($x);
-		// @TODO making the return of magicLink save to use either externalRedirect or internalRedirect
 		$a->redirect($link);
 	}
 
diff --git a/src/App.php b/src/App.php
index 7a579036c..429fa059f 100644
--- a/src/App.php
+++ b/src/App.php
@@ -2016,8 +2016,7 @@ class App
 	 */
 	public function redirect($toUrl)
 	{
-		if (filter_var($toUrl, FILTER_VALIDATE_URL))
-		{
+		if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
 			Core\System::externalRedirect($toUrl);
 		} else {
 			$this->internalRedirect($toUrl);

From 072eeb8bec84aa290d6e2b050cc41c5abf116701 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 24 Oct 2018 20:52:38 +0200
Subject: [PATCH 9/9] making english sentences

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

diff --git a/src/App.php b/src/App.php
index 429fa059f..9fb63ce67 100644
--- a/src/App.php
+++ b/src/App.php
@@ -2008,7 +2008,7 @@ class App
 	}
 
 	/**
-	 * Redirects to another URL in case
+	 * Automatically redirects to relative or absolute URL
 	 * Should only be used if it isn't clear if the URL is either internal or external
 	 *
 	 * @param string $toUrl The target URL