From 19dc4bd9d9137c0b7e40517bdfe94b5feef457ed Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 27 Apr 2015 09:57:31 -0500
Subject: [PATCH 01/22] Add question Matching Draggable type - refs 7611

---
 main/exercice/MatchingDraggable.php | 263 ++++++++++++++++++++++++++++
 main/exercice/question.class.php    |   3 +-
 main/inc/lib/api.lib.php            |   1 +
 3 files changed, 266 insertions(+), 1 deletion(-)
 create mode 100644 main/exercice/MatchingDraggable.php

diff --git a/main/exercice/MatchingDraggable.php b/main/exercice/MatchingDraggable.php
new file mode 100644
index 0000000000..a8ed038979
--- /dev/null
+++ b/main/exercice/MatchingDraggable.php
@@ -0,0 +1,263 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+/**
+ * MatchingDraggable
+ *
+ * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
+ */
+class MatchingDraggable extends Question
+{
+
+    public static $typePicture = 'matching.png';
+    static $explanationLangVar = 'MatchingDrag';
+
+    /**
+     * Class constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->type = MATCHING_DRAGGABLE;
+        $this->isContent = $this->getIsContent();
+    }
+
+    /**
+     * Creates the form to create / edit the answers of the question
+     * @param FormValidator $form
+     */
+    public function createAnswersForm($form)
+    {
+        $defaults = $matches = [];
+        $nb_matches = $nb_options = 2;
+
+        $answer = null;
+
+        if ($form->isSubmitted()) {
+            $nb_matches = $form->getSubmitValue('nb_matches');
+            $nb_options = $form->getSubmitValue('nb_options');
+
+            if (isset($_POST['lessMatches'])) {
+                $nb_matches--;
+            }
+
+            if (isset($_POST['moreMatches'])) {
+                $nb_matches++;
+            }
+
+            if (isset($_POST['lessOptions'])) {
+                $nb_options--;
+            }
+
+            if (isset($_POST['moreOptions'])) {
+                $nb_options++;
+            }
+        } else if (!empty($this->id)) {
+            $answer = new Answer($this->id);
+            $answer->read();
+
+            if (count($answer->nbrAnswers) > 0) {
+                $nb_matches = $nb_options = 0;
+
+                for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
+                    if ($answer->isCorrect($i)) {
+                        $nb_matches++;
+                        $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
+                        $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
+                        $defaults['matches[' . $nb_matches . ']'] = $answer->correct[$i];
+                    } else {
+                        $nb_options++;
+                        $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
+                    }
+                }
+            }
+        } else {
+            $defaults['answer[1]'] = get_lang('DefaultMakeCorrespond1');
+            $defaults['answer[2]'] = get_lang('DefaultMakeCorrespond2');
+            $defaults['matches[2]'] = '2';
+            $defaults['option[1]'] = get_lang('DefaultMatchingOptA');
+            $defaults['option[2]'] = get_lang('DefaultMatchingOptB');
+        }
+
+        for ($i = 1; $i <= $nb_options; ++$i) {
+            // fill the array with A, B, C.....
+            $matches[$i] = chr(64 + $i);
+        }
+
+        $form->addElement('hidden', 'nb_matches', $nb_matches);
+        $form->addElement('hidden', 'nb_options', $nb_options);
+
+        // DISPLAY MATCHES
+        $html = '<table class="table table-striped table-hover">
+            <thead>
+                <tr>
+                    <th width="10">' . get_lang('Number') . '</th>
+                    <th width="85%">' . get_lang('Answer') . '</th>
+                    <th width="15%">' . get_lang('MatchesTo') . '</th>
+                    <th width="10">' . get_lang('Weighting') . '</th>
+                </tr>
+            </thead>
+            <tbody>';
+
+        $form->addHeader(get_lang('MakeCorrespond'));
+        $form->addHtml($html);
+
+        if ($nb_matches < 1) {
+            $nb_matches = 1;
+            Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
+        }
+
+        for ($i = 1; $i <= $nb_matches; ++$i) {
+            $renderer = &$form->defaultRenderer();
+
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
+                "answer[$i]"
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
+                "matches[$i]"
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
+                "weighting[$i]"
+            );
+
+            $form->addHtml('<tr>');
+            $form->addHtml("<td>$i</td>");
+            $form->addText("answer[$i]", null);
+            $form->addSelect("matches[$i]", null, $matches);
+            $form->addText("weighting[$i]", null, true, ['value' => 10]);
+            $form->addHtml('</tr>');
+        }
+
+        $form->addHtml('</tbody></table>');
+        $group = array();
+
+        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessMatches');
+        $renderer->setElementTemplate('{element}</div></div>', 'moreMatches');
+
+        $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessMatches', true);
+        $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreMatches', true);
+
+        $form->addGroup($group);
+
+        // DISPLAY OPTIONS
+        $html = '<table class="table table-striped table-hover">
+            <thead>
+                <tr>
+                    <th width="15%">' . get_lang('Number') . '</th>
+                    <th width="85%">' . get_lang('Answer') . '</th>
+                </tr>
+            </thead>
+            <tbody>';
+
+        $form->addHtml($html);
+
+        if ($nb_options < 1) {
+            $nb_options = 1;
+            Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
+        }
+
+        for ($i = 1; $i <= $nb_options; ++$i) {
+            $renderer = &$form->defaultRenderer();
+
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
+                "option[$i]"
+            );
+
+            $form->addHtml('<tr>');
+
+            $form->addHtml('<td>' . chr(64 + $i) . '</td>');
+            $form->addText("option[$i]", null);
+
+            $form->addHtml('</tr>');
+        }
+
+        $form->addHtml('</table>');
+
+        global $text;
+
+        // setting the save button here and not in the question class.php
+        $group = [];
+        $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessOptions', true);
+        $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreOptions', true);
+        $group[] = $form->addButtonSave($text, 'submitQuestion', true);
+
+        $form->addGroup($group);
+
+        if (!empty($this->id)) {
+            $form->setDefaults($defaults);
+        } elseif ($this->isContent == 1) {
+            $form->setDefaults($defaults);
+        }
+
+        $form->setConstants(
+            [
+                'nb_matches' => $nb_matches,
+                'nb_options' => $nb_options
+            ]
+        );
+    }
+
+    /**
+     * 
+     * @param type $form
+     */
+    public function processAnswersCreation($form)
+    {
+        $nb_matches = $form->getSubmitValue('nb_matches');
+        $nb_options = $form->getSubmitValue('nb_options');
+        $this->weighting = 0;
+        $position = 0;
+
+        $objAnswer = new Answer($this->id);
+
+        // Insert the options
+        for ($i = 1; $i <= $nb_options; ++$i) {
+            $position++;
+            $option = $form->getSubmitValue("option[$i]");
+            $objAnswer->createAnswer($option, 0, '', 0, $position);
+        }
+
+        // Insert the answers
+        for ($i = 1; $i <= $nb_matches; ++$i) {
+            $position++;
+
+            $answer = $form->getSubmitValue("answer[$i]");
+            $matches = $form->getSubmitValue("matches[$i]");
+            $weighting = $form->getSubmitValue("weighting[$i]");
+
+            $this->weighting += $weighting;
+
+            $objAnswer->createAnswer($answer, $matches, '', $weighting, $position);
+        }
+
+        $objAnswer->save();
+        $this->save();
+    }
+
+    /**
+     * Shows question title an description
+     * @param string $feedback_type
+     * @param int $counter
+     * @param float $score
+     * @return string The header HTML code
+     */
+    public function return_header($feedback_type = null, $counter = null, $score = null)
+    {
+        $header = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="' . $this->question_table_class . '">
+                <tr>
+                    <th>' . get_lang('ElementList') . '</th>
+                    <th>' . get_lang('CorrespondsTo') . '</th>
+                </tr>
+            </table>';
+
+        return $header;
+    }
+
+}
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index fa55d43668..fdadddfcc4 100755
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -50,7 +50,8 @@ abstract class Question
         GLOBAL_MULTIPLE_ANSWER => array('global_multiple_answer.class.php' , 'GlobalMultipleAnswer'),
         CALCULATED_ANSWER => array('calculated_answer.class.php' , 'CalculatedAnswer'),
         UNIQUE_ANSWER_IMAGE => ['UniqueAnswerImage.php', 'UniqueAnswerImage'],
