diff --git a/main/exercice/admin.php b/main/exercice/admin.php index a38429d898..828b9df3fb 100755 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -344,121 +344,8 @@ $template = new Template(); $htmlHeadXtra[] = $template->fetch('default/exercise/submit.js.tpl'); $htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js'); -$htmlHeadXtra[] = ''; -$htmlHeadXtra[] = ''; - -$htmlHeadXtra[] = " - - - - -"; +$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; Display::display_header($nameTools,'Exercise'); /* diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 613753a860..b83bfe8142 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -2101,118 +2101,7 @@ class Exercise */ public function show_lp_javascript() { - return " - - - - - "; + return ""; } /** diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php index c12dbb9769..98d98eff98 100755 --- a/main/exercice/exercise_result.php +++ b/main/exercice/exercise_result.php @@ -75,8 +75,8 @@ $interbreadcrumb[] = array( "name" => get_lang('Exercises'), ); -$htmlHeadXtra[] = ''; -$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; if ($origin != 'learnpath') { // So we are not in learnpath tool diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php index 3c808b7241..455afb7538 100755 --- a/main/exercice/exercise_show.php +++ b/main/exercice/exercise_show.php @@ -120,8 +120,8 @@ $interbreadcrumb[]= array("url" => "#","name" => get_lang('Result')); $this_section = SECTION_COURSES; -$htmlHeadXtra[] = ''; -$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; if ($origin != 'learnpath') { Display::display_header(''); diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php index 0170cb32b9..d13463a3ff 100755 --- a/main/exercice/exercise_submit.php +++ b/main/exercice/exercise_submit.php @@ -60,8 +60,8 @@ $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epicloc $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[] = ''; -$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; $template = new Template(); diff --git a/main/exercice/exercise_submit_modal.php b/main/exercice/exercise_submit_modal.php index 3d71e914fd..84fbba8dc4 100755 --- a/main/exercice/exercise_submit_modal.php +++ b/main/exercice/exercise_submit_modal.php @@ -12,6 +12,9 @@ api_protect_course_script(false); require_once api_get_path(LIBRARY_PATH).'geometry.lib.php'; Display::display_reduced_header(); + +echo '
'; + $message = null; $dbg_local = 0; $gradebook = null; @@ -29,14 +32,20 @@ if (empty ($exerciseResult)) { $exerciseResultCoordinates = isset($_REQUEST['exerciseResultCoordinates']) ? $_REQUEST['exerciseResultCoordinates'] : null; +$origin = ''; + if (empty($origin)) { $origin = Security::remove_XSS($_REQUEST['origin']); } // if origin is learnpath +$learnpath_id = 0; + if (empty($learnpath_id)) { $learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']); } +$learnpath_item_id = 0; + if (empty($learnpath_item_id)) { $learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']); } @@ -67,6 +76,8 @@ if (is_array($coords) && count($coords) > 0) { } } +$choice_value = ''; + $user_array = substr($user_array,0,-1); if (isset($_GET['choice'])){ @@ -109,8 +120,10 @@ if (empty($choice_value)) { //this is the real redirect function //echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";'; echo ' url = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";'; - echo "$('#dialog').load(url); "; + echo "$('#global-modal .modal-body').load(url);"; echo ''; + + exit; } $choice = array(); @@ -574,3 +587,7 @@ if ($links!='') { //self.parent.tb_remove(); '; } + +echo '
'; + +Display::display_footer(); diff --git a/main/exercice/export/scorm/scorm_classes.php b/main/exercice/export/scorm/scorm_classes.php index fec3ba36e8..17393c7105 100755 --- a/main/exercice/export/scorm/scorm_classes.php +++ b/main/exercice/export/scorm/scorm_classes.php @@ -566,10 +566,7 @@ class ScormAnswerHotspot extends Answer { if ($this->standalone) { $header = ''; - $header .= ''; //because this header closes so many times the get_lang('Square'), 'Circle' => get_lang('Circle'), - 'Poly' => get_lang('Poly'), + 'Polygon' => get_lang('Polygon'), 'HotspotStatus1' => get_lang('HotspotStatus1'), 'HotspotStatus2Polygon' => get_lang('HotspotStatus2Polygon'), 'HotspotStatus2Other' => get_lang('HotspotStatus2Other'), @@ -54,7 +54,8 @@ $data['lang'] = [ 'NextAnswer' => get_lang('NextAnswer'), 'Delineation' => get_lang('Delineation'), 'CloseDelineation' => get_lang('CloseDelineation'), - 'Oar' => get_lang('oar') + 'Oar' => get_lang('Oar'), + 'ClosePolygon' => get_lang('ClosePolygon') ]; $data['image'] = $objQuestion->selectPicturePath(); $data['image_width'] = $pictureWidth; diff --git a/main/exercice/result.php b/main/exercice/result.php index 6ddf8d8d1b..21865c30d3 100755 --- a/main/exercice/result.php +++ b/main/exercice/result.php @@ -53,8 +53,8 @@ if (!$is_allowedToEdit) { } } -$htmlHeadXtra[] = ''; -$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; +$htmlHeadXtra[] = ''; if ($show_headers) { $interbreadcrumb[] = array( diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php index 6908143a63..ff8f450b9c 100644 --- a/main/inc/lib/exercise.lib.php +++ b/main/inc/lib/exercise.lib.php @@ -1172,12 +1172,12 @@ HOTSPOT; $canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1'); - $s .= << -
+ $s .= " +
+
-
+
$answerList
-HOTSPOT; + "; + echo << diff --git a/main/plugin/hotspot2/css/hotspot.css b/main/inc/lib/javascript/hotspot/css/hotspot.css similarity index 100% rename from main/plugin/hotspot2/css/hotspot.css rename to main/inc/lib/javascript/hotspot/css/hotspot.css diff --git a/main/plugin/hotspot2/js/hotspot.js b/main/inc/lib/javascript/hotspot/js/hotspot.js similarity index 69% rename from main/plugin/hotspot2/js/hotspot.js rename to main/inc/lib/javascript/hotspot/js/hotspot.js index 3d2325104a..9e4ac52c30 100755 --- a/main/plugin/hotspot2/js/hotspot.js +++ b/main/inc/lib/javascript/hotspot/js/hotspot.js @@ -399,7 +399,7 @@ var HotspotQuestion = (function () {
\n\ \n\ \n\ - ' + (this.hotspotSVG.model.get('name') ? this.hotspotSVG.model.get('name') : 'hotspot ' + this.hotspotIndex) + '\n\ + ' + (this.hotspotSVG.model.name ? this.hotspotSVG.model.name : 'hotspot ' + this.hotspotIndex) + '\n\ \n\ \n\ + \n\ + \n\ +
\n\ + '; + + $el.html(template); + + $el.find('select') + .on('focus', function () { + $('.input-group').removeClass('active'); + + $el.find('.input-group').addClass('active'); + + selectedPolygonIndex = self.model.id; + }); + + return this; + }; + }; + + var ContextMenu = function () { + this.el = $('
    ', { + id: 'hotspot-context-menu' + }).addClass('dropdown-menu').get(0); + + var self = this, + $el = $(this.el); + + this.onHide = function (callback) { + $(this).on('hide', function () { + callback(); + }); + }; + + this.render = function () { + var template = '\n\ +
  • \n\ + ' + lang.CloseDelineation + '\n\ +
  • \n\ + '; + + $el.html(template); + + $el.find('a') + .on('click', function (e) { + e.preventDefault(); + + $(self).trigger('hide'); + + $el.hide(); + }); + + return this; + }; + + this.show = function (x, y) { + $el.css({ + left: x, + top: y + }).show(); + }; + }; + + var AdminSvg = function (polygonCollection, image) { + this.collection = polygonCollection; + this.el = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + + var self = this, + $el = $(this.el); + + this.collection.onAdd(function (polygonModel) { + self.renderPolygon(polygonModel); + }); + + this.render = function () { + var imageSvg = document.createElementNS('http://www.w3.org/2000/svg', 'image'); + imageSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', image.src); + imageSvg.setAttributeNS(null, 'width', image.width); + imageSvg.setAttributeNS(null, 'height', image.height); + + this.el.setAttributeNS(null, 'version', '1.1'); + this.el.setAttributeNS(null, 'viewBox', '0 0 ' + image.width + ' ' + image.height); + this.el.appendChild(imageSvg); + + var isDrawing = false; + + var contextMenu = new ContextMenu(); + contextMenu.onHide(function () { + var currentHotspot = self.collection.get(selectedPolygonIndex); + + $('[name="hotspot_coordinates[' + (currentHotspot.id + 1) + ']"]').val( + currentHotspot.encode() + ); + + isDrawing = false; + }); + + $el.on({ + 'dragstart': function (e) { + e.preventDefault(); + }, + 'click': function (e) { + e.preventDefault(); + + var currentPoint = getPointOnImage(self.el, e.clientX, e.clientY), + points = []; + + if (!isDrawing) { + isDrawing = true; + } else { + points = self.collection.get(selectedPolygonIndex).get('points'); + } + + points.push([currentPoint.x, currentPoint.y]); + + self.collection.get(selectedPolygonIndex).set('points', points); + }, + 'contextmenu': function (e) { + e.preventDefault(); + + if (!contextMenu.el.parentNode) { + $el.parent().append(contextMenu.render().el); + } + + var currentPoint = getPointOnImage(self.el, e.clientX, e.clientY); + + contextMenu.show(currentPoint.x, currentPoint.y); + } + }); + + return this; + }; + + this.renderPolygon = function (oarModel) { + var oarSVG = new PolygonSvg(oarModel); + + $el.append(oarSVG.render().el); + + var oarSelect = new HotspotSelect(oarModel); + + $el.parent().parent().find('.row').append( + oarSelect.render().el + ); + + return this; + }; + }; + + var startAdminSvg = function (questionInfo) { + var image = new Image(); + image.onload = function () { + var polygonCollection = new PolygonCollection(), + adminSvg = new AdminSvg(polygonCollection, image); + + $(config.selector) + .css('width', this.width) + .append( + adminSvg.render().el + ); + + $(config.selector).parent().prepend('
    '); + + $.each(questionInfo.hotspots, function (index, hotspotInfo) { + $('.input-group').removeClass('active'); + + var polygonModel = PolygonModel.decode(hotspotInfo); + polygonModel.id = index; + + polygonCollection.add(polygonModel); + }); + }; + image.src = questionInfo.image; + + lang = questionInfo.lang; + }; + + var UserSvg = function (answerModel, image) { + this.el = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + this.model = answerModel; + + var self = this, + $el = $(this.el); + + this.render = function () { + var imageSvg = document.createElementNS('http://www.w3.org/2000/svg', 'image'); + imageSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', image.src); + imageSvg.setAttributeNS(null, 'width', image.width); + imageSvg.setAttributeNS(null, 'height', image.height); + + this.el.setAttributeNS(null, 'version', '1.1'); + this.el.setAttributeNS(null, 'viewBox', '0 0 ' + image.width + ' ' + image.height); + this.el.appendChild(imageSvg); + + this.renderDelineation(); + + var isDrawing = false; + + var contextMenu = new ContextMenu(); + contextMenu.onHide(function () { + var answerInput = $('hotspot[' + config.questionId + '][1]'), + choiceInput = $('choice[' + config.questionId + '][1]'); + + if (!answerInput.length) { + answerInput = $('', { + type: 'hidden', + name: 'hotspot[' + config.questionId + '][1]' + }).insertAfter($el); + } + + if (!choiceInput.length) { + choiceInput = $('', { + type: 'hidden', + name: 'choice[' + config.questionId + '][1]' + }).insertAfter($el); + } + + answerInput.val(self.model.encode()); + choiceInput.val(1); + + isDrawing = false; + }); + + $el.on({ + 'dragstart': function (e) { + e.preventDefault(); + }, + 'click': function (e) { + e.preventDefault(); + + var currentPoint = getPointOnImage(self.el, e.clientX, e.clientY), + points = []; + + if (!isDrawing) { + isDrawing = true; + } else { + points = self.model.get('points'); + } + + points.push([currentPoint.x, currentPoint.y]); + + self.model.set('points', points); + }, + 'contextmenu': function (e) { + e.preventDefault(); + + if (!contextMenu.el.parentNode) { + $el.parent().append(contextMenu.render().el); + } + + var currentPoint = getPointOnImage(self.el, e.clientX, e.clientY); + + contextMenu.show(currentPoint.x, currentPoint.y); + } + }); + + return this; + }; + + this.renderDelineation = function () { + var delineationSvg = new PolygonSvg(this.model); + + $el.append( + delineationSvg.render().el + ); + }; + }; + + var startUserSvg = function (questionInfo) { + var image = new Image(); + image.onload = function () { + var answerModel = new AnswerModel({ + points: [] + }), + userSvg = new UserSvg(answerModel, image); + + $(config.selector) + .css('width', this.width) + .append( + userSvg.render().el + ); + }; + image.src = questionInfo.image; + + lang = questionInfo.lang; + }; + + var config = { + questionId: 0, + exerciseId: 0, + selector: null, + for: '' + }, + lang = {}, + selectedPolygonIndex = -1; + + var getPointOnImage = function (referenceElement, x, y) { + var pointerPosition = { + left: x + window.scrollX, + top: y + window.scrollY + }, + canvasOffset = { + x: referenceElement.getBoundingClientRect().left + window.scrollX, + y: referenceElement.getBoundingClientRect().top + window.scrollY + }; + + return { + x: Math.round(pointerPosition.left - canvasOffset.x), + y: Math.round(pointerPosition.top - canvasOffset.y) + }; + }; + + return { + init: function (settings) { + config = $.extend({ + questionId: 0, + selector: '' + }, settings); + + if (!config.questionId || !config.selector) { + return; + } + + var xhrQuestion = null; + + switch (config.for) { + case 'admin': + xhrQuestion = $.getJSON('/main/exercice/hotspot_actionscript_admin.as.php', { + modifyAnswers: parseInt(config.questionId) + }); + break; + + case 'user': + xhrQuestion = $.getJSON('/main/exercice/hotspot_actionscript.as.php', { + modifyAnswers: parseInt(config.questionId) + }); + break; + + case 'solution': + xhrQuestion = $.getJSON('/main/exercice/hotspot_answers.as.php', { + modifyAnswers: parseInt(config.questionId), + exe_id: parseInt(config.exerciseId) + }); + } + + $.when(xhrQuestion).done(function (questionInfo) { + switch (questionInfo.type) { + case 'admin': + startAdminSvg(questionInfo); + break; + + case 'user': + startUserSvg(questionInfo); + break; + + case 'solution': + break; + } + }); + } + }; +})(); diff --git a/main/lang/arabic/hotspot.inc.php b/main/lang/arabic/hotspot.inc.php deleted file mode 100755 index 927be96498..0000000000 --- a/main/lang/arabic/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/asturian/hotspot.inc.php b/main/lang/asturian/hotspot.inc.php deleted file mode 100755 index 9f5fd1a41b..0000000000 --- a/main/lang/asturian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/basque/hotspot.inc.php b/main/lang/basque/hotspot.inc.php deleted file mode 100755 index e7687cc75f..0000000000 --- a/main/lang/basque/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/bengali/hotspot.inc.php b/main/lang/bengali/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/bengali/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/bosnian/hotspot.inc.php b/main/lang/bosnian/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/bosnian/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/brazilian/hotspot.inc.php b/main/lang/brazilian/hotspot.inc.php deleted file mode 100755 index 47e7500fd0..0000000000 --- a/main/lang/brazilian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/bulgarian/hotspot.inc.php b/main/lang/bulgarian/hotspot.inc.php deleted file mode 100755 index 7ab15e5359..0000000000 --- a/main/lang/bulgarian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/catalan/hotspot.inc.php b/main/lang/catalan/hotspot.inc.php deleted file mode 100755 index 050361fe38..0000000000 --- a/main/lang/catalan/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/croatian/hotspot.inc.php b/main/lang/croatian/hotspot.inc.php deleted file mode 100755 index 122b453049..0000000000 --- a/main/lang/croatian/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/czech/hotspot.inc.php b/main/lang/czech/hotspot.inc.php deleted file mode 100755 index 2db63545db..0000000000 --- a/main/lang/czech/hotspot.inc.php +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/danish/hotspot.inc.php b/main/lang/danish/hotspot.inc.php deleted file mode 100755 index 959ca57fd3..0000000000 --- a/main/lang/danish/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/dari/hotspot.inc.php b/main/lang/dari/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/dari/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/dutch/hotspot.inc.php b/main/lang/dutch/hotspot.inc.php deleted file mode 100755 index b060be6430..0000000000 --- a/main/lang/dutch/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/english/hotspot.inc.php b/main/lang/english/hotspot.inc.php deleted file mode 100755 index d84d500360..0000000000 --- a/main/lang/english/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index c3b0dbf128..9a7b18975e 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -7582,4 +7582,19 @@ $SocialWallWriteNewPostToFriend = "Write something on your friend's wall"; $EmptyTemplate = "Blank template"; $BaseCourse = "Base course"; $BaseCourses = "Base courses"; +$Square = "Square"; +$Ellipse = "Ellipse"; +$Polygon = "Polygon"; +$HotspotStatus1 = "Draw a hotspot"; +$HotspotStatus2Polygon = "Use right-click to close the polygon"; +$HotspotStatus2Other = "Release the mousebutton to save the hotspot"; +$HotspotStatus3 = "Hotspot saved"; +$HotspotShowUserPoints = "Show/Hide userclicks"; +$ShowHotspots = "Show / Hide hotspots"; +$Triesleft = "Attempts left"; +$NextAnswer = "Now click on:"; +$CloseDelineation = "Close delineation"; +$Oar = "Area at risk"; +$HotspotExerciseFinished = "Now click on the button below to validate your answers"; +$ClosePolygon = "Close polygon"; ?> \ No newline at end of file diff --git a/main/lang/esperanto/hotspot.inc.php b/main/lang/esperanto/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/esperanto/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/faroese/hotspot.inc.php b/main/lang/faroese/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/faroese/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/finnish/hotspot.inc.php b/main/lang/finnish/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/finnish/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/french/hotspot.inc.php b/main/lang/french/hotspot.inc.php deleted file mode 100755 index 4217576520..0000000000 --- a/main/lang/french/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/friulian/hotspot.inc.php b/main/lang/friulian/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/friulian/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/galician/hotspot.inc.php b/main/lang/galician/hotspot.inc.php deleted file mode 100755 index 1f6ecba6df..0000000000 --- a/main/lang/galician/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/georgian/hotspot.inc.php b/main/lang/georgian/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/georgian/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/german/hotspot.inc.php b/main/lang/german/hotspot.inc.php deleted file mode 100755 index 3b97092b49..0000000000 --- a/main/lang/german/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/greek/hotspot.inc.php b/main/lang/greek/hotspot.inc.php deleted file mode 100755 index 4ed48d124b..0000000000 --- a/main/lang/greek/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/hebrew/hotspot.inc.php b/main/lang/hebrew/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/hebrew/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/hindi/hotspot.inc.php b/main/lang/hindi/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/hindi/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/hungarian/hotspot.inc.php b/main/lang/hungarian/hotspot.inc.php deleted file mode 100755 index e8fc8a2708..0000000000 --- a/main/lang/hungarian/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/indonesian/hotspot.inc.php b/main/lang/indonesian/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/indonesian/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/italian/hotspot.inc.php b/main/lang/italian/hotspot.inc.php deleted file mode 100755 index ed7eb34bbe..0000000000 --- a/main/lang/italian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/japanese/hotspot.inc.php b/main/lang/japanese/hotspot.inc.php deleted file mode 100755 index 36777794f7..0000000000 --- a/main/lang/japanese/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/korean/hotspot.inc.php b/main/lang/korean/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/korean/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/latvian/hotspot.inc.php b/main/lang/latvian/hotspot.inc.php deleted file mode 100755 index e42fcb85b2..0000000000 --- a/main/lang/latvian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/lithuanian/hotspot.inc.php b/main/lang/lithuanian/hotspot.inc.php deleted file mode 100755 index 36777794f7..0000000000 --- a/main/lang/lithuanian/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/macedonian/hotspot.inc.php b/main/lang/macedonian/hotspot.inc.php deleted file mode 100755 index 4e7701386f..0000000000 --- a/main/lang/macedonian/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/malay/hotspot.inc.php b/main/lang/malay/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/malay/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/norwegian/hotspot.inc.php b/main/lang/norwegian/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/norwegian/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/occitan/hotspot.inc.php b/main/lang/occitan/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/occitan/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/pashto/hotspot.inc.php b/main/lang/pashto/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/pashto/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/persian/hotspot.inc.php b/main/lang/persian/hotspot.inc.php deleted file mode 100755 index 4a05ed2bb5..0000000000 --- a/main/lang/persian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/polish/hotspot.inc.php b/main/lang/polish/hotspot.inc.php deleted file mode 100755 index 9d2b3c763f..0000000000 --- a/main/lang/polish/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/portuguese/hotspot.inc.php b/main/lang/portuguese/hotspot.inc.php deleted file mode 100755 index 0958e7cf8b..0000000000 --- a/main/lang/portuguese/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/quechua_cusco/hotspot.inc.php b/main/lang/quechua_cusco/hotspot.inc.php deleted file mode 100755 index 83414842b6..0000000000 --- a/main/lang/quechua_cusco/hotspot.inc.php +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/romanian/hotspot.inc.php b/main/lang/romanian/hotspot.inc.php deleted file mode 100755 index 8c843cda6c..0000000000 --- a/main/lang/romanian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/russian/hotspot.inc.php b/main/lang/russian/hotspot.inc.php deleted file mode 100755 index 0e9c6b9ea7..0000000000 --- a/main/lang/russian/hotspot.inc.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/serbian/hotspot.inc.php b/main/lang/serbian/hotspot.inc.php deleted file mode 100755 index df5a324554..0000000000 --- a/main/lang/serbian/hotspot.inc.php +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/simpl_chinese/hotspot.inc.php b/main/lang/simpl_chinese/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/simpl_chinese/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/slovak/hotspot.inc.php b/main/lang/slovak/hotspot.inc.php deleted file mode 100755 index f766ec8b41..0000000000 --- a/main/lang/slovak/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/slovenian/hotspot.inc.php b/main/lang/slovenian/hotspot.inc.php deleted file mode 100755 index 193af0e03d..0000000000 --- a/main/lang/slovenian/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/somali/hotspot.inc.php b/main/lang/somali/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/somali/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/spanish/hotspot.inc.php b/main/lang/spanish/hotspot.inc.php deleted file mode 100755 index 9fe73dcced..0000000000 --- a/main/lang/spanish/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index 169f3b19d9..489cf479fd 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -7607,4 +7607,19 @@ $SocialWallWriteNewPostToFriend = "Escribe algo interesante en el muro de tu ami $EmptyTemplate = "Plantilla vacía"; $BaseCourse = "Curso base"; $BaseCourses = "Cursos base"; +$Square = "Cuadrado/rectángulo"; +$Ellipse = "Elipse"; +$Polygon = "Polígono"; +$HotspotStatus1 = "Dibuje una zona interactiva"; +$HotspotStatus2Polygon = "Use el botón derecho del ratón para cerrar el polígono"; +$HotspotStatus2Other = "Suelte el botón del ratón para guardar la zona interactiva"; +$HotspotStatus3 = "Zona interactiva guardada"; +$HotspotShowUserPoints = "Mostrar/Ocultar clicks"; +$ShowHotspots = "Mostrar/Ocultar zonas interactivas"; +$Triesleft = "Intentos restantes"; +$NextAnswer = "Haga clic sobre:"; +$CloseDelineation = "Cerrar delimitación"; +$Oar = "Zona de riesgo"; +$HotspotExerciseFinished = "Todas las zonas han sido seleccionadas. Ahora puede reasignar sus respuestas o pulsar el botón inferior y dar por finalizada la pregunta."; +$ClosePolygon = "Cerrar polígono"; ?> \ No newline at end of file diff --git a/main/lang/spanish_latin/hotspot.inc.php b/main/lang/spanish_latin/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/spanish_latin/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/swahili/hotspot.inc.php b/main/lang/swahili/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/swahili/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/swedish/hotspot.inc.php b/main/lang/swedish/hotspot.inc.php deleted file mode 100755 index c927ebf18e..0000000000 --- a/main/lang/swedish/hotspot.inc.php +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/tagalog/hotspot.inc.php b/main/lang/tagalog/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/tagalog/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/thai/hotspot.inc.php b/main/lang/thai/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/thai/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/tibetan/hotspot.inc.php b/main/lang/tibetan/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/tibetan/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/trad_chinese/hotspot.inc.php b/main/lang/trad_chinese/hotspot.inc.php deleted file mode 100755 index b665434512..0000000000 --- a/main/lang/trad_chinese/hotspot.inc.php +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/turkish/hotspot.inc.php b/main/lang/turkish/hotspot.inc.php deleted file mode 100755 index 97674caebe..0000000000 --- a/main/lang/turkish/hotspot.inc.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/ukrainian/hotspot.inc.php b/main/lang/ukrainian/hotspot.inc.php deleted file mode 100755 index b817467333..0000000000 --- a/main/lang/ukrainian/hotspot.inc.php +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/vietnamese/hotspot.inc.php b/main/lang/vietnamese/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/vietnamese/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/xhosa/hotspot.inc.php b/main/lang/xhosa/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/xhosa/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/lang/yoruba/hotspot.inc.php b/main/lang/yoruba/hotspot.inc.php deleted file mode 100755 index fdfb06ff3d..0000000000 --- a/main/lang/yoruba/hotspot.inc.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/main/plugin/hotspot/JavaScriptFlashGateway.js b/main/plugin/hotspot/JavaScriptFlashGateway.js deleted file mode 100755 index 7f121bd02d..0000000000 --- a/main/plugin/hotspot/JavaScriptFlashGateway.js +++ /dev/null @@ -1,455 +0,0 @@ -/* -Macromedia(r) Flash(r) JavaScript Integration Kit License - - -Copyright (c) 2005 Macromedia, inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: - -"This product includes software developed by Macromedia, Inc. -(http://www.macromedia.com)." - -Alternately, this acknowledgment may appear in the software itself, if and -wherever such third-party acknowledgments normally appear. - -4. The name Macromedia must not be used to endorse or promote products derived -from this software without prior written permission. For written permission, -please contact devrelations@macromedia.com. - -5. Products derived from this software may not be called "Macromedia" or -"Macromedia Flash", nor may "Macromedia" or "Macromedia Flash" appear in their -name. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MACROMEDIA OR -ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - --- - -This code is part of the Flash / JavaScript Integration Kit: -http://www.macromedia.com/go/flashjavascript/ - -Created by: - -Christian Cantrell -http://weblogs.macromedia.com/cantrell/ -mailto:cantrell@macromedia.com - -Mike Chambers -http://weblogs.macromedia.com/mesh/ -mailto:mesh@macromedia.com - -Macromedia -*/ - -/** - * Create a new Exception object. - * name: The name of the exception. - * message: The exception message. - */ -function Exception(name, message) -{ - if (name) - this.name = name; - if (message) - this.message = message; -} - -/** - * Set the name of the exception. - */ -Exception.prototype.setName = function(name) -{ - this.name = name; -} - -/** - * Get the exception's name. - */ -Exception.prototype.getName = function() -{ - return this.name; -} - -/** - * Set a message on the exception. - */ -Exception.prototype.setMessage = function(msg) -{ - this.message = msg; -} - -/** - * Get the exception message. - */ -Exception.prototype.getMessage = function() -{ - return this.message; -} - -/** - * Generates a browser-specific Flash tag. Create a new instance, set whatever - * properties you need, then call either toString() to get the tag as a string, or - * call write() to write the tag out. - */ - -/** - * Creates a new instance of the FlashTag. - * src: The path to the SWF file. - * width: The width of your Flash content. - * height: the height of your Flash content. - */ -function FlashTag(src, width, height) -{ - this.src = src; - this.width = width; - this.height = height; - this.version = '7,0,14,0'; - this.id = null; - this.bgcolor = 'ffffff'; - this.flashVars = null; -} - -/** - * Sets the Flash version used in the Flash tag. - */ -FlashTag.prototype.setVersion = function(v) -{ - this.version = v; -} - -/** - * Sets the ID used in the Flash tag. - */ -FlashTag.prototype.setId = function(id) -{ - this.id = id; -} - -/** - * Sets the background color used in the Flash tag. - */ -FlashTag.prototype.setBgcolor = function(bgc) -{ - this.bgcolor = bgc; -} - -/** - * Sets any variables to be passed into the Flash content. - */ -FlashTag.prototype.setFlashvars = function(fv) -{ - this.flashVars = fv; -} - -/** - * Get the Flash tag as a string. - */ -FlashTag.prototype.toString = function() -{ - var ie = (navigator.appName.indexOf ("Microsoft") != -1) ? 1 : 0; - var flashTag = new String(); - if (ie) - { - flashTag += ''; - flashTag += ''; - flashTag += ''; - flashTag += ''; - if (this.flashVars != null) - { - flashTag += ''; - } - flashTag += ''; - } - else - { - flashTag += ''; - break; - case 'string': - doc.xml += ''+this._escapeXml(obj)+''; - break; - case 'number': - doc.xml += ''+obj+''; - break; - case 'boolean': - doc.xml += ''; - break; - case 'object': - if (obj == null) - { - doc.xml += ''; - } - else if (obj instanceof Date) - { - doc.xml += ''+obj.getTime()+''; - } - else if (obj instanceof Array) - { - doc.xml += ''; - for (var i = 0; i < obj.length; ++i) - { - this._serializeNode(obj[i], doc, null); - } - doc.xml += ''; - } - else - { - doc.xml += ''; - for (var n in obj) - { - if (typeof(obj[n]) == 'function') - continue; - this._serializeNode(obj[n], doc, n); - } - doc.xml += ''; - } - break; - default: - throw new Exception("FlashSerializationException", - "You can only serialize strings, numbers, booleans, objects, dates, arrays, nulls and undefined"); - break; - } -} - -/** - * Private - */ -FlashSerializer.prototype._addName= function(name) -{ - if (name != null) - { - return ' name="'+name+'"'; - } - return ''; -} - -/** - * Private - */ -FlashSerializer.prototype._escapeXml = function(str) -{ - if (this.useCdata) - return ''; - else - return str.replace(/&/g,'&').replace(/ ""){ - // +1 because array names starts from 1 - _root.i = int(j) + 1; - // -1 because array values starts from 0 - _root.pType = _root.hotspots[_root.i - 1][1]; - if(_root.pType=="poly" || _root.pType=="delineation"){ - drawPoly(); - } - else{ - drawShape(true); - } - _root.map_mc["hotspot" + _root.i]._alpha = 0; - } - } -} - -function drawPoints(){ - answers = _root.target_mc.p_hotspot_answers.split("|"); - - if(answers[0]!=''){ - j = 1; - k = 500; - - for(var z:String in answers){ - if(target_mc["hotspot_"+j+"_type"]=="delineation") - { - // trace poly - delineation_coords = answers[j-1].split("/"); - drawDelineation(j, delineation_coords); - } - else - { - - xy = answers[j-1].split(";"); - $x = xy[0]; - $y = xy[1]; - - // create new hotspot - _root.createEmptyMovieClip("hotspot_answer" + j, k); - - // attach correct type of hotspot - _root["hotspot_answer" + j].attachMovie("numbers", "hotspot_mc", _root["hotspot_answer" + j].getNextHighestDepth()); - - _root["hotspot_answer" + j].hotspot_mc._width = 33; - _root["hotspot_answer" + j].hotspot_mc._height = 22; - - _root["hotspot_answer" + j].hotspot_mc._x = int($x) + _root.map_mc._x; - _root["hotspot_answer" + j].hotspot_mc._y = int($y) + _root.map_mc._y; - - _root["hotspot_answer" + j].hotspot_mc.order_txt.text = int(j); - _root["hotspot_answer" + j].hotspot_mc._visible = false; - - _root["hotspot_answer" + j]._alpha = 0; - } - - j++; - k++; - } - } - - -} - -function drawShape(userDrawing){ - // create new hotspot - _root.map_mc.createEmptyMovieClip("hotspot" + _root.i, _root.i); - - // attach correct type of hotspot - _root.map_mc["hotspot" + _root.i].attachMovie(_root.pType, "hotspot_mc", _root.map_mc["hotspot" + _root.i].getNextHighestDepth()); - - _root.map_mc["hotspot" + _root.i].hotspot_mc._visible = true; - _root.map_mc["hotspot" + _root.i].hotspot_mc.center_mc._alpha = 60; - _root.map_mc["hotspot" + _root.i].hotspot_mc._x = _root["p_hotspot_"+ _root.i][0]; - _root.map_mc["hotspot" + _root.i].hotspot_mc._y = _root["p_hotspot_"+ _root.i][1]; - _root.map_mc["hotspot" + _root.i].hotspot_mc._width = _root["p_hotspot_"+ _root.i][2]; - _root.map_mc["hotspot" + _root.i].hotspot_mc._height = _root["p_hotspot_"+ _root.i][3]; - - colorchange = new Color(_root.map_mc["hotspot" + _root.i].hotspot_mc); - colorchange.setRGB(_root.hotspots_c[_root.i - 1]); -} -// when black lines of hotspots are deleted, draw the exact same poly with coordinates -// that are saved in the array -function drawPoly(){ - // create empty movieclip - _root.map_mc.createEmptyMovieClip("hotspot" + _root.i, _root.i); - - // begin filling the movieclip - _root.map_mc["hotspot" + _root.i].beginFill(_root.hotspots_c[_root.i - 1], 60); - - // set linestyle - _root.map_mc["hotspot" + _root.i].lineStyle(1, _root.hotspots_c[_root.i - 1], 100); - - // move mouse to first coordinate - _root.map_mc["hotspot" + _root.i].moveTo(_root["p_hotspot_"+_root.i][0][0],_root["p_hotspot_"+_root.i][0][1]); - - // draw lines to all coordinates - v = _root["p_hotspot_"+_root.i].length; - for (k=1;k= 3 check for Flash plugin in plugin array - if (navigator.plugins != null && navigator.plugins.length > 0) { - if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) { - var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : ""; - var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description; - descArray = flashDescription.split(" "); - tempArrayMajor = descArray[2].split("."); - versionMajor = tempArrayMajor[0]; - versionMinor = tempArrayMajor[1]; - if ( descArray[3] != "" ) { - tempArrayMinor = descArray[3].split("r"); - } else { - tempArrayMinor = descArray[4].split("r"); - } - versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0; - flashVer = versionMajor + "." + versionMinor + "." + versionRevision; - } else { - flashVer = -1; - } - } - // MSN/WebTV 2.6 supports Flash 4 - else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4; - // WebTV 2.5 supports Flash 3 - else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3; - // older WebTV supports Flash 2 - else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2; - // Can\'t detect in all other cases - else { - - flashVer = -1; - } - return flashVer; -} -// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available -function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision) -{ - reqVer = parseFloat(reqMajorVer + "." + reqRevision); - // loop backwards through the versions until we find the newest version - for (i=25;i>0;i--) { - if (isIE && isWin && !isOpera) { - versionStr = VBGetSwfVer(i); - } else { - versionStr = JSGetSwfVer(i); - } - if (versionStr == -1 ) { - return false; - } else if (versionStr != 0) { - if(isIE && isWin && !isOpera) { - tempArray = versionStr.split(" "); - tempString = tempArray[1]; - versionArray = tempString .split(","); - } else { - versionArray = versionStr.split("."); - } - versionMajor = versionArray[0]; - versionMinor = versionArray[1]; - versionRevision = versionArray[2]; - - versionString = versionMajor + "." + versionRevision; // 7.0r24 == 7.24 - versionNum = parseFloat(versionString); - // is the major.revision >= requested major.revision AND the minor version >= requested minor - if ( (versionMajor > reqMajorVer) && (versionNum >= reqVer) ) { - return true; - } else { - return ((versionNum >= reqVer && versionMinor >= reqMinorVer) ? true : false ); - } - } - } -} diff --git a/main/plugin/hotspot/vbmethods.vbscript b/main/plugin/hotspot/vbmethods.vbscript deleted file mode 100755 index ff648bdba4..0000000000 --- a/main/plugin/hotspot/vbmethods.vbscript +++ /dev/null @@ -1,13 +0,0 @@ - -Function VBGetSwfVer(i) - on error resume next - Dim swControl, swVersion - swVersion = 0 - - set swControl = CreateObject(\"ShockwaveFlash.ShockwaveFlash.\" + CStr(i)) - if (IsObject(swControl)) then - swVersion = swControl.GetVariable(\"\$version\") - end if - VBGetSwfVer = swVersion -End Function - diff --git a/main/webservices/courses_list.soap.php b/main/webservices/courses_list.soap.php index 9e1be78e11..d98b6641fb 100755 --- a/main/webservices/courses_list.soap.php +++ b/main/webservices/courses_list.soap.php @@ -44,7 +44,7 @@ $server->wsdl->addComplexType( 'SOAP-ENC:Array', array(), array( - array('ref'=>'SOAP:ENC:arrayType', + array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:courseDetails[]') ), 'tns:courseDetails' diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index 0bb6a0f074..6aee97b3e8 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -6299,7 +6299,7 @@ $server->wsdl->addComplexType( 'SOAP-ENC:Array', array(), array( - array('ref'=>'SOAP:ENC:arrayType', + array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:certificateDetails[]') ), 'tns:certificateDetails' diff --git a/main/webservices/user_info.soap.php b/main/webservices/user_info.soap.php index 2c08c83c58..8eddd3f9b3 100755 --- a/main/webservices/user_info.soap.php +++ b/main/webservices/user_info.soap.php @@ -42,7 +42,7 @@ $server->wsdl->addComplexType( 'SOAP-ENC:Array', array(), array( - array('ref'=>'SOAP:ENC:arrayType', + array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:courseDetails[]') ), 'tns:courseDetails' @@ -120,7 +120,7 @@ $server->wsdl->addComplexType( 'SOAP-ENC:Array', array(), array( - array('ref'=>'SOAP:ENC:arrayType', + array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:eventDetails[]') ), 'tns:eventDetails'