Fix formatting and PHP notice in mod/photos

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index 177ce268822f96e29827fd0fceb79b2566bcef22..a652bc8ed87b92d86a646a3043b932b1f79ea65a 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,5 +1,9 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 function msearch_post(App $a) {
 
        $perpage = (($_POST['n']) ? $_POST['n'] : 80);
@@ -7,14 +11,14 @@ function msearch_post(App $a) {
        $startrec = (($page+1) * $perpage) - $perpage;
 
        $search = $_POST['s'];
-       if (! strlen($search))
+       if(! strlen($search))
                killme();
 
        $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
                dbesc($search)
        );
 
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                $total = $r[0]['total'];
 
        $results = array();
@@ -25,12 +29,12 @@ function msearch_post(App $a) {
                intval($perpage)
        );
 
-       if (dbm::is_result($r)) {
-               foreach ($r as $rr)
+       if (DBM::is_result($r)) {
+               foreach($r as $rr)
                        $results[] = array(
                                'name' => $rr['name'],
-                               'url' => App::get_baseurl() . '/profile/' . $rr['nickname'],
-                               'photo' => App::get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
+                               'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
+                               'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
                                'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
                        );
        }