Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Zotlabs/Module/Embedphotos.php

@@ -83,7 +83,7 @@ class Embedphotos extends \Zotlabs\Web\Controller {
 			return '';
 
 		if($args['album'])
-			$album = $args['album'];
+			$album = (($args['album'] === '/') ? '' : $args['album']);
 		if($args['title'])
 			$title = $args['title'];
 

boot.php

@@ -50,7 +50,7 @@ require_once('include/hubloc.php');
 require_once('include/attach.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '2.9.4' );
+define ( 'STD_VERSION',             '3.1' );
 define ( 'ZOT_REVISION',            '1.3' );
 
 define ( 'DB_UPDATE_VERSION',       1198  );

include/attach.php

@@ -308,6 +308,11 @@ function attach_can_view_folder($uid,$ob_hash,$folder_hash) {
 	$hash = $folder_hash;
 	$result = false;
 
+	if(! $folder_hash) {
+		return perm_is_allowed($uid,$ob_hash,'view_storage');
+	}
+
+
 	do {
 		$r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra",
 			dbesc($hash),

include/conversation.php

@@ -755,8 +755,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 					'forged' => $forged,
 					'txt_cats' => t('Categories:'),
 					'txt_folders' => t('Filed under:'),
-					'has_cats' => ((count($body['categories'])) ? 'true' : ''),
-					'has_folders' => ((count($body['folders'])) ? 'true' : ''),
+					'has_cats' => (($body['categories']) ? 'true' : ''),
+					'has_folders' => (($body['folders']) ? 'true' : ''),
 					'text' => strip_tags($body['html']),
 					'ago' => relative_date($item['created']),
 					'app' => $item['app'],

include/nav.php

@@ -176,13 +176,15 @@ EOT;
 
 	}
 
-
-	$homelink = get_my_url();
-	if(! $homelink) {
+	$my_url = get_my_url();
+	if(! $my_url) {
 		$observer = App::get_observer();
-		$homelink = (($observer) ? $observer['xchan_url'] : '');
+		$my_url = (($observer) ? $observer['xchan_url'] : '');
 	}
 
+	$homelink_arr = parse_url($my_url);
+	$homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host'];
+
 	if(! $is_owner) {
 		$nav['rusermenu'] = array(
 			$homelink,

view/css/mod_cloud.css

@@ -21,6 +21,10 @@
 	padding: 7px 3px 7px 10px;
 }
 
+#cloud-index td:nth-child(2){
+	word-break: break-all;
+}
+
 #cloud-index th:nth-child(8),
 #cloud-index td:nth-child(8){
 	padding: 7px 3px;

view/theme/redbasic/css/style.css

@@ -1802,12 +1802,6 @@ dl.bb-dl > dd > li {
 	overflow: hidden;
 }
 
-#cloud-index {
-	width: 100%;
-	table-layout: fixed;
-}
-
-#cloud-index td {
-	width: auto;
-	overflow: hidden;
+.caption-visible {
+	max-height: 75%;
 }

view/tpl/cloud_directory.tpl

@@ -39,12 +39,12 @@
 	{{else}}
 	<table id="cloud-index">
 		<tr>
-			<th width="4%"></th>
-			<th width="47%">{{$name}}</th>
-			<th width="4%"></th><th width="4%"></th><th width="4%"></th><th width="4%"></th>
+			<th width="1%"></th>
+			<th width="92%">{{$name}}</th>
+			<th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
 			<th width="1%">{{*{{$type}}*}}</th>
-			<th width="10%" class="d-none d-md-table-cell">{{$size}}</th>
-			<th width="22%" class="d-none d-md-table-cell">{{$lastmod}}</th>
+			<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
+			<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
 		</tr>
 	{{if $parentpath}}
 		<tr>