Merge remote-tracking branch 'origin/develop'

Author: Mstrodl

inc/databaseConn.php

@@ -79,7 +79,7 @@ function getMeetingInfo($sectionData) {
     ];
 
     if (isset($sectionData['description'])) {
-        $course['description'] = $sectionData['description'];
+        $course['description'] = iconv("ISO-8859-1", "UTF-8", $sectionData['description']);
     }
 
     // Make sure special sections don't get double-counted for their credits

tools/Parser.php

@@ -199,6 +199,7 @@ function fileToTempTable(string $tableName, $file, $fields, $fileSize, string $p
         while ($str = fgets($file, 4096)) {
             // Trim those damn newlines
             $str = trim($str);
+            $str = iconv("ISO-8859-1", "UTF-8", $str);
 
             // Progress bar
             if ($this->debugMode) {
@@ -238,8 +239,9 @@ function fileToTempTable(string $tableName, $file, $fields, $fileSize, string $p
             }
 
             // Build a query
-            $insQuery = "INSERT INTO {$tableName} VALUES('" . implode("', '", $lineSplit) . "')";
-            if (!mysqli_query($this->dbConn, $insQuery)) {
+            $stmt = $this->dbConn->prepare("INSERT INTO {$tableName} VALUES(" . implode(", ", array_fill(0, $fields, "?")) . ")");
+            $stmt->bind_param(str_repeat("s", $fields), ...$lineSplit);
+            if (!$stmt->execute()) {
                 echo("*** Failed to insert {$tableName}\n");
                 echo("    " . mysqli_error($this->dbConn) . "\n");
                 continue;