provide group options serverside and minor cleanup

3 files changed, 30 insertions, 124 deletions

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 148c67a6c..b10417b04 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -13,7 +13,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
-	$r = q("SELECT * FROM `groups` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `gname` ASC",
+	$r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
 		intval(local_channel())
 	);
 
@@ -44,112 +44,6 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 	return $o;
 }
 
-/* MicMee 20130114 function contact_selector no longer in use, sql table contact does no longer exist
-function contact_selector($selname, $selclass, $preselected = false, $options) {
-
-
-	$mutual = false;
-	$networks = null;
-	$single = false;
-	$exclude = false;
-	$size = 4;
-
-	if(is_array($options)) {
-		if(x($options,'size'))
-			$size = $options['size'];
-
-		if(x($options,'mutual_friends'))
-			$mutual = true;
-		if(x($options,'single'))
-			$single = true;
-		if(x($options,'multiple'))
-			$single = false;
-		if(x($options,'exclude'))
-			$exclude = $options['exclude'];
-
-		if(x($options,'networks')) {
-			switch($options['networks']) {
-				case 'DFRN_ONLY':
-					$networks = array('dfrn');
-					break;
-				case 'PRIVATE':
-					$networks = array('dfrn','face','mail', 'dspr');
-					break;
-				case 'TWO_WAY':
-					$networks = array('dfrn','face','mail','dspr','stat');
-					break;					
-				default:
-					break;
-			}
-		}
-	}
-		
-	$x = array('options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks);
-
-	call_hooks('contact_select_options', $x);
-
-	$o = '';
-
-	$sql_extra = '';
-
-	if($x['mutual']) {
-		$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
-	}
-
-	if(intval($x['exclude']))
-		$sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude']));
-
-	if(is_array($x['networks']) && count($x['networks'])) {
-		for($y = 0; $y < count($x['networks']) ; $y ++)
-			$x['networks'][$y] = "'" . dbesc($x['networks'][$y]) . "'";
-		$str_nets = implode(',',$x['networks']);
-		$sql_extra .= " AND `network` IN ( $str_nets ) ";
-	}
-	
-	$tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : "");
-
-	if($x['single'])
-		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" $tabindex >\r\n";
-	else 
-		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
-
-	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
-		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
-		$sql_extra
-		ORDER BY `name` ASC ",
-		intval(local_channel())
-	);
-
-
-	$arr = array('contact' => $r, 'entry' => $o);
-
-	// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
-
-	call_hooks(App::$module . '_pre_' . $selname, $arr);
-
-	if(count($r)) {
-		foreach($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
-				$selected = " selected=\"selected\" ";
-			else
-				$selected = '';
-
-			$trimmed = mb_substr($rr['name'],0,20);
-
-			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
-		}
-	
-	}
-
-	$o .= "</select>\r\n";
-
-	call_hooks(App::$module . '_post_' . $selname, $o);
-
-	return $o;
-}*/
-
-
-
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
 
 
@@ -260,10 +154,21 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
 		call_hooks('jot_networks', $jotnets);
 	}
 
+	$r = q("SELECT id, hash, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
+		intval(local_channel())
+	);
+
+	if($r) {
+		foreach($r as $rr) {
+			$groups .= '<option id="' . $rr['id'] . '" value="' . $rr['hash'] . '">' . $rr['gname'] . '</option>' . "\r\n";
+		}
+	}
+
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
 		'$showall'         => $showall_caption,
 		'$onlyme'          => t('Only me'),
+		'$groups'	   => $groups,
 		'$showallOrigin'   => $showall_origin,
 		'$showallIcon'     => $showall_icon,
 		'$select_label'    => t('Who can see this?'),
diff --git a/view/js/acl.js b/view/js/acl.js
index 9e3acf8e1..086d85750 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -13,6 +13,7 @@ function ACL(backend_url) {
 	that.deny_gid  = [];
 
 	that.group_uids = [];
+	that.group_ids = [];
 	that.selected_id = '';
 
 	that.info         = $("#acl-info");
@@ -131,7 +132,7 @@ ACL.prototype.on_onlyme = function(event) {
 	that.deny_gid  = [];
 
 
-	that.update_view(event.target.value);
+	that.update_view();
 	that.on_submit();
 
 	return true; // return true so that state changes from update_view() will be applied
@@ -146,28 +147,27 @@ ACL.prototype.on_showall = function(event) {
 	that.deny_cid  = [];
 	that.deny_gid  = [];
 
-	that.update_view(event.target.value);
+	that.update_view();
 	that.on_submit();
 
 	return true; // return true so that state changes from update_view() will be applied
 };
 
 ACL.prototype.on_showgroup = function(event) {
-       var xid = that.acl_select.children(":selected").val();
-	that.selected_id = that.acl_select.children(":selected").attr('id');
+	var xid = that.acl_select.children(":selected").val();
 
-       // preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
-       event.stopPropagation();
+	// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
+	event.stopPropagation();
 
-       that.allow_cid = [];
-       that.allow_gid = [xid];
-       that.deny_cid  = [];
-       that.deny_gid  = [];
+	that.allow_cid = [];
+	that.allow_gid = [xid];
+	that.deny_cid  = [];
+	that.deny_gid  = [];
 
-       that.update_view(that.selected_id);
-       that.on_submit();
+	that.update_view();
+	that.on_submit();
 
-       return true; // return true so that state changes from update_view() will be applied
+	return true; // return true so that state changes from update_view() will be applied
 };
 
 
@@ -180,7 +180,7 @@ ACL.prototype.on_showlimited = function(event) {
 	that.deny_cid  = [];
 	that.deny_gid  = [];
 
-	that.update_view(event.target.value);
+	that.update_view('limited');
 	that.on_submit();
 
 	return true; // return true so that state changes from update_view() will be applied
@@ -316,7 +316,7 @@ ACL.prototype.update_view = function(value) {
 	else if (that.allow_gid.length === 1 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') {
 		that.list.hide(); //hide acl-list
 		that.info.hide(); //show acl-info
-		that.selected_id = that.allow_gid[0].substring(0,40);
+		that.selected_id = that.group_ids[that.allow_gid[0]];
 		that.update_select(that.selected_id);
 
 		/* jot acl */
@@ -427,17 +427,17 @@ ACL.prototype.populate = function(data) {
 		html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
 		if (this.uids !== undefined) {
 			that.group_uids[this.xid] = this.uids;
-			that.onlyme.before($('<option></option>').attr('id', this.xid.substring(0,40)).attr('value', this.xid).text(this.name));
+			that.group_ids[this.xid] = this.id;
 		}
 		if (this.self === 'abook-self') {
 			that.self[0] = this.xid;
 		}
 		that.list_content.append(html);
 	});
+
 	$("#acl-list-content .acl-list-item img[data-src]").each(function(i, el) {
 		// Replace data-src attribute with src attribute for every image
 		$(el).attr('src', $(el).data("src"));
 		$(el).removeAttr("data-src");
 	});
-	//that.update_view();
 };
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index ddeb25a39..dbddc24a9 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -16,6 +16,7 @@
 				<label for="acl-select">{{$select_label}}</label>
 				<select id="acl-select" name="optionsRadios" class="form-control form-group">
 					<option id="acl-showall" value="public" selected>{{$showall}}</option>
+					{{$groups}}
 					<option id="acl-onlyme" value="onlyme">{{$onlyme}}</option>
 					<option id="acl-showlimited" value="limited">{{$showlimited}}</option>
 				</select>