-        DRAGGABLE => ['Draggable.php', 'Draggable']
+        DRAGGABLE => ['Draggable.php', 'Draggable'],
+        MATCHING_DRAGGABLE => ['MatchingDraggable.php', 'MatchingDraggable']
         //MEDIA_QUESTION => array('media_question.class.php' , 'MediaQuestion')
     );
 
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index e08b1c0ea0..e1a13584a6 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -474,6 +474,7 @@ define('MEDIA_QUESTION', 15);
 define('CALCULATED_ANSWER', 16);
 define('UNIQUE_ANSWER_IMAGE', 17);
 define('DRAGGABLE', 18);
+define('MATCHING_DRAGGABLE', 19);
 
 //Some alias used in the QTI exports
 define('MCUA', 1);

From e100653b33dd324634834a74f16af450f4141c55 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 27 Apr 2015 10:07:25 -0500
Subject: [PATCH 02/22] Allow restore Matching Draggable question - refs #7611

---
 main/coursecopy/classes/CourseRestorer.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php
index 3e68a7eab1..59aee9e36e 100755
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@@ -1578,8 +1578,7 @@ class CourseRestorer
                     }
                 }
             }
-
-			if ($question->quiz_type == MATCHING) {
+            if (in_array($question->quiz_type, [MATCHING, MATCHING_DRAGGABLE])) {
                 $temp = array();
                 foreach ($question->answers as $index => $answer) {
                     $temp[$answer['position']] = $answer;

From 47bd70b243ffe27f8b062a469dbf810b2a0da6a0 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 27 Apr 2015 10:18:18 -0500
Subject: [PATCH 03/22] Manage Matching Draggable answer - refs #7611

---
 main/exercice/answer_admin.inc.php |  8 ++++----
 main/exercice/exercise.class.php   | 13 +++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/main/exercice/answer_admin.inc.php b/main/exercice/answer_admin.inc.php
index a97bf266bb..98e7c5d869 100755
--- a/main/exercice/answer_admin.inc.php
+++ b/main/exercice/answer_admin.inc.php
@@ -62,7 +62,7 @@ if ($modifyIn) {
         $reponse = unserialize($reponse);
         $comment = unserialize($comment);
         $weighting = unserialize($weighting);
-    } elseif ($answerType == MATCHING) {
+    } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
         $option = unserialize($option);
         $match = unserialize($match);
         $sel = unserialize($sel);
@@ -368,7 +368,7 @@ if ($submitAnswers || $buttonBack) {
         } else {
             unset($setWeighting);
         }
-    } elseif ($answerType == MATCHING) {
+    } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
         if ($debug > 0) {
             echo str_repeat('&nbsp;', 2) . '$answerType is MATCHING' . "<br />\n";
         }
@@ -621,7 +621,7 @@ if ($modifyAnswers) {
                 $weighting = unserialize($weighting);
             }
         }
-    } elseif ($answerType == MATCHING) {
+    } elseif(in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
         if ($debug > 0) {
             echo str_repeat('&nbsp;', 2) . '$answerType is MATCHING' . "<br />\n";
         }
@@ -1066,7 +1066,7 @@ if ($modifyAnswers) {
                     <?php
                 }
                 //end of FREE_ANSWER type*/
-                elseif ($answerType == MATCHING) {
+                elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                     ?>
 
                 <h3>
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 304e8e462e..38131c70a8 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -2774,6 +2774,8 @@ class Exercise
                     break;
                 case DRAGGABLE:
                     //no break
+                case MATCHING_DRAGGABLE:
+                    //no break
                 case MATCHING:
                     if ($from_database) {
                         $sql = 'SELECT id, answer, id_auto
@@ -2851,7 +2853,8 @@ class Exercise
                                 echo '<tr>';
                                 echo '<td>' . $s_answer_label . '</td>';
                                 echo '<td>' . $user_answer;
-                                if ($answerType == MATCHING) {
+
+                                if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                                     if (isset($real_list[$i_answer_correct_answer])) {
                                         echo Display::span(
                                             $real_list[$i_answer_correct_answer],
@@ -2977,7 +2980,7 @@ class Exercise
                     if (
                         !in_array(
                             $answerType,
-                            [MATCHING, DRAGGABLE]
+                            [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE]
                         ) ||
                         $answerCorrect
                     ) {
@@ -3245,7 +3248,7 @@ class Exercise
                                     error_log(__LINE__.' first',0);
                                 }
                             }
-                        } elseif($answerType == MATCHING) {
+                        } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                             echo '<tr>';
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
@@ -3571,6 +3574,8 @@ class Exercise
                             break;
                         case DRAGGABLE:
                             //no break
+                        case MATCHING_DRAGGABLE:
+                            //no break
                         case MATCHING:
                             echo '<tr>';
                             echo Display::tag('td', $answerMatching[$answerId]);
@@ -3883,7 +3888,7 @@ class Exercise
                 } else {
                     Event::saveQuestionAttempt($questionScore, 0, $quesId, $exeId, 0, $this->id);
                 }
-            } elseif (in_array($answerType, [MATCHING, DRAGGABLE])) {
+            } elseif (in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE])) {
                 if (isset($matching)) {
                     foreach ($matching as $j => $val) {
                         Event::saveQuestionAttempt($questionScore, $val, $quesId, $exeId, $j, $this->id);

From 074419ba70b30ece9fa00eee8dd6a74d34938e05 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 27 Apr 2015 12:33:12 -0500
Subject: [PATCH 04/22] Vendor - Add jsPlumb - refs #7611

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6552d58b35..76968e35c0 100755
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,8 @@
         "bower-asset/mediaelement": "@stable",
         "bower-asset/modernizr": "2.8.*",
         "bower-asset/jqueryui-timepicker-addon": "@stable",
-	    "bower-asset/imageMap-resizer": "0.5.3"
+	    "bower-asset/imageMap-resizer": "0.5.3",
+        "bower-asset/jsPlumb" : "1.7.5"
     },
     "require-dev": {
         "behat/behat": "2.5.*@stable",

From 13b274cf2dca3079e00611d66811b7d572ab5b72 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 08:28:39 -0500
Subject: [PATCH 05/22] Vendor - Add XColor - refs #7611

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 76968e35c0..aa7246a40c 100755
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,8 @@
         "bower-asset/modernizr": "2.8.*",
         "bower-asset/jqueryui-timepicker-addon": "@stable",
 	    "bower-asset/imageMap-resizer": "0.5.3",
-        "bower-asset/jsPlumb" : "1.7.5"
+        "bower-asset/jsPlumb" : "1.7.5",
+        "bower-asset/xcolor": "1.8.0"
     },
     "require-dev": {
         "behat/behat": "2.5.*@stable",

From 4ed3f9e330f3f54416a227ef0d72a2e085679d39 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 08:43:29 -0500
Subject: [PATCH 06/22] Allow export Matching Dragable questions - refs #7611

---
 main/exercice/export/qti2/qti2_classes.php   | 2 ++
 main/exercice/export/scorm/scorm_classes.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/main/exercice/export/qti2/qti2_classes.php b/main/exercice/export/qti2/qti2_classes.php
index e8d23f72b8..b771475694 100755
--- a/main/exercice/export/qti2/qti2_classes.php
+++ b/main/exercice/export/qti2/qti2_classes.php
@@ -32,6 +32,8 @@ class Ims2Question extends Question
 
                 return $answer;
             case MATCHING:
+                //no break
+            case MATCHING_DRAGGABLE:
                 $answer = new ImsAnswerMatching($this->id);
 
                 return $answer;
diff --git a/main/exercice/export/scorm/scorm_classes.php b/main/exercice/export/scorm/scorm_classes.php
index dbeb3494e4..ec548d13f4 100755
--- a/main/exercice/export/scorm/scorm_classes.php
+++ b/main/exercice/export/scorm/scorm_classes.php
@@ -43,6 +43,8 @@ class ScormQuestion extends Question
                 $this->answer->questionJSId = $this->js_id;
 				break;
 			case MATCHING :
+                            //no break
+                        case MATCHING_DRAGGABLE:
 				$this->answer = new ScormAnswerMatching($this->id);
                 $this->answer->questionJSId = $this->js_id;
 				break;

From 108e61917d2163ef1757f6b19dd111fed36133b9 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 08:46:24 -0500
Subject: [PATCH 07/22] Show question in exercise resport - refs #7611

---
 main/exercice/stats.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/exercice/stats.php b/main/exercice/stats.php
index 4e11e5d590..5d1302354c 100755
--- a/main/exercice/stats.php
+++ b/main/exercice/stats.php
@@ -169,6 +169,8 @@ if (!empty($question_list)) {
                     }
                     break;
                 case MATCHING:
+                    //no break
+                case MATCHING_DRAGGABLE:
                     if ($is_correct == 0) {
                         if ($answer_id == 1) {
                             $data[$id]['name'] = cut($question_obj->question, 100);

From 09c5864de7ef302845bf8ab568f68f9310d9e574 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 10:03:15 -0500
Subject: [PATCH 08/22] Allow solve Matching Draggable answer - refs #7611

---
 main/css/base.css                            |  24 +++
 main/exercice/answer.class.php               |  16 ++
 main/exercice/exercise_show.php              |   2 +-
 main/exercice/exercise_submit.php            |   7 +
 main/inc/lib/display.lib.php                 |   6 +-
 main/inc/lib/exercise.lib.php                | 137 ++++++++++++++++-
 main/template/default/exercise/submit.js.tpl | 148 +++++++++++++++++++
 7 files changed, 328 insertions(+), 12 deletions(-)

diff --git a/main/css/base.css b/main/css/base.css
index 06e9f9e523..3d56ed0bc7 100755
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -5930,3 +5930,27 @@ ul.exercise-draggable-answer li {
 .question_options .droppable .gallery .exercise-draggable-answer-option {
     margin-bottom: 15px;
 }
+
+/***    Matching Draggable answer ***/
+.drag_question {
+    float: left;
+    min-height: 4em;
+    width: 100%;
+}
+.drag_question .window{
+    box-shadow: 2px 2px 19px #AAA;
+    cursor: pointer;
+    min-height: 65px;
+    padding-top: 25px;
+}
+.window_left_question {
+    padding: 10px 25px 10px 10px;
+    text-align: right;
+}
+.window_right_question {
+    padding: 10px 10px 10px 25px;
+}
+
+._jsPlumb_endpoint {
+    z-index: 50;
+}
\ No newline at end of file
diff --git a/main/exercice/answer.class.php b/main/exercice/answer.class.php
index b62f8c2a24..7777e2595f 100755
--- a/main/exercice/answer.class.php
+++ b/main/exercice/answer.class.php
@@ -759,4 +759,20 @@ class Answer
 			}
         }
 	}
+
+    /**
+     * Get the necessary JavaScript for some ansers
+     * @return string
+     */
+    public function getJs() {
+        //if ($this->questionId == 2)
+        return "<script>
+                jsPlumb.ready(function() {
+                    if ($('#drag{$this->questionId}_question').length > 0) {
+                        MatchingDraggable.init('{$this->questionId}');
+                    }
+                });
+            </script>";
+    }
+
 }
diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php
index 52bdc1ee9c..649d7f40de 100755
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@@ -343,7 +343,7 @@ foreach ($questionList as $questionId) {
 		$question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
 		$questionScore   = $question_result['score'];
 		$totalScore     += $question_result['score'];
-        } elseif (in_array($answerType, [MATCHING, DRAGGABLE])) {
+        } elseif (in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE])) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php
index f85b84fa92..a5b7e354bf 100755
--- a/main/exercice/exercise_submit.php
+++ b/main/exercice/exercise_submit.php
@@ -50,6 +50,13 @@ if ($showGlossary) {
     $htmlHeadXtra[] = api_get_js('jquery.highlight.js');
 }
 
