smtech / canvas-ics-sync

admin/oauth.php

Indentation +37 added lines, -37 removed lines

@@ -4,53 +4,53 @@
 
 /* save the URL we were given for the OAuth endpoint */
 if (isset($_REQUEST['url']) && !empty($_REQUEST['url'])) {
-	$metadata['CANVAS_INSTANCE_URL'] = $_REQUEST['url'];
-	$metadata['CANVAS_API_URL'] = '@CANVAS_INSTANCE_URL/api/v1';
+    $metadata['CANVAS_INSTANCE_URL'] = $_REQUEST['url'];
+    $metadata['CANVAS_API_URL'] = '@CANVAS_INSTANCE_URL/api/v1';
 	
-	/* if a token is provided use it, otherwise we will begin the interactive token
+    /* if a token is provided use it, otherwise we will begin the interactive token
 	   authorization process */
-	if (isset($_REQUEST['token']) && !empty($_REQUEST['token'])) {
-		$metadata['CANVAS_API_TOKEN'] = $_REQUEST['token'];
-		header("Location: {$metadata['APP_URL']}/admin/install.php?step=" . CanvasAPIviaLTI_Installer::API_TOKEN_PROVIDED_STEP);
-		exit;
-	}
+    if (isset($_REQUEST['token']) && !empty($_REQUEST['token'])) {
+        $metadata['CANVAS_API_TOKEN'] = $_REQUEST['token'];
+        header("Location: {$metadata['APP_URL']}/admin/install.php?step=" . CanvasAPIviaLTI_Installer::API_TOKEN_PROVIDED_STEP);
+        exit;
+    }
 }
 
 try {
-	/* are we at the beginning of the process, so we need to give the OAuthNegotiator as much information as possible? */
-	if (isset($_REQUEST['step'])) {
+    /* are we at the beginning of the process, so we need to give the OAuthNegotiator as much information as possible? */
+    if (isset($_REQUEST['step'])) {
 		
-		/* clear any existing session data */
-		if (session_status() === PHP_SESSION_NONE) {
-			session_start();
-		}
-		$_SESSION = array();
-		session_destroy();
-		session_start();
+        /* clear any existing session data */
+        if (session_status() === PHP_SESSION_NONE) {
+            session_start();
+        }
+        $_SESSION = array();
+        session_destroy();
+        session_start();
 	
-		$oauth = new OAuthNegotiator(
-			"{$metadata['CANVAS_INSTANCE_URL']}/login/oauth2",
-			(string) $secrets->oauth->id,
-			(string) $secrets->oauth->key,
-			"{$metadata['APP_URL']}/admin/install.php?step={$_REQUEST['step']}",
-			(string) $secrets->app->name
-		);
-	}
+        $oauth = new OAuthNegotiator(
+            "{$metadata['CANVAS_INSTANCE_URL']}/login/oauth2",
+            (string) $secrets->oauth->id,
+            (string) $secrets->oauth->key,
+            "{$metadata['APP_URL']}/admin/install.php?step={$_REQUEST['step']}",
+            (string) $secrets->app->name
+        );
+    }
 	
-	/* OAuthNegotiator will return here periodically and we will just keep re-instantiating it until it finishes */
-	$oauth = new OAuthNegotiator();
+    /* OAuthNegotiator will return here periodically and we will just keep re-instantiating it until it finishes */
+    $oauth = new OAuthNegotiator();
 } catch (OAuthNegotiator_Exception $e) {
-	$smarty->addMessage(
-		'OAuthNegotiator error',
-		$e->getMessage() . ' [Error ' . $e->getCode() . ']',
-		NotificationMessage::ERROR
-	);
-	$smarty->assign(
-		'content',
-		'<h1>Install Interrupted</h1>
+    $smarty->addMessage(
+        'OAuthNegotiator error',
+        $e->getMessage() . ' [Error ' . $e->getCode() . ']',
+        NotificationMessage::ERROR
+    );
+    $smarty->assign(
+        'content',
+        '<h1>Install Interrupted</h1>
 		<p>An error interrupted the installation process. To restart, <a href="install.php">click here</a>.</p>');
-	$smarty->display();
-	exit;
+    $smarty->display();
+    exit;
 }
 
 ?>
\ No newline at end of file

admin/index.php

Indentation +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 require_once('common.inc.php');
 
 if ($ready) {
-	header('Location: consumers.php');
+    header('Location: consumers.php');
 } else {
-	header('Location: install.php');
+    header('Location: install.php');
 }
 	
 ?>
\ No newline at end of file

admin/consumers.php

Indentation +53 added lines, -53 removed lines

@@ -10,72 +10,72 @@
 
 /* validate new consumer information and save it */
 if (isset($_REQUEST['name']) && isset($_REQUEST['key']) && isset($_REQUEST['secret'])) {
-	$valid = true;
-	$message = 'Invalid consumer information. ';
-	if (empty($_name = trim($_REQUEST['name']))) {
-		$valid = false;
-		$message .= 'Consumer name must not be empty. ';
-	}
-	if (empty($_key = trim($_REQUEST['key']))) {
-		$valid = false;
-		$message .= 'Consumer key must not be empty. ';
-	}
-	if (empty(trim($_REQUEST['secret']))) { // secret may contain intentional whitespace -- leave untrimmed
-		$valid = false;
-		$message .= 'Shared secret must not be empty. ';
-	}
+    $valid = true;
+    $message = 'Invalid consumer information. ';
+    if (empty($_name = trim($_REQUEST['name']))) {
+        $valid = false;
+        $message .= 'Consumer name must not be empty. ';
+    }
+    if (empty($_key = trim($_REQUEST['key']))) {
+        $valid = false;
+        $message .= 'Consumer key must not be empty. ';
+    }
+    if (empty(trim($_REQUEST['secret']))) { // secret may contain intentional whitespace -- leave untrimmed
+        $valid = false;
+        $message .= 'Shared secret must not be empty. ';
+    }
 	
-	if ($valid) {
-		$consumer = new LTI_Tool_Consumer($_key, LTI_Data_Connector::getDataConnector($sql));
-		$consumer->name = $_name;
-		$consumer->secret = $_REQUEST['secret'];
-		$consumer->enabled = isset($_REQUEST['enabled']);
-		if (!$consumer->save()) {
-			$valid = false;
-			$message = "<strong>Consumer could not be saved.</strong> {$sql->error}";
-		}
-	}
+    if ($valid) {
+        $consumer = new LTI_Tool_Consumer($_key, LTI_Data_Connector::getDataConnector($sql));
+        $consumer->name = $_name;
+        $consumer->secret = $_REQUEST['secret'];
+        $consumer->enabled = isset($_REQUEST['enabled']);
+        if (!$consumer->save()) {
+            $valid = false;
+            $message = "<strong>Consumer could not be saved.</strong> {$sql->error}";
+        }
+    }
 	
-	if (!$valid) {
-		$smarty->addMessage(
-			'Required information missing',
-			$message,
-			NotificationMessage::ERROR
-		);
-	}
+    if (!$valid) {
+        $smarty->addMessage(
+            'Required information missing',
+            $message,
+            NotificationMessage::ERROR
+        );
+    }
 
 /* look up consumer to edit, if requested */
 } elseif (isset($_REQUEST['consumer_key'])) {
-	$consumer = new LTI_Tool_Consumer($_REQUEST['consumer_key'], LTI_Data_Connector::getDataConnector($sql));
-	if (isset($_REQUEST['action']))
-		switch ($_REQUEST['action']) {
-			case 'delete': {
-				$consumer->delete();
-				break;
-			}
-			case 'select': {
-				$name = $consumer->name;
-				$key = $consumer->getKey();
-				$secret = $consumer->secret;
-				$enabled = $consumer->enabled;
-				break;
-			}
-			case 'update':
-			case 'insert':
-			default: {
-				// leave default form values set
-			}
-		}
+    $consumer = new LTI_Tool_Consumer($_REQUEST['consumer_key'], LTI_Data_Connector::getDataConnector($sql));
+    if (isset($_REQUEST['action']))
+        switch ($_REQUEST['action']) {
+            case 'delete': {
+                $consumer->delete();
+                break;
+            }
+            case 'select': {
+                $name = $consumer->name;
+                $key = $consumer->getKey();
+                $secret = $consumer->secret;
+                $enabled = $consumer->enabled;
+                break;
+            }
+            case 'update':
+            case 'insert':
+            default: {
+                // leave default form values set
+            }
+        }
 }
 
 /* display a list of consumers */
 $response = $sql->query("SELECT * FROM `" . LTI_Data_Connector::CONSUMER_TABLE_NAME . "` ORDER BY `name` ASC, `consumer_key` ASC");
 $consumers = array();
 while ($consumer = $response->fetch_assoc()) {
-	$consumers[] = $consumer;
+    $consumers[] = $consumer;
 }
 if (!empty($consumers)) {
-	$smarty->assign('fields', array_keys($consumers[0]));
+    $smarty->assign('fields', array_keys($consumers[0]));
 }
 $smarty->assign('consumers', $consumers);
 

Braces +3 added lines, -2 removed lines

@@ -47,10 +47,11 @@
 /* look up consumer to edit, if requested */
 } elseif (isset($_REQUEST['consumer_key'])) {
 	$consumer = new LTI_Tool_Consumer($_REQUEST['consumer_key'], LTI_Data_Connector::getDataConnector($sql));
-	if (isset($_REQUEST['action']))
-		switch ($_REQUEST['action']) {
+	if (isset($_REQUEST['action'])) {
+			switch ($_REQUEST['action']) {
 			case 'delete': {
 				$consumer->delete();
+	}
 				break;
 			}
 			case 'select': {

purge.php

Indentation +20 added lines, -20 removed lines

@@ -3,30 +3,30 @@
 require_once('common.inc.php');
 
 if (isset($_REQUEST['course_url'])) {
-	$eventsApi = new CanvasPest($_SESSION['apiUrl'], $_SESSION['apiToken']);
+    $eventsApi = new CanvasPest($_SESSION['apiUrl'], $_SESSION['apiToken']);
 	
-	// TODO work nicely with the cache (purge uncached events, or only cached events, etc.)
+    // TODO work nicely with the cache (purge uncached events, or only cached events, etc.)
 	
-	$events = $eventsApi->get('calendar_events',
-		array(
-			'type' => 'event',
-			'all_events' => true,
-			'context_codes[]' => preg_replace('|.*/courses/(\d+)/?.*|', "course_$1", $_REQUEST['course_url'])
-		)
-	);
-	do {
-		foreach($events as $event) {
-			$api->delete("calendar_events/{$event['id']}",
-				array(
-					'cancel_reason' => $metadata['APP_NAME'] . " course_url={$_REQUEST['course_url']}"
-				)
-			);
-		}
-	} while($events = $eventsApi->nextPage());
+    $events = $eventsApi->get('calendar_events',
+        array(
+            'type' => 'event',
+            'all_events' => true,
+            'context_codes[]' => preg_replace('|.*/courses/(\d+)/?.*|', "course_$1", $_REQUEST['course_url'])
+        )
+    );
+    do {
+        foreach($events as $event) {
+            $api->delete("calendar_events/{$event['id']}",
+                array(
+                    'cancel_reason' => $metadata['APP_NAME'] . " course_url={$_REQUEST['course_url']}"
+                )
+            );
+        }
+    } while($events = $eventsApi->nextPage());
 	
-	$smarty->assign('content', 'Calendar purged.');
+    $smarty->assign('content', 'Calendar purged.');
 } else {
-	$smarty->assign('content', '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><label for="course_url">Course URL <input id="course_url" name="course_url" type="text" /><input type="submit" value="Purge All Calendar Events" /></form>');
+    $smarty->assign('content', '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><label for="course_url">Course URL <input id="course_url" name="course_url" type="text" /><input type="submit" value="Purge All Calendar Events" /></form>');
 }
 
 $smarty->display();

Spacing +2 added lines, -2 removed lines

@@ -15,14 +15,14 @@
 		)
 	);
 	do {
-		foreach($events as $event) {
+		foreach ($events as $event) {
 			$api->delete("calendar_events/{$event['id']}",
 				array(
 					'cancel_reason' => $metadata['APP_NAME'] . " course_url={$_REQUEST['course_url']}"
 				)
 			);
 		}
-	} while($events = $eventsApi->nextPage());
+	} while ($events = $eventsApi->nextPage());
 	
 	$smarty->assign('content', 'Calendar purged.');
 } else {

export.php

Indentation +18 added lines, -18 removed lines

@@ -3,27 +3,27 @@
 require_once('common.inc.php');
 
 if (isset($_REQUEST['course_url'])) {
-	$courseId = preg_replace('|.*/courses/(\d+)/?.*|', '$1', parse_url($_REQUEST['course_url'], PHP_URL_PATH));
-	$course = $api->get("/courses/$courseId");
-	if ($course) {
-		$webcalFeed = str_replace('https://', 'webcal://', $course['calendar']['ics']);
-		$smarty->assign('content', '
+    $courseId = preg_replace('|.*/courses/(\d+)/?.*|', '$1', parse_url($_REQUEST['course_url'], PHP_URL_PATH));
+    $course = $api->get("/courses/$courseId");
+    if ($course) {
+        $webcalFeed = str_replace('https://', 'webcal://', $course['calendar']['ics']);
+        $smarty->assign('content', '
 		<h3>Course Calendar ICS Feed</h3>
 		<p>You can subscribe to the calendar for <a href="https://' .
-		parse_url(CANVAS_API_URL, PHP_URL_HOST) . '/courses/' . $courseId .
-		'">' . $course['name'] . '</a> at <a href="' .
-		$webcalFeed . '">' . $webcalFeed .
-		'</a> in any calendar application that supports external ICS feeds.</p>'
-		);
-	} else {
-		$messages[] = array(
-			'class' => 'error',
-			'title' => 'Canvas API Error',
-			'content' => 'The course you requested could not be accessed.<pre>' . print_r($json, false) . '</pre>'
-		);
-	}
+        parse_url(CANVAS_API_URL, PHP_URL_HOST) . '/courses/' . $courseId .
+        '">' . $course['name'] . '</a> at <a href="' .
+        $webcalFeed . '">' . $webcalFeed .
+        '</a> in any calendar application that supports external ICS feeds.</p>'
+        );
+    } else {
+        $messages[] = array(
+            'class' => 'error',
+            'title' => 'Canvas API Error',
+            'content' => 'The course you requested could not be accessed.<pre>' . print_r($json, false) . '</pre>'
+        );
+    }
 } else {
-	$smarty->assign('content', '
+    $smarty->assign('content', '
 	<form method="post" action="' . $_SERVER['PHP_SELF'] . '">
 		<label for="course_url">Course URL <span class="comment">The URL to the course whose calendar you would like to export as an ICS feed</span></label>
 		<input id="course_url" name="course_url" type="text" />

lti/token_request.php

Indentation +28 added lines, -28 removed lines

@@ -7,41 +7,41 @@
    user is about to be asked to log into Canvas in the middle of Canvas */
 
 try {
-	$oauth = new OAuthNegotiator();
+    $oauth = new OAuthNegotiator();
 } catch (OAuthNegotiator_Exception $e) {}
 
 if (isset($_REQUEST['oauth'])) {
-	switch ($_REQUEST['oauth']) {
-		case 'request': {
-			$smarty->assign('content', '<h1>Token Request</h1>
+    switch ($_REQUEST['oauth']) {
+        case 'request': {
+            $smarty->assign('content', '<h1>Token Request</h1>
 		<p>This application requires access to the Canvas APIs. Canvas is about to ask you to give permission for this.</p>
 		<p><a href="' . $_SERVER['PHP_SELF'] . '?oauth=process">Click to continue</a></p>');
-			$smarty->display();
-			exit;
-		}
-		case 'process': {
-			$oauth = new OAuthNegotiator(
-				'https://' . $toolProvider->user->getResourceLink()->settings['custom_canvas_api_domain'] . '/login/oauth2',
-				(string) $secrets->oauth->id,
-				(string) $secrets->oauth->key,
-				"{$_SERVER['PHP_SELF']}?oauth=complete",
-				(string) $secrets->app->name
-			);
-			break;
-		}
-		case 'complete': {
-			$user = new UserAPIToken($_SESSION['user_consumer_key'], $_SESSION['user_id'], $sql);
-			$user->setToken($oauth->getToken());
-			$user->setAPIUrl("{$metadata['CANVAS_INSTANCE_URL']}/api/v1");
+            $smarty->display();
+            exit;
+        }
+        case 'process': {
+            $oauth = new OAuthNegotiator(
+                'https://' . $toolProvider->user->getResourceLink()->settings['custom_canvas_api_domain'] . '/login/oauth2',
+                (string) $secrets->oauth->id,
+                (string) $secrets->oauth->key,
+                "{$_SERVER['PHP_SELF']}?oauth=complete",
+                (string) $secrets->app->name
+            );
+            break;
+        }
+        case 'complete': {
+            $user = new UserAPIToken($_SESSION['user_consumer_key'], $_SESSION['user_id'], $sql);
+            $user->setToken($oauth->getToken());
+            $user->setAPIUrl("{$metadata['CANVAS_INSTANCE_URL']}/api/v1");
 			
-			$_SESSION['apiToken'] = $user->getToken();
-			$_SESSION['apiUrl'] = $user->getAPIUrl();
-			$_SESSION['isUserToken'] = true;
+            $_SESSION['apiToken'] = $user->getToken();
+            $_SESSION['apiUrl'] = $user->getAPIUrl();
+            $_SESSION['isUserToken'] = true;
 			
-			header("Location: {$metadata['APP_URL']}/app.php");
-			exit;
-		}
-	}
+            header("Location: {$metadata['APP_URL']}/app.php");
+            exit;
+        }
+    }
 }
 
 ?>
\ No newline at end of file

common-app.inc.php

Indentation +54 added lines, -54 removed lines

@@ -4,15 +4,15 @@ 
 use Battis\BootstrapSmarty\NotificationMessage;
 
 if (isset($_SESSION['toolProvider']->user)) {
-	$_SESSION['canvasInstanceUrl'] = 'https://' . $_SESSION['toolProvider']->user->getResourceLink()->settings['custom_canvas_api_domain'];
+    $_SESSION['canvasInstanceUrl'] = 'https://' . $_SESSION['toolProvider']->user->getResourceLink()->settings['custom_canvas_api_domain'];
 } else {
-	$_SESSION['canvasInstanceUrl'] = $metadata['CANVAS_INSTANCE_URL'];
+    $_SESSION['canvasInstanceUrl'] = $metadata['CANVAS_INSTANCE_URL'];
 }
 
 if (isset($_SESSION['apiUrl']) && isset($_SESSION['apiToken'])) {
-	$api = new CanvasPest($_SESSION['apiUrl'], $_SESSION['apiToken']);
+    $api = new CanvasPest($_SESSION['apiUrl'], $_SESSION['apiToken']);
 } else {
-	$api = new CanvasPest($metadata['CANVAS_API_URL'], $metadata['CANVAS_API_TOKEN']);
+    $api = new CanvasPest($metadata['CANVAS_API_URL'], $metadata['CANVAS_API_TOKEN']);
 }
 
 /* argument values for sync */
@@ -59,18 +59,18 @@ 
 
 $log = null;
 function postMessage($subject, $body, $flag = NotificationMessage::INFO) {
-	global $log;
-	global $smarty;
-	if (php_sapi_name() != 'cli') {
-		$smarty->addMessage($subject, $body, $flag);
-	} else {
-		$logEntry = "[$flag] $subject: $body";
-		if (is_a($log, Log::class)) {
-			$log->log($logEntry);
-		} else {
-			echo "$logEntry\n";
-		}
-	}
+    global $log;
+    global $smarty;
+    if (php_sapi_name() != 'cli') {
+        $smarty->addMessage($subject, $body, $flag);
+    } else {
+        $logEntry = "[$flag] $subject: $body";
+        if (is_a($log, Log::class)) {
+            $log->log($logEntry);
+        } else {
+            echo "$logEntry\n";
+        }
+    }
 }
 
 /**
@@ -78,45 +78,45 @@ 
  * Canvas calendar
  **/
 function getPairingHash($icsUrl, $canvasContext) {
-	global $metadata;
-	return md5($icsUrl . $canvasContext . $metadata['CANVAS_INSTANCE_URL']);
+    global $metadata;
+    return md5($icsUrl . $canvasContext . $metadata['CANVAS_INSTANCE_URL']);
 }
 
 $FIELD_MAP = array(
-	'calendar_event[title]' => 'SUMMARY',
-	'calendar_event[description]' => 'DESCRIPTION',
-	'calendar_event[start_at]' => array (
-		0 => 'X-CURRENT-DTSTART',
-		1 => 'DTSTART'
-	),
-	'calendar_event[end_at]' => array(
-		0 => 'X-CURRENT-DTEND',
-		1 => 'DTEND'
-	),
-	'calendar_event[location_name]' => 'LOCATION'
+    'calendar_event[title]' => 'SUMMARY',
+    'calendar_event[description]' => 'DESCRIPTION',
+    'calendar_event[start_at]' => array (
+        0 => 'X-CURRENT-DTSTART',
+        1 => 'DTSTART'
+    ),
+    'calendar_event[end_at]' => array(
+        0 => 'X-CURRENT-DTEND',
+        1 => 'DTEND'
+    ),
+    'calendar_event[location_name]' => 'LOCATION'
 );
 
 /**
  * Generate a hash of this version of an event to cache in the database
  **/
 function getEventHash($event) {
-	global $FIELD_MAP;
-	$blob = '';
-	foreach ($FIELD_MAP as $field) {
-		if (is_array($field)) {
-			foreach ($field as $option) {
-				if (!empty($property = $event->getProperty($option))) {
-					$blob .= serialize($property);
-					break;
-				}
-			}
-		} else {
-			if (!empty($property = $event->getProperty($field))) {
-				$blob .= serialize($property);
-			}
-		}
-	}
-	return md5($blob);
+    global $FIELD_MAP;
+    $blob = '';
+    foreach ($FIELD_MAP as $field) {
+        if (is_array($field)) {
+            foreach ($field as $option) {
+                if (!empty($property = $event->getProperty($option))) {
+                    $blob .= serialize($property);
+                    break;
+                }
+            }
+        } else {
+            if (!empty($property = $event->getProperty($field))) {
+                $blob .= serialize($property);
+            }
+        }
+    }
+    return md5($blob);
 }
 
 /**
@@ -124,14 +124,14 @@ 
  **/
 $SYNC_TIMESTAMP = null;
 function getSyncTimestamp() {
-	global $SYNC_TIMESTAMP;
-	if ($SYNC_TIMESTAMP) {
-		return $SYNC_TIMESTAMP;
-	} else {
-		$timestamp = new DateTime();
-		$SYNC_TIMESTAMP = $timestamp->format(SYNC_TIMESTAMP_FORMAT) . SEPARATOR . md5((php_sapi_name() == 'cli' ? 'cli' : $_SERVER['REMOTE_ADDR']) . time());
-		return $SYNC_TIMESTAMP;
-	}
+    global $SYNC_TIMESTAMP;
+    if ($SYNC_TIMESTAMP) {
+        return $SYNC_TIMESTAMP;
+    } else {
+        $timestamp = new DateTime();
+        $SYNC_TIMESTAMP = $timestamp->format(SYNC_TIMESTAMP_FORMAT) . SEPARATOR . md5((php_sapi_name() == 'cli' ? 'cli' : $_SERVER['REMOTE_ADDR']) . time());
+        return $SYNC_TIMESTAMP;
+    }
 }
 
 ?>

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 $FIELD_MAP = array(
 	'calendar_event[title]' => 'SUMMARY',
 	'calendar_event[description]' => 'DESCRIPTION',
-	'calendar_event[start_at]' => array (
+	'calendar_event[start_at]' => array(
 		0 => 'X-CURRENT-DTSTART',
 		1 => 'DTSTART'
 	),