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

directory services cleanup

Browse Source
This commit is contained in:
friendica
2013-01-19 01:07:35 -08:00
parent 9725dcf41d
commit d8d8dd5ced
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/acl.php
+3 -14
View File
@@ -5,7 +5,7 @@ require_once("include/acl_selectors.php");
function acl_init(&$a){
logger('mod_acl: ' . print_r($_REQUEST,true));
// logger('mod_acl: ' . print_r($_REQUEST,true));
$start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
$count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
@@ -26,8 +26,6 @@ function acl_init(&$a){
if($type != 'x')
killme();
logger('continue');
if ($search != "") {
$sql_extra = " AND `name` LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
$sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . ") ";
@@ -170,16 +168,7 @@ function acl_init(&$a){
}
echo json_encode($x);
killme();
// $r = q("SELECT xchan_name 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())
// );
}
else
$r = array();
@@ -196,7 +185,7 @@ function acl_init(&$a){
foreach($r as $g) {
$x['photos'][] = $g['micro'];
$x['links'][] = $g['url'];
$x['suggestions'][] = (($type === 'x') ? '@' : '') . $g['name'];
$x['suggestions'][] = $g['name'];
$x['data'][] = $g['id'];
}
}
@@ -235,7 +224,7 @@ function acl_init(&$a){
function navbar_complete(&$a) {
logger('navbar_complete');
// logger('navbar_complete');
$dirmode = intval(get_config('system','directory_mode'));
$search = ((x($_REQUEST,'query')) ? htmlentities($_REQUEST['query'],ENT_COMPAT,'UTF-8',false) : '');