Merge pull request #288 from ComputerScienceHouse/develop

Bring up master to develop
ComputerScienceHouse · Jan 19, 2022 · 64c75fe · 64c75fe
2 parents d1fd981 + 2ec1899
commit 64c75fe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12-buster-slim as builder
+FROM docker.io/node:12-buster-slim as builder
 LABEL author="Devin Matte <[email protected]>"
 
 WORKDIR /usr/src/schedule
@@ -11,7 +11,7 @@ COPY assets ./assets
 RUN npm run-script build
 
 
-FROM php:7.3-apache
+FROM docker.io/php:7.3-apache
 LABEL author="Devin Matte <[email protected]>"
 
 RUN echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list

diff --git a/index.php b/index.php
@@ -26,8 +26,8 @@
 require_once('./inc/databaseConn.php');
 require_once('./inc/timeFunctions.php');
 
-// Strips the 'http:' from the root address so it can work on SSL.
-$ASSETROOTADDRESS = substr($HTTPROOTADDRESS, 5);
+// Strips the 'http(s):' from the root address so it can work on SSL.
+$ASSETROOTADDRESS = substr($HTTPROOTADDRESS, strpos($HTTPROOTADDRESS, ":") + 1);
 
 // HACK FOR OPEN-GRAPH TAGS, I KNOW, THIS IS TERRIBLE
 $path = explode('/', $_SERVER['REQUEST_URI']);
@@ -44,7 +44,7 @@
 //OLD header.inc
 ?>
 <!DOCTYPE html>
-<html prefix="og: http://ogp.me/ns#" ng-app="sm" lang="en">
+<html prefix="og: https://ogp.me/ns#" ng-app="sm" lang="en">
 	<head>
 		<title><?= (!empty($TITLE)) ? $TITLE . " - " : "" ?>Schedule Maker</title>
 
@@ -66,7 +66,7 @@
         <meta property="og:title" content="<?= (!empty($TITLE)) ? $TITLE . " - " : "" ?>ScheduleMaker" />
         <meta property="og:type" content="website" />
         <meta property="og:description" content="CSH ScheduleMaker makes picking your RIT class schedule easy! Preview all permutations of your schedule, browse available courses, and search for any course, all with ScheduleMaker.">
-        <meta property="og:url" content="http://<?= $_SERVER['HTTP_HOST'] ?><?= $_SERVER['REQUEST_URI'] ?>" />
+        <meta property="og:url" content="https://<?= $_SERVER['HTTP_HOST'] ?><?= $_SERVER['REQUEST_URI'] ?>" />
         <? if(!empty($IMGURL)) { ?>
         <meta property="og:image" content="<?= $IMGURL ?>" />
         <? } else { ?>
@@ -100,20 +100,20 @@
 			</div>
 			<footer class="main default">
 				<div class="container">
-					<div class="csh"><a target="_blank" rel="noopener" href="http://www.csh.rit.edu/"><img width="90" src="<?=$ASSETROOTADDRESS?>img/csh_logo_square.svg" alt="CSH" /></a></div>
+					<div class="csh"><a target="_blank" rel="noopener" href="https://www.csh.rit.edu/"><img width="90" src="<?=$ASSETROOTADDRESS?>img/csh_logo_square.svg" alt="CSH" /></a></div>
 					<a target="_blank" rel="noopener" href="https://github.com/ComputerScienceHouse/schedulemaker">Version: <?=$APP_VERSION?></a> | <a ui-sref="help">Help</a> | <a href="/status">Status</a> | <a target="_blank" rel="noopener" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">Report Issues</a>
 					<div>
 						Development v3.1: Devin Matte (matted at csh.rit.edu)<br>
 						Development v3: Ben Grawi (bgrawi at csh.rit.edu)<br>
 						Development v2: Ben Russell (benrr101 at csh.rit.edu)<br>
 						Idea: John Resig (phytar at csh.rit.edu)<br>
-						Hosting: <a href="http://www.csh.rit.edu/">Computer Science House</a><br>
+						Hosting: <a href="https://www.csh.rit.edu/">Computer Science House</a><br>
 					</div>
 				</div>
 			</footer>
 			<footer class="main print">
 				Made Using <a href='<?= $HTTPROOTADDRESS ?>'>CSH ScheduleMaker</a>
-				<a target="_blank" rel="noopener" href="http://www.csh.rit.edu/"><img height="25" src="/img/csh_print.png"></a>
+				<a target="_blank" rel="noopener" href="https://www.csh.rit.edu/"><img height="25" src="/img/csh_print.png"></a>
 			</footer>
 		</div>
 		<!-- LOAD SCRIPTS LAST -->

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
   "config": {
     "stateVersion": 1
   },
-  "homepage": "http://schedule.csh.rit.edu",
+  "homepage": "https://schedule.csh.rit.edu",
   "devDependencies": {
     "@datadog/browser-rum": "^3.6.10",
     "@types/angular": "1.5",