Merge branch 'master' into tres

Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php

4 files changed, 70 insertions, 70 deletions

diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl
index 2175d2e5d..02a71b77a 100644
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
@@ -1,6 +1,6 @@
 
 Hallo {{$username}},
-	auf {{$sitename} wurde eine Rücksetzung Deines Passwortes angefordert. 
+auf {{$sitename}} wurde eine Rücksetzung Deines Passwortes angefordert. 
 Bitte klicke auf den Link unten, um diese Anforderung zu bestätigen,
 oder kopiere den Link und füge ihn in die Adresszeile Deines Browsers ein. 
 
@@ -27,6 +27,4 @@ Username:	{{$email}}
 
 
 Viele Grüße,
-	der Administrator von {{$sitename}}
-
- 
\ No newline at end of file
+der Administrator von {{$sitename}}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index bfef8216c..b072f5782 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -1,79 +1,79 @@
 <?php
 
 function theme_content(&$a) {
-	if(!local_user()) { return;}
+	if(!local_channel()) { return;}
 
 	$arr = array();
 
-	$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
-	$arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' );
-	$arr['nav_bg'] = get_pconfig(local_user(),'redbasic', 'nav_bg' );
-	$arr['nav_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_top' );
-	$arr['nav_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_bottom' );
-	$arr['nav_active_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_active_gradient_top' );
-	$arr['nav_active_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_active_gradient_bottom' );
-	$arr['nav_bd'] = get_pconfig(local_user(),'redbasic', 'nav_bd' );
-	$arr['nav_icon_colour'] = get_pconfig(local_user(),'redbasic', 'nav_icon_colour' );
-	$arr['nav_active_icon_colour'] = get_pconfig(local_user(),'redbasic', 'nav_active_icon_colour' );
-	$arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' );
-	$arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' );
-	$arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
-	$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
-	$arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' );
-	$arr['comment_item_colour'] = get_pconfig(local_user(),'redbasic', 'comment_item_colour' );
-	$arr['comment_border_colour'] = get_pconfig(local_user(),'redbasic', 'comment_border_colour' );
-	$arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' );
-	$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
-	$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
-	$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
-	$arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
-	$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
-	$arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' );
-	$arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
-	$arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width");
-	$arr['converse_center']=get_pconfig(local_user(),"redbasic","converse_center");
-	$arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity");
-	$arr['top_photo']=get_pconfig(local_user(),"redbasic","top_photo");
-	$arr['reply_photo']=get_pconfig(local_user(),"redbasic","reply_photo");
-	$arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos");
+	$arr['schema'] = get_pconfig(local_channel(),'redbasic', 'schema' );
+	$arr['narrow_navbar'] = get_pconfig(local_channel(),'redbasic', 'narrow_navbar' );
+	$arr['nav_bg'] = get_pconfig(local_channel(),'redbasic', 'nav_bg' );
+	$arr['nav_gradient_top'] = get_pconfig(local_channel(),'redbasic', 'nav_gradient_top' );
+	$arr['nav_gradient_bottom'] = get_pconfig(local_channel(),'redbasic', 'nav_gradient_bottom' );
+	$arr['nav_active_gradient_top'] = get_pconfig(local_channel(),'redbasic', 'nav_active_gradient_top' );
+	$arr['nav_active_gradient_bottom'] = get_pconfig(local_channel(),'redbasic', 'nav_active_gradient_bottom' );
+	$arr['nav_bd'] = get_pconfig(local_channel(),'redbasic', 'nav_bd' );
+	$arr['nav_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_icon_colour' );
+	$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_active_icon_colour' );
+	$arr['link_colour'] = get_pconfig(local_channel(),'redbasic', 'link_colour' );
+	$arr['banner_colour'] = get_pconfig(local_channel(),'redbasic', 'banner_colour' );
+	$arr['bgcolour'] = get_pconfig(local_channel(),'redbasic', 'background_colour' );
+	$arr['background_image'] = get_pconfig(local_channel(),'redbasic', 'background_image' );
+	$arr['item_colour'] = get_pconfig(local_channel(),'redbasic', 'item_colour' );
+	$arr['comment_item_colour'] = get_pconfig(local_channel(),'redbasic', 'comment_item_colour' );
+	$arr['comment_border_colour'] = get_pconfig(local_channel(),'redbasic', 'comment_border_colour' );
+	$arr['comment_indent'] = get_pconfig(local_channel(),'redbasic', 'comment_indent' );
+	$arr['toolicon_colour'] = get_pconfig(local_channel(),'redbasic','toolicon_colour');
+	$arr['toolicon_activecolour'] = get_pconfig(local_channel(),'redbasic','toolicon_activecolour');
+	$arr['font_size'] = get_pconfig(local_channel(),'redbasic', 'font_size' );
+	$arr['body_font_size'] = get_pconfig(local_channel(),'redbasic', 'body_font_size' );
+	$arr['font_colour'] = get_pconfig(local_channel(),'redbasic', 'font_colour' );
+	$arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' );
+	$arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' );
+	$arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width");
+	$arr['converse_center']=get_pconfig(local_channel(),"redbasic","converse_center");
+	$arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity");
+	$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
+	$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
+	$arr['sloppy_photos']=get_pconfig(local_channel(),"redbasic","sloppy_photos");
 	return redbasic_form($a, $arr);
 }
 
 function theme_post(&$a) {
-	if(!local_user()) { return;}
+	if(!local_channel()) { return;}
 
 	if (isset($_POST['redbasic-settings-submit'])) {
-		set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
-		set_pconfig(local_user(), 'redbasic', 'narrow_navbar', $_POST['redbasic_narrow_navbar']);
-		set_pconfig(local_user(), 'redbasic', 'nav_bg', $_POST['redbasic_nav_bg']);
-		set_pconfig(local_user(), 'redbasic', 'nav_gradient_top', $_POST['redbasic_nav_gradient_top']);
-		set_pconfig(local_user(), 'redbasic', 'nav_gradient_bottom', $_POST['redbasic_nav_gradient_bottom']);
-		set_pconfig(local_user(), 'redbasic', 'nav_active_gradient_top', $_POST['redbasic_nav_active_gradient_top']);
-		set_pconfig(local_user(), 'redbasic', 'nav_active_gradient_bottom', $_POST['redbasic_nav_active_gradient_bottom']);
-		set_pconfig(local_user(), 'redbasic', 'nav_bd', $_POST['redbasic_nav_bd']);
-		set_pconfig(local_user(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']);
-		set_pconfig(local_user(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']);
-		set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
-		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
-		set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']);
-		set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
-		set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']);
-		set_pconfig(local_user(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']);
-		set_pconfig(local_user(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']);
-		set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
-		set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
-		set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
-		set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
-		set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
-		set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
-		set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
-		set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
-		set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
-		set_pconfig(local_user(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']);
-		set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
-		set_pconfig(local_user(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
-		set_pconfig(local_user(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
-		set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
+		set_pconfig(local_channel(), 'redbasic', 'schema', $_POST['redbasic_schema']);
+		set_pconfig(local_channel(), 'redbasic', 'narrow_navbar', $_POST['redbasic_narrow_navbar']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_bg', $_POST['redbasic_nav_bg']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_gradient_top', $_POST['redbasic_nav_gradient_top']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_gradient_bottom', $_POST['redbasic_nav_gradient_bottom']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_active_gradient_top', $_POST['redbasic_nav_active_gradient_top']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_active_gradient_bottom', $_POST['redbasic_nav_active_gradient_bottom']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_bd', $_POST['redbasic_nav_bd']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
+		set_pconfig(local_channel(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
+		set_pconfig(local_channel(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
+		set_pconfig(local_channel(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
+		set_pconfig(local_channel(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
+		set_pconfig(local_channel(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
+		set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']);
+		set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
+		set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
+		set_pconfig(local_channel(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']);
+		set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
+		set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
+		set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
+		set_pconfig(local_channel(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
 	}
 }
 
@@ -91,7 +91,7 @@ function redbasic_form(&$a, $arr) {
 		}
 	}
 
-if(feature_enabled(local_user(),'expert')) 
+if(feature_enabled(local_channel(),'expert')) 
 				$expert = 1;
 					
 	  $t = get_markup_template('theme_settings.tpl');
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index 403323085..c75815d07 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -1,7 +1,9 @@
 <div class="section-title-wrapper">
 	{{if $actionspanel}}
 	<div class="pull-right">
+		{{if $is_owner}}
 		<a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i>&nbsp;{{$shared}}</a>
+		{{/if}}
 		<button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;{{$create}}</button>
 		<button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
 	</div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 8a32bd7f6..ebb52dea9 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -23,7 +23,7 @@
 <script>
 
 	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
 	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
 	var justifiedGalleryActive = false;
 	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}