Merge branch '3.2RC'3.2

5 files changed, 114 insertions, 24 deletions

diff --git a/Zotlabs/Widget/Affinity.php b/Zotlabs/Widget/Affinity.php
index a3e5b5c07..4fb2874ae 100644
--- a/Zotlabs/Widget/Affinity.php
+++ b/Zotlabs/Widget/Affinity.php
@@ -9,9 +9,11 @@ class Affinity {
 		if(! local_channel())
 			return '';
 	
+		$default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0);
+		$default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99);
 
-		$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : 0);
-		$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : 99);
+		$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $default_cmin);
+		$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $default_cmax);
 
 
 		if(feature_enabled(local_channel(),'affinity')) {
diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
index 91b987746..f65a639ff 100644
--- a/Zotlabs/Widget/Forums.php
+++ b/Zotlabs/Widget/Forums.php
@@ -11,8 +11,8 @@ class Forums {
 
 		$o = '';
 
-		if(is_array($arr) && array_key_exists('limit',$arr))
-			$limit = " limit " . intval($limit) . " ";
+		if(is_array($arr) && array_key_exists('limit',$arr) && intval($arr['limit']) >= 0)
+			$limit = " limit " . intval($arr['limit']) . " ";
 		else
 			$limit = '';
 
@@ -64,13 +64,16 @@ class Forums {
 		// There also should be a way to update this via ajax.
 
 		for($x = 0; $x < count($r1); $x ++) {
-			$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d and item_unseen = 1 $perms_sql ",
+			$r = q("select sum(item_unseen) as unseen from item 
+				where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ",
 				dbesc($r1[$x]['xchan_hash']),
 				intval(local_channel())
 			);
 			if($r)
 				$r1[$x]['unseen'] = $r[0]['unseen'];
 
+		}
+
 		/**
 		 * @FIXME
 		 * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
@@ -79,21 +82,19 @@ class Forums {
 		 * It may make more sense in that query to look for the mention in the body rather than another join,
 		 * but that makes it very inefficient.
 		 *
-		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
-			intval(TERM_OBJ_POST),
-			dbesc($r1[$x]['xchan_hash']),
-			intval(local_channel()),
-			dbesc($r1[$x]['xchan_url']),
-			intval(TERM_MENTION)
-		);
-		if($r)
-			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
+		 *		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
+		 *			intval(TERM_OBJ_POST),
+		 *			dbesc($r1[$x]['xchan_hash']),
+		 *			intval(local_channel()),
+		 *			dbesc($r1[$x]['xchan_url']),
+		 *			intval(TERM_MENTION)
+		 *		);
+		 *		if($r)
+		 *			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
 		 *
 		 * end @FIXME
 		 */
 
-		}
-
 		if($r1) {
 			$o .= '<div class="widget">';
 			$o .= '<h3>' . t('Forums') . '</h3><ul class="nav nav-pills flex-column">';
diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php
new file mode 100644
index 000000000..cdb70e23d
--- /dev/null
+++ b/Zotlabs/Widget/Newmember.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Newmember {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return EMPTY_STR;
+
+		$c = \App::get_channel();
+		if(! $c)
+			return EMPTY_STR;
+
+
+		$a = \App::get_account();
+		if(! $a)
+			return EMPTY_STR;
+
+
+		if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days'))
+			return EMPTY_STR;
+
+		// This could be a new account that was used to clone a very old channel
+
+		$ob = \App::get_observer();
+		if($ob && array_key_exists('xchan_name_date',$ob) && $ob['xchan_name_date'] < datetime_convert('UTC','UTC','now - 60 days'))
+			return EMPTY_STR;
+
+
+		$options = [
+			t('Profile Creation'),
+			[ 
+				'profile_photo' => t('Upload profile photo'),
+				'cover_photo'   => t('Upload cover photo'),
+				'profiles'      => t('Edit your profile'),
+			],
+
+			t('Find and Connect with others'),
+			[
+				'directory'              => t('View the directory'),
+				'directory?f=&suggest=1' => t('View friend suggestions'),
+				'connections'            => t('Manage your connections'),
+			],
+
+			t('Communicate'),
+			[
+				'channel/' . $channel['channel_address']       => t('View your channel homepage'),
+				'network'       => t('View your network stream'),
+			],
+
+			t('Miscellaneous'),
+			[
+				'settings'      => t('Settings'),
+				'help'    	    => t('Documentation'),
+			]
+		];
+
+		$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
+		$net_firehose  = ((get_config('system','disable_discover_tab',1)) ? false : true);
+
+
+		// hack to put this in the correct spot of the array
+
+		if($site_firehose || $net_firehose) {
+			$options[5]['pubstream'] = t('View public stream');
+		}
+
+		$o = replace_macros(get_markup_template('new_member.tpl'), [
+			'$title' => t('New Member Links'),
+			'$options' => $options
+
+		]);
+
+		return $o;
+
+	}
+
+}
+
+
+	
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 5a0c1f3d5..f2619c5cf 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -23,7 +23,8 @@ class Notifications {
 					'label' => t('Mark all notifications read')
 				],
 				'filter' => [
-					'label' => t('Show new posts only')
+					'posts_label' => t('Show new posts only'),
+					'name_label' => t('Filter by name')
 				]
 			];
 
@@ -41,7 +42,8 @@ class Notifications {
 					'label' => t('Mark all notifications seen')
 				],
 				'filter' => [
-					'label' => t('Show new posts only')
+					'posts_label' => t('Show new posts only'),
+					'name_label' => t('Filter by name')
 				]
 			];
 
@@ -67,7 +69,7 @@ class Notifications {
 				'label' => t('New Events'),
 				'title' => t('New Events Notifications'),
 				'viewall' => [
-					'url' => 'mail/combined',
+					'url' => 'events',
 					'label' => t('View events')
 				],
 				'markall' => [
@@ -136,7 +138,8 @@ class Notifications {
 					'label' => t('Mark all notifications seen')
 				],
 				'filter' => [
-					'label' => t('Show new posts only')
+					'posts_label' => t('Show new posts only'),
+					'name_label' => t('Filter by name')
 				]
 			];
 		}
@@ -145,7 +148,8 @@ class Notifications {
 			'$module' => \App::$module,
 			'$notifications' => $notifications,
 			'$no_notifications' => t('Sorry, you have got no notifications at the moment'),
-			'$loading' => t('Loading')
+			'$loading' => t('Loading'),
+			'$startpage' => get_pconfig(local_channel(), 'system', 'startpage')
 		));
 
 		return $o;
diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index e15ed96a5..455fdcb9b 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -54,7 +54,7 @@ class Settings_menu {
 		}
 
 		$tabs[] =	array(
-			'label'	=> t('Feature/Addon settings'),
+			'label'	=> t('Addon settings'),
 			'url' 	=> z_root().'/settings/featured',
 			'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
 		);
@@ -79,7 +79,7 @@ class Settings_menu {
 			'selected' => ''
 		);
 
-		if(get_account_techlevel() > 0) {
+		if(feature_enabled(local_channel(),'oauth_clients')) {
 			$tabs[] =	array(
 				'label' => t('Connected apps'),
 				'url' => z_root() . '/settings/oauth',
@@ -87,7 +87,7 @@ class Settings_menu {
 			);
 		}
 
-		if(get_account_techlevel() > 2) {
+		if(feature_enabled(local_channel(),'access_tokens')) {
 			$tabs[] =	array(
 				'label' => t('Guest Access Tokens'),
 				'url' => z_root() . '/settings/tokens',