+$htmlHeadXtra[] = '<script src="'
+    . api_get_path(WEB_PATH) . 'web/assets/jsplumb/dist/js/jquery.jsPlumb-1.7.5-min.js'
+    . '"></script>';
+$htmlHeadXtra[] = '<script src="'
+    . api_get_path(WEB_PATH) . 'web/assets/xcolor/jquery.xcolor.min.js'
+    . '"></script>';
+
 //This library is necessary for the time control feature
 $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
 $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index eb3e99b495..300db8a1a4 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -954,7 +954,7 @@ class Display
             if ($key == 'id') {
                 $default_id = '';
             }
-            $extra .= $key.'="'.$parameter.'"';
+            $extra .= $key.'="'.$parameter.'" ';
         }
         $html .= '<select name="'.$name.'" '.$default_id.' '.$extra.'>';
 
@@ -976,13 +976,13 @@ class Display
                 if (is_array($default)) {
                     foreach($default as $item) {
                         if ($item == $key) {
-                            $html .= 'selected="selected"';
+                            $html .= ' selected="selected"';
                             break;
                         }
                     }
                 } else {
                     if ($default == $key) {
-                        $html .= 'selected="selected"';
+                        $html .= ' selected="selected"';
                     }
                 }
 
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index dd81897ac5..8aacb831e5 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -104,13 +104,16 @@ class ExerciseLib
             // on the right side are called answers
             $num_suggestions = 0;
 
-            if (in_array($answerType, [MATCHING, DRAGGABLE])) {
+            if (in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE])) {
                 if ($answerType == DRAGGABLE) {
                     $s .= '<div class="ui-widget ui-helper-clearfix">
                         <div class="clearfix">
                         <ul class="exercise-draggable-answer ui-helper-reset ui-helper-clearfix">';
                 } else {
-                    $s .= '<table class="table table-hover table-striped">';
+                    $s .= <<<HTML
+                        <div id="drag{$questionId}_question" class="drag_question">
+                            <table class="data_table">
+HTML;
                 }
                 // Iterate through answers
                 $x = 1;
@@ -1002,17 +1005,129 @@ JAVASCRIPT;
 
                         $s .= '</li>';
                     }
+                } elseif ($answerType == MATCHING_DRAGGABLE) {
+                    if ($answerId == 1) {
+                        echo $objAnswerTmp->getJs();
+                    }
+
+                    if ($answerCorrect != 0) {
+                        $parsed_answer = $answer;
+                        $windowId = "{$questionId}_{$lines_count}";
+
+                        $s .= <<<HTML
+                            <tr>
+                                <td widht="45%">
+                                    <div id="window_{$windowId}" class="window window_left_question window{$questionId}_question">
+                                        <strong>$lines_count.</strong> $parsed_answer
+                                    </div>
+                                </td>
+                                <td width="10%">
+HTML;
+                        $selectedValue = 0;
+                        $questionOptions = [];
+
+                        foreach ($select_items as $key => $val) {
+                            if ($debug_mark_answer) {
+                                if ($val['id'] == $answerCorrect) {
+                                    $selectedValue = $val['id'];
+                                }
+                            }
+
+                            if (
+                                isset($user_choice[$matching_correct_answer]) &&
+                                $val['id'] == $user_choice[$matching_correct_answer]['answer']
+                            ) {
+                                $selectedValue = $val['id'];
+                            }
+
+                            $questionOptions[$val['id']] = $val['letter'];
+                        }
+
+                        $s .= Display::select(
+                            "choice[$questionId][$numAnswer]",
+                            $questionOptions,
+                            $selectedValue,
+                            [
+                                'id' => "window_{$windowId}_select",
+                                'class' => 'hidden'
+                            ],
+                            false
+                        );
+
+                        if (!empty($answerCorrect) && !empty($selectedValue)) {
+                            $s .= <<<JAVASCRIPT
+                                <script>
+                                    jsPlumb.ready(function() {
+                                        jsPlumb.connect({
+                                            source: 'window_$windowId',
+                                            target: 'window_{$questionId}_{$selectedValue}_answer',
+                                            endpoint: ['Blank', {radius: 15}],
+                                            anchors: ['RightMiddle', 'LeftMiddle'],
+                                            paintStyle: {strokeStyle: '#8A8888', lineWidth: 8},
+                                            connector: [
+                                                MatchingDraggable.connectorType,
+                                                {curvines: MatchingDraggable.curviness}
+                                            ]
+                                        });
+                                    });
+                                </script>
+JAVASCRIPT;
+                        }
+
+                        $s .= <<<HTML
+                            </td>
+                            <td width="45%">
+HTML;
+
+                        if (isset($select_items[$lines_count])) {
+                            $s .= <<<HTML
+                                <div id="window_{$windowId}_answer" class="window window_right_question">
+                                    <strong>{$select_items[$lines_count]['letter']}.</strong> {$select_items[$lines_count]['answer']}
+                                </div>
+HTML;
+                        } else {
+                            $s .= '&nbsp;';
+                        }
+
+                        $s .= '</td></tr>';
+
+                        $lines_count++;
+
+                        if (($lines_count - 1) == $num_suggestions) {
+                            while (isset($select_items[$lines_count])) {
+                                $s .= <<<HTML
+                                    <tr>
+                                        <td colspan="2"></td>
+                                        <td>
+                                            <strong>{$select_items[$lines_count]['letter']}</strong>
+                                            $select_items[$lines_count]['answer']
+                                        </td>
+                                    </tr>
+HTML;
+                                $lines_count++;
+                            }
+                        }
+
+                        $matching_correct_answer++;
+                    }
                 }
             }    // end for()
 
             if ($show_comment) {
                 $s .= '</table>';
-            } else {
-                if ($answerType == MATCHING || $answerType == UNIQUE_ANSWER_NO_OPTION || $answerType == MULTIPLE_ANSWER_TRUE_FALSE ||
-                    $answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE
-                ) {
+            } elseif(
+                in_array(
+                    $answerType,
+                    [
+                        MATCHING,
+                        MATCHING_DRAGGABLE,
+                        UNIQUE_ANSWER_NO_OPTION,
+                        MULTIPLE_ANSWER_TRUE_FALSE,
+                        MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE
+                    ]
+                )
+            ) {
                     $s .= '</table>';
-                }
             }
 
             if ($answerType == DRAGGABLE) {
@@ -1042,7 +1157,7 @@ JAVASCRIPT;
                 $s .= '</div></div>';
             }
 
