Revert "httpsig: add parentheses"

This reverts commit e455fae334c4b5f8d5a563e099add1482749c92f.

6 files changed, 17 insertions, 122 deletions

diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php
index 57b8f30db..6e8e03f20 100644
--- a/Zotlabs/Module/Notes.php
+++ b/Zotlabs/Module/Notes.php
@@ -19,12 +19,7 @@ class Notes extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Notes'))
 			return EMPTY_STR;
 
-		$ret = [
-			'success' => false,
-			'html' => ''
-		];
-
-
+		$ret = array('success' => true);
 		if(array_key_exists('note_text',$_REQUEST)) {
 			$body = escape_tags($_REQUEST['note_text']);
 
@@ -38,10 +33,6 @@ class Notes extends Controller {
 					set_pconfig(local_channel(),'notes','text.bak',$old_text);
 			}
 			set_pconfig(local_channel(),'notes','text',$body);
-
-			$ret['html'] = bbcode($body);
-			$ret['success'] = true;
-
 		}
 
 		// push updates to channel clones
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index ad10fa182..5aa1e1913 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -323,7 +323,7 @@ class HTTPSig {
 	static function get_webfinger_key($id, $force = false) {
 
 		if (!$force) {
-			$x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s') and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc",
+			$x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc",
 				dbesc(str_replace('acct:', '', $id)),
 				dbesc($id)
 			);
@@ -370,7 +370,7 @@ class HTTPSig {
 
 	static function get_zotfinger_key($id, $force = false) {
 		if (!$force) {
-			$x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s') and hubloc_network = 'zot6' order by hubloc_id desc",
+			$x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc",
 				dbesc(str_replace('acct:', '', $id)),
 				dbesc($id)
 			);
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
index 66c90ef7d..05c1a0292 100644
--- a/Zotlabs/Widget/Notes.php
+++ b/Zotlabs/Widget/Notes.php
@@ -20,7 +20,6 @@ class Notes {
 		$o = replace_macros($tpl, array(
 			'$banner' => t('Notes'),
 			'$text' => $text,
-			'$html' => bbcode($text),
 			'$save' => t('Save'),
 			'$app' => ((isset($arr['app'])) ? true : false),
 			'$hidden' => ((isset($arr['hidden'])) ? true : false)
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 88081c2c6..dbb930fc7 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -313,7 +313,7 @@ code {
 }
 
 code.inline-code {
-	padding: 0.2em;
+	padding: 0px 4px;
 	display: inline;
 }
 
diff --git a/view/css/widgets.css b/view/css/widgets.css
index b78725919..a67c10ed2 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -41,23 +41,13 @@ li:hover .widget-nav-pills-icons {
 /* notes */
 
 #note-text {
-	padding: 7px 10px;
+	border: 1px solid rgba(0,0,0,.125);
+	padding: 5px;
 	width: 100%;
 	resize: vertical;
 	min-height: 250px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-#note-text-html {
-	padding: 7px 10px;
-	height: 250px;
-	width: 100%;
-	resize: vertical;
-	min-height: 250px;
-	overflow-y: auto;
-	overflow-x: hidden;
-
+	overflow: auto;
+	outline: none;
 }
 
 /* saved searches */
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 22a249fd9..0ae0604ef 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,122 +1,37 @@
 {{if $app}}
 <div id="personal-notes" class="generic-content-wrapper{{if $hidden}} d-none{{/if}}">
-	<div class="section-title-wrapper clearfix">
-		<div class="float-end rounded border border-secondary p-1 text-muted small note-mode" title="Double click into note for edit mode">Read mode</div>
+	<div class="section-title-wrapper">
 		<h2>{{$banner}}</h2>
 	</div>
-	<div class="section-content-wrapper-np">
+	<div class="section-content-wrapper">
 {{else}}
 <div id="personal-notes" class="widget{{if $hidden}} d-none{{/if}}">
-	<div class="float-end rounded border border-secondary mb-1 ps-1 pe-1 text-muted small note-mode" title="Double click note for edit mode">Read mode</div>
-	<h3 class="float-start">{{$banner}}</h3>
+	<h3>{{$banner}}</h3>
 {{/if}}
-	<textarea name="note_text" id="note-text" class="form-control{{if $app}} border-0{{else}} p-1{{/if}}" style="display: none;">{{$text}}</textarea>
-	<div id="note-text-html" class="{{if !$app}}border rounded p-1{{/if}}">{{$html}}</div>
+	<textarea name="note_text" id="note-text" class="{{if $app}}form-control border-0{{/if}}">{{$text}}</textarea>
 	<script>
 		var noteSaveTimer = null;
 		var noteText = $('#note-text');
-		var noteTextHTML = $('#note-text-html');
-		var noteMode = $('.note-mode');
-		var noteEditing = false;
-
-		noteText.bbco_autocomplete('bbcode');
 
 		$(document).on('focusout',"#note-text",function(e){
 			if(noteSaveTimer)
 				clearTimeout(noteSaveTimer);
-
-			noteEditing = false;
 			notePostFinal();
 			noteSaveTimer = null;
-			setNoteMode(noteMode, 'saving');
 		});
 
-		$(document).on('dblclick',"#note-text-html",function(e){
-			noteEditing = 1;
-			noteText.show().focusin();
-			noteText.height(noteTextHTML.outerHeight());
-			noteText.scrollTop(noteTextHTML.scrollTop());
-			noteTextHTML.hide();
-			setNoteMode(noteMode, 'edit');
-
-			$(document).one('click', function(e) {
-				if (e.target.id !== 'note-text') {
-					noteTextHTML.show();
-					noteTextHTML.height(noteText.outerHeight());
-					noteTextHTML.scrollTop(noteText.scrollTop());
-					noteText.hide();
-					setNoteMode(noteMode, 'read');
-				}
-			});
-
-			$(document).one('click', '#note-text', function(e){
-				noteEditing = 2;
-				setNoteMode(noteMode, 'editing');
-				noteSaveTimer = setTimeout(noteSaveChanges,10000);
-			});
-
+		$(document).on('focusin',"#note-text",function(e){
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
 		});
 
-
-
 		function notePostFinal() {
-			$.post(
-				'notes/sync',
-				{
-					'note_text' : noteText.val()
-				},
-				function (data) {
-					noteTextHTML.html(data.html);
-					noteTextHTML.show();
-					noteTextHTML.height(noteText.outerHeight());
-					noteTextHTML.scrollTop(noteText.scrollTop());
-					noteText.hide();
-					setNoteMode(noteMode, 'saved');
-				}
-			);
+			$.post('notes/sync', { 'note_text' : $('#note-text').val() });
 		}
 
 		function noteSaveChanges() {
-			$.post('notes', { 'note_text' : noteText.val() });
-			noteSaveTimer = setTimeout(noteSaveChanges, 10000);
+			$.post('notes', { 'note_text' : $('#note-text').val() });
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
 		}
-
-		function setNoteMode (obj, mode) {
-			switch(mode) {
-				case 'edit':
-					obj.removeClass('border-secondary border-success text-muted text-success')
-					obj.addClass('border-danger text-danger')
-					obj.html('Edit mode');
-				break;
-				case 'editing':
-					obj.removeClass('border-secondary border-success text-muted text-success')
-					obj.addClass('border-danger text-danger')
-					obj.html('Editing...');
-				break;
-				case 'saving':
-					obj.removeClass('border-secondary border-danger text-muted text-danger')
-					obj.addClass('border-success text-success')
-					obj.html('Saving...');
-				break;
-				case 'saved':
-					obj.removeClass('border-secondary border-danger text-muted text-danger')
-					obj.addClass('border-success text-success')
-					obj.html('Saved');
-					setTimeout(function () {
-						if(noteEditing) {
-							setNoteMode(noteMode, noteEditing === 1 ? 'edit' : 'editing');
-						}
-						else {
-							setNoteMode(noteMode, 'read');
-						}
-					}, 3000);
-				break;
-				case 'read':
-				default:
-					obj.removeClass('border-success border-danger text-success text-danger').addClass('border-secondary text-muted').html('Read mode');
-			}
-		}
-
 	</script>
 {{if $app}}
 </div>