Skip to content

Commit ebf1dc5

Browse files
committed
Fixed #57 Allowed assets to be loaded regardless of protocall
1 parent efb44bb commit ebf1dc5

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

index.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
require_once('./inc/databaseConn.php');
2323
require_once('./inc/timeFunctions.php');
2424

25+
// Strips the 'http:' from the root address so it can work on SSL.
26+
$ASSETROOTADDRESS = substr($HTTPROOTADDRESS, 5);
27+
2528
// HACK FOR OPEN-GRAPH TAGS, I KNOW, THIS IS TERRIBLE
2629
$path = explode('/', $_SERVER['REQUEST_URI']);
2730
if ($path[1] == 'schedule') {
@@ -50,7 +53,7 @@
5053
<!-- STYLE SHEETS -->
5154
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Roboto:300,700">
5255
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css">
53-
<link rel="stylesheet" href="<?=$HTTPROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.css">
56+
<link rel="stylesheet" href="<?=$ASSETROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.css">
5457

5558
<!-- OPEN GRAPH TAGS -->
5659
<meta name="twitter:card" content="photo">
@@ -90,7 +93,7 @@
9093
<div ui-view autoscroll="false"></div>
9194
</div>
9295
<footer class="main default">
93-
<div class="csh"><a target="_blank" href="http://www.csh.rit.edu/"><img src="<?=$HTTPROOTADDRESS?>img/csh.png" alt="CSH" /></a></div>
96+
<div class="csh"><a target="_blank" href="http://www.csh.rit.edu/"><img src="<?=$ASSETROOTADDRESS?>img/csh.png" alt="CSH" /></a></div>
9497
Version: <?=$APP_VERSION?> | <a ui-sref="help">Help</a> | <a href="/status">Status</a> | <a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">Report Issues</a>
9598
<div>
9699
Development v3: Ben Grawi (bgrawi at csh.rit.edu)<br>
@@ -121,7 +124,7 @@
121124
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular-animate.min.js"></script>
122125
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular-sanitize.min.js"></script>
123126
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.8/angular-ui-router.min.js"></script>
124-
<script src="<?=$HTTPROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.js"></script>
127+
<script src="<?=$ASSETROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.js"></script>
125128
</body>
126129
</html>
127130

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "schedulemaker",
3-
"version": "3.0.6",
3+
"version": "3.0.7",
44
"private": true,
55
"description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
66
"main": "index.php",

0 commit comments

Comments
 (0)