From: rabuzarus Date: Fri, 16 Oct 2015 22:39:50 +0000 (+0200) Subject: match.php: restructure acdording to the change of match.tpl X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67f699403a6df541c1eb9dc26008232858e8084a;p=friendica.git match.php: restructure acdording to the change of match.tpl --- diff --git a/mod/match.php b/mod/match.php index f31b0f67a4..30d057a0da 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; }