aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-07 18:09:31 -0700
committerzotlabs <mike@macgirvin.com>2017-09-07 18:09:31 -0700
commit4d794103be4112a6f1f0d8f54e0d54c0961297b5 (patch)
treeb403e734b4f6ac9870e0ee48642bc732e013117d
parent61f339a874784d3181f4c884bab9994ec9200f50 (diff)
downloadvolse-hubzilla-4d794103be4112a6f1f0d8f54e0d54c0961297b5.tar.gz
volse-hubzilla-4d794103be4112a6f1f0d8f54e0d54c0961297b5.tar.bz2
volse-hubzilla-4d794103be4112a6f1f0d8f54e0d54c0961297b5.zip
testing owa
-rw-r--r--include/channel.php2
-rw-r--r--include/connections.php2
-rw-r--r--include/text.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/include/channel.php b/include/channel.php
index 41feca362..213676f52 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1633,7 +1633,7 @@ function zid_init() {
$query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query);
$dest = '/' . urlencode($query);
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
logger('zid_init: no hubloc found.');
diff --git a/include/connections.php b/include/connections.php
index 8df795190..a9f906649 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -115,7 +115,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
App::$profile_uid = $xchan['channel_id'];
$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']
);
diff --git a/include/text.php b/include/text.php
index a3c2bbc08..51d711021 100644
--- a/include/text.php
+++ b/include/text.php
@@ -987,7 +987,7 @@ function chanlink_cid($d) {
function magiclink_url($observer,$myaddr,$url) {
return (($observer)
- ? z_root() . '/magic?f=&dest=' . $url . '&addr=' . $myaddr
+ ? z_root() . '/magic?f=&owa=1&dest=' . $url . '&addr=' . $myaddr
: $url
);
}
@@ -1389,7 +1389,7 @@ function theme_attachments(&$item) {
if(is_foreigner($item['author_xchan']))
$url = $r['href'];
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>';
$attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title);