progress on the acl selector - it should mostly work, but the returned data isn't yet parsed correctly in mod_item

2 files changed, 8 insertions, 6 deletions

diff --git a/js/acl.js b/js/acl.js
index e383224ca..3eb6a65a4 100644
--- a/js/acl.js
+++ b/js/acl.js
@@ -105,7 +105,7 @@ ACL.prototype.on_button_hide = function(event){
 
 ACL.prototype.set_allow = function(itemid){
 	type = itemid[0];
-	id 	 = parseInt(itemid.substr(1));
+	id 	 = itemid.substr(1);
 	switch(type){
 		case "g":
 			if (that.allow_gid.indexOf(id)<0){
@@ -129,7 +129,7 @@ ACL.prototype.set_allow = function(itemid){
 
 ACL.prototype.set_deny = function(itemid){
 	type = itemid[0];
-	id 	 = parseInt(itemid.substr(1));
+	id 	 = itemid.substr(1);
 	switch(type){
 		case "g":
 			if (that.deny_gid.indexOf(id)<0){
@@ -178,7 +178,7 @@ ACL.prototype.update_view = function(){
 	$("#acl-list-content .acl-list-item").each(function(){
 		itemid = $(this).attr('id');
 		type = itemid[0];
-		id 	 = parseInt(itemid.substr(1));
+		id 	 = itemid.substr(1);
 		
 		btshow = $(this).children(".acl-button-show").removeClass("selected");
 		bthide = $(this).children(".acl-button-hide").removeClass("selected");	
@@ -248,7 +248,7 @@ ACL.prototype.populate = function(data){
 	that.list_content.height(height);
 	$(data.items).each(function(){
 		html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
-		html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
+		html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link );
 		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
 		//console.log(html);
 		that.list_content.append(html);
diff --git a/mod/acl.php b/mod/acl.php
index 338996829..76be01ee6 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -114,7 +114,8 @@ function acl_init(&$a){
 				"type"  => "g",
 				"photo" => "images/twopeople.png",
 				"name"  => $g['name'],
-				"id"	=> $g['hash'],
+				"id"	=> $g['id'],
+				"xid"   => $g['hash'],
 				"uids"  => explode(",",$g['uids']),
 				"link"  => ''
 			);
@@ -122,7 +123,7 @@ function acl_init(&$a){
 	}
 	
 	if ($type=='' || $type=='c') {
-		$r = q("SELECT xchan_hash as id, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick 
+		$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 
 				FROM abook left join xchan on abook_xchan = xchan_hash 
 				WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" ,
 			intval(local_user()),
@@ -186,6 +187,7 @@ function acl_init(&$a){
 				"photo"   => $g['micro'],
 				"name"    => $g['name'],
 				"id"	  => $g['id'],
+				"xid"     => $g['hash'],
 				"link"    => $g['url'],
 				"nick"    => $g['nick'],
 			);