diff options
| author | zotlabs <mike@macgirvin.com> | 2018-04-02 22:47:11 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-04-02 22:47:11 -0700 |
| commit | cf6d51bee84bfd147e36084b79c5bdc2093d0081 (patch) | |
| tree | 274870b69aa7c32f727d8f8a7550fe7359095535 | |
| parent | d68ce0f3456437a452b37782df3322eb36c8ee3f (diff) | |
| download | volse-hubzilla-cf6d51bee84bfd147e36084b79c5bdc2093d0081.tar.gz volse-hubzilla-cf6d51bee84bfd147e36084b79c5bdc2093d0081.tar.bz2 volse-hubzilla-cf6d51bee84bfd147e36084b79c5bdc2093d0081.zip | |
some more work on hubzilla issue #1019
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 6 | ||||
| -rwxr-xr-x | view/tpl/settings_nick_set.tpl | 2 |
2 files changed, 6 insertions, 2 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 . ' (' . $webbie . ')'), '$subdir' => $subdir, '$davdesc' => t('Your files/photos are accessible via WebDAV at'), '$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''), diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index 76fe7cd8d..4dbe58d82 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,5 +1,5 @@ <div id="settings-nick-wrapper" class="section-content-info-wrapper"> -<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div> +<div id="settings-nickname-desc">{{$desc}} <strong>{{$nickname}}</strong></div> {{if $davpath}} <br> <div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div> |