smtech / canvas-ics-sync

include/mysql.inc.php

Spacing +4 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-require_once(__DIR__ . '/../config.inc.php');
-require_once(APP_PATH . '/include/debug.inc.php');
-require_once(APP_PATH . '/include/page-generator.inc.php');
+require_once(__DIR__.'/../config.inc.php');
+require_once(APP_PATH.'/include/debug.inc.php');
+require_once(APP_PATH.'/include/page-generator.inc.php');
 
 $MYSQL = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE);
 function mysqlQuery($query) {
@@ -25,8 +25,7 @@ 
 			'Query' => $query,
 			'Response' => (
 				$response ?
-					'True' :
-					mysqlError()
+					'True' : mysqlError()
 			)
 		),
 		true,

import.php

Spacing +51 added lines, -51 removed lines

@@ -9,12 +9,12 @@ 
 /* REQUIRES crontab
    http://en.wikipedia.org/wiki/Cron */
 
-require_once(__DIR__ . '/.ignore.calendar-ics-authentication.inc.php');
-require_once(__DIR__ . '/config.inc.php');
+require_once(__DIR__.'/.ignore.calendar-ics-authentication.inc.php');
+require_once(__DIR__.'/config.inc.php');
 
-require_once(APP_PATH . '/include/page-generator.inc.php');
-require_once(APP_PATH . '/include/canvas-api.inc.php');
-require_once(APP_PATH . '/include/mysql.inc.php');
+require_once(APP_PATH.'/include/page-generator.inc.php');
+require_once(APP_PATH.'/include/canvas-api.inc.php');
+require_once(APP_PATH.'/include/mysql.inc.php');
 
 define('TOOL_NAME_ABBREVIATION', 'ICS Import');
 
@@ -27,7 +27,7 @@ 
 
 define('WARNING_REGEXP_FILTER', '<em>Note:</em> The regular expression match is applied to the <em>title</em> of an event <em>only</em>, and the event must both match the include regular expression <em>and</em> not match the exclude regular expression to be included. Note also that the regular expressions are <em>case-sensitive</em>.');
 
