Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

5 files changed, 17 insertions, 16 deletions

diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php
index 04e9fc4b1..5d9795c7e 100644
--- a/Zotlabs/Widget/Activity.php
+++ b/Zotlabs/Widget/Activity.php
@@ -35,7 +35,7 @@ class Activity {
 				}
 			}
 			foreach($contributors as $k => $v) {
-				$arr[] = [ 'author_xchan' => $k, 'total' => $v	];	
+				$arr[] = [ 'author_xchan' => $k, 'total' => $v	];
 			}
 			usort($arr,'total_sort');
 			xchan_query($arr);
@@ -43,19 +43,19 @@ class Activity {
 
 		$x = [ 'entries' => $arr ];
 		call_hooks('activity_widget',$x);
-		$arr = $x['entries']; 
+		$arr = $x['entries'];
 
 		if($arr) {
 			$o .= '<div class="widget">';
-			$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills flex-column">';
+			$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav rounded-pill flex-column">';
 
 			foreach($arr as $rv) {
-				$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge badge-secondary float-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>';
+				$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge bg-secondary float-end">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>';
 			}
 			$o .= '</ul></div>';
 		}
 		return $o;
 	}
 
-}	
+}
 
diff --git a/Zotlabs/Widget/Appcategories.php b/Zotlabs/Widget/Appcategories.php
index aebd144d0..e916f095f 100644
--- a/Zotlabs/Widget/Appcategories.php
+++ b/Zotlabs/Widget/Appcategories.php
@@ -40,7 +40,7 @@ class Appcategories {
 				$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
 
 			return replace_macros(get_markup_template('categories_widget.tpl'),array(
-				'$title' => t('Categories'),
+				'$title' => t('App Categories'),
 				'$desc' => '',
 				'$sel_all' => (($selected == '') ? 'selected' : ''),
 				'$all' => t('Everything'),
diff --git a/Zotlabs/Widget/Appstore.php b/Zotlabs/Widget/Appstore.php
index 6a00ac06a..da05c0b62 100644
--- a/Zotlabs/Widget/Appstore.php
+++ b/Zotlabs/Widget/Appstore.php
@@ -6,12 +6,11 @@ namespace Zotlabs\Widget;
 class Appstore {
 
 	function widget($arr) {
-		$store = ((argc() > 1 && argv(1) === 'available') ? 1 : 0);
-		return replace_macros(get_markup_template('appstore.tpl'), [ 
+		return replace_macros(get_markup_template('appstore.tpl'), [
 			'$title' => t('App Collections'),
 			'$options' => [
-				[ z_root() . '/apps',           t('Installed apps'), 1 - $store ],
-				[ z_root() . '/apps/available', t('Available Apps'), $store ]
+				[z_root() . '/apps',           t('Installed apps'), ((argc() == 1 && argv(0) === 'apps') ? 1 : 0)],
+				[z_root() . '/apps/available', t('Available Apps'), ((argc() > 1 && argv(1) === 'available') ? 1 : 0)]
 			]
 		]);
 	}
diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
index d3e2f2534..2af7347f1 100644
--- a/Zotlabs/Widget/Forums.php
+++ b/Zotlabs/Widget/Forums.php
@@ -34,7 +34,7 @@ class Forums {
 				intval(local_channel())
 			);
 
-			if($x2) { 
+			if($x2) {
 				$xf = ids_to_querystr($x2,'xchan',true);
 
 				// private forums
@@ -47,7 +47,7 @@ class Forums {
 			}
 		}
 
-		$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); 
+		$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 ");
 
 
 
@@ -64,7 +64,7 @@ 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 
+			$r = q("select sum(item_unseen) as unseen from item
 				where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ",
 				intval(local_channel()),
 				dbesc($r1[$x]['xchan_hash'])
@@ -109,12 +109,12 @@ class Forums {
 						}
 					}
 				}
-							
+
 				if($unseen && (! intval($rr['unseen'])))
 					continue;
 
 
-				$o .= '<li class="nav-item"><a class="nav-link" href="' . $link . '" ><span class="badge badge-secondary float-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>';
+				$o .= '<li class="nav-item"><a class="nav-link" href="' . $link . '" ><span class="badge bg-secondary float-end">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>';
 			}
 			$o .= '</ul></div>';
 		}
diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php
index 269d669dc..21375b08f 100644
--- a/Zotlabs/Widget/Messages.php
+++ b/Zotlabs/Widget/Messages.php
@@ -13,6 +13,8 @@ class Messages {
 
 		$page = self::get_messages_page($options);
 
+		$_SESSION['messages_loadtime'] = datetime_convert();
+
 		$tpl = get_markup_template('messages_widget.tpl');
 		$o = replace_macros($tpl, [
 			'$entries' => $page['entries'],
@@ -49,7 +51,7 @@ class Messages {
 			$offset = intval($options['offset']);
 		}
 
-		$loadtime = (($offset) ? $_SESSION['page_loadtime'] : datetime_convert());
+		$loadtime = (($offset) ? $_SESSION['messages_loadtime'] : datetime_convert());
 
 		switch($options['type']) {
 			case 'direct':