Echap properly the JIDs in Visio

5 years ago · 67a2e5ee51
6 changed files with 12 additions and 12 deletions
--- a/app/widgets/Chat/_chat_header.tpl
+++ b/app/widgets/Chat/_chat_header.tpl
@ -223,11 +223,11 @@
                {loop="$roster->presences"}
                    {if="$value->capability && $value->capability->isJingle() && $value->jid"}
                        <span title="{$c->__('button.audio_call')}" class="control icon active on_desktop"
-                            onclick="VisioLink.openVisio('{$value->jid}');">
+                            onclick="VisioLink.openVisio('{$value->jid|echapJS}');">
                            <i class="material-icons">phone</i>
                        </span>
                        <span title="{$c->__('button.video_call')}" class="control icon active on_desktop"
-                            onclick="VisioLink.openVisio('{$value->jid}', '', true);">
+                            onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);">
                            <i class="material-icons">videocam</i>
                        </span>
                        {break}
--- a/app/widgets/ContactActions/_contactactions_drawer.tpl
+++ b/app/widgets/ContactActions/_contactactions_drawer.tpl
@ -33,11 +33,11 @@
                        {loop="$roster->presences"}
                            {if="$value->capability && $value->capability->isJingle()"}
                                <span title="{$c->__('button.audio_call')}" class="control icon active"
-                                    onclick="VisioLink.openVisio('{$value->jid}');">
+                                    onclick="VisioLink.openVisio('{$value->jid|echapJS}');">
                                    <i class="material-icons">phone</i>
                                </span>
                                <span title="{$c->__('button.video_call')}" class="control icon active"
-                                    onclick="VisioLink.openVisio('{$value->jid}', '', true);">
+                                    onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);">
                                    <i class="material-icons">videocam</i>
                                </span>
                                {break}
--- a/app/widgets/ContactData/_contactdata.tpl
+++ b/app/widgets/ContactData/_contactdata.tpl
@ -93,7 +93,7 @@
            {if="$roster && $roster->presences->count() > 0"}
                {loop="$roster->presences"}
                    {if="$value->capability && $value->capability->isJingle()"}
-                        <li onclick="VisioLink.openVisio('{$value->jid}');">
+                        <li onclick="VisioLink.openVisio('{$value->jid|echapJS}');">
                            <span class="primary icon green">
                                <i class="material-icons">phone</i>
                            </span>
@ -101,7 +101,7 @@
                                <p class="normal">{$c->__('button.audio_call')}</p>
                            </div>
                        </li>
-                        <li onclick="VisioLink.openVisio('{$value->jid}', '', true);">
+                        <li onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);">
                            <span class="primary icon green">
                                <i class="material-icons">videocam</i>
                            </span>
--- a/app/widgets/Search/_search_roster.tpl
+++ b/app/widgets/Search/_search_roster.tpl
@ -36,11 +36,11 @@
                {loop="$value->presences"}
                    {if="$value->capability && $value->capability->isJingle()"}
                        <span title="{$c->__('button.audio_call')}" class="control icon active gray"
-                            onclick="VisioLink.openVisio('{$value->jid}');">
+                            onclick="VisioLink.openVisio('{$value->jid|echapJS}');">
                            <i class="material-icons">phone</i>
                        </span>
                        <span title="{$c->__('button.video_call')}" class="control icon active gray"
-                            onclick="VisioLink.openVisio('{$value->jid}', '', true);">
+                            onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);">
                            <i class="material-icons">videocam</i>
                        </span>
                        {break}
--- a/app/widgets/Visio/Visio.php
+++ b/app/widgets/Visio/Visio.php
@ -98,7 +98,7 @@ class Visio extends Base
            5,
            null,
            null,
-            'VisioLink.openVisio(\''.$data['from'].'\', \''.$data['id'].'\', '.$withVideoParameter.'); Dialog_ajaxClear()'
+            'VisioLink.openVisio(\''.echapJS($data['from']).'\', \''.$data['id'].'\', '.$withVideoParameter.'); Dialog_ajaxClear()'
        );
    }

@ -114,7 +114,7 @@ class Visio extends Base
    public function onProceed($packet)
    {
        $data = $packet->content;
-        $this->rpc('Visio.onProceed', $data['from'], $data['id']);
+        $this->rpc('Visio.onProceed', echapJS($data['from']), $data['id']);
    }

    public function onAccept($packet)
--- a/app/widgets/Visio/_visio_dialog.tpl
+++ b/app/widgets/Visio/_visio_dialog.tpl
@ -22,10 +22,10 @@
    </ul>
 </section>
 <div class="no_bar">
-    <button onclick="VisioLink_ajaxReject('{$from}', '{$id}'); Dialog_ajaxClear()" class="button flat">
+    <button onclick="VisioLink_ajaxReject('{$from|echapJS}', '{$id}'); Dialog_ajaxClear()" class="button flat">
        {$c->__('button.refuse')}
    </button>
-    <button onclick="VisioLink.openVisio('{$from}', '{$id}', {if="$withvideo"}true{else}false{/if}); Dialog_ajaxClear();" class="button flat green">
+    <button onclick="VisioLink.openVisio('{$from|echapJS}', '{$id}', {if="$withvideo"}true{else}false{/if}); Dialog_ajaxClear();" class="button flat green">
        {$c->__('button.reply')}
    </button>
 </div>