harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Acl.php

Browse Source
This commit is contained in:
Max Kostikov
2018-09-28 00:14:21 +02:00
parent 978e45911f
commit 25e8d70786
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zotlabs/Module/Acl.php
View File

@@ -81,7 +81,7 @@ class Acl extends \Zotlabs\Web\Controller {
if($search) { if($search) {
$sql_extra = " AND groups.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " "; $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
$sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") "; $sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") ";
// This horrible mess is needed because position also returns 0 if nothing is found. // This horrible mess is needed because position also returns 0 if nothing is found.
@@ -128,13 +128,13 @@ class Acl extends \Zotlabs\Web\Controller {
// Normal privacy groups // Normal privacy groups
$r = q("SELECT groups.id, groups.hash, groups.gname $r = q("SELECT pgrp.id, pgrp.hash, pgrp.gname
FROM groups, group_member FROM pgrp, pgrp_member
WHERE groups.deleted = 0 AND groups.uid = %d WHERE pgrp.deleted = 0 AND pgrp.uid = %d
AND group_member.gid = groups.id AND pgrp_member.gid = pgrp.id
$sql_extra $sql_extra
GROUP BY groups.id GROUP BY pgrp.id
ORDER BY groups.gname ORDER BY pgrp.gname
LIMIT %d OFFSET %d", LIMIT %d OFFSET %d",
intval(local_channel()), intval(local_channel()),
intval($count), intval($count),