Merge pull request #405 from ucfopen/dev/v2-4-2

Release 2.4.2

Author: bagofarms

config/settings.php

@@ -3,7 +3,7 @@
 define('ENV_PROD', 'prod');
 define('ENV_DEV', 'dev');
 
-define('UDOIT_VERSION', '2.4.1');
+define('UDOIT_VERSION', '2.4.2');
 
 // SET UP AUTOLOADER (uses autoload rules from composer)
 require_once(__DIR__.'/../vendor/autoload.php');

migrations/001_move_reports_to_db.php

@@ -70,7 +70,7 @@
 echo("Migrating old reports from disk to database.\r\n");
 
 // Grab all rows from the reports table
-if ($rows = UdoidDB::query('SELECT * FROM reports')) {
+if ($rows = UdoitDB::query('SELECT * FROM reports')) {
     $rows = $rows->fetchAll();
 }
 

public/assets/js/default.js

@@ -20,6 +20,11 @@
 var progressTimer = null;
 var $doc = $(document); // hold a jquery doc reference
 
+/* Escapes special characters for use in jquery selectors. */
+function escapeSelector(sel){
+	return sel.replace( /(:|\.|\[|\]|,|=|@|\|)/g, "\\$1" );
+}
+
 /* Fades out and destroys the popup window and background. */
 function killButton(callback) {
 	var $popup = $('#popup');
@@ -355,7 +360,7 @@ $doc.ready(function() {
 
 	// view error source
 	$doc.on('click', '.viewError', function(e) {
-		let errorId = e.target.dataset.error;
+		let errorId = escapeSelector(e.target.dataset.error);
 		let $error = $('#'+errorId);
 
 		$(this).addClass('hidden');
@@ -368,7 +373,7 @@ $doc.ready(function() {
 
 	// close error source
 	$doc.on('click', '.closeError', function(e) {
-		let errorId = e.target.dataset.error;
+		let errorId = escapeSelector(e.target.dataset.error);
 		let $error = $('#'+errorId);
 		let $vidiframe = $error.find('div.more-info .error-preview iframe')
 		let tmpElement = null