bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

PortableContact created

Browse source 
Create PortableContact and remove socgraph, update references, and calls
This commit is contained in:
Adam Magness 2017-11-15 10:53:16 -05:00
commit 259f91caa9
26 changed files with 266 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

69
mod/match.php
View file

@ -1,14 +1,15 @@
<?php
/**
* @file mod/match.php
*/
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;
require_once('include/text.php');
require_once('include/socgraph.php');
require_once('include/contact_widgets.php');
require_once('mod/proxy.php');
require_once 'include/text.php';
require_once 'include/contact_widgets.php';
require_once 'mod/proxy.php';
/**
* @brief Controller for /match.
@ -16,11 +17,12 @@ require_once('mod/proxy.php');
* It takes keywords from your profile and queries the directory server for
* matching keywords from other profiles.
*
* @param App $a
* @param App $a App
*
* @return void|string
*/
function match_content(App $a) {
function match_content(App $a)
{
$o = '';
if (! local_user()) {
return;
@ -31,46 +33,50 @@ function match_content(App $a) {
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
$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())
);
if (! DBM::is_result($r)) {
return;
}
if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
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();
$tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
if($tags) {
if ($tags) {
$params['s'] = $tags;
if($a->pager['page'] != 1)
if ($a->pager['page'] != 1) {
$params['p'] = $a->pager['page'];
}
if(strlen(Config::get('system','directory')))
if (strlen(Config::get('system', 'directory'))) {
$x = post_url(get_server().'/msearch', $params);
else
} else {
$x = post_url(System::baseUrl() . '/msearch', $params);
}
$j = json_decode($x);
if($j->total) {
if ($j->total) {
$a->set_pager_total($j->total);
$a->set_pager_itemspage($j->items_page);
}
if(count($j->results)) {
if (count($j->results)) {
$id = 0;
foreach($j->results as $jj) {
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",
$match = q(
"SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
intval(local_user()),
dbesc($match_nurl));
dbesc($match_nurl)
);
if (!count($match)) {
$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
@ -102,19 +108,18 @@ function match_content(App $a) {
}
}
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl,array(
'$title' => t('Profile Match'),
'$contacts' => $entries,
'$paginate' => paginate($a),
));
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros(
$tpl,
array(
'$title' => t('Profile Match'),
'$contacts' => $entries,
'$paginate' => paginate($a))
);
} else {
info(t('No matches') . EOL);
}
else {
info( t('No matches') . EOL);
}
}
return $o;