Merge pull request #70 from ucfcdl/UDOIT_issue69

bagofarms · bagofarms · commit e2e5f1748c86 · 2015-11-30T14:43:00.000-05:00
Fix for issue 69, base_url not being saved properly.
diff --git a/README.md b/README.md
@@ -93,14 +93,9 @@ CREATE TABLE `users` (
 ## Configuration
 Make a copy of `config/localConfig.template.php`, rename it to `localConfig.php`.
 
-### Miscellaneous
-
-* `$referer_test` This is a regular expression that lets UDOIT detect whether the user accessed UDOIT from the correct URL.  For instance, UCF's value for this is: `$referer_test = '/(webcourses.ucf.edu)/';`
-
 ### Canvas API
 Please refer to the [Canvas API Policy](http://www.canvaslms.com/policies/api-policy) before using this application, as it makes heavy use of the Canvas API.
 
-* `$base_url`: The URL of your Canvas installation
 * `$consumer_key`: A consumer key you make up.  Used when installing the LTI in Canvas.
 * `$shared_secret`: The shared secret you make up.  Used when installing the LTI in Canvas.
 
diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar
diff --git a/index.php b/index.php
@@ -68,7 +68,29 @@
 $redirect = true;
 
 // Establish base_url given by canvas API
-$base_url = 'https://'.$_POST['custom_canvas_api_domain'].'/';
+if( isset($_POST['custom_canvas_api_domain']) ){
+	$base_url = $_SESSION['base_url'] = 'https://'.$_POST['custom_canvas_api_domain'].'/';
+} else {
+	echo '
+			<!DOCTYPE html>
+			<html lang="en">
+				<head>
+					<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+					<title>UDOIT Accessibility Checker</title>
+					<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
+					<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css" />
+				</head>
+				<body>
+					<div style="padding: 12px;">
+						<div class="alert alert-danger">
+							<span class="glyphicon glyphicon-exclamation-sign"></span> No domain provided.  Please ensure that your instance of UDOIT is installed to Canvas correctly.
+						</div>
+					</div>
+				</body>
+			</html>
+		';
+		die();
+}
 
 // Pull the API key from the database
 $dsn = "mysql:dbname=$db_name;host=$db_host";
@@ -152,7 +174,7 @@
 						</div>
 						<form class="form-horizontal no-print" id="udoitForm" method="post" action="lib/process.php" role="form">
 							<input type="hidden" name="main_action" value="udoit">
-							<input type="hidden" name="base_url" value="https://<?php echo $_POST['custom_canvas_api_domain'] ?>/">
+							<input type="hidden" name="base_url" value="<?php echo $base_url ?>">
 							<input type="hidden" name="session_course_id" value="<?php echo $_SESSION['launch_params']['custom_canvas_course_id'] ?>">
 							<input type="hidden" name="session_context_label" value="<?php echo $_SESSION['launch_params']['context_label'] ?>">
 							<input type="hidden" name="session_context_title" value="<?php echo $_SESSION['launch_params']['context_title'] ?>">
diff --git a/lib/process.php b/lib/process.php
@@ -23,11 +23,14 @@
 include 'Udoit.php';
 include 'Ufixit.php';
 
+session_start();
+
 use Httpful\Request;
-$base_url = $_POST['base_url'];
+$base_url = $_SESSION['base_url'];
 $SESSION_course_id = $_POST['course_id'];
 $SESSION_context_label = $_POST['context_label'];
 $SESSION_context_title = $_POST['context_title'];
+session_write_close();
 
 // check if course content is being scanned or fixed
 switch ($_POST['main_action']) {
diff --git a/oauth2response.php b/oauth2response.php
@@ -43,6 +43,8 @@ function printError($msg){
 	die();
 }
 
+$base_url = $_SESSION['base_url'];
+
 if (isset($_GET['code'])) {
 	//Exchange code for API key
 	$url = $base_url . '/login/oauth2/token';

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ function printError($msg){`
`43`	`43`	`die();`
`44`	`44`	`}`
`45`	`45`
	`46`	`+$base_url = $_SESSION['base_url'];`
	`47`	`+`
`46`	`48`	`if (isset($_GET['code'])) {`
`47`	`49`	`//Exchange code for API key`
`48`	`50`	`$url = $base_url . '/login/oauth2/token';`