From 0e09dca9529ee15ad8457353391a9c97de6aeaf1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 Apr 2018 20:19:56 +0200
Subject: fix missing login/out buttons for medium screensize

---
 view/tpl/navbar_default.tpl | 6 +++---
 view/tpl/navbar_tucson.tpl  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 92b067bcb..532e10f22 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -91,7 +91,7 @@
 <div class="collapse navbar-collapse" id="navbar-collapse-1">
 	<ul class="navbar-nav mr-auto">
 		{{if $nav.login && !$userinfo}}
-		<li class="nav-item d-none d-xl-flex">
+		<li class="nav-item d-lg-flex">
 			{{if $nav.loginmenu.1.4}}
 			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">
 			{{$nav.loginmenu.1.1}}
@@ -104,12 +104,12 @@
 		</li>
 		{{/if}}
 		{{if $nav.register}}
-		<li class="nav-item {{$nav.register.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.register.2}} d-lg-flex">
 			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
 		</li>
 		{{/if}}
 		{{if $nav.alogout}}
-		<li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.alogout.2}} d-lg-flex">
 			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
 		</li>
 		{{/if}}
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
index 92b067bcb..800f863dd 100755
--- a/view/tpl/navbar_tucson.tpl
+++ b/view/tpl/navbar_tucson.tpl
@@ -91,7 +91,7 @@
 <div class="collapse navbar-collapse" id="navbar-collapse-1">
 	<ul class="navbar-nav mr-auto">
 		{{if $nav.login && !$userinfo}}
-		<li class="nav-item d-none d-xl-flex">
+		<li class="nav-item d-lg-flex">
 			{{if $nav.loginmenu.1.4}}
 			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">
 			{{$nav.loginmenu.1.1}}
@@ -104,12 +104,12 @@
 		</li>
 		{{/if}}
 		{{if $nav.register}}
-		<li class="nav-item {{$nav.register.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.register.2}} d-lg-flex">
 			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
 		</li>
 		{{/if}}
 		{{if $nav.alogout}}
-		<li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.alogout.2}} d-none d-lg-flex">
 			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
 		</li>
 		{{/if}}
-- 
cgit v1.2.3


From bcffb6cf55ff2d9d88fcb38105695b14ea3586b3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 1 Apr 2018 16:53:10 -0700
Subject: obscurify chats

---
 Zotlabs/Lib/Chatroom.php   | 2 +-
 Zotlabs/Module/Chatsvc.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Lib/Chatroom.php b/Zotlabs/Lib/Chatroom.php
index e762620ae..882c846cd 100644
--- a/Zotlabs/Lib/Chatroom.php
+++ b/Zotlabs/Lib/Chatroom.php
@@ -266,7 +266,7 @@ class Chatroom {
 			intval($room_id),
 			dbesc($xchan),
 			dbesc(datetime_convert()),
-			dbesc($arr['chat_text'])
+			dbesc(str_rot47(base64url_encode($arr['chat_text'])))
 		);
 
 		$ret['success'] = true;
diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php
index 0f79e3b4c..b4657e84d 100644
--- a/Zotlabs/Module/Chatsvc.php
+++ b/Zotlabs/Module/Chatsvc.php
@@ -60,7 +60,7 @@ class Chatsvc extends \Zotlabs\Web\Controller {
 			intval(\App::$data['chat']['room_id']),
 			dbesc(get_observer_hash()),
 			dbesc(datetime_convert()),
-			dbesc($arr['chat_text'])		
+			dbesc(str_rot47(base64url_encode($arr['chat_text'])))		
 		);
 	
 		$ret['success'] = true;
@@ -157,7 +157,7 @@ class Chatsvc extends \Zotlabs\Web\Controller {
 						'name' => $rr['xchan_name'],
 						'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
 						'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
-						'text' => zidify_links(smilies(bbcode($rr['chat_text']))),
+						'text' => zidify_links(smilies(bbcode(base64url_decode(str_rot47($rr['chat_text']))))),
 						'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '')
 					);
 				}
-- 
cgit v1.2.3


From 9a1f051068b5d301bbe1f08b6b160447fa94a34a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 2 Apr 2018 13:32:10 -0700
Subject: missing year on profile birthday input, some optimisations to stats

