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

some more work on hubzilla issue #1019

Browse Source
This commit is contained in:
zotlabs 2018-04-02 22:47:11 -07:00
parent d68ce0f345
commit cf6d51bee8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Settings/Channel.php
View File

@ -412,12 +412,16 @@ class Channel {
)); ));
$subdir = ((strlen(\App::get_path())) ? '<br />' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); $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"); $tpl_addr = get_markup_template("settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array( $prof_addr = replace_macros($tpl_addr,array(
'$desc' => t('Your channel address is'), '$desc' => t('Your channel address is'),
'$nickname' => $nickname, '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . '&nbsp;(' . $webbie . ')'),
'$subdir' => $subdir, '$subdir' => $subdir,
'$davdesc' => t('Your files/photos are accessible via WebDAV at'), '$davdesc' => t('Your files/photos are accessible via WebDAV at'),
'$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''), '$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''),

2
view/tpl/settings_nick_set.tpl
View File

@ -1,5 +1,5 @@
<div id="settings-nick-wrapper" class="section-content-info-wrapper"> <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}} {{if $davpath}}
<br> <br>
<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div> <div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>