nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

match.php: restructure acdording to the change of match.tpl

Browse source
This commit is contained in:
rabuzarus 2015-10-17 00:39:50 +02:00
parent 20bb16859f
commit 67f699403a
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
mod/match.php
View file

@ -4,6 +4,15 @@ require_once('include/socgraph.php');
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
require_once('mod/proxy.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) { function match_content(&$a) {
$o = ''; $o = '';
@ -15,10 +24,6 @@ function match_content(&$a) {
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; $_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", $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval(local_user()) intval(local_user())
); );
@ -27,7 +32,6 @@ function match_content(&$a) {
if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
notice( t('No keywords to match. Please add keywords to your default profile.') . EOL); notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
return; return;
} }
$params = array(); $params = array();
@ -52,9 +56,6 @@ function match_content(&$a) {
if(count($j->results)) { if(count($j->results)) {
$tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) { foreach($j->results as $jj) {
$match_nurl = normalise_link($jj->url); $match_nurl = normalise_link($jj->url);
$match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1", $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)) { if (!count($match)) {
$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
$o .= replace_macros($tpl,array( $entry = array(
'$url' => zrl($jj->url), 'url' => zrl($jj->url),
'$name' => $jj->name, 'name' => $jj->name,
'$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
'$inttxt' => ' ' . t('is interested in:'), 'inttxt' => ' ' . t('is interested in:'),
'$conntxt' => t('Connect'), 'conntxt' => t('Connect'),
'$connlnk' => $connlnk, 'connlnk' => $connlnk,
'$tags' => $jj->tags '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); info( t('No matches') . EOL);
} }
} }
$o .= cleardiv();
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }