Merge pull request #487 from git-marijus/dev
implement groups in the acl select.
This commit is contained in:
hubzilla
GitHub
commit
752bb169ed
@ -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?'),
|
||||
|
||||
@ -13,6 +13,8 @@ function ACL(backend_url) {
|
||||
that.deny_gid = [];
|
||||
|
||||
that.group_uids = [];
|
||||
that.group_ids = [];
|
||||
that.selected_id = '';
|
||||
|
||||
that.info = $("#acl-info");
|
||||
that.list = $("#acl-list");
|
||||
@ -33,6 +35,10 @@ function ACL(backend_url) {
|
||||
that.acl_select.change(function(event) {
|
||||
var option = that.acl_select.val();
|
||||
|
||||
if(option != 'public' && option != 'onlyme' && option != 'limited') { // selected group
|
||||
that.on_showgroup(event);
|
||||
}
|
||||
|
||||
if(option == 'public') { // public
|
||||
that.on_showall(event);
|
||||
}
|
||||
@ -126,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
|
||||
@ -141,26 +147,40 @@ 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();
|
||||
|
||||
// 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.update_view();
|
||||
that.on_submit();
|
||||
|
||||
return true; // return true so that state changes from update_view() will be applied
|
||||
};
|
||||
|
||||
|
||||
ACL.prototype.on_showlimited = function(event) {
|
||||
// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
|
||||
event.stopPropagation();
|
||||
|
||||
if(that.allow_cid.length === 0 && that.allow_gid.length === 0 && that.deny_cid.length === 0 && that.deny_gid.length === 0) {
|
||||
that.allow_cid = [that.self[0]];
|
||||
}
|
||||
that.allow_cid = [];
|
||||
that.allow_gid = [];
|
||||
that.deny_cid = [];
|
||||
that.deny_gid = [];
|
||||
|
||||
that.allow_cid = (that.allow_cid || []);
|
||||
that.allow_gid = (that.allow_gid || []);
|
||||
that.deny_cid = (that.deny_cid || []);
|
||||
that.deny_gid = (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
|
||||
@ -237,7 +257,7 @@ ACL.prototype.set_allow = function(itemid) {
|
||||
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
|
||||
break;
|
||||
}
|
||||
that.update_view();
|
||||
that.update_view('limited');
|
||||
};
|
||||
|
||||
ACL.prototype.set_deny = function(itemid) {
|
||||
@ -261,16 +281,20 @@ ACL.prototype.set_deny = function(itemid) {
|
||||
if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
|
||||
break;
|
||||
}
|
||||
that.update_view();
|
||||
that.update_view('limited');
|
||||
};
|
||||
|
||||
ACL.prototype.update_select = function(set) {
|
||||
if(set != 'public' && set != 'onlyme' && set != 'limited') {
|
||||
$('#' + set).prop('selected', true );
|
||||
}
|
||||
that.showall.prop('selected', set === 'public');
|
||||
that.onlyme.prop('selected', set === 'onlyme');
|
||||
that.showlimited.prop('selected', set === 'limited');
|
||||
};
|
||||
|
||||
ACL.prototype.update_view = function(value) {
|
||||
|
||||
if(that.form_id) {
|
||||
that.form_id.data('allow_cid', that.allow_cid);
|
||||
that.form_id.data('allow_gid', that.allow_gid);
|
||||
@ -278,7 +302,7 @@ ACL.prototype.update_view = function(value) {
|
||||
that.form_id.data('deny_gid', that.deny_gid);
|
||||
}
|
||||
|
||||
if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0) {
|
||||
if (that.allow_gid.length === 0 && 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.show(); //show acl-info
|
||||
that.update_select('public');
|
||||
@ -289,6 +313,17 @@ 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.group_ids[that.allow_gid[0]];
|
||||
that.update_select(that.selected_id);
|
||||
|
||||
/* jot acl */
|
||||
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
|
||||
$('.profile-jot-net input').attr('disabled', 'disabled');
|
||||
}
|
||||
|
||||
// if value != 'onlyme' we should fall through this one
|
||||
else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') {
|
||||
that.list.hide(); //hide acl-list
|
||||
@ -306,10 +341,16 @@ ACL.prototype.update_view = function(value) {
|
||||
that.update_select('limited');
|
||||
|
||||
/* jot acl */
|
||||
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
|
||||
$('.profile-jot-net input').attr('disabled', 'disabled');
|
||||
|
||||
if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'limited') {
|
||||
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
|
||||
$('.profile-jot-net input').attr('disabled', false);
|
||||
}
|
||||
else {
|
||||
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
|
||||
$('.profile-jot-net input').attr('disabled', 'disabled');
|
||||
}
|
||||
}
|
||||
|
||||
$("#acl-list-content .acl-list-item").each(function() {
|
||||
$(this).removeClass("groupshow grouphide");
|
||||
});
|
||||
@ -384,15 +425,19 @@ ACL.prototype.populate = function(data) {
|
||||
$(data.items).each(function(){
|
||||
html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
|
||||
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;
|
||||
if (this.self === 'abook-self') that.self[0] = this.xid;
|
||||
//console.log(html);
|
||||
if (this.uids !== undefined) {
|
||||
that.group_uids[this.xid] = this.uids;
|
||||
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();
|
||||
};
|
||||
|
||||
@ -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>
|
||||
|
||||
Reference in New Issue
Block a user