diff options
| author | friendica <info@friendica.com> | 2012-12-04 18:24:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-12-04 18:24:46 -0800 |
| commit | e17ba14696d6ee7532bacce6b5519594e001f13f (patch) | |
| tree | 490c90c8ec7cebc3fec94a7ad4c1eab4e9bacab3 /mod/acl.php | |
| parent | 707397580c1c4547c0e308f90df61bc68e91b219 (diff) | |
| download | volse-hubzilla-e17ba14696d6ee7532bacce6b5519594e001f13f.tar.gz volse-hubzilla-e17ba14696d6ee7532bacce6b5519594e001f13f.tar.bz2 volse-hubzilla-e17ba14696d6ee7532bacce6b5519594e001f13f.zip | |
DB: do the mail table again. Mail almost working onsite, still needs to zot though
Diffstat (limited to 'mod/acl.php')
| -rw-r--r-- | mod/acl.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mod/acl.php b/mod/acl.php index 0db8af45e..248ba23d0 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -127,15 +127,11 @@ function acl_init(&$a){ ); } elseif($type == 'm') { - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` 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 - ORDER BY `name` ASC ", - intval(local_user()), - dbesc(NETWORK_DFRN), - dbesc(NETWORK_ZOT), - dbesc(NETWORK_DIASPORA) + $r = q("SELECT xchan_hash as id, xchan_name as name, xchan_photo_s as micro, xchan_url as url from xchan + where 1 + $sql_extra3 + ORDER BY `xchan_name` ASC ", + intval(local_user()) ); } elseif($type == 'a') { @@ -170,7 +166,7 @@ function acl_init(&$a){ $x['photos'][] = $g['micro']; $x['links'][] = $g['url']; $x['suggestions'][] = (($type === 'x') ? '@' : '') . $g['name']; - $x['data'][] = intval($g['id']); + $x['data'][] = $g['id']; } } echo json_encode($x); |