harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that Red members never see the accursed "and nobody was found..." when you've put in an explicit address of a channel you know for certain exists.

Browse Source
This commit is contained in:
friendica 2013-01-20 20:14:13 -08:00
parent 59eed70246
commit c9f10f41f4
3 changed files with 128 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mod/chanview.php
View File

@ -1,9 +1,11 @@
<?php <?php
require_once('include/Contact.php'); require_once('include/Contact.php');
require_once('include/zot.php');
function chanview_content(&$a) { function chanview_content(&$a) {
$observer = $a->get_observer();
$xchan = null; $xchan = null;
$r = null; $r = null;
@ -30,26 +32,58 @@ function chanview_content(&$a) {
$r = q("select * from xchan where xchan_url = '%s' limit 1", $r = q("select * from xchan where xchan_url = '%s' limit 1",
dbesc($_REQUEST['url']) dbesc($_REQUEST['url'])
); );
if(! $r)
$r = array(array('xchan_url' => $_REQUEST['url']));
} }
if($r) { if($r) {
$xchan = $r[0]; $xchan = $r[0];
if($xchan['xchan_hash'])
$a->set_widget('vcard',vcard_from_xchan($xchan));
} }
else {
notice( t('No valid channel provided.') . EOL);
// Here, let's see if we have an xchan. If we don't, how we proceed is determined by what
// info we do have. If it's a URL, we can offer to visit it directly. If it's a webbie or
// address, we can and should try to import it. If it's just a hash, we can't continue, but we
// probably wouldn't have a hash if we don't already have an xchan for this channel.
if(! $xchan) {
logger('mod_chanview: fallback');
// This is hackish - construct a zot address from the url
if($_REQUEST['url']) {
if(preg_match('/https?\:\/\/(.*?)(\/channel\/|\/profile\/)(.*?)$/ism',$_REQUEST['url'],$matches)) {
$_REQUEST['address'] = $matches[3] . '@' . $matches[1];
}
logger('mod_chanview: constructed address ' . print_r($matches,true));
}
if($_REQUEST['address']) {
$ret = zot_finger($_REQUEST['address'],null);
if($ret['success']) {
$j = json_decode($ret['body'],true);
if($j)
import_xchan($j);
$r = q("select * from xchan where xchan_addr = '%s' limit 1",
dbesc($_REQUEST['address'])
);
if($r)
$xchan = $r[0];
}
}
}
if(! $xchan) {
notice( t('Channel not found.') . EOL);
return; return;
} }
$observer = $a->get_observer(); if($xchan['xchan_hash'])
$a->set_widget('vcard',vcard_from_xchan($xchan));
$url = (($observer) $url = (($observer)
? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] ? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr']
: $xchan['xchan_url'] : $xchan['xchan_url']
); );
$o = replace_macros(get_markup_template('chanview.tpl'),array( $o = replace_macros(get_markup_template('chanview.tpl'),array(
'$url' => $url '$url' => $url

159
mod/directory.php
View File

@ -57,7 +57,6 @@ function directory_content(&$a) {
if($search) if($search)
$query .= '&name=' . urlencode($search); $query .= '&name=' . urlencode($search);
}
if($a->pager['page'] != 1) if($a->pager['page'] != 1)
$query .= '&p=' . $a->pager['page']; $query .= '&p=' . $a->pager['page'];
@ -67,111 +66,113 @@ function directory_content(&$a) {
if($x['success']) { if($x['success']) {
$t = 0; $t = 0;
$j = json_decode($x['body'],true); $j = json_decode($x['body'],true);
if($j && $j['results']) { if($j) {
$entries = array(); if($j['results']) {
$photo = 'thumb'; $entries = array();
foreach($j['results'] as $rr) { $photo = 'thumb';
foreach($j['results'] as $rr) {
$profile_link = chanlink_url($rr['url']);
$profile_link = chanlink_url($rr['url']);
$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : ''); $pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
$details = ''; $details = '';
if(strlen($rr['locale']))
$details .= $rr['locale'];
if(strlen($rr['region'])) {
if(strlen($rr['locale'])) if(strlen($rr['locale']))
$details .= ', '; $details .= $rr['locale'];
$details .= $rr['region']; if(strlen($rr['region'])) {
} if(strlen($rr['locale']))
if(strlen($rr['country'])) { $details .= ', ';
if(strlen($details)) $details .= $rr['region'];
$details .= ', '; }
$details .= $rr['country']; if(strlen($rr['country'])) {
} if(strlen($details))
if(strlen($rr['birthday'])) { $details .= ', ';
if(($years = age($rr['birthday'],'UTC','')) != 0) $details .= $rr['country'];
$details .= '<br />' . t('Age: ') . $years ; }
} if(strlen($rr['birthday'])) {
if(strlen($rr['gender'])) if(($years = age($rr['birthday'],'UTC','')) != 0)
$details .= '<br />' . t('Gender: ') . $rr['gender']; $details .= '<br />' . t('Age: ') . $years ;
}
if(strlen($rr['gender']))
$details .= '<br />' . t('Gender: ') . $rr['gender'];
$page_type = ''; $page_type = '';
$profile = $rr; $profile = $rr;
if ((x($profile,'locale') == 1) if ((x($profile,'locale') == 1)
|| (x($profile,'region') == 1) || (x($profile,'region') == 1)
|| (x($profile,'postcode') == 1) || (x($profile,'postcode') == 1)
|| (x($profile,'country') == 1)) || (x($profile,'country') == 1))
$location = t('Location:'); $location = t('Location:');
$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
$marital = ((x($profile,'marital') == 1) ? t('Status:') : False); $marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
$about = ((x($profile,'about') == 1) ? t('About:') : False); $about = ((x($profile,'about') == 1) ? t('About:') : False);
$entry = array( $entry = array(
'id' => ++$t, 'id' => ++$t,
'profile_link' => $profile_link, 'profile_link' => $profile_link,
'photo' => $rr['photo'], 'photo' => $rr['photo'],
'alttext' => $rr['name'] . ' ' . $rr['address'], 'alttext' => $rr['name'] . ' ' . $rr['address'],
'name' => $rr['name'], 'name' => $rr['name'],
'details' => $pdesc . $details, 'details' => $pdesc . $details,
'profile' => $profile, 'profile' => $profile,
'location' => $location, 'location' => $location,
'gender' => $gender, 'gender' => $gender,
'pdesc' => $pdesc, 'pdesc' => $pdesc,
'marital' => $marital, 'marital' => $marital,
'homepage' => $homepage, 'homepage' => $homepage,
'about' => $about, 'about' => $about,
); );
$arr = array('contact' => $rr, 'entry' => $entry); $arr = array('contact' => $rr, 'entry' => $entry);
call_hooks('directory_item', $arr); call_hooks('directory_item', $arr);
$entries[] = $entry; $entries[] = $entry;
unset($profile); unset($profile);
unset($location); unset($location);
}
logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
$o .= replace_macros($tpl, array(
'$search' => $search,
'$desc' => t('Find'),
'$finddsc' => t('Finding:'),
'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
'$entries' => $entries,
'$dirlbl' => t('Directory'),
'$submit' => t('Find')
));
$o .= alt_pager($a,$j['records'], t('more'), t('back'));
}
else {
if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) {
goaway(z_root() . '/chanview/?f=&address=' . $search);
}
info( t("No entries (some entries may be hidden).") . EOL);
} }
logger('entries: ' . print_r($entries,true));
$o .= replace_macros($tpl, array(
'$search' => $search,
'$desc' => t('Find'),
'$finddsc' => t('Finding:'),
'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
'$entries' => $entries,
'$dirlbl' => t('Directory'),
'$submit' => t('Find')
));
$o .= alt_pager($a,$j['records'], t('more'), t('back'));
} }
else
info( t("No entries (some entries may be hidden).") . EOL);
} }
}
return $o; return $o;
} }

8
mod/dirsearch.php
View File

@ -78,9 +78,11 @@ function dirsearch_content(&$a) {
$qlimit = " LIMIT $limit "; $qlimit = " LIMIT $limit ";
else { else {
$qlimit = " LIMIT " . intval($startrec) . " , " . intval($perpage); $qlimit = " LIMIT " . intval($startrec) . " , " . intval($perpage);
$r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where 1 $sql_extra"); if($return_total) {
if($r) { $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where 1 $sql_extra");
$ret['total_items'] = $r[0]['total']; if($r) {
$ret['total_items'] = $r[0]['total'];
}
} }
} }