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

testing owa

Browse Source
This commit is contained in:
zotlabs 2017-09-07 18:09:31 -07:00
parent 61f339a874
commit 4d794103be
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/channel.php
View File

@ -1633,7 +1633,7 @@ function zid_init() {
$query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query); $query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query);
$dest = '/' . urlencode($query); $dest = '/' . urlencode($query);
if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) {
goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&dest=' . z_root() . $dest);
} }
else else
logger('zid_init: no hubloc found.'); logger('zid_init: no hubloc found.');

2
include/connections.php
View File

@ -115,7 +115,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
App::$profile_uid = $xchan['channel_id']; App::$profile_uid = $xchan['channel_id'];
$url = (($observer) $url = (($observer)
? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] ? z_root() . '/magic?f=&owa=1&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr']
: $xchan['xchan_url'] : $xchan['xchan_url']
); );

4
include/text.php
View File

@ -987,7 +987,7 @@ function chanlink_cid($d) {
function magiclink_url($observer,$myaddr,$url) { function magiclink_url($observer,$myaddr,$url) {
return (($observer) return (($observer)
? z_root() . '/magic?f=&dest=' . $url . '&addr=' . $myaddr ? z_root() . '/magic?f=&owa=1&dest=' . $url . '&addr=' . $myaddr
: $url : $url
); );
} }
@ -1389,7 +1389,7 @@ function theme_attachments(&$item) {
if(is_foreigner($item['author_xchan'])) if(is_foreigner($item['author_xchan']))
$url = $r['href']; $url = $r['href'];
else else
$url = z_root() . '/magic?f=&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision']; $url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision'];
//$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink" >' . $icon . '</a>'; //$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink" >' . $icon . '</a>';
$attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title); $attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title);