Contact names with ">" and "<" are a problem ...

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index b0d578a3c63fe0ff5ba918894c8f859c4c12bd70..0c2505361ee123f322508b6c2c2e036a6c384873 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,6 +1,7 @@
 <?php
 require_once('include/contact_widgets.php');
 require_once('include/socgraph.php');
+require_once('include/Contact.php');
 
 function dirfind_init(&$a) {
 
@@ -113,6 +114,8 @@ function dirfind_content(&$a, $prefix = "") {
 
                if(count($j->results)) {
 
+                       $id = 0;
+
                        $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
 
@@ -120,20 +123,29 @@ function dirfind_content(&$a, $prefix = "") {
                                if ($jj->cid > 0) {
                                        $connlnk = "";
                                        $conntxt = "";
+                                       $contact = q("SELECT * FROM `contact` WHERE `id` = %d",
+                                                       intval($jj->cid));
+                                       if ($contact)
+                                               $photo_menu = contact_photo_menu($contact[0]);
+                                       else
+                                               $photo_menu = array();
                                } else {
                                        $connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
                                        $conntxt = t('Connect');
+                                       $photo_menu = array(array(t("Connect/Follow"), $connlnk));
                                }
 
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
                                $o .= replace_macros($tpl,array(
                                        '$url' => zrl($jj->url),
-                                       '$name' => $jj->name,
-                                       '$photo' => proxy_url($jj->photo),
+                                       '$name' => htmlentities($jj->name),
+                                       '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
                                        '$tags' => $jj->tags,
                                        '$conntxt' => $conntxt,
                                        '$connlnk' => $connlnk,
+                                       '$photo_menu' => $photo_menu,
+                                       '$id' => ++$id,
                                ));
                        }
                }