Merge pull request #366 from ComputerScienceHouse/fix-ntid-classes

Fix ntid classes

Author: BigSpaceships

.gitignore

@@ -37,4 +37,3 @@ web.config
 vwd.webinfo
 WebEssentials-Settings.json
 vendor
-composer.lock

Dockerfile

@@ -14,7 +14,7 @@ RUN npm run-script build
 FROM docker.io/php:7.3-apache
 LABEL author="Devin Matte <matted@csh.rit.edu>"
 
-RUN echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list
+RUN echo "deb-src http://archive.debian.org/debian buster main" >> /etc/apt/sources.list
 
 RUN apt-get -yq update && \
     apt-get -yq install \
@@ -59,6 +59,8 @@ RUN a2enmod rewrite && a2enmod headers && a2enmod expires && \
     sed -i '/Listen/{s/\([0-9]\+\)/8080/; :a;n; ba}' /etc/apache2/ports.conf && \
     chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2
 
+RUN git config --global --add safe.directory /var/www/html
+
 COPY . /var/www/html
 COPY --from=builder /usr/src/schedule/assets/prod /var/www/html/assets/prod
 

api/generate.php

@@ -67,7 +67,7 @@ function ajaxErrorHandler($errno, $errstr, $errfile, $errline) {
             }
 
             $course = strtoupper($course);
-            preg_match('/([A-Z]{4})[-\s]*(\d{0,3}[A-Z]?)?(?:[-\s]+(\d{0,2}[A-Z]?\d?))?/', $course, $courseParts);
+            preg_match('/([A-Z0-9]{4})[-\s]*(\d{0,3}[A-Z]?)?(?:[-\s]+(\d{0,2}[A-Z]?\d?))?/', $course, $courseParts);
 
             // Query base: Noncancelled courses from the requested term
             $query = "SELECT s.id