<?php
require_once("include/contact_selectors.php");
+require_once("include/features.php");
/**
*
if($r) {
$ret = array();
foreach($r as $rr)
- $ret[] = $rr['id'];
+ $ret[] = intval($rr['id']);
return $ret;
}
return array();
$o .= '</div>';
$o .= '</div>' . "\r\n";
$o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/
-
+
$tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array(
'$showall'=> t("Visible to everybody"),
'$allowgid' => json_encode($perms['allow_gid']),
'$denycid' => json_encode($perms['deny_cid']),
'$denygid' => json_encode($perms['deny_gid']),
+ '$features' => array(
+ "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false")
+ ),
));
-
-
+
+
return $o;
}
function construct_acl_data(&$a, $user) {
// Get group and contact information for html ACL selector
- $acl_data = acl_lookup(&$a, 'html');
+ $acl_data = acl_lookup($a, 'html');
$user_defaults = get_acl_permissions($user);
} else {
$sql_extra = $sql_extra2 = "";
}
-
+
// count groups and contacts
if ($type=='' || $type=='g'){
- $r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+ $r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
intval(local_user())
);
$group_count = (int)$r[0]['g'];
} else {
$group_count = 0;
}
-
+
if ($type=='' || $type=='c'){
- $r = q("SELECT COUNT(`id`) AS c FROM `contact`
+ $r = q("SELECT COUNT(*) AS c FROM `contact`
WHERE `uid` = %d AND `self` = 0
AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
AND `notify` != '' $sql_extra2" ,
// autocomplete for Private Messages
- $r = q("SELECT COUNT(`id`) AS c FROM `contact`
+ $r = q("SELECT COUNT(*) AS c FROM `contact`
WHERE `uid` = %d AND `self` = 0
AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
AND `network` IN ('%s','%s','%s') $sql_extra2" ,
// autocomplete for Contacts
- $r = q("SELECT COUNT(`id`) AS c FROM `contact`
+ $r = q("SELECT COUNT(*) AS c FROM `contact`
WHERE `uid` = %d AND `self` = 0
AND `pending` = 0 $sql_extra2" ,
intval(local_user())
"name" => $g['name'],
"id" => intval($g['id']),
"uids" => array_map("intval", explode(",",$g['uids'])),
- "link" => ''
+ "link" => '',
+ "forum" => '0'
);
}
}
if ($type=='' || $type=='c'){
- $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
+ $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
$sql_extra2
ORDER BY `name` ASC ",
"network" => $g['network'],
"link" => $g['url'],
"nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
+ "forum" => $g['forum']
);
}
}