Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help

4 files changed, 30 insertions, 22 deletions

diff --git a/mod/acl.php b/mod/acl.php
index aaf056b60..146cb74c8 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -2,6 +2,7 @@
 
 /* ACL selector json backend */
 require_once("include/acl_selectors.php");
+require_once("include/group.php");
 
 function acl_init(&$a){
 
@@ -47,31 +48,29 @@ function acl_init(&$a){
 	$contacts = array();
 	
 	if ($type=='' || $type=='g'){
-		
-		$r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name`, 
-				%s as uids
+
+		$r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name`
 				FROM `groups`,`group_member` 
 				WHERE `groups`.`deleted` = 0 AND `groups`.`uid` = %d 
-					AND `group_member`.`gid`=`groups`.`id`
-					$sql_extra
+				AND `group_member`.`gid`=`groups`.`id`
+				$sql_extra
 				GROUP BY `groups`.`id`
 				ORDER BY `groups`.`name` 
 				LIMIT %d OFFSET %d",
-			db_concat('group_member.xchan', ','),
 			intval(local_channel()),
 			intval($count),
 			intval($start)
 		);
 
 		foreach($r as $g){
-//		logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);		
+//		logger('acl: group: ' . $g['name'] . ' members: ' . group_get_members_xchan($g['id']));
 			$groups[] = array(
 				"type"  => "g",
 				"photo" => "images/twopeople.png",
 				"name"  => $g['name'],
 				"id"	=> $g['id'],
 				"xid"   => $g['hash'],
-				"uids"  => explode(",",$g['uids']),
+				"uids"  => group_get_members_xchan($g['id']),
 				"link"  => ''
 			);
 		}
@@ -94,7 +93,7 @@ function acl_init(&$a){
 
 			$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self 
 				FROM abook left join xchan on abook_xchan = xchan_hash 
-				WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+				WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
 				intval(local_channel())
 			);
 
@@ -118,7 +117,7 @@ function acl_init(&$a){
 
 				$r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self 
 					FROM abook left join xchan on abook_xchan = xchan_hash 
-					WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
+					WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
 				if($r2)
 					$r = array_merge($r,$r2);
 
diff --git a/mod/manage.php b/mod/manage.php
index 671003efd..cb845befe 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -134,9 +134,7 @@ function manage_content(&$a) {
  		}
 	}
 
-	$links = array(
-		array( 'new_channel', t('Create a new channel'), t('Create a new channel'))
-	);
+	$create = array( 'new_channel', t('Create a new channel'), t('Create New'));
 
 	$delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where 
 		abook_channel = %d and (abook_their_perms & %d) > 0",
@@ -156,8 +154,6 @@ function manage_content(&$a) {
 		$delegates = null;
 	}
 
-
-
 	$o = replace_macros(get_markup_template('channels.tpl'), array(
 		'$header'           => t('Channel Manager'),
 		'$msg_selected'     => t('Current Channel'),
@@ -165,17 +161,17 @@ function manage_content(&$a) {
 		'$desc'             => t('Switch to one of your channels by selecting it.'),
 		'$msg_default'      => t('Default Channel'),
 		'$msg_make_default' => t('Make Default'),
-		'$links'            => $links,
+		'$create'           => $create,
 		'$all_channels'     => $channels,
 		'$mail_format'      => t('%d new messages'),
 		'$intros_format'    => t('%d new introductions'),
 		'$channel_usage_message' => $channel_usage_message,
-		'$delegate_header'  => t('Delegated Channels'),
+		'$delegated_desc'   => t('Delegated Channel'),
 		'$delegates'        => $delegates,
+		'$locs'             => t('Manage locations')
 
 	));
 
-
 	return $o;
 
 }
diff --git a/mod/oep.php b/mod/oep.php
index 42535c069..36741a752 100644
--- a/mod/oep.php
+++ b/mod/oep.php
@@ -106,7 +106,7 @@ function oep_display_reply($args) {
 	$w = (($maxwidth) ? $maxwidth : 640);
 	$h = (($maxheight) ? $maxheight : $w * 2 / 3);
 
-	$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . ';" >' . $o . '</div>';
+	$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
 	
 	$ret['width'] = $w;
 	$ret['height'] = $h;
@@ -165,7 +165,7 @@ function oep_mid_reply($args) {
 	$w = (($maxwidth) ? $maxwidth : 640);
 	$h = (($maxheight) ? $maxheight : $w * 2 / 3);
 
-	$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . ';" >' . $o . '</div>';
+	$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
 	
 	$ret['width'] = $w;
 	$ret['height'] = $h;
diff --git a/mod/xrd.php b/mod/xrd.php
index da4ab51a4..ed8e1eabe 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -7,8 +7,12 @@ function xrd_init(&$a) {
 	$uri = urldecode(notags(trim($_GET['uri'])));
 	logger('xrd: ' . $uri,LOGGER_DEBUG);
 
-	if(substr($uri,0,4) === 'http')
+	$resource = $uri;
+
+	if(substr($uri,0,4) === 'http') {
+		$uri = str_replace('~','',$uri);
 		$name = basename($uri);
+	}
 	else {
 		$local = str_replace('acct:', '', $uri);
 		if(substr($local,0,2) == '//')
@@ -35,9 +39,18 @@ function xrd_init(&$a) {
 	header("Content-type: application/xrd+xml");
 
 
+	$aliases = array('acct:' . $r[0]['channel_address'] . '@' . $a->get_hostname(), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']);
+
+	for($x = 0; $x < count($aliases); $x ++) {
+		if($aliases[$x] === $resource)
+			unset($aliases[$x]);
+	}
+
+
 	$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
 		'$nick'        => $r[0]['channel_address'],
-		'$accturi'     => $uri,
+		'$accturi'     => $resource,
+		'$aliases'     => $aliases,
 		'$profile_url' => $a->get_baseurl() . '/channel/'       . $r[0]['channel_address'],
 		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['channel_address'],
 		'$atom'        => $a->get_baseurl() . '/feed/'          . $r[0]['channel_address'],