Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index f6f50f65c06b282d1a64e2f09cc8b53cbe79dd9c..fc5750f2dd9f10c13eed84b5325197bbdd442db7 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -5,9 +5,9 @@ require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 require_once('mod/contacts.php');
 
-function dirfind_init(&$a) {
+function dirfind_init(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL );
                return;
        }
@@ -33,6 +33,7 @@ function dirfind_content(&$a, $prefix = "") {
 
        if(strpos($search,'@') === 0) {
                $search = substr($search,1);
+               $header = sprintf( t('People Search - %s'), $search);
                if ((valid_email($search) AND validate_email($search)) OR
                        (substr(normalise_link($search), 0, 7) == "http://")) {
                        $user_data = probe_url($search);
@@ -43,6 +44,7 @@ function dirfind_content(&$a, $prefix = "") {
        if(strpos($search,'!') === 0) {
                $search = substr($search,1);
                $community = true;
+               $header = sprintf( t('Forum Search - %s'), $search);
        }
 
        $o = '';
@@ -154,7 +156,7 @@ function dirfind_content(&$a, $prefix = "") {
                        }
 
                        // Add found profiles from the global directory to the local directory
-                       proc_run('php','include/discover_poco.php', "dirsearch", urlencode($search));
+                       proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search));
                } else {
 
                        $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
@@ -195,7 +197,7 @@ function dirfind_content(&$a, $prefix = "") {
                                        } else
                                                $photo_menu = array();
                                } else {
-                                       $connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
+                                       $connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
                                        $conntxt = t('Connect');
                                        $photo_menu = array(
                                                'profile' => array(t("View Profile"), zrl($jj->url)),
@@ -218,7 +220,7 @@ function dirfind_content(&$a, $prefix = "") {
                                        'details'       => $contact_details['location'],
                                        'tags'          => $contact_details['keywords'],
                                        'about'         => $contact_details['about'],
-                                       'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
+                                       'account_type'  => account_type($contact_details),
                                        'network' => network_to_name($jj->network, $jj->url),
                                        'id' => ++$id,
                                );
@@ -228,7 +230,7 @@ function dirfind_content(&$a, $prefix = "") {
                $tpl = get_markup_template('viewcontact_template.tpl');
 
                $o .= replace_macros($tpl,array(
-                       'title' => sprintf( t('People Search - %s'), $search),
+                       'title' => $header,
                        '$contacts' => $entries,
                        '$paginate' => paginate($a),
                ));