From 20bb16859f4ae23d268ef656029917c7277c59f7 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Sat, 17 Oct 2015 00:19:01 +0200 Subject: [PATCH 1/3] dirfind.php: move html to templates --- mod/dirfind.php | 35 +++++++++++---------- view/templates/match.tpl | 67 +++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index 95f9bf53a..39c13dcb7 100644 --- 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 .= '
'; $o .= paginate($a); return $o; } diff --git a/view/templates/match.tpl b/view/templates/match.tpl index 3ebabf185..db612e3dc 100644 --- a/view/templates/match.tpl +++ b/view/templates/match.tpl @@ -1,33 +1,38 @@ +{{include file="section_title.tpl"}} -
-
- - {{$name}} - - {{if $photo_menu}} - menu -
-
    - {{foreach $photo_menu as $k=>$c}} - {{if $c.2}} -
  • {{$c.0}}
    • - {{else}} -
  • {{$c.0}}
    • - {{/if}} - {{/foreach}} -
-
- {{/if}} -
-
-
- {{$name}} -
-
- {{if $connlnk}} -
{{$conntxt}}
- {{/if}} +{{foreach $entries as $entry}} +
+
+ + {{$entry.name}} + + {{if $entry.photo_menu}} + menu +
+
    + {{foreach $entry.photo_menu as $k=>$c}} + {{if $c.2}} +
  • {{$c.0}}
    • + {{else}} +
  • {{$c.0}}
    • + {{/if}} + {{/foreach}} +
+
+ {{/if}} +
+
+
+ {{$entry.name}} +
+
+ {{if $entry.connlnk}} +
{{$entry.conntxt}}
+ {{/if}} -
+
+{{/foreach}} + +
From 67f699403a6df541c1eb9dc26008232858e8084a Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Sat, 17 Oct 2015 00:39:50 +0200 Subject: [PATCH 2/3] match.php: restructure acdording to the change of match.tpl --- mod/match.php | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/mod/match.php b/mod/match.php index f31b0f67a..30d057a0d 100644 --- a/mod/match.php +++ b/mod/match.php @@ -4,6 +4,15 @@ require_once('include/socgraph.php'); require_once('include/contact_widgets.php'); require_once('mod/proxy.php'); +/** + * @brief Controller for /match. + * + * It takes keywords from your profile and queries the directory server for + * matching keywords from other profiles. + * + * @param App &$a + * @return void|string + */ function match_content(&$a) { $o = ''; @@ -15,10 +24,6 @@ function match_content(&$a) { $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Profile Match') - )); - $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval(local_user()) ); @@ -27,7 +32,6 @@ function match_content(&$a) { if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { notice( t('No keywords to match. Please add keywords to your default profile.') . EOL); return; - } $params = array(); @@ -52,9 +56,6 @@ function match_content(&$a) { if(count($j->results)) { - - - $tpl = get_markup_template('match.tpl'); foreach($j->results as $jj) { $match_nurl = normalise_link($jj->url); $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1", @@ -63,24 +64,33 @@ function match_content(&$a) { if (!count($match)) { $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; - $o .= replace_macros($tpl,array( - '$url' => zrl($jj->url), - '$name' => $jj->name, - '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - '$inttxt' => ' ' . t('is interested in:'), - '$conntxt' => t('Connect'), - '$connlnk' => $connlnk, - '$tags' => $jj->tags - )); + $entry = array( + 'url' => zrl($jj->url), + 'name' => $jj->name, + 'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'inttxt' => ' ' . t('is interested in:'), + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'tags' => $jj->tags + ); + $entries[] = $entry; } } - } else { + + $tpl = get_markup_template('match.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => t('Profile Match'), + 'entries' => $entries, + )); + + } + else { info( t('No matches') . EOL); } } - $o .= cleardiv(); $o .= paginate($a); return $o; } From 4b8ca578d1245c760a1c04bea6daf5b8582d0cbd Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 17 Oct 2015 22:09:19 +0200 Subject: [PATCH 3/3] dirfind: move pagination into template --- mod/dirfind.php | 2 +- mod/match.php | 2 +- view/templates/match.tpl | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index 39c13dcb7..9e02a47e2 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -156,6 +156,7 @@ function dirfind_content(&$a, $prefix = "") { $o .= replace_macros($tpl,array( 'title' => sprintf( t('People Search - %s'), $search), '$entries' => $entries, + '$paginate' => paginate($a), )); } @@ -165,6 +166,5 @@ function dirfind_content(&$a, $prefix = "") { } - $o .= paginate($a); return $o; } diff --git a/mod/match.php b/mod/match.php index 30d057a0d..380f6e74a 100644 --- a/mod/match.php +++ b/mod/match.php @@ -82,6 +82,7 @@ function match_content(&$a) { $o .= replace_macros($tpl,array( '$title' => t('Profile Match'), 'entries' => $entries, + '$paginate' => paginate($a), )); } @@ -91,6 +92,5 @@ function match_content(&$a) { } - $o .= paginate($a); return $o; } diff --git a/view/templates/match.tpl b/view/templates/match.tpl index db612e3dc..d269a253b 100644 --- a/view/templates/match.tpl +++ b/view/templates/match.tpl @@ -36,3 +36,5 @@ {{/foreach}}
+ +{{$paginate}}