-            if ($answerType == MATCHING) {
+            if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                 $s .= '</div>';
             }
 
@@ -3106,6 +3221,9 @@ JAVASCRIPT;
                 $select_condition = " e.exe_id, answer ";
                 break;
             case MATCHING:
+                //no break
+            case MATCHING_DRAGGABLE:
+                //no break
             default:
                 $answer_condition = " answer = $answer_id AND ";
                 $select_condition = " DISTINCT exe_user_id ";
@@ -3161,6 +3279,9 @@ JAVASCRIPT;
                     return $good_answers;
                     break;
                 case MATCHING:
+                    //no break
+                case MATCHING_DRAGGABLE:
+                    //no break
                 default:
                     $return = Database::num_rows($result);
             }
diff --git a/main/template/default/exercise/submit.js.tpl b/main/template/default/exercise/submit.js.tpl
index dbc0a0c999..27801e2032 100644
--- a/main/template/default/exercise/submit.js.tpl
+++ b/main/template/default/exercise/submit.js.tpl
@@ -86,6 +86,154 @@
         }
     };
 
+    var MatchingDraggable = {
+        colorDestination: '#316B31',
+        curviness: 0,
+        connectorType: 'Straight',
+        initialized: false,
+        init: function (questionId) {
+            var windowQuestionSelector = '.window' + questionId + '_question',
+                countConnections = $(windowQuestionSelector).length,
+                colorArray = [],
+                colorArrayDestination = [];
+
+            if (countConnections > 0) {
+                colorArray = $.xcolor.analogous("#da0", countConnections);
+                colorArrayDestination = $.xcolor.analogous("#51a351", countConnections);
+            } else {
+                colorArray = $.xcolor.analogous("#da0", 10);
+                colorArrayDestination = $.xcolor.analogous("#51a351", 10);
+            }
+
+            jsPlumb.importDefaults({
+                DragOptions: {cursor: 'pointer', zIndex: 2000},
+                PaintStyle: {strokeStyle: '#000'},
+                EndpointStyle: {strokeStyle: '#316b31'},
+                Endpoint: 'Rectangle',
+                Anchors: ['TopCenter', 'TopCenter']
+            });
+
+            var exampleDropOptions = {
+                tolerance: 'touch',
+                hoverClass: 'dropHover',
+                activeClass: 'dragActive'
+            };
+
+            var destinationEndPoint = {
+                endpoint: ["Dot", {radius: 15}],
+                paintStyle: {fillStyle: MatchingDraggable.colorDestination},
+                isSource: false,
+                connectorStyle: {strokeStyle: MatchingDraggable.colorDestination, lineWidth: 8},
+                connector: [
+                    MatchingDraggable.connectorType,
+                    {curviness: MatchingDraggable.curviness}
+                ],
+                maxConnections: 1000,
+                isTarget: true,
+                dropOptions: exampleDropOptions,
+                beforeDrop: function (params) {
+                    jsPlumb.select({source: params.sourceId}).each(function (connection) {
+                        jsPlumb.detach(connection);
+                    });
+
+                    var selectId = params.sourceId + "_select";
+                    var value = params.targetId.split("_")[2];
+
+                    $("#" + selectId + " option")
+                        .removeAttr('selected')
+                        .filter(function (index) {
+                            return index === parseInt(value);
+                        })
+                        .attr("selected", true);
+
+                    return true;
+                }
+            };
+
+            var count = 0;
+            var sourceDestinationArray = [];
+
+            $(windowQuestionSelector).each(function (index) {
+                var windowId = $(this).attr("id");
+                var scope = windowId + "scope";
+                var destinationColor = colorArray[count].getHex();
+
+                var sourceEndPoint = {
+                    endpoint: [
+                        "Dot",
+                        {radius: 15}
+                    ],
+                    paintStyle: {
+                        fillStyle: destinationColor
+                    },
+                    isSource: true,
+                    connectorStyle: {
+                        strokeStyle: "#8a8888",
+                        lineWidth: 8
+                    },
+                    connector: [
+                        MatchingDraggable.connectorType,
+                        {curviness: MatchingDraggable.curviness}
+                    ],
+                    maxConnections: 1,
+                    isTarget: false,
+                    dropOptions: exampleDropOptions,
+                    scope: scope
+                };
+
+                sourceDestinationArray[count + 1] = sourceEndPoint;
+
+                count++;
+
+                jsPlumb.addEndpoint(
+                    windowId,
+                    {
+                        anchor: ['RightMiddle', 'RightMiddle', 'RightMiddle', 'RightMiddle']
+                    },
+                    sourceEndPoint
+                );
+
+                var destinationCount = 0;
+
+                $(windowQuestionSelector).each(function (index) {
+                    var windowDestinationId = $(this).attr("id");
+                    destinationEndPoint.scope = scope;
+                    destinationEndPoint.paintStyle.fillStyle = colorArrayDestination[destinationCount].getHex();
+                    destinationCount++;
+
+                    jsPlumb.addEndpoint(
+                        windowDestinationId + "_answer",
+                        {
+                            anchors: ['LeftMiddle', 'LeftMiddle', 'LeftMiddle', 'LeftMiddle']
+                        },
+                        destinationEndPoint
+                    );
+                });
+            });
+
+            MatchingDraggable.attachBehaviour();
+        },
+        attachBehaviour: function () {
+            if (!MatchingDraggable.initialized) {
+                MatchingDraggable.initialized = true;
+            }
+        }
+    };
+    
+    jsPlumb.ready(function () {
+        if ($(".drag_question").length > 0) {
+            MatchingDraggable.init();
+
+            $(document).scroll(function () {
+                jsPlumb.repaintEverything();
+            });
+
+            $(window).resize(function () {
+                jsPlumb.repaintEverything();
+            });
+        }
+    });
+
     $(document).on('ready', function () {
         DraggableAnswer.init(
             $(".exercise-draggable-answer"),

From 90128fb2f1af03781b1f83b21da5dc7af7117c82 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 10:36:52 -0500
Subject: [PATCH 09/22] Fix show exercise results - refs #7611

---
 main/exercice/MatchingDraggable.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/exercice/MatchingDraggable.php b/main/exercice/MatchingDraggable.php
index a8ed038979..d7ea2b6a85 100644
--- a/main/exercice/MatchingDraggable.php
+++ b/main/exercice/MatchingDraggable.php
@@ -254,8 +254,7 @@ class MatchingDraggable extends Question
                 <tr>
                     <th>' . get_lang('ElementList') . '</th>
                     <th>' . get_lang('CorrespondsTo') . '</th>
-                </tr>
-            </table>';
+                </tr>';
 
         return $header;
     }

From 2fdb8e62a8eb8a9f37fb9fe31f1d16f5788665f1 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 12:06:49 -0500
Subject: [PATCH 10/22] User Bootstrap modal for show exercise results - refs
 #7611

---
 main/exercice/overview.php              |  2 +-
 main/template/default/layout/footer.tpl | 16 +++++++
 main/template/default/layout/head.tpl   | 61 ++++++++++---------------
 3 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/main/exercice/overview.php b/main/exercice/overview.php
index f05ab9d4eb..2699a23d9d 100755
--- a/main/exercice/overview.php
+++ b/main/exercice/overview.php
@@ -163,7 +163,7 @@ if (!empty($attempts) && $visible_return['value'] == true) {
             $attempt_result['exe_result'],
             $attempt_result['exe_weighting']
         );
-        $attempt_url = api_get_path(WEB_CODE_PATH) . 'exercice/result.php?' . api_get_cidreq() . '&id=' . $attempt_result['exe_id'] . '&height=500&width=950' . $url_suffix;
+        $attempt_url = api_get_path(WEB_CODE_PATH) . 'exercice/result.php?' . api_get_cidreq() . '&id=' . $attempt_result['exe_id'] . '&modal_size=lg' . $url_suffix;
         $attempt_link = Display::url(
             get_lang('Show'),
             $attempt_url,
diff --git a/main/template/default/layout/footer.tpl b/main/template/default/layout/footer.tpl
index 38097a82e5..4f34bb23e6 100755
--- a/main/template/default/layout/footer.tpl
+++ b/main/template/default/layout/footer.tpl
@@ -73,6 +73,22 @@
     </div>
 </div>
 
+{# Global modal, load content by AJAX call to href attribute on anchor tag with 'ajax' class #}
+<div class="modal fade" id="global-modal" tabindex="-1" role="dialog" aria-labelledby="global-modal-title" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | get_lang }}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="global-modal-title">&nbsp;</h4>
+            </div>
+            <div class="modal-body">
+            </div>
+        </div>
+    </div>
+</div>
+
 <script>
     $("form").on("click", ' .advanced_parameters', function() {
         /*var id = $(this).attr('id') + '_options';
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 82be94604f..dd4880f890 100755
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -367,47 +367,36 @@ $(function() {
     });
 
     // Global popup
-    $('.ajax').on('click', function() {
-        var url = this.href;
-        var dialog  = $("#dialog");
-        if ($("#dialog").length == 0) {
-            dialog  = $('<div id="dialog" style="display:none"></div>').appendTo('body');
-        }
-
-        var width_value = 580;
-        var height_value = 450;
-        var resizable_value = true;
+    $('a.ajax').on('click', function(e) {
+        e.preventDefault();
 
-        var new_param = get_url_params(url, 'width');
-        if (new_param) {
-            width_value = new_param;
-        }
+        var contentUrl = this.href,
+            loadModalContent = $.get(contentUrl);
 
-        var new_param = get_url_params(url, 'height')
-        if (new_param) {
-            height_value = new_param;
-        }
+        $.when(loadModalContent).done(function(modalContent) {
+            var modalDialog = $('#global-modal').find('.modal-dialog'),
+                modalSize = get_url_params(contentUrl, 'modal_size'),
+                modalWidth = get_url_params(contentUrl, 'width');
 
-        var new_param = get_url_params(url, 'resizable');
-        if (new_param) {
-            resizable_value = new_param;
-        }
+            modalDialog.removeClass('modal-lg modal-sm').css('width', '');
 
-        // load remote content
-        dialog.load(
-            url,
-            {},
-            function(responseText, textStatus, XMLHttpRequest) {
-                dialog.dialog({
-                    modal       : true,
-                    width       : width_value,
-                    height      : height_value,
-                    resizable   : resizable_value
-                });
+            if (modalSize) {
+                switch (modalSize) {
+                    case 'lg':
+                        modalDialog.addClass('modal-lg');
+                        break;
+                    case 'sm':
+                        modalDialog.addClass('modal-sm');
+                        break;
+                }
+            } else if (modalWidth) {
+                modalDialog.css('width', modalWidth + 'px');
             }
-        );
-        // prevent the browser to follow the link
-        return false;
+
+            $('#global-modal').find('.modal-body').html(modalContent);
+
+            $('#global-modal').modal('show');
+        });
     });
 
     $('a.expand-image').on('click', function(e) {

From 1f52fd6f4a1671bf03bc7a40bba27cfd5957c0fa Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 28 Apr 2015 14:22:17 -0500
Subject: [PATCH 11/22] Fix call to Template - refs #7611

---
 main/exercice/exercise_submit.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php
index a5b7e354bf..d644f27151 100755
--- a/main/exercice/exercise_submit.php
+++ b/main/exercice/exercise_submit.php
@@ -64,7 +64,9 @@ $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
 $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.epiclock.min.js');
 $htmlHeadXtra[] = api_get_js('epiclock/renderers/minute/epiclock.minute.js');
 
-$htmlHeadXtra[] = (new Template())->fetch('default/exercise/submit.js.tpl');
+$template = new Template();
+
+$htmlHeadXtra[] = $template->fetch('default/exercise/submit.js.tpl');
 
 // General parameters passed via POST/GET
 

From 62f33385a5164b53112586d4820115fa5c0b2b23 Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Wed, 29 Apr 2015 11:29:03 -0500
Subject: [PATCH 12/22] Fix session-course visibility and price configuration -
 refs #7370

---
 plugin/buycourses/database.php           |  8 ++++----
 plugin/buycourses/js/buycourses.js       | 19 ++++++++++---------
 plugin/buycourses/src/buy_course.lib.php | 10 +++++-----
 plugin/buycourses/src/function.php       |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/plugin/buycourses/database.php b/plugin/buycourses/database.php
index f1cc054280..7c3e04a45c 100644
--- a/plugin/buycourses/database.php
+++ b/plugin/buycourses/database.php
@@ -31,7 +31,7 @@ $tableSession = Database::get_main_table(TABLE_MAIN_SESSION);
 $sql = "SELECT id, name, date_start, date_end FROM $tableSession";
 $res = Database::query($sql);
 while ($row = Database::fetch_assoc($res)) {
-    $presql = "INSERT INTO $table (session_id, name, date_start, date_end, visible)
+    $presql = "INSERT INTO $table (id, name, date_start, date_end, visible)
     VALUES ('" . $row['id'] . "','" . $row['name'] . "','" . $row['date_start'] . "','" . $row['date_end'] . "','NO')";
     Database::query($presql);
 }
@@ -59,7 +59,7 @@ while ($row = Database::fetch_assoc($res)) {
 $table = Database::get_main_table(TABLE_BUY_SESSION_COURSE);
 $sql = "CREATE TABLE IF NOT EXISTS $table (
 	id INT unsigned NOT NULL auto_increment PRIMARY KEY,
-    id_session SMALLINT(5) unsigned DEFAULT '0',
+    session_id SMALLINT(5) unsigned DEFAULT '0',
     course_code VARCHAR(40),
     nbr_users SMALLINT(5) unsigned DEFAULT '0',
     sync int)";
@@ -69,8 +69,8 @@ $tableSessionCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 $sql = "SELECT * FROM $tableSessionCourse";
 $res = Database::query($sql);
 while ($row = Database::fetch_assoc($res)) {
-    $presql = "INSERT INTO $table (id_session, course_code, nbr_users)
-    VALUES ('" . $row['id_session'] . "','" . $row['course_code'] . "','" . $row['nbr_users'] . "')";
+    $presql = "INSERT INTO $table (session_id, c_id, nbr_users)
+    VALUES ('" . $row['session_id'] . "','" . $row['c_id'] . "','" . $row['nbr_users'] . "')";
     Database::query($presql);
 }
 
diff --git a/plugin/buycourses/js/buycourses.js b/plugin/buycourses/js/buycourses.js
index a499492b1e..7ca4c9f64b 100644
--- a/plugin/buycourses/js/buycourses.js
+++ b/plugin/buycourses/js/buycourses.js
@@ -32,17 +32,18 @@ $(document).ready(function () {
     });
 
     $(".save").click(function () {
-        var visible = $(this).parent().parent().prev().prev().children().attr("checked");
-        var price = $(this).parent().parent().prev().children().attr("value");
+        var currentRow = $(this).closest("tr");
+        var courseOrSessionObject ={
+            tab: "save_mod",
+            visible: currentRow.find("[name='visible']").is(':checked') ? 1 : 0,
+            price: currentRow.find("[name='price']").val()
+        };
+
         var course_id = $(this).attr('id');
-        var courseOrSession = $(this).parent().parent()[0].attributes[0].value;
-        if (courseOrSession.indexOf("session") > -1) {
-            courseOrSession = "session_id";
-        } else {
-            courseOrSession = "course_id";
-        }
-        var courseOrSessionObject = {tab: "save_mod", visible: visible, price: price};
+        var courseOrSession = ($(this).closest("td").attr('id')).indexOf("session") > -1 ? "session_id" : "course_id";
+
         courseOrSessionObject[courseOrSession] = course_id;
+
         $.post("function.php", courseOrSessionObject,
             function (data) {
                 if (data.status == "false") {
diff --git a/plugin/buycourses/src/buy_course.lib.php b/plugin/buycourses/src/buy_course.lib.php
index f4a6615c19..7629514d8c 100644
--- a/plugin/buycourses/src/buy_course.lib.php
+++ b/plugin/buycourses/src/buy_course.lib.php
@@ -25,14 +25,14 @@ function sync()
     $sql = "SELECT session_id, c_id, nbr_users FROM $tableSessionRelCourse";
     $res = Database::query($sql);
     while ($row = Database::fetch_assoc($res)) {
-        $sql = "SELECT 1 FROM $tableBuySessionRelCourse WHERE id_session=" . $row['session_id'];
+        $sql = "SELECT 1 FROM $tableBuySessionRelCourse WHERE session_id=" . $row['session_id'];
         $result = Database::query($sql);
         if (Database::affected_rows($result) > 0) {
-            $sql = "UPDATE $tableBuySessionRelCourse SET sync = 1 WHERE id_session=" . $row['session_id'];
+            $sql = "UPDATE $tableBuySessionRelCourse SET sync = 1 WHERE session_id=" . $row['session_id'];
             Database::query($sql);
         } else {
             $courseCode = api_get_course_info_by_id($row['c_id'])['code'];
-            $sql = "INSERT INTO $tableBuySessionRelCourse (id_session, course_code, nbr_users, sync)
+            $sql = "INSERT INTO $tableBuySessionRelCourse (session_id, course_code, nbr_users, sync)
             VALUES (" . $row['session_id'] . ", '" . $courseCode . "', " . $row['nbr_users'] . ", 1);";
             Database::query($sql);
         }
@@ -49,9 +49,9 @@ function sync()
     $sql = "SELECT id, code, title FROM $tableCourse";
     $res = Database::query($sql);
     while ($row = Database::fetch_assoc($res)) {
-        $sql = "SELECT id_session FROM $tableBuySessionRelCourse
+        $sql = "SELECT session_id FROM $tableBuySessionRelCourse
         WHERE course_code = '" . $row['code'] . "' LIMIT 1";
-        $courseIdSession = Database::fetch_assoc(Database::query($sql))['id_session'];
+        $courseIdSession = Database::fetch_assoc(Database::query($sql))['session_id'];
         if (!is_numeric($courseIdSession)) {
             $courseIdSession = 0;
         }
diff --git a/plugin/buycourses/src/function.php b/plugin/buycourses/src/function.php
index edbbff0f06..aab58404da 100644
--- a/plugin/buycourses/src/function.php
+++ b/plugin/buycourses/src/function.php
@@ -442,7 +442,7 @@ if ($_REQUEST['tab'] == 'save_mod') {
         $tableField = 'session_id';
     }
 
-    $visible = (isset($_REQUEST['visible'])) ? 1 : 0;
+    $visible = intval($_REQUEST['visible']);
     $price = Database::escape_string($_REQUEST['price']);
 
     $sql = "UPDATE $tableBuy

From fa51c538aa423c5ea7da2c7ebc414fbbd52f820d Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 30 Apr 2015 11:23:27 -0500
Subject: [PATCH 13/22] Add true to parameter file_name in
 api_replace_dangerous_char because it will be only intended to evaluate file
 names

---
 main/inc/lib/api.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index e08b1c0ea0..09a9f323b7 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -5612,7 +5612,7 @@ function api_is_element_in_the_session($tool, $element_id, $session_id = null) {
 
 function api_replace_dangerous_char($filename, $strict = 'loose')
 {
-    return URLify::filter($filename, 250);
+    return URLify::filter($filename, 250, null, true);
     /*
     // Safe replacements for some non-letter characters.
     static $search  = array(',', "\0", ' ', "\t", "\n", "\r", "\x0B", '/', "\\", '"', "'", '?', '*', '>', '<', '|', ':', '$', '(', ')', '^', '[', ']', '#', '+', '&', '%');

From ef5fe3b8126892aa784ef48639c82464e33aa8e2 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 30 Apr 2015 11:21:17 -0500
Subject: [PATCH 14/22] Vendor - Remove JS libraries - refs #7611

jsPlumb and XColor already exists in Chamilo
and with these versions Matching Draggable answer type, works
---
 composer.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index aa7246a40c..6552d58b35 100755
--- a/composer.json
+++ b/composer.json
@@ -70,9 +70,7 @@
         "bower-asset/mediaelement": "@stable",
         "bower-asset/modernizr": "2.8.*",
         "bower-asset/jqueryui-timepicker-addon": "@stable",
-	    "bower-asset/imageMap-resizer": "0.5.3",
-        "bower-asset/jsPlumb" : "1.7.5",
-        "bower-asset/xcolor": "1.8.0"
+	    "bower-asset/imageMap-resizer": "0.5.3"
     },
     "require-dev": {
         "behat/behat": "2.5.*@stable",

From faad0a85352212a4fe57f8fc7f77ce1e5ac4b497 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 30 Apr 2015 11:26:33 -0500
Subject: [PATCH 15/22] Use existents libraries - refs #7611

---
 main/exercice/exercise_submit.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php
index d644f27151..027badd3a8 100755
--- a/main/exercice/exercise_submit.php
+++ b/main/exercice/exercise_submit.php
@@ -50,12 +50,8 @@ if ($showGlossary) {
     $htmlHeadXtra[] = api_get_js('jquery.highlight.js');
 }
 
-$htmlHeadXtra[] = '<script src="'
-    . api_get_path(WEB_PATH) . 'web/assets/jsplumb/dist/js/jquery.jsPlumb-1.7.5-min.js'
-    . '"></script>';
-$htmlHeadXtra[] = '<script src="'
-    . api_get_path(WEB_PATH) . 'web/assets/xcolor/jquery.xcolor.min.js'
-    . '"></script>';
+$htmlHeadXtra[] = api_get_js('jquery.jsPlumb.all.js');
+$htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');
 
 //This library is necessary for the time control feature
 $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');

From 577afc98a5a615a920b7932bf5181ff42f41625d Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 30 Apr 2015 11:54:33 -0500
Subject: [PATCH 16/22] Minor - Code conventions - refs #7611

---
 composer.json                       |  4 ++--
 main/exercice/MatchingDraggable.php |  2 +-
 main/exercice/answer.class.php      |  2 +-
 main/inc/lib/display.lib.php        | 21 +++++++++++----------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 6552d58b35..96670edc65 100755
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "symfony/validator": "2.6.4",
         "gedmo/doctrine-extensions": "~2.3",
         "sonata-project/user-bundle": "~2.2",
-	    "ramsey/array_column": "~1.1",
+        "ramsey/array_column": "~1.1",
         "patchwork/utf8": "~1.2",
         "ddeboer/data-import": "@stable",
         "phpoffice/phpexcel": "~1.8",
@@ -70,7 +70,7 @@
         "bower-asset/mediaelement": "@stable",
         "bower-asset/modernizr": "2.8.*",
         "bower-asset/jqueryui-timepicker-addon": "@stable",
-	    "bower-asset/imageMap-resizer": "0.5.3"
+        "bower-asset/imageMap-resizer": "0.5.3"
     },
     "require-dev": {
         "behat/behat": "2.5.*@stable",
diff --git a/main/exercice/MatchingDraggable.php b/main/exercice/MatchingDraggable.php
index d7ea2b6a85..91f9e0afd8 100644
--- a/main/exercice/MatchingDraggable.php
+++ b/main/exercice/MatchingDraggable.php
@@ -204,7 +204,7 @@ class MatchingDraggable extends Question
     }
 
     /**
-     * 
+     * Process the creation of answers
      * @param type $form
      */
     public function processAnswersCreation($form)
diff --git a/main/exercice/answer.class.php b/main/exercice/answer.class.php
index 7777e2595f..e05ae17bce 100755
--- a/main/exercice/answer.class.php
+++ b/main/exercice/answer.class.php
@@ -761,7 +761,7 @@ class Answer
 	}
 
     /**
-     * Get the necessary JavaScript for some ansers
+     * Get the necessary JavaScript for some answers
      * @return string
      */
     public function getJs() {
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 300db8a1a4..efb61156f7 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -946,17 +946,18 @@ class Display
         $extra_attributes = array(),
         $show_blank_item = true,
         $blank_item_text = null
-    ) {
+    )
+    {
         $html = '';
         $extra = '';
-        $default_id =  'id="'.$name.'" ';
-        foreach($extra_attributes as $key=>$parameter) {
+        $default_id = 'id="' . $name . '" ';
+        foreach ($extra_attributes as $key => $parameter) {
             if ($key == 'id') {
                 $default_id = '';
             }
-            $extra .= $key.'="'.$parameter.'" ';
+            $extra .= $key . '="' . $parameter . '" ';
         }
-        $html .= '<select name="'.$name.'" '.$default_id.' '.$extra.'>';
+        $html .= '<select name="' . $name . '" ' . $default_id . ' ' . $extra . '>';
 
         if ($show_blank_item) {
             if (empty($blank_item_text)) {
@@ -964,17 +965,17 @@ class Display
             } else {
                 $blank_item_text = Security::remove_XSS($blank_item_text);
             }
-            $html .= self::tag('option', '-- '.$blank_item_text.' --', array('value'=>'-1'));
+            $html .= self::tag('option', '-- ' . $blank_item_text . ' --', array('value' => '-1'));
         }
         if ($values) {
             foreach ($values as $key => $value) {
-                if(is_array($value) && isset($value['name'])) {
+                if (is_array($value) && isset($value['name'])) {
                     $value = $value['name'];
                 }
-                $html .= '<option value="'.$key.'"';
+                $html .= '<option value="' . $key . '"';
 
                 if (is_array($default)) {
-                    foreach($default as $item) {
+                    foreach ($default as $item) {
                         if ($item == $key) {
                             $html .= ' selected="selected"';
                             break;
@@ -986,7 +987,7 @@ class Display
                     }
                 }
 
-                $html .= '>'.$value.'</option>';
+                $html .= '>' . $value . '</option>';
             }
         }
         $html .= '</select>';

From 957775bfd072bb5100432db6bc947f10daf3f854 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 30 Apr 2015 12:04:47 -0500
Subject: [PATCH 17/22] Fix language variable name - refs #7611

---
 main/exercice/MatchingDraggable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/exercice/MatchingDraggable.php b/main/exercice/MatchingDraggable.php
index 91f9e0afd8..9311ede7e5 100644
--- a/main/exercice/MatchingDraggable.php
+++ b/main/exercice/MatchingDraggable.php
@@ -11,7 +11,7 @@ class MatchingDraggable extends Question
 {
 
     public static $typePicture = 'matching.png';
-    static $explanationLangVar = 'MatchingDrag';
+    static $explanationLangVar = 'MatchingDraggable';
 
     /**
      * Class constructor

From 3fdaf5dbdb593976ffbf4a0dd13c09538b5f8a31 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 30 Apr 2015 12:05:03 -0500
Subject: [PATCH 18/22] Update languages file - refs #7611

---
 main/lang/english/trad4all.inc.php | 7 +++++++
 main/lang/spanish/trad4all.inc.php | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 0764b4f9f8..d69a404fd4 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -7231,4 +7231,11 @@ $RequestSubmitted = "Your request has been submitted.";
 $RequestFailed = "We are not able to fulfill your request at this time. Please contact your administrator.";
 $InternalLogin = "Internal login";
 $AlreadyLoggedIn = "You are already logged in";
+$Draggable = "Draggable";
+$Incorrect = "Incorrect";
+$YouNotYetAchievedCertificates = "You not yet achieved certificates";
+$SearchCertificates = "Search certificates";
+$TheUserXNotYetAchievedCertificates = "The user %s not yet achieved certificates";
+$CertificatesNotPublic = "Certificates not public";
+$MatchingDraggable = "Matching Draggable";
 ?>
\ No newline at end of file
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index 7a5271dac8..783813940b 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -7235,4 +7235,11 @@ $SaveBadge = "Guardar insignia";
 $BadgeMeasuresXPixelsInPNG = "Medidas de la insignia 200x200 píxeles en formato PNG";
 $SetTutor = "Hacer tutor";
 $UniqueAnswerImage = "Respuesta de imagen única";
+$Draggable = "Arrastrable";
+$Incorrect = "Incorrecto";
+$YouNotYetAchievedCertificates = "Aún no ha logrado certificados";
+$SearchCertificates = "Buscar certificados";
+$TheUserXNotYetAchievedCertificates = "El usuario %s aún no ha logrado certificados";
+$CertificatesNotPublic = "Los certificados no son públicos";
+$MatchingDraggable = "Coincidencia arrastrable";
 ?>
\ No newline at end of file

From 7fb83a5252ff8a530a2ed56b89da43a8f5f3b953 Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 30 Apr 2015 15:31:11 -0500
Subject: [PATCH 19/22] Fix queries - refs #7639

---
 main/inc/lib/hook/HookManagement.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/hook/HookManagement.php b/main/inc/lib/hook/HookManagement.php
index 794940f027..e07fcb0bc4 100644
--- a/main/inc/lib/hook/HookManagement.php
+++ b/main/inc/lib/hook/HookManagement.php
@@ -145,8 +145,8 @@ class HookManagement implements HookManagementInterface
     public function listHookObservers($eventName)
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . 'hc ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . 'he ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
+            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
             ' ON hc.hook_event_id = he.id ' .
             ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
             ' ON hc.hook_observer_id = ho.id ';
@@ -202,8 +202,8 @@ class HookManagement implements HookManagementInterface
     public function listAllHookCalls()
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . 'hc ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . 'he ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
+            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
             ' ON hc.hook_event_id = he.id ' .
             ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
             ' ON hc.hook_observer_id = ho.id ';
@@ -338,8 +338,8 @@ class HookManagement implements HookManagementInterface
         $eventName = Database::escape_string($eventName);
         $observerClassName($observerClassName);
         $type = Database::escape_string($type);
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . 'hc ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . 'he ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
+            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
             ' ON hc.hook_event_id = he.id ' .
             ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
             ' ON hc.hook_observer_id = ho.id ';

From 0052386b168a1ea4a6274220c74da0c8630a8366 Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 30 Apr 2015 15:31:25 -0500
Subject: [PATCH 20/22] Fix extra field creation - refs #7639

---
 plugin/skype/src/Skype.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin/skype/src/Skype.php b/plugin/skype/src/Skype.php
index b06d8b557b..c49ae8d895 100644
--- a/plugin/skype/src/Skype.php
+++ b/plugin/skype/src/Skype.php
@@ -48,8 +48,10 @@ class Skype extends Plugin implements HookPluginInterface
             )
         );
         if (empty($result)) {
+            require_once api_get_path(LIBRARY_PATH).'extra_field.lib.php';
             $extraField = new Extrafield('user');
             $extraField->save(array(
+                'field_type' => UserManager::USER_FIELD_TYPE_TEXT,
                 'field_variable' => 'skype',
                 'field_display_text' => 'Skype',
                 'field_visible' => 1,

From a5de6f1e75b93c30b478952b7c179dff57b6ff94 Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 30 Apr 2015 11:53:55 -0500
Subject: [PATCH 21/22] Remove notices and warning messages - refs #7670

---
 plugin/ticket/src/myticket.php       | 40 +++++++++++++++++++++++-----
 plugin/ticket/src/new_ticket.php     |  5 +++-
 plugin/ticket/src/ticket.class.php   | 18 ++++++++-----
 plugin/ticket/src/ticket_details.php | 12 +++++----
 4 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/plugin/ticket/src/myticket.php b/plugin/ticket/src/myticket.php
index a0e79494e4..5fbda89c8b 100755
--- a/plugin/ticket/src/myticket.php
+++ b/plugin/ticket/src/myticket.php
@@ -199,9 +199,35 @@ $isAdmin = api_is_platform_admin();
 
 Display::display_header($plugin->get_lang('MyTickets'));
 if ($isAdmin) {
-    $get_parameter = '&keyword=' . Security::remove_XSS($_GET['keyword']) . '&keyword_status=' . Security::remove_XSS($_GET['keyword_status']) . '&keyword_category=' .Security::remove_XSS($_GET['keyword_category']). '&keyword_request_user=' . Security::remove_XSS($_GET['keyword_request_user']);
-    $get_parameter .= '&keyword_admin=' . Security::remove_XSS($_GET['keyword_admin']) . '&keyword_start_date=' . Security::remove_XSS($_GET['keyword_start_date']) . '&keyword_unread=' . Security::remove_XSS($_GET['keyword_unread']);
-    $get_parameter2 = '&Tickets_per_page=' . Security::remove_XSS($_GET['Tickets_per_page']) . '&Tickets_column=' . Security::remove_XSS($_GET['Tickets_column']);
+    $getParameters = [
+        'keyword',
+        'keyword_status',
+        'keyword_category',
+        'keyword_request_user',
+        'keyword_admin',
+        'keyword_start_date',
+        'keyword_unread',
+        'Tickets_per_page',
+        'Tickets_column'
+    ];
+    $get_parameter = '';
+    foreach ($getParameters as $getParameter) {
+        if (isset($_GET[$getParameter])) {
+            $get_parameter .= "&$getParameter=".Security::remove_XSS($_GET[$getParameter]);
+        }
+    }
+
+    $getParameters = [
+        'Tickets_per_page',
+        'Tickets_column'
+    ];
+    $get_parameter2 = '';
+    foreach ($getParameters as $getParameter) {
+        if (isset($_GET[$getParameter])) {
+            $get_parameter2 .= "&$getParameter=".Security::remove_XSS($_GET[$getParameter]);
+        }
+    }
+
     if (isset($_GET['submit_advanced'])) {
         $get_parameter .= "&submit_advanced=";
     }
@@ -209,7 +235,7 @@ if ($isAdmin) {
         $get_parameter .= "&submit_simple=";
     }
     //select categories
-    $select_types .= '<select class="chzn-select" name = "keyword_category" id="keyword_category" ">';
+    $select_types = '<select class="chzn-select" name = "keyword_category" id="keyword_category" ">';
     $select_types .= '<option value="">---' . get_lang('Select') . '---</option>';
     $types = TicketManager::get_all_tickets_categories();
     foreach ($types as $type) {
@@ -217,7 +243,7 @@ if ($isAdmin) {
     }
     $select_types .= "</select>";
     //select admins
-    $select_admins .= '<select  class ="chzn-select" name = "keyword_admin" id="keyword_admin" ">';
+    $select_admins = '<select  class ="chzn-select" name = "keyword_admin" id="keyword_admin" ">';
     $select_admins .= '<option value="">---' . get_lang('Select') . '---</option>';
     $select_admins .= '<option value = "0">' . $plugin->get_lang('Unassigned') . '</option>';
     $admins = UserManager::get_user_list_like(array("status" => "1"), array("username"), true);
@@ -226,7 +252,7 @@ if ($isAdmin) {
     }
     $select_admins .= "</select>";
     //select status
-    $select_status .= '<select  class ="chzn-select" name = "keyword_status" id="keyword_status" >';
+    $select_status = '<select  class ="chzn-select" name = "keyword_status" id="keyword_status" >';
     $select_status .= '<option value="">---' . get_lang('Select') . '---</option>';
     $status = TicketManager::get_all_tickets_status();
     foreach ($status as $stat) {
@@ -234,7 +260,7 @@ if ($isAdmin) {
     }
     $select_status .= "</select>";
     //select priority
-    $select_priority .= '<select  name = "keyword_priority" id="keyword_priority" >';
+    $select_priority = '<select  name = "keyword_priority" id="keyword_priority" >';
     $select_priority .= '<option value="">' . get_lang('All') . '</option>';
     $select_priority .= '<option value="NRM">' . $plugin->get_lang('PriorityNormal') . '</option>';
     $select_priority .= '<option value="HGH">' . $plugin->get_lang('PriorityHigh') . '</option>';
diff --git a/plugin/ticket/src/new_ticket.php b/plugin/ticket/src/new_ticket.php
index 8c29143fff..8fdd6187f3 100755
--- a/plugin/ticket/src/new_ticket.php
+++ b/plugin/ticket/src/new_ticket.php
@@ -411,8 +411,11 @@ function show_form_send_ticket()
         'button',
         'compose',
         get_lang('SendMessage'),
+        null,
+        null,
+        null,
+        'save',
         array(
-            'class' => 'save',
             'id' => 'btnsubmit'
         )
     );
diff --git a/plugin/ticket/src/ticket.class.php b/plugin/ticket/src/ticket.class.php
index f5dece4692..056cc64023 100755
--- a/plugin/ticket/src/ticket.class.php
+++ b/plugin/ticket/src/ticket.class.php
@@ -504,9 +504,12 @@ class TicketManager
         if (!$isAdmin) {
             $sql .= " AND request_user = '$user_id' ";
         }
-        $keyword_unread = Database::escape_string(
-            trim($_GET['keyword_unread'])
-        );
+        $keyword_unread = '';
+        if (isset($_GET['keyword_unread'])) {
+            $keyword_unread = Database::escape_string(
+                trim($_GET['keyword_unread'])
+            );
+        }
         //Search simple
         if (isset($_GET['submit_simple'])) {
             if ($_GET['keyword'] != '') {
@@ -812,9 +815,12 @@ class TicketManager
                          OR user.username LIKE '%$keyword%')  ";
             }
         }
-        $keyword_unread = Database::escape_string(
-            trim($_GET['keyword_unread'])
-        );
+        $keyword_unread = '';
+        if (isset($_GET['keyword_unread'])) {
+            $keyword_unread = Database::escape_string(
+                trim($_GET['keyword_unread'])
+            );
+        }
         //Search advanced
         if (isset($_GET['submit_advanced'])) {
             $keyword_category = Database::escape_string(
diff --git a/plugin/ticket/src/ticket_details.php b/plugin/ticket/src/ticket_details.php
index 2998ca740e..4b154d55c5 100755
--- a/plugin/ticket/src/ticket_details.php
+++ b/plugin/ticket/src/ticket_details.php
@@ -247,13 +247,14 @@ if (!isset($_POST['compose'])) {
         }
     }
     $titulo = '<center><h1>Ticket #' . $ticket['ticket']['ticket_code'] . '</h1></center>';
+    $img_assing = '';
     if ($isAdmin && $ticket['ticket']['status_id'] != 'CLS' && $ticket['ticket']['status_id'] != 'REE') {
         if ($ticket['ticket']['assigned_last_user'] != 0 && $ticket['ticket']['assigned_last_user'] == $user_id) {
             $img_assing = '<a href="' . api_get_self() . '?ticket_id=' . $ticket['ticket']['ticket_id'] . '&amp;action=unassign" id="unassign">
                             <img src="' . api_get_path(WEB_CODE_PATH) . 'img/admin_star.png"  style="height: 32px; width: 32px;" border="0" title="Unassign" align="center"/>
                            </a>';
         } else {
-            $img_assing .= '<a href="#" id="assign"><img src="' . api_get_path(WEB_CODE_PATH) . 'img/admin_star_na.png" style="height: 32px; width: 32px;" title="Assign" align="center"/></a>';
+            $img_assing = '<a href="#" id="assign"><img src="' . api_get_path(WEB_CODE_PATH) . 'img/admin_star_na.png" style="height: 32px; width: 32px;" title="Assign" align="center"/></a>';
         }
     }
     $bold = '';
@@ -306,7 +307,7 @@ if (!isset($_POST['compose'])) {
  	      </tr>';
     }
     //select admins
-    $select_admins .= '<select  class ="chzn-select" style="width: 350px; " name = "admins" id="admins" ">';
+    $select_admins = '<select  class ="chzn-select" style="width: 350px; " name = "admins" id="admins" ">';
 
     $admins = UserManager::get_user_list_like(array("status" => "1"), array("username"), true);
     foreach ($admins as $admin) {
@@ -450,9 +451,10 @@ function show_form_send_message()
         'button',
         'compose',
         get_lang('SendMessage'),
-        array(
-            'class' => 'save'
-        )
+        null,
+        null,
+        null,
+        'save'
     );
 
     $form->display();

From 785fbdaf5b9db205e18fa064b0e22a7f7024d8af Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 30 Apr 2015 11:55:45 -0500
Subject: [PATCH 22/22] Show content of tickets in the right way - refs #7670

---
 plugin/ticket/src/ticket.class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugin/ticket/src/ticket.class.php b/plugin/ticket/src/ticket.class.php
index 056cc64023..4c0b954dc3 100755
--- a/plugin/ticket/src/ticket.class.php
+++ b/plugin/ticket/src/ticket.class.php
@@ -94,6 +94,14 @@ class TicketManager
         $category_id = intval($category_id);
         $project_id = intval($project_id);
         $subject = Database::escape_string($subject);
+        // Remove html tags
+        $content = strip_tags($content);
+        // Remove &nbsp;
+        $content = str_replace("&nbsp;", '', $content);
+        // Remove \r\n\t\s... from ticket's beginning and end
+        $content = trim($content);
+        // Replace server newlines with html
+        $content = str_replace("\r\n", '<br>', $content);
         $content = Database::escape_string($content);
         $personalEmail = Database::escape_string($personalEmail);
         $status = Database::escape_string($status);
@@ -717,7 +725,7 @@ class TicketManager
                     $row['col7'],
                     $row['col8'],
                     $actions,
-                    eregi_replace("[\n|\r|\n\r|\r\n]", ' ', strip_tags($row['col9']))
+                    $row['col9']
                 );
             } else {
                 $actions = "";