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/Chatsvc.php | |
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/Chatsvc.php')
-rw-r--r-- | Zotlabs/Module/Chatsvc.php | 4 |
1 files changed, 2 insertions, 2 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' : '') ); } |