dirfind.php: move html to templates

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 95f9bf53a8890052a264ae701d911dca765cee57..39c13dcb73462edb67d1c94ec4e609eb1ee5dc3a 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -38,10 +38,6 @@ function dirfind_content(&$a, $prefix = "") {
 
        $o = '';
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => sprintf( t('People Search - %s'), $search)
-       ));
-
        if($search) {
 
                if ($local) {
@@ -121,7 +117,6 @@ function dirfind_content(&$a, $prefix = "") {
 
                        $id = 0;
 
-                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
 
                                // If We already know this contact then don't show the "connect" button
@@ -143,17 +138,26 @@ function dirfind_content(&$a, $prefix = "") {
 
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-                               $o .= replace_macros($tpl,array(
-                                       '$url' => zrl($jj->url),
-                                       '$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,
-                               ));
+                               $entry = array(
+                                       'url' => zrl($jj->url),
+                                       '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,
+                               );
+                               $entries[] = $entry;
                        }
+
+               $tpl = get_markup_template('match.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       'title' => sprintf( t('People Search - %s'), $search),
+                       '$entries' => $entries,
+               ));
+
                }
                else {
                        info( t('No matches') . EOL);
@@ -161,7 +165,6 @@ function dirfind_content(&$a, $prefix = "") {
 
        }
 
-       $o .= '<div class="clear"></div>';
        $o .= paginate($a);
        return $o;
 }

diff --git a/view/templates/match.tpl b/view/templates/match.tpl
index 3ebabf1854ef3407ecbe24a02ada6a9a8720ca83..db612e3dc54c8422b023615d685b02664ad0594d 100644 (file)
--- a/view/templates/match.tpl
+++ b/view/templates/match.tpl
@@ -1,33 +1,38 @@
+{{include file="section_title.tpl"}}
+
+{{foreach $entries as $entry}}
+       <div class="profile-match-wrapper">
+               <div class="profile-match-photo" id="contact-entry-photo-{{$entry.id}}"
+                       onmouseover="if (typeof t{{$entry.id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$entry.id}}')" 
+                       onmouseout="t{{$entry.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$entry.id}}\'); closeMenu(\'contact-photo-menu-{{$entry.id}}\');',200)" >
+                       <a href="{{$entry.url}}">
+                               <img width="80" height="80" src="{{$entry.photo}}" alt="{{$entry.name}}" title="{{$entry.name}}[{{$entry.tags}}]" />
+                       </a>
+                       {{if $entry.photo_menu}}
+                               <span onclick="openClose('contact-photo-menu-{{$entry.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$entry.id}}">menu</span>
+                               <div class="contact-photo-menu" id="contact-photo-menu-{{$entry.id}}">
+                                       <ul>
+                                               {{foreach $entry.photo_menu as $k=>$c}}
+                                               {{if $c.2}}
+                                               <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
+                                       </ul>
+                               </div>
+                               {{/if}}
+               </div>
+               <div class="profile-match-break"></div>
+               <div class="profile-match-name">
+                       <a href="{{$entry.url}}" title="{{$entry.name}}[{{$entry.tags}}]">{{$entry.name}}</a>
+               </div>
+               <div class="profile-match-end"></div>
+               {{if $entry.connlnk}}
+               <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+               {{/if}}
 
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo" id="contact-entry-photo-{{$id}}"
-                onmouseover="if (typeof t{{$id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$id}}')" 
-                onmouseout="t{{$id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$id}}\'); closeMenu(\'contact-photo-menu-{{$id}}\');',200)" >
-               <a href="{{$url}}">
-                       <img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-               </a>
-               {{if $photo_menu}}
-                        <span onclick="openClose('contact-photo-menu-{{$id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$id}}">menu</span>
-                        <div class="contact-photo-menu" id="contact-photo-menu-{{$id}}">
-                                <ul>
-                                        {{foreach $photo_menu as $k=>$c}}
-                                        {{if $c.2}}
-                                        <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{else}}
-                                        <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{/if}}
-                                        {{/foreach}}
-                                </ul>
-                        </div>
-                        {{/if}}
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
        </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
+{{/foreach}}
 
-</div>
+<div class="clear"></div>