Merge branch 'feature/spaRefactor' into develop

Author: bgrawi

.gitignore

@@ -1,19 +1,32 @@
-# Ignore PhpStorm files
-.idea
+#### PROJECT IGNORES ####
 
 # Ignore configuration files
 inc/config.php
 
 # Ignore schedule images
 img/schedules/*.png
 
+# Ignore node_modules dependencies
+node_modules/*
+
+# Ignore built files
+assets/prod/*
+!assets/prod/.gitkeep
+
+#### EDITOR IGNORES####
+
+# Ignore PhpStorm files
+.idea
+
 # Ignore Eclipse files
 .settings
 .project
 .buildpath
 
 # Ignore VisualStudio files
-/*.phpproj*
-/*.sln
-/*.suo
-/WebEssentials-Settings.json
+*.phpproj*
+*.sln
+*.suo
+web.config
+vwd.webinfo
+WebEssentials-Settings.json

.htaccess

@@ -1,2 +1,23 @@
-RewriteEngine On
-RewriteRule ^schedule/([^/]*)(?:/([^/]*))?$ /schedule.php?id=$1&mode=$2 [L]
+RewriteEngine On
+
+#Legacy Rewrites
+RewriteCond %{QUERY_STRING} ^id=(.*)$ [NC]
+RewriteRule ^schedule.php$ /schedule/%1? [NC,L,R=302]
+
+
+# Let old ScheduleMaker handle Resig's schedules for now
+#RewriteCond %{QUERY_STRING} ^mode=old&id=(.*)$ [NC]
+RewriteRule ^schedule.php$ http://schedule-old.csh.rit.edu/schedule.php [NC,L,R=302]
+
+RewriteCond %{HTTP:Accept} application/json [NC]
+RewriteRule ^(schedule|generate|entity|search|status|rmp)(?:/([^/]*))*$ api/$1.php [L]
+
+
+# Don't rewrite files or directories
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+
+
+# Rewrite everything else to index.html to allow html5 state links
+RewriteRule ^ index.php [L]

js/entityAjax.php api/entity.phpjs/entityAjax.php renamed to api/entity.php

@@ -22,12 +22,9 @@
 $_POST = sanitize($_POST);
 
 // MAIN EXECUTION //////////////////////////////////////////////////////////
-if(empty($_POST['action'])) {
-	die(json_encode(array("error" => "argument", "msg" => "You must provide an action")));
-}
 
 // Switch on the action
-switch($_POST['action']) {
+switch(getAction()) {
 	case "getCourses":
 		// Query for the courses in this department
 

js/scheduleAjax.php api/generate.phpjs/scheduleAjax.php renamed to api/generate.php

@@ -1,10 +1,10 @@
 <?php
 ////////////////////////////////////////////////////////////////////////////
-// SCHEDULE AJAX CALLS
+// GENERATION AJAX CALLS
 //
 // @author	Ben Russell ([email protected])
 //
-// @file	js/scheduleAjax.php
+// @file	api/generate.php
 // @descrip	Provides standalone JSON object retreival for schedule designing
 // 			form　and display
 ////////////////////////////////////////////////////////////////////////////
@@ -184,42 +184,6 @@ function timeStringToMinutes($str) {
     return $hour * 60 + $minute;
 }
 
-/**
- * Generates a render of schedule's SVG. The PNG render of the image will be
- * stored in /img/schedules/ with a filename equal to the id of the schedule.
- * @param   $svg    string  The SVG code for the image
- * @param   $id     string  The ID of the schedule, for file name generation
- * @return  bool    True on success, False otherwise.
- */
-function renderSvg($svg, $id) {
-    try {
-    	
-    	// Prepend parsing info
-    	$svg = preg_replace('/(.*<svg[^>]* width=")(100\%)(.*)/', '${1}1000px${3}', $svg);
-    	$svg = '<?xml version="1.1" encoding="UTF-8" standalone="no"?>' . $svg;
-        // Load the image into an ImageMagick object
-        $im = new Imagick();
-        $im->readimageblob($svg);
-
-        // Convert it to png
-        $im->setImageFormat("png24");
- 
-        $im->scaleimage(1000, 600, true);
-
-
-        // Write it to the filesystem
-        $im->writeimage("../img/schedules/{$id}.png");
-        $im->clear();
-        $im->destroy();
-
-        // Success!
-        return true;
-
-    } catch(Exception $e) {
-        return false;
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////
 // MAIN EXECUTION
 
@@ -229,12 +193,7 @@ function renderSvg($svg, $id) {
 // Escape the post data
 $_POST = sanitize($_POST);
 
-// What action are we performing today?
-if(empty($_POST['action'])) {
-	$_POST['action'] = null;
-}
-
-switch($_POST['action']) {
+switch(getAction()) {
 	////////////////////////////////////////////////////////////////////////
 	// GET COURSE OPTIONS	
 	case "getCourseOpts":
@@ -328,22 +287,6 @@ function renderSvg($svg, $id) {
 
 		break;
 
-	////////////////////////////////////////////////////////////////////////
-	// GET TIME DROPDOWNS
-	case "getTimeField":
-		// Verify that we have the field name and the default time
-		if(empty($_POST['name'])) {
-			die(json_encode(array("error"=>"argument", "msg"=>"A field name must be provided", "arg"=>"name")));
-		}
-		if(empty($_POST['default'])) {
-			die(json_encode(array("error"=>"argument", "msg"=>"A default time must be provided", "arg"=>"default")));
-		}
-
-		// Return the code
-		echo json_encode(array("code" => getTimeField($_POST['name'], $_POST['default'])));
-
-		break;
-
 	////////////////////////////////////////////////////////////////////////
 	// GET MATCHING SCHEDULES
 	case "getMatchingSchedules":
@@ -434,76 +377,7 @@ function renderSvg($svg, $id) {
 
 		break;
 
-	////////////////////////////////////////////////////////////////////////
-	// STORE A SCHEDULE
-	case "saveSchedule":
-		// There has to be a json object given
-		if(empty($_POST['data'])) {
-			die(json_encode(array("error" => "argument", "msg" => "No schedule was provided", "arg" => "schedule")));
-		}
-		$_POST['data'] = html_entity_decode($_POST['data'], ENT_QUOTES);
-		$json = stripslashes($_POST['data']);
-		
-		// Make sure the object was successfully decoded
-		$json = json_decode($json, true);
-		if($json == null) {
-			die(json_encode(array("error" => "argument", "msg" => "The schedule could not be decoded", "arg" => "schedule")));
-		}
-		if(!isset($json['starttime']) || !isset($json['endtime']) || !isset($json['building']) || !isset($json['startday']) || !isset($json['endday'])) {
-            die(json_encode(array("error" => "argument", "msg" => "A required schedule parameter was not provided")));
-        }
-
-		// Start the storing process with storing the data about the schedule
-		$query = "INSERT INTO schedules (oldid, startday, endday, starttime, endtime, building, quarter)" .
-				" VALUES('', '{$json['startday']}', '{$json['endday']}', '{$json['starttime']}', '{$json['endtime']}', '{$json['building']}', " .
-				" '{$json['term']}')";
-		$result = mysql_query($query);
-		if(!$result) {
-			die(json_encode(array("error" => "mysql", "msg" => "Failed to store the schedule: " . mysql_error($dbConn))));
-		}
-
-		// Grab the latest id for the schedule
-		$schedId = mysql_insert_id();
-
-        // Optionally process the svg for the schedule
-        $image = false;
-        if(!empty($_POST['svg']) && renderSvg(html_entity_decode($_POST['svg']), $schedId)) {
-            $query = "UPDATE schedules SET image = ((1)) WHERE id = '{$schedId}'";
-            mysql_query($query);  // We don't particularly care if this fails
-        }
 
-		// Now iterate through the schedule
-		foreach($json['schedule'] as $item) {
-			// Process it into schedulenoncourses if the item is a non-course item
-			if($item['courseNum'] == "non") {
-				// Process each time as a seperate item
-				foreach($item['times'] as $time) {
-					$query = "INSERT INTO schedulenoncourses (title, day, start, end, schedule)" .
-							" VALUES('{$item['title']}', '{$time['day']}', '{$time['start']}', '{$time['end']}', '{$schedId}')";
-					$result = mysql_query($query);
-					if(!$result) {
-						die(json_encode(array("error" => "mysql", "msg" => "Storing non-course item '{$item['title']}' failed: " . mysql_error($dbConn))));
-					}
-				}
-			} else {
-				// Process each course. It's crazy simple now.
-				$query = "INSERT INTO schedulecourses (schedule, section)" .
-						" VALUES('{$schedId}', '{$item['id']}')";
-				$result = mysql_query($query);
-				if(!$result) {
-					die(json_encode(array("error" => "mysql", "msg" => "Storing a course '{$item['courseNum']}' failed: " . mysql_error($dbConn))));
-				}
-			}
-		}
-
-		// Everything was successful, return a nice, simple URL to the schedule
-		// To make it cool, let's make it a hex id
-		$hexId = dechex($schedId);
-		$url = "{$HTTPROOTADDRESS}schedule/{$hexId}";
-		
-		echo json_encode(array("url" => $url, "id" => $hexId));
-
-		break;
 
 	////////////////////////////////////////////////////////////////////////
 	// DEFAULT ACTION	

js/rmp.php api/rmp.phpjs/rmp.php renamed to api/rmp.php

@@ -10,6 +10,6 @@
 $curl = curl_init();
 curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($curl, CURLOPT_HEADER, false);
-$name = $_GET['professor'];
+$name = explode('/', $_SERVER['REQUEST_URI'])[2];
 curl_setopt ($curl, CURLOPT_URL, "http://www.ratemyprofessors.com/SelectTeacher.jsp?searchName=".$name."&search_submit1=Search&sid=807");
 echo curl_exec($curl);