Merge pull request #3613 from annando/some-ostatus

[friendica.git] / mod / qsearch.php

diff --git a/mod/qsearch.php b/mod/qsearch.php
index efc095a263f3b722269e4b772e6020ba9cfb8352..ba62fce0d7bddc829c884e117f862ef1bb85dcc1 100644 (file)
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\App;
+
 function qsearch_init(App $a) {
 
        if (! local_user()) {
@@ -10,14 +12,12 @@ function qsearch_init(App $a) {
 
        $search = ((x($_GET,'s')) ? notags(trim(urldecode($_GET['s']))) : '');
 
-       if (! strlen($search)) {
+       if(! strlen($search))
                killme();
-       }
 
 
-       if ($search) {
+       if($search)
                $search = dbesc($search);
-       }
 
        $results = array();
 
@@ -27,9 +27,9 @@ function qsearch_init(App $a) {
        );
 
        if (dbm::is_result($r)) {
-               foreach ($r as $rr) {
+
+               foreach($r as $rr)
                        $results[] = array( 0, (int) $rr['id'], $rr['name'], '', '');
-               }
        }
 
        $sql_extra = ((strlen($search)) ? " AND (`name` REGEXP '$search' OR `nick` REGEXP '$search') " : "");
@@ -42,12 +42,11 @@ function qsearch_init(App $a) {
 
 
        if (dbm::is_result($r)) {
-               foreach ($r as $rr) {
+
+               foreach($r as $rr)
                        $results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']);
-               }
        }
 
        echo json_encode((object) $results);
        killme();
 }
-