Merge remote-tracking branch 'mike/master' into dev

5 files changed, 26 insertions, 12 deletions

diff --git a/Zotlabs/Module/Ap_probe.php b/Zotlabs/Module/Ap_probe.php
index 29629a8eb..57e254267 100644
--- a/Zotlabs/Module/Ap_probe.php
+++ b/Zotlabs/Module/Ap_probe.php
@@ -2,7 +2,7 @@
 namespace Zotlabs\Module;
 
 require_once('include/zot.php');
-
+require_once('addon/pubcrawl/HTTPSig.php');
 
 class Ap_probe extends \Zotlabs\Web\Controller {
 
@@ -21,16 +21,19 @@ class Ap_probe extends \Zotlabs\Web\Controller {
 			$addr = $_GET['addr'];
 
 			if($_GET['magenv']) {
-				$headers = 'Accept: application/magic-envelope+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
+				$headers = 'Accept: application/magic-envelope+json, application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
 			}
 			else {
-				$headers = 'Accept: application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
+				$headers = 'Accept: application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
 			}
 
 			$redirects = 0;
 		    $x = z_fetch_url($addr,true,$redirects, [ 'headers' => [ $headers ]]);
 	    	if($x['success'])
 				$o .= '<pre>' . $x['header'] . '</pre>' . EOL;
+				
+				$o .= 'verify returns: ' . \HTTPSig::verify($x) . EOL;
+ 
 				$o .= '<pre>' . str_replace(['\\n','\\'],["\n",''],jindent($x['body'])) . '</pre>';
 		}
 		return $o;
diff --git a/Zotlabs/Web/HTTPHeaders.php b/Zotlabs/Web/HTTPHeaders.php
index 1e4c1bf84..4be51a8f3 100644
--- a/Zotlabs/Web/HTTPHeaders.php
+++ b/Zotlabs/Web/HTTPHeaders.php
@@ -40,6 +40,20 @@ class HTTPHeaders {
 	function fetch() {
 		return $this->parsed;
 	}
+
+	function fetcharr() {
+		$ret = [];
+		if($this->parsed) {
+			foreach($this->parsed as $x) {
+				foreach($x as $y => $z) {
+					$ret[$y] = $z;
+				}
+			}
+		}
+		return $ret;
+	}
+
+
 }
 
 
diff --git a/include/items.php b/include/items.php
index 5a0ca01c6..e7bec7f20 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1600,7 +1600,6 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 	$arr['aid']           = ((x($arr,'aid'))           ? intval($arr['aid'])                           : 0);
 	$arr['mid']           = ((x($arr,'mid'))           ? notags(trim($arr['mid']))                     : random_string());
 	$arr['revision']      = ((x($arr,'revision') && intval($arr['revision']) > 0)   ? intval($arr['revision']) : 0);
-logger('revision: ' . $arr['revision']);
 
 	$arr['author_xchan']  = ((x($arr,'author_xchan'))  ? notags(trim($arr['author_xchan']))  : '');
 	$arr['owner_xchan']   = ((x($arr,'owner_xchan'))   ? notags(trim($arr['owner_xchan']))   : '');
diff --git a/include/text.php b/include/text.php
index 5af4f1b67..dd2dc7620 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2401,13 +2401,6 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 			//...do nothing
 			return $replaced;
 		}
-		if($tag == '#getzot') {
-			$basetag = 'getzot';
-			$url = 'http://hubzilla.org';
-			$newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]';
-			$body = str_replace($tag,$newtag,$body);
-			$replaced = true;
-		}
 		if(! $replaced) {
 
 			//base tag has the tags name only
diff --git a/view/js/main.js b/view/js/main.js
index f928fa377..f20432735 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -272,6 +272,7 @@ var last_filestorage_id = null;
 var mediaPlaying = false;
 var contentHeightDiff = 0;
 var liveRecurse = 0;
+var savedTitle = '';
 
 $(function() {
 	$.ajaxSetup({cache: false});
@@ -401,11 +402,13 @@ function NavUpdate() {
 			if(data.network == 0) {
 				data.network = '';
 				$('.net-update, .net-button').hide();
+				document.title = savedTitle;
 			} else {
 				$('.net-update, .net-button').show();
+				document.title = '(' + data.network + ') ' + savedTitle;
 			}
 			$('.net-update').html(data.network);
-
+			
 			if(data.pubs == 0) {
 				data.pubs = '';
 				$('.pubs-update, .pubs-button').hide();
@@ -1384,6 +1387,8 @@ $(document).ready(function() {
 		numbers       : aStr['t17'],
 	};
 
+	savedTitle = document.title;
+
 });
 
 function zFormError(elm,x) {