From 96683eaf1f92188bc09a58ab086eeb95310deebd Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 12 May 2020 11:33:35 -0500
Subject: [PATCH] CKEditor: Set vimeo_embed in toolbars

---
 .../Editor/CkEditor/Toolbar/Announcements.php       |  2 +-
 .../CkEditor/Toolbar/AssessmentsIntroduction.php    |  2 +-
 .../Component/Editor/CkEditor/Toolbar/Basic.php     | 13 ++++++++++---
 .../Component/Editor/CkEditor/Toolbar/Careers.php   |  3 ++-
 .../Component/Editor/CkEditor/Toolbar/Documents.php |  3 +++
 .../Editor/CkEditor/Toolbar/DocumentsStudent.php    |  2 ++
 .../Component/Editor/CkEditor/Toolbar/FAQ.php       |  1 +
 .../Component/Editor/CkEditor/Toolbar/Forum.php     |  4 ++--
 .../Editor/CkEditor/Toolbar/IntroductionSection.php |  9 +++------
 .../CkEditor/Toolbar/LearningPathDocuments.php      |  4 +++-
 .../Component/Editor/CkEditor/Toolbar/Messages.php  |  3 ++-
 .../Editor/CkEditor/Toolbar/NotebookStudent.php     |  3 ++-
 .../Editor/CkEditor/Toolbar/PortalNews.php          |  3 ++-
 .../Component/Editor/CkEditor/Toolbar/Profile.php   |  3 ++-
 .../Component/Editor/CkEditor/Toolbar/Project.php   |  3 ++-
 .../Editor/CkEditor/Toolbar/ProjectComment.php      |  3 ++-
 .../Component/Editor/CkEditor/Toolbar/Survey.php    |  1 +
 .../Editor/CkEditor/Toolbar/SurveyQuestion.php      |  3 ++-
 .../Editor/CkEditor/Toolbar/TestAnswerFeedback.php  |  2 +-
 .../Editor/CkEditor/Toolbar/TestFreeAnswer.php      |  2 +-
 .../Editor/CkEditor/Toolbar/TestMatching.php        |  2 +-
 .../CkEditor/Toolbar/TestQuestionDescription.php    |  3 ++-
 .../Component/Editor/CkEditor/Toolbar/Wiki.php      |  2 +-
 .../Component/Editor/CkEditor/Toolbar/WikiTask.php  |  3 ++-
 .../Component/Editor/CkEditor/Toolbar/Work.php      |  5 +++--
 25 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Announcements.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Announcements.php
