Merge https://github.com/friendica/red into pending_merge

2 files changed, 27 insertions, 13 deletions

diff --git a/mod/filestorage.php b/mod/filestorage.php
index 92474f336..f2c795379 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -32,14 +32,15 @@ function filestorage_post(&$a) {
 	$str_contact_allow = perms2str($_REQUEST['contact_allow']);
 	$str_group_deny    = perms2str($_REQUEST['group_deny']);
 	$str_contact_deny  = perms2str($_REQUEST['contact_deny']);
- 
-	attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $recurse);
 
-	//Build directory tree and redirect
 	$channel = $a->get_channel();
 	$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
+
+	//get the object before permissions change so we can catch eventual former allowed members
 	$object = get_file_activity_object($channel_id, $resource, $cloudPath);
 
+	attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $recurse);
+
 	file_activity($channel_id, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity);
 
 	goaway($cloudPath);
diff --git a/mod/network.php b/mod/network.php
index 0eeeedbe9..7f8d39044 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -119,13 +119,16 @@ function network_content(&$a, $update = 0, $load = false) {
 	if($cid)
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
-
 	if(! $update) {
-		$o .= network_tabs();
+		$tabs = network_tabs();
+		$o .= $tabs;
 
 		// search terms header
-		if($search)
-			$o .= '<h2>' . t('Search Results For:') . ' '  . htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>';
+		if($search) {
+			$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8')
+			));
+		}
 
 		nav_set_selected('network');
 
@@ -136,7 +139,6 @@ function network_content(&$a, $update = 0, $load = false) {
 			'deny_gid'  => $channel['channel_deny_gid']
 		); 
 
-
 		$x = array(
 			'is_owner'         => true,
 			'allow_location'   => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
@@ -149,8 +151,8 @@ function network_content(&$a, $update = 0, $load = false) {
 			'profile_uid'      => local_channel()
 		);
 
-		$o .= status_editor($a,$x);
-
+		$status_editor = status_editor($a,$x);
+		$o .= $status_editor;
 	}
 
 
@@ -186,9 +188,15 @@ function network_content(&$a, $update = 0, $load = false) {
 
 		$x = group_rec_byhash(local_channel(), $group_hash);
 
-		if($x)
-			$o = '<h2>' . t('Collection: ') . $x['name'] . '</h2>' . $o;
+		if($x) {
+			$title = replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => t('Collection: ') . $x['name']
+			));
+		}
 
+		$o = $tabs;
+		$o .= $title;
+		$o .= $status_editor;
 
 	}
 
@@ -200,7 +208,12 @@ function network_content(&$a, $update = 0, $load = false) {
 		);
 		if($r) {
 			$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) ";
-			$o = '<h2>' . t('Connection: ') . $r[0]['xchan_name'] . '</h2>' . $o;
+			$title = replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => t('Connection: ') . $r[0]['xchan_name']
+			));
+			$o = $tabs;
+			$o .= $title;
+			$o .= $status_editor;
 		}
 		else {
 			notice( t('Invalid connection.') . EOL);