aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-02 22:47:11 -0700
committerzotlabs <mike@macgirvin.com>2018-04-02 22:47:11 -0700
commitcf6d51bee84bfd147e36084b79c5bdc2093d0081 (patch)
tree274870b69aa7c32f727d8f8a7550fe7359095535 /Zotlabs
parentd68ce0f3456437a452b37782df3322eb36c8ee3f (diff)
downloadvolse-hubzilla-cf6d51bee84bfd147e36084b79c5bdc2093d0081.tar.gz
volse-hubzilla-cf6d51bee84bfd147e36084b79c5bdc2093d0081.tar.bz2
volse-hubzilla-cf6d51bee84bfd147e36084b79c5bdc2093d0081.zip
some more work on hubzilla issue #1019
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Settings/Channel.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 139e5f966..a7dfdd790 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -412,12 +412,16 @@ class Channel {
));
$subdir = ((strlen(\App::get_path())) ? '<br />' . t('or') . ' ' . z_root() . '/channel/' . $nickname : '');
+
+ $webbie = $nickname . '@' . \App::get_hostname();
+ $intl_nickname = unpunify($nickname) . '@' . unpunify(\App::get_hostname());
+
$tpl_addr = get_markup_template("settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array(
'$desc' => t('Your channel address is'),
- '$nickname' => $nickname,
+ '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . '&nbsp;(' . $webbie . ')'),
'$subdir' => $subdir,
'$davdesc' => t('Your files/photos are accessible via WebDAV at'),
'$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''),