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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source
This commit is contained in:
redmatrix 2015-05-24 20:21:30 -07:00
commit dfa4984089
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/search.php
View File

@ -203,9 +203,9 @@ function search_content(&$a,$update = 0, $load = false) {
}
if($tag)
$o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>';
$o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
else
$o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>';
$o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
$o .= conversation($a,$items,'search',$update,'client');

2
mod/settings.php
View File

@ -394,7 +394,7 @@ function settings_post(&$a) {
}
$username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
$timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
$timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select'])) : '');
$defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
$openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
$maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);

13
mod/webfinger.php
View File

@ -14,10 +14,15 @@ function webfinger_content(&$a) {
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
if(strpos($addr,'@' !== false))
$res = webfinger($addr);
else
$res = lrdd($addr);
if(strpos($addr,'@') !== false) {
$res = webfinger_rfc7033($addr);
if(! $res)
$res = old_webfinger($addr);
}
else {
if(function_exists('lrdd'))
$res = lrdd($addr);
}
$o .= '<pre>';
$o .= str_replace("\n",'<br />',print_r($res,true));
$o .= '</pre>';

8
mod/wfinger.php
View File

@ -65,7 +65,7 @@ function wfinger_init(&$a) {
$result['aliases'] = array();
$result['properties'] = array('http://webfinger.example/ns/name' => $r[0]['channel_name']);
$result['properties'] = array('http://webfinger.net/ns/name' => $r[0]['channel_name']);
foreach($aliases as $alias)
if($alias != $resource)
@ -75,18 +75,18 @@ function wfinger_init(&$a) {
$result['links'] = array(
array(
'rel' => 'http://webfinger.example/rel/avatar',
'rel' => 'http://webfinger.net/rel/avatar',
'type' => $r[0]['xchan_photo_mimetype'],
'href' => $r[0]['xchan_photo_l']
),
array(
'rel' => 'http://webfinger.example/rel/profile-page',
'rel' => 'http://webfinger.net/rel/profile-page',
'href' => z_root() . '/profile/' . $r[0]['channel_address'],
),
array(
'rel' => 'http://webfinger.example/rel/blog',
'rel' => 'http://webfinger.net/rel/blog',
'href' => z_root() . '/channel/' . $r[0]['channel_address'],
),