---
 include/datetime.php       |  8 +++++++-
 include/items.php          |  4 +---
 include/statistics_fns.php | 44 +++++++++-----------------------------------
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/include/datetime.php b/include/datetime.php
index 766c90d16..3a07f1ccf 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -125,10 +125,16 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  */
 function dob($dob) {
 
+	$y = substr($dob,0,4);
+	if((! ctype_digit($y)) || ($y < 1900))
+		$ignore_year = true;
+	else
+		$ignore_year = false;
+
 	if ($dob === '0000-00-00' || $dob === '')
 		$value = '';
 	else
-		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
+		$value = (($ignore_year) ? datetime_convert('UTC','UTC',$dob,'m-d') : datetime_convert('UTC','UTC',$dob,'Y-m-d'));
 
 	$o = replace_macros(get_markup_template("field_input.tpl"), [
 		'$field' => [ 'dob', t('Birthday'), $value, ((intval($value)) ? t('Age: ') . age($value,App::$user['timezone'],App::$user['timezone']) : ''), '', 'placeholder="' . t('YYYY-MM-DD or MM-DD') .'"' ]
diff --git a/include/items.php b/include/items.php
index d1625e944..e232a0200 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2551,9 +2551,7 @@ function tag_deliver($uid, $item_id) {
 					$j_obj = json_decode($item['obj'],true);
 					logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA);
 					if($j_obj && $j_obj['id'] && $j_obj['title']) {
-						if(is_array($j_obj['link']))
-							$taglink = get_rel_link($j_obj['link'],'alternate');
-
+						//COMMUNITYTAG
 						store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$j_obj['title'],$j_obj['id']);
 						$x = q("update item set edited = '%s', received = '%s', changed = '%s' where mid = '%s' and uid = %d",
 							dbesc(datetime_convert()),
diff --git a/include/statistics_fns.php b/include/statistics_fns.php
index d213485bf..98b0efd41 100644
--- a/include/statistics_fns.php
+++ b/include/statistics_fns.php
@@ -17,23 +17,10 @@ function update_channels_active_halfyear_stat() {
 		db_utcnow(), db_quoteinterval('6 MONTH')
 	);
 	if($r) {
-		$s = '';
-		foreach($r as $rr) {
-			if($s)
-				$s .= ',';
-			$s .= intval($rr['channel_id']);
-		}
-		$x = q("select uid from item where uid in ( $s ) and item_wall = 1 and created > %s - INTERVAL %s group by uid",
-			db_utcnow(), db_quoteinterval('6 MONTH')
-		);
-		if($x) {
-			$channels_active_halfyear_stat = count($x);
-			set_config('system','channels_active_halfyear_stat',$channels_active_halfyear_stat);
-		} else {
-			set_config('system','channels_active_halfyear_stat',0);
-		}
-	} else {
-		set_config('system','channels_active_halfyear_stat',0);
+		set_config('system','channels_active_halfyear_stat',count($r));
+	}
+	else {
+		set_config('system','channels_active_halfyear_stat','0');
 	}
 }
 
@@ -43,28 +30,15 @@ function update_channels_active_monthly_stat() {
 		db_utcnow(), db_quoteinterval('1 MONTH')
 	);
 	if($r) {
-		$s = '';
-		foreach($r as $rr) {
-			if($s)
-				$s .= ',';
-			$s .= intval($rr['channel_id']);
-		}
-		$x = q("select uid from item where uid in ( $s ) and item_wall = 1 and created > %s - INTERVAL %s group by uid",
-			db_utcnow(), db_quoteinterval('1 MONTH')
-		);
-		if($x) {
-			$channels_active_monthly_stat = count($x);
-			set_config('system','channels_active_monthly_stat',$channels_active_monthly_stat);
-		} else {
-			set_config('system','channels_active_monthly_stat',0);
-		}
-	} else {
-		set_config('system','channels_active_monthly_stat',0);
+		set_config('system','channels_active_monthly_stat',count($r));
+	}
+	else {
+		set_config('system','channels_active_monthly_stat','0');
 	}
 }
 
 function update_local_posts_stat() {
-	$posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 ");
+	$posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 and id = parent");
 	if (is_array($posts)) {
 		$local_posts_stat = intval($posts[0]["local_posts"]);
 		set_config('system','local_posts_stat',$local_posts_stat);
-- 
cgit v1.2.3


From 753e1e4616acc19ff54024443e9ed3d60b0296fc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 2 Apr 2018 19:32:22 -0700
Subject: commtag refactor

---
 include/items.php | 93 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 35 deletions(-)

diff --git a/include/items.php b/include/items.php
index e232a0200..5e84c62c7 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2532,41 +2532,7 @@ function tag_deliver($uid, $item_id) {
 	 */
 
 	if($item['obj_type'] === ACTIVITY_OBJ_TAGTERM) {
-
-		// We received a community tag activity for a post.
-		// See if we are the owner of the parent item and have given permission to tag our posts.
-		// If so tag the parent post.
-
-		logger('tag_deliver: community tag activity received');
-
-		if(($item['owner_xchan'] === $u[0]['channel_hash']) && (! get_pconfig($u[0]['channel_id'],'system','blocktags'))) {
-			logger('tag_deliver: community tag recipient: ' . $u[0]['channel_name']);
-			$j_tgt = json_decode($item['target'],true);
-			if($j_tgt && $j_tgt['id']) {
-				$p = q("select * from item where mid = '%s' and uid = %d limit 1",
-					dbesc($j_tgt['id']),
-					intval($u[0]['channel_id'])
-				);
-				if($p) {
-					$j_obj = json_decode($item['obj'],true);
-					logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA);
-					if($j_obj && $j_obj['id'] && $j_obj['title']) {
-						//COMMUNITYTAG
-						store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$j_obj['title'],$j_obj['id']);
-						$x = q("update item set edited = '%s', received = '%s', changed = '%s' where mid = '%s' and uid = %d",
-							dbesc(datetime_convert()),
-							dbesc(datetime_convert()),
-							dbesc(datetime_convert()),
-							dbesc($j_tgt['id']),
-							intval($u[0]['channel_id'])
-						);
-						Zotlabs\Daemon\Master::Summon(array('Notifier','edit_post',$p[0]['id']));
-					}
-				}
-			}
-		}
-		else
-			logger('Tag permission denied for ' . $u[0]['channel_address']);
+		item_community_tag($u[0],$item);
 	}
 
 	/*
@@ -2761,6 +2727,63 @@ function tag_deliver($uid, $item_id) {
 
 }
 
+
+function item_community_tag($channel,$item) {
+
+
+	// We received a community tag activity for a post.
+	// See if we are the owner of the parent item and have given permission to tag our posts.
+	// If so tag the parent post.
+
+	logger('tag_deliver: community tag activity received');
+
+	// refactor of this code block is in progress and is not yet completed
+
+	$tag_the_post = false;
+	$p = null;
+
+	$j_tgt = json_decode($item['target'],true);
+	if($j_tgt && $j_tgt['id']) {
+		$p = q("select * from item where mid = '%s' and uid = %d limit 1",
+			dbesc($j_tgt['id']),
+			intval($channel['channel_id'])
+		);
+	}
+	if($p) {
+		xchan_query($p);
+		$items = fetch_post_tags($p,true);
+		$pitem = $items[0];
+		$auth = get_iconfig($pitem,'system','communitytagauth');
+		if($auth) {
+			if(rsa_verify('tagauth.' . $item['mid'],$auth,$pitem['owner']['xchan_pubkey'])) {
+				logger('tag_deliver: tagging the post: ' . $channel['channel_name']);
+				$tag_the_post = true;
+			}
+		}
+		else {
+			if(($pitem['owner_xchan'] === $channel['channel_hash']) && (! intval(get_pconfig($channel['channel_id'],'system','blocktags')))) {
+				logger('tag_deliver: community tag recipient: ' . $channel['channel_name']);
+				$tag_the_post = true;
+				$sig = rsa_sign('tagauth.' . $item['mid'],$channel['channel_prvkey']);
+				set_iconfig($item['id'],'system','communitytagauth',$sig,1);
+			}
+		}
+
+		if($tag_the_post) {
+			store_item_tag($channel['channel_id'],$pitem['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$j_obj['title'],$j_obj['id']);
+		}
+
+	}
+
+	if(! $tag_the_post) {
+		logger('Tag permission denied for ' . $channel['channel_address']);
+	}
+
+}
+
+
+
+
 /**
  * @brief This function is called pre-deliver to see if a post matches the criteria to be tag delivered.
  *
-- 
cgit v1.2.3


From 4e21c14ff6b8c8dddf10acaf5cac9fe0764e4899 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 2 Apr 2018 20:39:28 -0700
Subject: community tagging refactor - we no longer send an edited post/comment
 to everybody. The post owner approves the tag and this is transmitted along
 with the tag activity. Recipients check the signature of the approval and add
 the tag to their local copy of the post.

---
 include/items.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/items.php b/include/items.php
index 5e84c62c7..62f1c6195 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2735,13 +2735,12 @@ function item_community_tag($channel,$item) {
 	// See if we are the owner of the parent item and have given permission to tag our posts.
 	// If so tag the parent post.
 
-	logger('tag_deliver: community tag activity received');
-
-	// refactor of this code block is in progress and is not yet completed
+	logger('tag_deliver: community tag activity received: channel: ' . $channel['channel_name']);
 
 	$tag_the_post = false;
 	$p = null;
 
+	$j_obj = json_decode($item['obj'],true);
 	$j_tgt = json_decode($item['target'],true);
 	if($j_tgt && $j_tgt['id']) {
 		$p = q("select * from item where mid = '%s' and uid = %d limit 1",
@@ -2753,9 +2752,9 @@ function item_community_tag($channel,$item) {
 		xchan_query($p);
 		$items = fetch_post_tags($p,true);
 		$pitem = $items[0];
-		$auth = get_iconfig($pitem,'system','communitytagauth');
+		$auth = get_iconfig($item,'system','communitytagauth');
 		if($auth) {
-			if(rsa_verify('tagauth.' . $item['mid'],$auth,$pitem['owner']['xchan_pubkey'])) {
+			if(rsa_verify('tagauth.' . $item['mid'],base64url_decode($auth),$pitem['owner']['xchan_pubkey'])) {
 				logger('tag_deliver: tagging the post: ' . $channel['channel_name']);
 				$tag_the_post = true;
 			}
@@ -2765,18 +2764,17 @@ function item_community_tag($channel,$item) {
 				logger('tag_deliver: community tag recipient: ' . $channel['channel_name']);
 				$tag_the_post = true;
 				$sig = rsa_sign('tagauth.' . $item['mid'],$channel['channel_prvkey']);
-				set_iconfig($item['id'],'system','communitytagauth',$sig,1);
+				logger('tag_deliver: setting iconfig for ' . $item['id']);
+				set_iconfig($item['id'],'system','communitytagauth',base64url_encode($sig),1);
 			}
 		}
 
 		if($tag_the_post) {
 			store_item_tag($channel['channel_id'],$pitem['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$j_obj['title'],$j_obj['id']);
 		}
-
-	}
-
-	if(! $tag_the_post) {
-		logger('Tag permission denied for ' . $channel['channel_address']);
+		else {
+			logger('Tag permission denied for ' . $channel['channel_address']);
+		}
 	}
 
 }
-- 
cgit v1.2.3


From cf6d51bee84bfd147e36084b79c5bdc2093d0081 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 2 Apr 2018 22:47:11 -0700
Subject: some more work on hubzilla issue #1019

---
 Zotlabs/Module/Settings/Channel.php | 6 +++++-
 view/tpl/settings_nick_set.tpl      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 139e5f966..a7dfdd790 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -412,12 +412,16 @@ class Channel {
 		));
 	
 		$subdir = ((strlen(\App::get_path())) ? '<br />' . t('or') . ' ' . z_root() . '/channel/' . $nickname : '');
+
+		$webbie = $nickname . '@' . \App::get_hostname();
+		$intl_nickname = unpunify($nickname) . '@' . unpunify(\App::get_hostname());
 	
+
 		$tpl_addr = get_markup_template("settings_nick_set.tpl");
 	
 		$prof_addr = replace_macros($tpl_addr,array(
 			'$desc' => t('Your channel address is'),
-			'$nickname' => $nickname,
+			'$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . '&nbsp;(' . $webbie . ')'),
 			'$subdir' => $subdir,
 			'$davdesc' => t('Your files/photos are accessible via WebDAV at'),
 			'$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''),
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index 76fe7cd8d..4dbe58d82 100755
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
@@ -1,5 +1,5 @@
 <div id="settings-nick-wrapper" class="section-content-info-wrapper">
-<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
+<div id="settings-nickname-desc">{{$desc}} <strong>{{$nickname}}</strong></div>
 {{if $davpath}}
 <br>
 <div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
-- 
cgit v1.2.3


From 5ac0f371c748367b16fedde27edc9771b08bf4c6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 3 Apr 2018 17:52:54 -0700
Subject: community tags: allow signature of either author or owner so that it
 stands a chance of working across multiple delivery chains

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

diff --git a/include/items.php b/include/items.php
index 62f1c6195..6ddab9bf8 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2754,7 +2754,7 @@ function item_community_tag($channel,$item) {
 		$pitem = $items[0];
 		$auth = get_iconfig($item,'system','communitytagauth');
 		if($auth) {
-			if(rsa_verify('tagauth.' . $item['mid'],base64url_decode($auth),$pitem['owner']['xchan_pubkey'])) {
+			if(rsa_verify('tagauth.' . $item['mid'],base64url_decode($auth),$pitem['owner']['xchan_pubkey']) || rsa_verify('tagauth.' . $item['mid'],base64url_decode($auth),$pitem['author']['xchan_pubkey'])) {
 				logger('tag_deliver: tagging the post: ' . $channel['channel_name']);
 				$tag_the_post = true;
 			}
-- 
cgit v1.2.3