index 232aa91c707..9fc2dd85978 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Announcements.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Announcements.php
@@ -36,7 +36,7 @@ protected function getNormalToolbar()
         return [
             ['Save', 'Maximize', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor', 'inserthtml'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'SpecialChar'],
             [
                 'NumberedList',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/AssessmentsIntroduction.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/AssessmentsIntroduction.php
index e6ec5b0fca6..5a4aae95486 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/AssessmentsIntroduction.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/AssessmentsIntroduction.php
@@ -36,7 +36,7 @@ protected function getNormalToolbar()
         return [
             ['Save', 'Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'SpecialChar'],
             ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'TextColor', 'BGColor'],
             '/',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
index 0ae2d32bfba..c1776818495 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
@@ -64,7 +64,6 @@ class Basic extends Toolbar
         'inserthtml',
         'xml',
         'qmarkersrolls',
-        'ckeditor_vimeo_embed',
     ];
 
     /**
@@ -82,6 +81,9 @@ public function __construct(
         $config = [],
         $prefix = null
     ) {
+        $isAllowedToEdit = api_is_allowed_to_edit();
+        $isPlatformAdmin = api_is_platform_admin();
+
         // Adding plugins depending of platform conditions
         $plugins = [];
 
@@ -92,7 +94,7 @@ public function __construct(
         if (api_get_setting('youtube_for_students') == 'true') {
             $plugins[] = 'youtube';
         } else {
-            if (api_is_allowed_to_edit() || api_is_platform_admin()) {
+            if ($isAllowedToEdit || $isPlatformAdmin) {
                 $plugins[] = 'youtube';
             }
         }
@@ -140,6 +142,10 @@ public function __construct(
             $plugins[] = 'scayt';
         }
 
+        if (api_get_configuration_sub_value('ckeditor_vimeo_embed/config') && ($isAllowedToEdit || $isPlatformAdmin)) {
+            $plugins[] = 'ckeditor_vimeo_embed';
+        }
+
         $this->defaultPlugins = array_unique(array_merge($this->defaultPlugins, $plugins));
 
         parent::__construct($toolbar, $config, $prefix);
@@ -241,7 +247,7 @@ protected function getMinimizedToolbar()
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
+            ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'VimeoEmbed', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             ['Styles', 'Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
@@ -269,6 +275,7 @@ protected function getMaximizedToolbar()
                 'Oembed',
                 'Flash',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'leaflet',
                 'Smiley',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Careers.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Careers.php
index 6f6bf02d7cf..1a5fa2bfc81 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Careers.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Careers.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -91,7 +92,7 @@ protected function getMinimizedToolbar()
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Flash', 'Youtube', 'Audio', 'Table'],
+            ['Link', 'Image', 'Video', 'Flash', 'Youtube', 'VimeoEmbed', 'Audio', 'Table'],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php
index d000277bd32..ca83011fd2e 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php
@@ -64,6 +64,7 @@ protected function getNormalToolbar()
                 'Flash',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'Asciimath',
                 'Asciisvg',
@@ -108,6 +109,7 @@ protected function getMaximizedToolbar()
                 'Oembed',
                 'Flash',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'leaflet',
                 'Smiley',
@@ -156,6 +158,7 @@ protected function getMinimizedToolbar()
                 'Video',
                 'Flash',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'Table',
                 'Asciimath',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/DocumentsStudent.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/DocumentsStudent.php
index 192441640cd..bafee11ded4 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/DocumentsStudent.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/DocumentsStudent.php
@@ -48,6 +48,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -104,6 +105,7 @@ protected function getNormalToolbar()
                 'Flash',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'Asciimath',
             ],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/FAQ.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/FAQ.php
index b5b8911a5ae..8d809b8e302 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/FAQ.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/FAQ.php
@@ -46,6 +46,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Forum.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Forum.php
index f0b9b075b3b..37ab999f67e 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Forum.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Forum.php
@@ -36,7 +36,7 @@ protected function getNormalToolbar()
         return [
             ['Save', 'Maximize', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'SpecialChar'],
             [
                 'NumberedList',
@@ -71,7 +71,7 @@ protected function getMinimizedToolbar()
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
+            ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'VimeoEmbed', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/IntroductionSection.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/IntroductionSection.php
index b4769f5b9b9..18c9f4c7144 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/IntroductionSection.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/IntroductionSection.php
@@ -55,8 +55,6 @@ public function getConditionalPlugins()
      */
     protected function getNormalToolbar()
     {
-        $config = api_get_configuration_sub_value('ckeditor_vimeo_embed/config');
-
         return [
             ['Maximize', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor', 'inserthtml', 'Glossary'],
@@ -66,10 +64,10 @@ protected function getNormalToolbar()
                 'Flash',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'Asciimath',
                 'Asciisvg',
-                empty($config) ? null : 'VimeoEmbed',
             ],
             ['Table', 'SpecialChar'],
             [
@@ -101,8 +99,6 @@ protected function getNormalToolbar()
      */
     protected function getMinimizedToolbar()
     {
-        $config = api_get_configuration_sub_value('ckeditor_vimeo_embed/config');
-
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
@@ -112,7 +108,7 @@ protected function getMinimizedToolbar()
                 'Video',
                 'Flash',
                 'Youtube',
-                empty($config) ? null : 'VimeoEmbed',
+                'VimeoEmbed',
                 'Audio',
                 'Table',
                 'Asciimath',
@@ -157,6 +153,7 @@ protected function getMaximizedToolbar()
                 'Oembed',
                 'Flash',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'leaflet',
                 'Smiley',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/LearningPathDocuments.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/LearningPathDocuments.php
index 8a868d6745f..8f4cd6bda60 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/LearningPathDocuments.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/LearningPathDocuments.php
@@ -47,6 +47,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -83,6 +84,7 @@ protected function getNormalToolbar()
                 'Flash',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'Asciimath',
                 'Asciisvg',
@@ -117,7 +119,7 @@ protected function getMinimizedToolbar()
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Youtube', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
+            ['Link', 'Image', 'Video', 'Youtube', 'VimeoEmbed', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             ['Toolbarswitch'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Messages.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Messages.php
index 31efc403c61..83b4ea3568a 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Messages.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Messages.php
@@ -48,6 +48,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -78,7 +79,7 @@ protected function getNormalToolbar()
     {
         return [
             ['Link', 'Unlink'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'Smiley'],
             ['TextColor', 'BGColor'],
             ['Source'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/NotebookStudent.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/NotebookStudent.php
index 6d34f24bed5..88620810dec 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/NotebookStudent.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/NotebookStudent.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -75,7 +76,7 @@ protected function getNormalToolbar()
         return [
             ['Save', 'Maximize', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'SpecialChar'],
             ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'TextColor', 'BGColor'],
             '/',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/PortalNews.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/PortalNews.php
index b6ab8aaff37..3d0ea736184 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/PortalNews.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/PortalNews.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -76,7 +77,7 @@ protected function getNormalToolbar()
         return [
             ['Save', 'Maximize', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'SpecialChar'],
             ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'TextColor', 'BGColor', '-', 'Source'],
             '/',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Profile.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Profile.php
index 7270d56b2e8..2cb7470dae2 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Profile.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Profile.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -73,7 +74,7 @@ protected function getNormalToolbar()
         return [
             ['Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'Smiley'],
             '/',
             ['Font', 'FontSize'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php
index ae167557621..ece2cf25efb 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -74,7 +75,7 @@ protected function getNormalToolbar()
         return [
             ['Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'leaflet'],
             ['Font', 'FontSize'],
             ['Bold', 'Italic', 'Underline'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php
index ddd216ab15f..8d25c135953 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -74,7 +75,7 @@ protected function getNormalToolbar()
         return [
             ['Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'leaflet'],
             ['Bold', 'Italic', 'Underline'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Survey.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Survey.php
index ae37b0d377c..b81c9c8ed87 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Survey.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Survey.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/SurveyQuestion.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/SurveyQuestion.php
index 227eaa562f7..dee294447e0 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/SurveyQuestion.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/SurveyQuestion.php
@@ -46,6 +46,7 @@ protected function getMaximizedToolbar()
                 'Oembed',
                 'Flash',
                 'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'leaflet',
                 'Smiley',
@@ -88,7 +89,7 @@ protected function getMinimizedToolbar()
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
+            ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'VimeoEmbed', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             [
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestAnswerFeedback.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestAnswerFeedback.php
index 77a3e115d37..06e0ed7ec69 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestAnswerFeedback.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestAnswerFeedback.php
@@ -67,7 +67,7 @@ protected function getMaximizedToolbar()
             ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord'],
             ['Undo', 'Redo', '-', 'SelectAll', 'Find', '-', 'RemoveFormat'],
             ['Link', 'Unlink', 'Anchor', 'Glossary'],
-            ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar'],
+            ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'VimeoEmbed', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar'],
             '/',
             ['Table', '-', 'CreateDiv'],
             ['BulletedList', 'NumberedList', 'HorizontalRule', '-', 'Outdent', 'Indent', 'Blockquote'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php
index 7011742cbff..29778f74ed0 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php
@@ -56,7 +56,7 @@ protected function getMaximizedToolbar()
             ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord'],
             ['Undo', 'Redo', '-', 'SelectAll', 'Find', '-', 'RemoveFormat'],
             ['Link', 'Unlink', 'Anchor', 'Glossary'],
-            ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar'],
+            ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'VimeoEmbed', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar'],
             ['Asciimath', 'Asciisvg'],
             '/',
             ['Table', '-', 'CreateDiv'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
index c847bb6afca..cd1d6fb91d8 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
@@ -54,7 +54,7 @@ protected function getMaximizedToolbar()
             ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord'],
             ['Undo', 'Redo', '-', 'SelectAll', 'Find', '-', 'RemoveFormat'],
             ['Link', 'Unlink', 'Anchor', 'Glossary'],
-            ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar'],
+            ['Image', 'Mapping', 'Video', 'Oembed', 'Youtube', 'VimeoEmbed', 'Flash', 'Audio', 'leaflet', 'Smiley', 'SpecialChar'],
             ['Asciimath', 'Asciisvg'],
             '/',
             ['Table', '-', 'CreateDiv'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
index 8fb345566d8..19fbb8798c5 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
@@ -77,6 +77,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Flash',
                 'Youtube',
+                'VimeoEmbed',
                 'Oembed',
                 'Audio',
                 'leaflet',
@@ -119,7 +120,7 @@ protected function getNormalToolbar()
         return [
             ['Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'SpecialChar'],
             [
                 'NumberedList',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Wiki.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Wiki.php
index 9c715e7cd3c..1d7edfc62c9 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Wiki.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Wiki.php
@@ -58,7 +58,7 @@ protected function getNormalToolbar()
                 'Find',
             ],
             ['Wikilink', 'Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio', 'Asciimath'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio', 'Asciimath'],
             ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'leaflet'],
             ['Format', 'Font', 'FontSize'],
             ['Bold', 'Italic', 'Underline'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiTask.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiTask.php
index 6db2afb2b8d..4b3ace5c136 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiTask.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiTask.php
@@ -45,6 +45,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -74,7 +75,7 @@ protected function getNormalToolbar()
         return [
             ['Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table'],
             ['Bold', 'Italic', 'Underline'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Work.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Work.php
index 9a7fc2935d4..c7d59ec6bcf 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Work.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Work.php
@@ -48,6 +48,7 @@ protected function getMaximizedToolbar()
                 'Video',
                 'Oembed',
                 'Youtube',
+                'VimeoEmbed',
                 'Flash',
                 'Audio',
                 'leaflet',
@@ -77,7 +78,7 @@ protected function getNormalToolbar()
         return [
             ['Maxmize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
             ['Link', 'Unlink', 'Anchor'],
-            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'VimeoEmbed', 'Audio'],
             ['Table', 'Smiley'],
             '/',
             ['Font', 'FontSize'],
@@ -97,7 +98,7 @@ protected function getMinimizedToolbar()
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath'],
+            ['Link', 'Image', 'Video', 'Flash', 'Youtube', 'VimeoEmbed', 'Audio', 'Table', 'Asciimath'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor', 'BGColor'],
             ['Toolbarswitch'],