Fixes for iCal support, comma courses, and versioning.

Author: bgrawi

.htaccess

@@ -11,6 +11,7 @@ RewriteRule ^schedule.php$ http://schedule-old.csh.rit.edu/schedule.php [NC,L,R=
 
 RewriteCond %{HTTP:Accept} application/json [NC]
 RewriteRule ^(schedule|generate|entity|search|status|rmp)(?:/([^/]*))*$ api/$1.php [L]
+RewriteRule ^schedule/[^/]*/ical$ api/schedule.php [L]
 
 
 # Don't rewrite files or directories

api/generate.php

@@ -210,9 +210,9 @@ function timeStringToMinutes($str) {
         $courseOptions = array();
         foreach(explode(',', $_POST['course']) as $course) {
             // If the course has enough characters for a lab section but
-            // but doesn't match OR there are <= 9 characters but it isn't
+            // but doesn't match OR there are <= 12 characters but it isn't
             // numeric, then they fucked up.
-            if(strlen($course) > 11) {
+            if(strlen($course) > 13) {
                 die(json_encode(array("error" => "argument", "msg" => "Your courses must be in the format XXXX-XXX-XXLX")));
             }
 

api/schedule.php

@@ -51,7 +51,7 @@ function generateIcal($schedule) {
 	$code .= "CALSCALE:GREGORIAN\r\n";
 
 	// Iterate over all the courses
-	foreach($schedule['courses'][0] as $course) {
+	foreach($schedule['courses'] as $course) {
 		// Skip classes that don't meet
 		if(empty($course['times'])) {
 			continue;
@@ -245,16 +245,12 @@ function renderSvg($svg, $id) {
 	case "ical":
 		// iCAL FORMAT SCHEDULE ////////////////////////////////////////////
 		// If we don't have a schedule, die!
-		if(empty($_GET['id'])) {
+		if(empty($id)) {
 			die("You must provide a schedule");
 		}
 
-		// Database connection is required
-		require_once("inc/databaseConn.php");
-		require_once("inc/timeFunctions.php");
-
 		// Decode the schedule
-		$schedule = getScheduleFromId(hexdec($_GET['id']));		
+		$schedule = getScheduleFromId($id);		
 
 		// Set header for ical mime, output the xml
 		header("Content-Type: text/calendar");

index.php

@@ -17,6 +17,7 @@
 } 
 
 // REQUIRED FILES
+$APP_ROOT = "./";
 require_once('./inc/config.php');
 require_once('./inc/databaseConn.php');
 require_once('./inc/timeFunctions.php');
@@ -90,7 +91,7 @@
 			</div>
 			<footer class="main default">
 				<div class="csh"><a target="_blank" href="http://www.csh.rit.edu/"><img src="<?=$HTTPROOTADDRESS?>img/csh.png" alt="CSH" /></a></div>
-				<a ui-sref="help">Help</a> | <a href="/status">Status</a> | <a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">Report Issues</a>
+				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>
 				<div>
 					Idea: John Resig (phytar at csh.rit.edu)<br>
 					Development v2: Ben Russell (benrr101 at csh.rit.edu),<br>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",
@@ -38,6 +38,9 @@
   "bugs": {
     "url": "https://github.com/ComputerScienceHouse/schedulemaker/issues"
   },
+  "config": {
+	"stateVersion": 1
+  },
   "homepage": "http://schedule.csh.rit.edu",
   "devDependencies": {
     "gulp": "^3.6.0",