diff options
| author | zotlabs <mike@macgirvin.com> | 2018-04-03 19:57:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-04-03 19:57:35 -0700 |
| commit | 245142cc07bd989adfb03bb7680e3db948e7564f (patch) | |
| tree | 7aa74358ee307f7e4535232e0f0ffe8e68dc87cf /Zotlabs/Module | |
| parent | 3bd3686acf2a2878a6275ff9eb303e6ed136d4c9 (diff) | |
| parent | 5ac0f371c748367b16fedde27edc9771b08bf4c6 (diff) | |
| download | volse-hubzilla-245142cc07bd989adfb03bb7680e3db948e7564f.tar.gz volse-hubzilla-245142cc07bd989adfb03bb7680e3db948e7564f.tar.bz2 volse-hubzilla-245142cc07bd989adfb03bb7680e3db948e7564f.zip | |
Merge branch 'master' into oauth2
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Chatsvc.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php index 0f79e3b4c..b4657e84d 100644 --- a/Zotlabs/Module/Chatsvc.php +++ b/Zotlabs/Module/Chatsvc.php @@ -60,7 +60,7 @@ class Chatsvc extends \Zotlabs\Web\Controller { intval(\App::$data['chat']['room_id']), dbesc(get_observer_hash()), dbesc(datetime_convert()), - dbesc($arr['chat_text']) + dbesc(str_rot47(base64url_encode($arr['chat_text']))) ); $ret['success'] = true; @@ -157,7 +157,7 @@ class Chatsvc extends \Zotlabs\Web\Controller { 'name' => $rr['xchan_name'], 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'), - 'text' => zidify_links(smilies(bbcode($rr['chat_text']))), + 'text' => zidify_links(smilies(bbcode(base64url_decode(str_rot47($rr['chat_text']))))), 'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '') ); } 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 : ''), |