call_hooks($a->module . '_pre_' . $selname, $arr);
- if(count($r)) {
- foreach($r as $rr) {
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
if((is_array($preselected)) && in_array($rr['id'], $preselected))
$selected = " selected=\"selected\" ";
else
call_hooks($a->module . '_pre_' . $selname, $arr);
- if(count($r)) {
- foreach($r as $rr) {
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
if((is_array($preselected)) && in_array($rr['id'], $preselected))
$selected = " selected=\"selected\" ";
else
$receiverlist = array();
- if(count($r)) {
- foreach($r as $rr) {
- if((is_array($preselected)) && in_array($rr['id'], $preselected))
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
+ if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
$selected = " selected=\"selected\" ";
- else
+ }
+ else {
$selected = '';
+ }
- if($privmail)
+ if ($privmail) {
$trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
- else
+ }
+ else {
$trimmed = mb_substr($rr['name'],0,20);
+ }
$receiverlist[] = $trimmed;
return $arr;
$str = dbesc(implode(',',$arr));
$r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
- if($r) {
+ if ($r) {
$ret = array();
foreach($r as $rr)
$ret[] = intval($rr['id']);
$r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
intval(local_user())
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$mail_enabled = true;
if(intval($r[0]['pubmail']))
$pubmail_enabled = true;
function acl_lookup(&$a, $out_type = 'json') {
- if(!local_user())
- return "";
+ if (!local_user()) {
+ return '';
+ }
$start = (x($_REQUEST,'start') ? $_REQUEST['start'] : 0);
$count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 100);
$search = (x($_REQUEST,'search') ? $_REQUEST['search'] : "");
$type = (x($_REQUEST,'type') ? $_REQUEST['type'] : "");
- $mode = (x($_REQUEST,'mode') ? $_REQUEST['mode'] : "");
+ $mode = (x($_REQUEST,'smode') ? $_REQUEST['smode'] : "");
$conv_id = (x($_REQUEST,'conversation') ? $_REQUEST['conversation'] : null);
// For use with jquery.textcomplete for private mail completion
if ($type=='' || $type=='g'){
$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
- FROM `group`,`group_member`
- WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d
- AND `group_member`.`gid`=`group`.`id`
+ FROM `group`
+ INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
+ WHERE NOT `group`.`deleted` AND `group`.`uid` = %d
$sql_extra
- GROUP BY `group`.`id`
+ GROUP BY `group`.`name`
ORDER BY `group`.`name`
LIMIT %d,%d",
intval(local_user()),
// autocomplete for global contact search (e.g. navbar search)
$r = navbar_complete($a);
$contacts = array();
- if($r) {
+ if ($r) {
foreach($r as $g) {
$contacts[] = array(
- "photo" => $g['photo'],
+ "photo" => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
"name" => $g['name'],
"nick" => (x($g['addr']) ? $g['addr'] : $g['url']),
"network" => $g['network'],
$r = array();
- if(count($r)) {
+ if (dbm::is_result($r)) {
foreach($r as $g){
$contacts[] = array(
"type" => "c",
dbesc($search),
implode("','", $known_contacts)
);
- if (is_array($r) && count($r)){
+ if (dbm::is_result($r)){
foreach($r as $row) {
// nickname..
$up = parse_url($row['author-link']);
$tot += count($unknow_contacts);
}
+ $results = array(
+ "tot" => $tot,
+ "start" => $start,
+ "count" => $count,
+ "groups" => $groups,
+ "contacts" => $contacts,
+ "items" => $items,
+ "type" => $type,
+ "search" => $search,
+ );
+
+ call_hooks('acl_lookup_end', $results);
+
if($out_type === 'html') {
$o = array(
- 'tot' => $tot,
- 'start' => $start,
- 'count' => $count,
- 'groups' => $groups,
- 'contacts' => $contacts,
+ 'tot' => $results["tot"],
+ 'start' => $results["start"],
+ 'count' => $results["count"],
+ 'groups' => $results["groups"],
+ 'contacts' => $results["contacts"],
);
return $o;
}
$o = array(
- 'tot' => $tot,
- 'start' => $start,
- 'count' => $count,
- 'items' => $items,
+ 'tot' => $results["tot"],
+ 'start' => $results["start"],
+ 'count' => $results["count"],
+ 'items' => $results["items"],
);
echo json_encode($o);
$localsearch = get_config('system','poco_local_search');
$search = $prefix.notags(trim($_REQUEST['search']));
- $mode = $_REQUEST['mode'];
+ $mode = $_REQUEST['smode'];
// don't search if search term has less than 2 characters
if(! $search || mb_strlen($search) < 2)