-require_once(__DIR__ . '/common.inc.php');
+require_once(__DIR__.'/common.inc.php');
 
 if (isset($argc)) {
 	$_REQUEST['cal'] = urldecode($argv[1]);
@@ -52,7 +52,7 @@ 
 	// TODO: it would probably be better to look up users by email address than URL
 	/* get the context (user, course or group) for the canvas URL */
 	$canvasContext = array();
-	if (preg_match('%(https?://)?(' . parse_url(CANVAS_API_URL, PHP_URL_HOST) . '/((about/(\d+))|(courses/(\d+)(/groups/(\d+))?)|(accounts/\d+/groups/(\d+))))%', $_REQUEST['canvas_url'], $matches)) {
+	if (preg_match('%(https?://)?('.parse_url(CANVAS_API_URL, PHP_URL_HOST).'/((about/(\d+))|(courses/(\d+)(/groups/(\d+))?)|(accounts/\d+/groups/(\d+))))%', $_REQUEST['canvas_url'], $matches)) {
 		$canvasContext['canonical_url'] = "https://{$matches[2]}"; // https://stmarksschool.instructure.com/courses/953
 		
 		// course or account groups
@@ -112,7 +112,7 @@ 
 		$event['event_text'] = preg_replace('%^([^\]]+)(\s*\[[^\]]+\]\s*)+$%', '\\1', $event['event_text']);	
 	
 		/* replace newlines with <br /> to maintain formatting */
-		$event['description'] = str_replace( PHP_EOL , '<br />' . PHP_EOL, $event['description']);
+		$event['description'] = str_replace(PHP_EOL, '<br />'.PHP_EOL, $event['description']);
 	
 		return $event;
 	}
@@ -133,7 +133,7 @@ 
 	
 	if ($canvasContext = getCanvasContext($_REQUEST['canvas_url'])) {
 		/* check ICS feed to be sure it exists */
-		if(urlExists($_REQUEST['cal'])) {
+		if (urlExists($_REQUEST['cal'])) {
 			/* look up the canvas object -- mostly to make sure that it exists! */
 			if ($canvasObject = callCanvasApi(CANVAS_API_GET, $canvasContext['verification_url'])) {
 			
@@ -145,14 +145,14 @@ 
 				/* tell users that it's started and to cool their jets */
 				displayPage('
 					<h3>Calendar Import Started</h3>
-					<p>The calendar import that you requested has begun. You may leave this page at anytime. You can see the progress of the import by visiting <a target="_blank" href="https://' . parse_url(CANVAS_API_URL, PHP_URL_HOST) . "/calendar?include_contexts={$canvasContext['context']}_{$canvasObject['id']}\">this calendar</a> in Canvas.</p>"
+					<p>The calendar import that you requested has begun. You may leave this page at anytime. You can see the progress of the import by visiting <a target="_blank" href="https://' . parse_url(CANVAS_API_URL, PHP_URL_HOST)."/calendar?include_contexts={$canvasContext['context']}_{$canvasObject['id']}\">this calendar</a> in Canvas.</p>"
 				);
 				
 				/* use phpicalendar to parse the ICS feed into $master_array */
 				define('BASE', './phpicalendar/');
-				require_once(BASE . 'functions/date_functions.php');
-				require_once(BASE . 'functions/init.inc.php');
-				require_once(BASE . 'functions/ical_parser.php');
+				require_once(BASE.'functions/date_functions.php');
+				require_once(BASE.'functions/init.inc.php');
+				require_once(BASE.'functions/ical_parser.php');
 				displayError(
 					$master_array,
 					false, null, null,
@@ -173,7 +173,7 @@ 
 					mysqlQuery("
 						UPDATE `calendars`
 							SET
-								`synced` = '" . getSyncTimestamp() . "'
+								`synced` = '" . getSyncTimestamp()."'
 							WHERE
 								`id` = '$pairingHash'
 					");
@@ -192,13 +192,13 @@ 
 							)
 							VALUES (
 								'$pairingHash',
-								'" . addslashes($master_array['calendar_name']) . "',
+								'".addslashes($master_array['calendar_name'])."',
 								'{$_REQUEST['cal']}',
 								'{$canvasContext['canonical_url']}',
-								'" . getSyncTimestamp() . "',
-								'" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER) . "',
-								" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'" . addslashes($_REQUEST['include_regexp']) . "'" : 'NULL') . ",
-								" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'" . addslashes($_REQUEST['exclude_regexp']) . "'" : 'NULL') . "
+								'".getSyncTimestamp()."',
+								'" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER)."',
+								" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'".addslashes($_REQUEST['include_regexp'])."'" : 'NULL').",
+								" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'".addslashes($_REQUEST['exclude_regexp'])."'" : 'NULL')."
 							)
 					");
 				}
@@ -215,10 +215,10 @@ 
 				/* walk through $master_array and update the Canvas calendar to match the
 				   ICS feed, caching changes in the database */
 				// TODO: would it be worth the performance improvement to just process things from today's date forward? (i.e. ignore old items, even if they've changed...)
-				foreach($master_array as $date => $times) {
+				foreach ($master_array as $date => $times) {
 					if (date_create_from_format('Ymd', $date)) {
-						foreach($times as $time => $uids) {
-							foreach($uids as $uid => $event) {
+						foreach ($times as $time => $uids) {
+							foreach ($uids as $uid => $event) {
 								/* urldecode all of the fields of the event, for easier processing! */
 								foreach ($event as $key => $value) {
 									$event[$key] = urldecode($value);
@@ -251,7 +251,7 @@ 
 										mysqlQuery("
 											UPDATE `events`
 												SET
-													`synced` = '" . getSyncTimestamp() . "'
+													`synced` = '" . getSyncTimestamp()."'
 												WHERE
 													`id` = '{$eventCache['id']}'
 										");
@@ -294,7 +294,7 @@ 
 													'{$calendarCache['id']}',
 													'{$calendarEvent['id']}',
 													'$eventHash',
-													'" . getSyncTimestamp() . "'
+													'".getSyncTimestamp()."'
 												)
 										");
 									}
@@ -309,7 +309,7 @@ 
 					SELECT * FROM `events`
 						WHERE
 							`calendar` = '{$calendarCache['id']}' AND
-							`synced` != '" . getSyncTimestamp() . "'
+							`synced` != '".getSyncTimestamp()."'
 				");
 				while ($deletedEventCache = $deletedEventsResponse->fetch_assoc()) {
 					try {
@@ -353,7 +353,7 @@ 
 					mysqlQuery("
 						UPDATE `schedules`
 							SET
-								`synced` = '" . getSyncTimestamp() . "'
+								`synced` = '" . getSyncTimestamp()."'
 							WHERE
 								`id` = '{$_REQUEST['schedule']}'
 					");
@@ -361,9 +361,9 @@ 
 				
 				/* are we setting up a regular synchronization? */
 				if (isset($_REQUEST['sync']) && $_REQUEST['sync'] != SCHEDULE_ONCE) {
-					$shellArguments[INDEX_COMMAND] = dirname(__FILE__) . '/sync.sh';
+					$shellArguments[INDEX_COMMAND] = dirname(__FILE__).'/sync.sh';
 					$shellArguments[INDEX_SCHEDULE] = $_REQUEST['sync'];
-					$shellArguments[INDEX_WEB_PATH] = 'http://localhost' . dirname($_SERVER['PHP_SELF']);
+					$shellArguments[INDEX_WEB_PATH] = 'http://localhost'.dirname($_SERVER['PHP_SELF']);
 					$crontab = null;
 					switch ($_REQUEST['sync']) {
 						case SCHEDULE_WEEKLY: {
@@ -379,22 +379,22 @@ 
 							break;
 						}
 						case SCHEDULE_CUSTOM: {
-							$shellArguments[INDEX_SCHEDULE] = md5($_REQUEST['crontab'] . getSyncTimestamp());
+							$shellArguments[INDEX_SCHEDULE] = md5($_REQUEST['crontab'].getSyncTimestamp());
 							$crontab = trim($_REQUEST['crontab']);
 						}
 					}
 					
 					/* schedule crontab trigger, if it doesn't already exist */
-					$crontab .= ' ' . implode(' ', $shellArguments);
+					$crontab .= ' '.implode(' ', $shellArguments);
 					
 					/* thank you http://stackoverflow.com/a/4421284 ! */
 					$crontabs = shell_exec('crontab -l');
 					/* check to see if this sync is already scheduled */
 					if (strpos($crontabs, $crontab) === false) {
-						$filename = md5(getSyncTimestamp()) . '.txt';
-						file_put_contents("/tmp/$filename", $crontabs . $crontab . PHP_EOL);
+						$filename = md5(getSyncTimestamp()).'.txt';
+						file_put_contents("/tmp/$filename", $crontabs.$crontab.PHP_EOL);
 						shell_exec("crontab /tmp/$filename");
-						debugFlag("added new schedule '" . $shellArguments[INDEX_SCHEDULE] . "' to crontab");
+						debugFlag("added new schedule '".$shellArguments[INDEX_SCHEDULE]."' to crontab");
 					}
 					
 					/* try to make sure that we have execute access to sync.sh */
@@ -424,8 +424,8 @@ 
 							");
 							/* we're the last one, delete it from crontab */
 							if ($schedulesResponse->num_rows == 0) {
-								$crontabs = preg_replace("%^.*{$schedule['schedule']}.*" . PHP_EOL . '%', '', shell_exec('crontab -l'));
-								$filename = md5(getSyncTimestamp()) . '.txt';
+								$crontabs = preg_replace("%^.*{$schedule['schedule']}.*".PHP_EOL.'%', '', shell_exec('crontab -l'));
+								$filename = md5(getSyncTimestamp()).'.txt';
 								file_put_contents("/tmp/$filename", $crontabs);
 								shell_exec("crontab /tmp/$filename");
 								debugFlag("removed unused schedule '{$schedule['schedule']}' from crontab");
@@ -434,8 +434,8 @@ 
 							mysqlQuery("
 								UPDATE `schedules`
 									SET
-										`schedule` = '" . $shellArguments[INDEX_SCHEDULE] . "',
-										`synced` = '" . getSyncTimestamp() . "'
+										`schedule` = '" . $shellArguments[INDEX_SCHEDULE]."',
+										`synced` = '" . getSyncTimestamp()."'
 									WHERE
 										`calendar` = '{$calendarCache['id']}'
 							");
@@ -450,8 +450,8 @@ 
 								)
 								VALUES (
 									'{$calendarCache['id']}',
-									'" . $shellArguments[INDEX_SCHEDULE] . "',
-									'" . getSyncTimestamp() . "'
+									'".$shellArguments[INDEX_SCHEDULE]."',
+									'" . getSyncTimestamp()."'
 								)
 						");
 					}
@@ -536,7 +536,7 @@ 
 
 var crontabSection = '<label for=\"crontab\">Custom Sync Schedule <span class=\"comment\"><em>Warning:</em> Not for the faint of heart! Enter a valid crontab time specification. For more information, <a target=\"_blank\" href=\"http://www.linuxweblog.com/crotab-tutorial\">refer to this tutorial.</a></span></label><input id=\"crontab\" name=\"crontab\" type=\"text\" class=\"code\" value=\"0 0 * * *\" />';
 
-var tagFilterSection = '<label for=\"include_regexp\">Regular expression to include <span class=\"comment\">A regular expression to include in the import (e.g. <code>.*</code>). " . WARNING_REGEXP_FILTER . "</span></label><input id=\"include_regexp\" name=\"include_regexp\" class=\"code\" type=\"text\" value=\".*\" /><label for=\"exclude_regexp\">Regular expression to exclude <span class=\"comment\">A regular expression to exclude from the import (e.g. <code>((\\[PAR\\])|(\\[FAC\\]))</code>). " . WARNING_REGEXP_FILTER . "</span></label><input id=\"exclude_regexp\" name=\"exclude_regexp\" class=\"code\" type=\"text\" />';
+var tagFilterSection = '<label for=\"include_regexp\">Regular expression to include <span class=\"comment\">A regular expression to include in the import (e.g. <code>.*</code>). " . WARNING_REGEXP_FILTER."</span></label><input id=\"include_regexp\" name=\"include_regexp\" class=\"code\" type=\"text\" value=\".*\" /><label for=\"exclude_regexp\">Regular expression to exclude <span class=\"comment\">A regular expression to exclude from the import (e.g. <code>((\\[PAR\\])|(\\[FAC\\]))</code>). ".WARNING_REGEXP_FILTER."</span></label><input id=\"exclude_regexp\" name=\"exclude_regexp\" class=\"code\" type=\"text\" />';
 
 function toggleVisibility(target, visibleTrigger, innerHTML) {
 	var targetElement = document.getElementById(target);
@@ -549,7 +549,7 @@ 
 	}
 }
 " . '//--></script>
-<form enctype="multipart/form-data" action="' . $_SERVER['PHP_SELF'] . '" method="get">
+<form enctype="multipart/form-data" action="' . $_SERVER['PHP_SELF'].'" method="get">
 	<table>
 		<tr valign="middle">
 			<td class="calendarUrl">
@@ -568,29 +568,29 @@ 
 			<td colspan="3">
 				<dl>
 					<dt>
-						<label for="overwrite"><input id="overwrite" name="overwrite" type="checkbox" value="' . VALUE_OVERWRITE_CANVAS_CALENDAR . '" unchecked disabled /> Replace existing calendar information <span class="comment">Checking this box will <em>delete</em> all of your current Canvas calendar information for this user/group/course.</span></label>
+						<label for="overwrite"><input id="overwrite" name="overwrite" type="checkbox" value="' . VALUE_OVERWRITE_CANVAS_CALENDAR.'" unchecked disabled /> Replace existing calendar information <span class="comment">Checking this box will <em>delete</em> all of your current Canvas calendar information for this user/group/course.</span></label>
 					</dt>
 					<dt>
-						<label for="enable_regexp_filter"><input id="enable_regexp_filter" name="enable_regexp_filter" type="checkbox" value="' . VALUE_ENABLE_REGEXP_FILTER . '" onChange="toggleVisibility(\'tag-filter-section\', this.checked, tagFilterSection);" />Filter event by regular expression <span class="comment">Filter calendar events with a regular expression on their title (e.g. <code>.* Classes</code>).</span></label>
+						<label for="enable_regexp_filter"><input id="enable_regexp_filter" name="enable_regexp_filter" type="checkbox" value="' . VALUE_ENABLE_REGEXP_FILTER.'" onChange="toggleVisibility(\'tag-filter-section\', this.checked, tagFilterSection);" />Filter event by regular expression <span class="comment">Filter calendar events with a regular expression on their title (e.g. <code>.* Classes</code>).</span></label>
 					</dt>
 					<dd>
 						<div id="tag-filter-section" onLoad="toggleVisibility(this.id, document.getElementById(\'enable_regexp_filter\').checked, tagFilterSection);"></div>
 					</dd>
 				<dl>
 					<dt>
-						<label for="schedule">Schedule automatic updates from this feed to this course <span class="comment">' . WARNING_SYNC . '</span></label>
-						<select id="schedule" name="sync" onChange="toggleVisibility(\'crontab-section\', this.value == \'' . SCHEDULE_CUSTOM . '\', crontabSection);">
-							<option value="' . SCHEDULE_ONCE . '">One-time import only</option>
+						<label for="schedule">Schedule automatic updates from this feed to this course <span class="comment">' . WARNING_SYNC.'</span></label>
+						<select id="schedule" name="sync" onChange="toggleVisibility(\'crontab-section\', this.value == \'' . SCHEDULE_CUSTOM.'\', crontabSection);">
+							<option value="' . SCHEDULE_ONCE.'">One-time import only</option>
 							<optgroup label="Recurring">
-								<option value="' . SCHEDULE_WEEKLY . '">Weekly (Saturday at midnight)</option>
-								<option value="' . SCHEDULE_DAILY . '">Daily (at midnight)</option>
-								<option value="' . SCHEDULE_HOURLY . '">Hourly (at the top of the hour)</option>
-								<option value="' . SCHEDULE_CUSTOM . '">Custom (define your own schedule)</option>
+								<option value="' . SCHEDULE_WEEKLY.'">Weekly (Saturday at midnight)</option>
+								<option value="' . SCHEDULE_DAILY.'">Daily (at midnight)</option>
+								<option value="' . SCHEDULE_HOURLY.'">Hourly (at the top of the hour)</option>
+								<option value="' . SCHEDULE_CUSTOM.'">Custom (define your own schedule)</option>
 							</optgroup>
 						</select>
 					</dt>
 					<dd>
-						<div id="crontab-section" onLoad="toggleVisibility(this.id, document.getElementById(\'schedule\').value == \'' . SCHEDULE_CUSTOM . '\', crontabSection);"></div>
+						<div id="crontab-section" onLoad="toggleVisibility(this.id, document.getElementById(\'schedule\').value == \'' . SCHEDULE_CUSTOM.'\', crontabSection);"></div>
 					</dd>
 				</dl>
 			</td>

Braces +3 added lines, -1 removed lines

@@ -246,7 +246,9 @@
 									/* if we already have the event cached in its current form, just update
 									   the timestamp */
 									$eventCache = $eventCacheResponse->fetch_assoc();
-									if (DEBUGGING & DEBUGGING_MYSQL) displayError($eventCache);
+									if (DEBUGGING & DEBUGGING_MYSQL) {
+										displayError($eventCache);
+									}
 									if ($eventCache) {
 										mysqlQuery("
 											UPDATE `events`

common.inc.php

Spacing +3 added lines, -3 removed lines

@@ -44,14 +44,14 @@ 
  * Canvas calendar
  **/
 function getPairingHash($icsUrl, $canvasContext) {
-	return md5($icsUrl . $canvasContext . CANVAS_API_URL);
+	return md5($icsUrl.$canvasContext.CANVAS_API_URL);
 }
 
 /**
  * Generate a hash of this version of an event to cache in the database
  **/
 function getEventHash($date, $time, $uid, $event) {
-	return md5($date . $time . $uid . serialize($event));
+	return md5($date.$time.$uid.serialize($event));
 }
 
 /**
@@ -64,7 +64,7 @@ 
 		return $SYNC_TIMESTAMP;
 	} else {
 		$timestamp = new DateTime();
-		$SYNC_TIMESTAMP = $timestamp->format(SYNC_TIMESTAMP_FORMAT) . SEPARATOR . md5($_SERVER['REMOTE_ADDR'] . time());
+		$SYNC_TIMESTAMP = $timestamp->format(SYNC_TIMESTAMP_FORMAT).SEPARATOR.md5($_SERVER['REMOTE_ADDR'].time());
 		return $SYNC_TIMESTAMP;
 	}
 }