diff --git a/app/widgets/Chat/_chat_header.tpl b/app/widgets/Chat/_chat_header.tpl index 3a55ebc46..14418ce51 100644 --- 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"} + onclick="VisioLink.openVisio('{$value->jid|echapJS}');"> phone + onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);"> videocam {break} diff --git a/app/widgets/ContactActions/_contactactions_drawer.tpl b/app/widgets/ContactActions/_contactactions_drawer.tpl index 68b816eb5..c52552ee7 100644 --- 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()"} + onclick="VisioLink.openVisio('{$value->jid|echapJS}');"> phone + onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);"> videocam {break} diff --git a/app/widgets/ContactData/_contactdata.tpl b/app/widgets/ContactData/_contactdata.tpl index 648b7345e..a5866ed56 100644 --- 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()"} -
  • +
  • phone @@ -101,7 +101,7 @@

    {$c->__('button.audio_call')}

  • -
  • +
  • videocam diff --git a/app/widgets/Search/_search_roster.tpl b/app/widgets/Search/_search_roster.tpl index fde9ea01f..d1baea5b5 100644 --- 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()"} + onclick="VisioLink.openVisio('{$value->jid|echapJS}');"> phone + onclick="VisioLink.openVisio('{$value->jid|echapJS}', '', true);"> videocam {break} diff --git a/app/widgets/Visio/Visio.php b/app/widgets/Visio/Visio.php index d4bd4254d..77edcc2fb 100644 --- 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) diff --git a/app/widgets/Visio/_visio_dialog.tpl b/app/widgets/Visio/_visio_dialog.tpl index ee0a92314..b2b02e4b9 100644 --- a/app/widgets/Visio/_visio_dialog.tpl +++ b/app/widgets/Visio/_visio_dialog.tpl @@ -22,10 +22,10 @@
    - -