smtech / canvas-ics-sync

common.inc.php

Indentation +4 added lines, -4 removed lines

@@ -13,17 +13,17 @@
 
 /* prepare the toolbox */
 if (empty($_SESSION[Toolbox::class])) {
-    $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE);
+	$_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE);
 }
 $toolbox =& $_SESSION[Toolbox::class];
 $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__));
 $toolbox->smarty_assign([
-    'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__)))
+	'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__)))
 ]);
 
 /* set the Tool Consumer's instance URL, if present */
 if (empty($_SESSION[CANVAS_INSTANCE_URL]) &&
-    !empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])
+	!empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])
 ) {
-    $_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain'];
+	$_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain'];
 }

Spacing +6 added lines, -6 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 use smtech\StMarksReflexiveCanvasLTIExample\Toolbox;
 use smtech\ReflexiveCanvasLTI\LTI\ToolProvider;
 use Battis\DataUtilities;
 
-define('CONFIG_FILE', __DIR__ . '/config.xml');
+define('CONFIG_FILE', __DIR__.'/config.xml');
 define('CANVAS_INSTANCE_URL', 'canvas_instance_url');
 
 @session_start(); // TODO I don't feel good about suppressing warnings
 
 /* prepare the toolbox */
 if (empty($_SESSION[Toolbox::class])) {
-    $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE);
+    $_SESSION[Toolbox::class] = & Toolbox::fromConfiguration(CONFIG_FILE);
 }
-$toolbox =& $_SESSION[Toolbox::class];
-$toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__));
+$toolbox = & $_SESSION[Toolbox::class];
+$toolbox->smarty_prependTemplateDir(__DIR__.'/templates', basename(__DIR__));
 $toolbox->smarty_assign([
     'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__)))
 ]);
@@ -25,5 +25,5 @@ 
 if (empty($_SESSION[CANVAS_INSTANCE_URL]) &&
     !empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])
 ) {
-    $_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain'];
+    $_SESSION[CANVAS_INSTANCE_URL] = 'https://'.$_SESSION[ToolProvider::class]['canvas']['api_domain'];
 }

index.php

Indentation +48 added lines, -48 removed lines

@@ -13,74 +13,74 @@
 
 /* store any requested actions for future handling */
 $action = (empty($_REQUEST['action']) ?
-    ACTION_UNSPECIFIED :
-    strtolower($_REQUEST['action'])
+	ACTION_UNSPECIFIED :
+	strtolower($_REQUEST['action'])
 );
 
 /* action requests only come from outside the LTI! */
 if ($action) {
-    unset($_SESSION[ToolProvider::class]);
+	unset($_SESSION[ToolProvider::class]);
 }
 
 /* authenticate LTI launch request, if present */
 if ($toolbox->lti_isLaunching()) {
-    $toolbox->resetSession();
-    $toolbox->lti_authenticate();
-    exit;
+	$toolbox->resetSession();
+	$toolbox->lti_authenticate();
+	exit;
 }
 
 /* if authenticated LTI launch, get the current user profile */
 if (!empty($_SESSION[ToolProvider::class]['canvas'])) {
-    try {
-        $profile = $toolbox->api_get('users/' . $_SESSION[ToolProvider::class]['canvas']['user_id'] . '/profile');
-    } catch (Exception $e) {
-        $toolbox->smarty_addMessage(
-            'Error',
-            json_decode($e->getMessage(), true),
-            NotificationMessage::DANGER
-        );
-    }
-    $toolbox->smarty_assign([
-        'profile' => $profile
-    ]);
-    $toolbox->smarty_display('home.tpl');
-    exit;
+	try {
+		$profile = $toolbox->api_get('users/' . $_SESSION[ToolProvider::class]['canvas']['user_id'] . '/profile');
+	} catch (Exception $e) {
+		$toolbox->smarty_addMessage(
+			'Error',
+			json_decode($e->getMessage(), true),
+			NotificationMessage::DANGER
+		);
+	}
+	$toolbox->smarty_assign([
+		'profile' => $profile
+	]);
+	$toolbox->smarty_display('home.tpl');
+	exit;
 
 /* if not authenticated, default to showing credentials */
 } else {
-    $action = (empty($action) ?
-        ACTION_CONFIG :
-        $action
-    );
+	$action = (empty($action) ?
+		ACTION_CONFIG :
+		$action
+	);
 }
 
 /* process any actions */
 switch ($action) {
-    /* reset cached install data from config file */
-    case ACTION_INSTALL:
-        $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
-        $toolbox =& $_SESSION['toolbox'];
+	/* reset cached install data from config file */
+	case ACTION_INSTALL:
+		$_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
+		$toolbox =& $_SESSION['toolbox'];
 
-        /* test to see if we can connect to the API */
-        try {
-            $toolbox->getAPI();
-        } catch (ConfigurationException $e) {
-            /* if there isn't an API token in config.xml, are there OAuth credentials? */
-            if ($e->getCode() === ConfigurationException::CANVAS_API_INCORRECT) {
-                $toolbox->interactiveGetAccessToken();
-                exit;
-            } else { /* no (understandable) API credentials available -- doh! */
-                throw $e;
-            }
-        }
+		/* test to see if we can connect to the API */
+		try {
+			$toolbox->getAPI();
+		} catch (ConfigurationException $e) {
+			/* if there isn't an API token in config.xml, are there OAuth credentials? */
+			if ($e->getCode() === ConfigurationException::CANVAS_API_INCORRECT) {
+				$toolbox->interactiveGetAccessToken();
+				exit;
+			} else { /* no (understandable) API credentials available -- doh! */
+				throw $e;
+			}
+		}
 
-        /* finish by opening consumers control panel */
-        header('Location: consumers.php');
-        exit;
+		/* finish by opening consumers control panel */
+		header('Location: consumers.php');
+		exit;
 
-    /* show LTI configuration XML file */
-    case ACTION_CONFIG:
-        header('Content-type: application/xml');
-        echo $toolbox->saveConfigurationXML();
-        exit;
+	/* show LTI configuration XML file */
+	case ACTION_CONFIG:
+		header('Content-type: application/xml');
+		echo $toolbox->saveConfigurationXML();
+		exit;
 }

Spacing +4 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 
 /* store any requested actions for future handling */
 $action = (empty($_REQUEST['action']) ?
-    ACTION_UNSPECIFIED :
-    strtolower($_REQUEST['action'])
+    ACTION_UNSPECIFIED : strtolower($_REQUEST['action'])
 );
 
 /* action requests only come from outside the LTI! */
@@ -32,7 +31,7 @@ 
 /* if authenticated LTI launch, get the current user profile */
 if (!empty($_SESSION[ToolProvider::class]['canvas'])) {
     try {
-        $profile = $toolbox->api_get('users/' . $_SESSION[ToolProvider::class]['canvas']['user_id'] . '/profile');
+        $profile = $toolbox->api_get('users/'.$_SESSION[ToolProvider::class]['canvas']['user_id'].'/profile');
     } catch (Exception $e) {
         $toolbox->smarty_addMessage(
             'Error',
@@ -49,8 +48,7 @@ 
 /* if not authenticated, default to showing credentials */
 } else {
     $action = (empty($action) ?
-        ACTION_CONFIG :
-        $action
+        ACTION_CONFIG : $action
     );
 }
 
@@ -59,7 +57,7 @@ 
     /* reset cached install data from config file */
     case ACTION_INSTALL:
         $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
-        $toolbox =& $_SESSION['toolbox'];
+        $toolbox = & $_SESSION['toolbox'];
 
         /* test to see if we can connect to the API */
         try {

export.php

Indentation +19 added lines, -19 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' => '<h3>Course Calendar ICS Feed</h3>
+	$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://' .
-                $_SESSION[CANVAS_INSTANCE_URL] . '/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>'
-        );
-    }
+				$_SESSION[CANVAS_INSTANCE_URL] . '/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" />

Spacing +5 added lines, -5 removed lines

@@ -10,21 +10,21 @@
         $smarty->assign([
             'content' => '<h3>Course Calendar ICS Feed</h3>
                 <p>You can subscribe to the calendar for <a href="https://' .
-                $_SESSION[CANVAS_INSTANCE_URL] . '/courses/' . $courseId .
-                '">' . $course['name'] . '</a> at <a href="' .
-                $webcalFeed . '">' . $webcalFeed .
+                $_SESSION[CANVAS_INSTANCE_URL].'/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>'
+            'content' => 'The course you requested could not be accessed.<pre>'.print_r($json, false).'</pre>'
         );
     }
 } else {
     $smarty->assign('content', '
-    <form method="post" action="' . $_SERVER['PHP_SELF'] . '">
+    <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" />
         <input type="submit" value="Generate ICS Feed" />

visualize.php

Indentation +10 added lines, -10 removed lines

@@ -10,8 +10,8 @@ 
 $smarty->addTemplateDir(__DIR__ . '/templates');
 
 if (empty($_REQUEST['url'])) {
-    $smarty->display('visualize-form.tpl');
-    exit;
+	$smarty->display('visualize-form.tpl');
+	exit;
 }
 
 $config = new ConfigXML(__DIR__ . '/secrets.xml');
@@ -22,14 +22,14 @@ 
 
 $ics = $cache->getCache($_REQUEST['url']);
 if (empty($ics)) {
-    $ics = new vcalendar(
-        array(
-            'unique_id' => basename(__FILE__, '.php'),
-            'url' => $_REQUEST['url']
-        )
-    );
-    $ics->parse();
-    $cache->setCache($_REQUEST['url'], $ics);
+	$ics = new vcalendar(
+		array(
+			'unique_id' => basename(__FILE__, '.php'),
+			'url' => $_REQUEST['url']
+		)
+	);
+	$ics->parse();
+	$cache->setCache($_REQUEST['url'], $ics);
 }
 
 $smarty->assign('ics', $ics);

Spacing +4 added lines, -4 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 use smtech\StMarksSmarty\StMarksSmarty;
 use Battis\ConfigXML;
 use Battis\HierarchicalSimpleCache;
 
 $smarty = StMarksSmarty::getSmarty();
-$smarty->addTemplateDir(__DIR__ . '/templates');
+$smarty->addTemplateDir(__DIR__.'/templates');
 
 if (empty($_REQUEST['url'])) {
     $smarty->display('visualize-form.tpl');
     exit;
 }
 
-$config = new ConfigXML(__DIR__ . '/secrets.xml');
+$config = new ConfigXML(__DIR__.'/secrets.xml');
 
 $sql = $config->newInstanceOf(mysqli::class, 'mysql');
 
@@ -33,5 +33,5 @@ 
 }
 
 $smarty->assign('ics', $ics);
-$smarty->assign('veventProperties', array('unique' => array('CLASS','CREATED','SUMMARY','DESCRIPTION','DTSTART','X-CURRENT-DTSTART','DTEND','X-CURRENT-DTEND','DURATION','GEO','LAST-MOD','LOCATION','ORGANIZER','PRIORITY','DTSTAMP','SEQ','STATUS','TRANSP','UID','URL','RECURID'),'multiple'=>array('ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE','EXRULE','RSTATUS','RELATED','RESOURCES','RDATE','RRULE','X-PROP')));
+$smarty->assign('veventProperties', array('unique' => array('CLASS', 'CREATED', 'SUMMARY', 'DESCRIPTION', 'DTSTART', 'X-CURRENT-DTSTART', 'DTEND', 'X-CURRENT-DTEND', 'DURATION', 'GEO', 'LAST-MOD', 'LOCATION', 'ORGANIZER', 'PRIORITY', 'DTSTAMP', 'SEQ', 'STATUS', 'TRANSP', 'UID', 'URL', 'RECURID'), 'multiple'=>array('ATTACH', 'ATTENDEE', 'CATEGORIES', 'COMMENT', 'CONTACT', 'EXDATE', 'EXRULE', 'RSTATUS', 'RELATED', 'RESOURCES', 'RDATE', 'RRULE', 'X-PROP')));
 $smarty->display('visualize.tpl');

import.php

Indentation +257 added lines, -257 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
 if (php_sapi_name() == 'cli') {
-    // TODO there is a more streamlined way of doing this that escapes me just this second
-    $_REQUEST['cal'] = $argv[1];
-    $_REQUEST['canvas_url'] = $argv[2];
-    $_REQUEST['schedule'] = $argv[3];
+	// TODO there is a more streamlined way of doing this that escapes me just this second
+	$_REQUEST['cal'] = $argv[1];
+	$_REQUEST['canvas_url'] = $argv[2];
+	$_REQUEST['schedule'] = $argv[3];
 
-    define('IGNORE_LTI', true);
+	define('IGNORE_LTI', true);
 }
 
 require_once 'common.inc.php';
@@ -19,8 +19,8 @@ 
  **/
 function urlExists($url)
 {
-    $handle = fopen($url, 'r');
-    return $handle !== false;
+	$handle = fopen($url, 'r');
+	return $handle !== false;
 }
 
 /**
@@ -28,41 +28,41 @@ 
  **/
 function getCanvasContext($canvasUrl)
 {
-    global $metadata;
-
-    // TODO: accept calendar2?contexts links too (they would be an intuitively obvious link to use, after all)
-    // FIXME: users aren't working
-    // 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($metadata['CANVAS_INSTANCE_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
-        if (isset($matches[9]) || isset($matches[11])) {
-            $canvasContext['context'] = 'group'; // used to for context_code in events
-            $canvasContext['id'] = ($matches[9] > $matches[11] ? $matches[9] : $matches[11]);
-            $canvasContext['verification_url'] = "groups/{$canvasContext['id']}"; // used once to look up the object to be sure it really exists
-
-        // courses
-        } elseif (isset($matches[7])) {
-            $canvasContext['context'] = 'course';
-            $canvasContext['id'] = $matches[7];
-            $canvasContext['verification_url'] = "courses/{$canvasContext['id']}";
-
-        // users
-        } elseif (isset($matches[5])) {
-            $canvasContext['context'] = 'user';
-            $canvasContext['id'] = $matches[5];
-            $canvasContext['verification_url'] = "users/{$canvasContext['id']}/profile";
-
-        // we're somewhere where we don't know where we are
-        } else {
-            return false;
-        }
-        return $canvasContext;
-    }
-    return false;
+	global $metadata;
+
+	// TODO: accept calendar2?contexts links too (they would be an intuitively obvious link to use, after all)
+	// FIXME: users aren't working
+	// 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($metadata['CANVAS_INSTANCE_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
+		if (isset($matches[9]) || isset($matches[11])) {
+			$canvasContext['context'] = 'group'; // used to for context_code in events
+			$canvasContext['id'] = ($matches[9] > $matches[11] ? $matches[9] : $matches[11]);
+			$canvasContext['verification_url'] = "groups/{$canvasContext['id']}"; // used once to look up the object to be sure it really exists
+
+		// courses
+		} elseif (isset($matches[7])) {
+			$canvasContext['context'] = 'course';
+			$canvasContext['id'] = $matches[7];
+			$canvasContext['verification_url'] = "courses/{$canvasContext['id']}";
+
+		// users
+		} elseif (isset($matches[5])) {
+			$canvasContext['context'] = 'user';
+			$canvasContext['id'] = $matches[5];
+			$canvasContext['verification_url'] = "users/{$canvasContext['id']}/profile";
+
+		// we're somewhere where we don't know where we are
+		} else {
+			return false;
+		}
+		return $canvasContext;
+	}
+	return false;
 }
 
 /**
@@ -73,22 +73,22 @@ 
 function filterEvent($event, $calendarCache)
 {
 
-     return (
-         // include this event if filtering is off...
-         $calendarCache['enable_regexp_filter'] == false ||
-         (
-            (
-                ( // if filtering is on, and there's an include pattern test that pattern...
-                    !empty($calendarCache['include_regexp']) &&
-                    preg_match("%{$calendarCache['include_regexp']}%", $event->getProperty('SUMMARY'))
-                )
-            ) &&
-            !( // if there is an exclude pattern, make sure that this event is NOT excluded
-                !empty($calendarCache['exclude_regexp']) &&
-                preg_match("%{$calendarCache['exclude_regexp']}%", $event->getProperty('SUMMARY'))
-            )
-        )
-    );
+	 return (
+		 // include this event if filtering is off...
+		 $calendarCache['enable_regexp_filter'] == false ||
+		 (
+			(
+				( // if filtering is on, and there's an include pattern test that pattern...
+					!empty($calendarCache['include_regexp']) &&
+					preg_match("%{$calendarCache['include_regexp']}%", $event->getProperty('SUMMARY'))
+				)
+			) &&
+			!( // if there is an exclude pattern, make sure that this event is NOT excluded
+				!empty($calendarCache['exclude_regexp']) &&
+				preg_match("%{$calendarCache['exclude_regexp']}%", $event->getProperty('SUMMARY'))
+			)
+		)
+	);
 }
 
 // TODO: it would be nice to be able to cleanly remove a synched calendar
@@ -99,54 +99,54 @@ 
 /* do we have the vital information (an ICS feed and a URL to a canvas
    object)? */
 if (isset($_REQUEST['cal']) && isset($_REQUEST['canvas_url'])) {
-    if ($canvasContext = getCanvasContext($_REQUEST['canvas_url'])) {
-        /* check ICS feed to be sure it exists */
-        if (urlExists($_REQUEST['cal'])) {
-            /* look up the canvas object -- mostly to make sure that it exists! */
-            if ($canvasObject = $api->get($canvasContext['verification_url'])) {
-                /* calculate the unique pairing ID of this ICS feed and canvas object */
-                $pairingHash = $toolbox->getPairingHash($_REQUEST['cal'], $canvasContext['canonical_url']);
-                $log = Log::singleton('file', __DIR__ . "/logs/$pairingHash.log");
-                postMessage('Sync started', getSyncTimestamp(), NotificationMessage::INFO);
-
-                /* tell users that it's started and to cool their jets */
-                if (php_sapi_name() != 'cli') {
-                    $smarty->assign([
-                        'content' => '<h3>Calendar Import Started</h3>
+	if ($canvasContext = getCanvasContext($_REQUEST['canvas_url'])) {
+		/* check ICS feed to be sure it exists */
+		if (urlExists($_REQUEST['cal'])) {
+			/* look up the canvas object -- mostly to make sure that it exists! */
+			if ($canvasObject = $api->get($canvasContext['verification_url'])) {
+				/* calculate the unique pairing ID of this ICS feed and canvas object */
+				$pairingHash = $toolbox->getPairingHash($_REQUEST['cal'], $canvasContext['canonical_url']);
+				$log = Log::singleton('file', __DIR__ . "/logs/$pairingHash.log");
+				postMessage('Sync started', getSyncTimestamp(), NotificationMessage::INFO);
+
+				/* tell users that it's started and to cool their jets */
+				if (php_sapi_name() != 'cli') {
+					$smarty->assign([
+						'content' => '<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="' . $_SESSION[CANVAS_INSTANCE_URL] . "/calendar?include_contexts={$canvasContext['context']}_{$canvasObject['id']}\">this calendar</a> in Canvas.</p>"
-                    ]);
-                    $smarty->display('page.tpl');
-                }
-
-                /* parse the ICS feed */
-                $ics = new vcalendar(
-                    array(
-                        'unique_id' => $metadata['APP_ID'],
-                        'url' => $_REQUEST['cal']
-                    )
-                );
-                $ics->parse();
-
-                /* log this pairing in the database cache, if it doesn't already exist */
-                $calendarCacheResponse = $sql->query("
+					]);
+					$smarty->display('page.tpl');
+				}
+
+				/* parse the ICS feed */
+				$ics = new vcalendar(
+					array(
+						'unique_id' => $metadata['APP_ID'],
+						'url' => $_REQUEST['cal']
+					)
+				);
+				$ics->parse();
+
+				/* log this pairing in the database cache, if it doesn't already exist */
+				$calendarCacheResponse = $sql->query("
                     SELECT *
                         FROM `calendars`
                         WHERE
                             `id` = '$pairingHash'
                 ");
-                $calendarCache = $calendarCacheResponse->fetch_assoc();
+				$calendarCache = $calendarCacheResponse->fetch_assoc();
 
-                /* if the calendar is already cached, just update the sync timestamp */
-                if ($calendarCache) {
-                    $sql->query("
+				/* if the calendar is already cached, just update the sync timestamp */
+				if ($calendarCache) {
+					$sql->query("
                         UPDATE `calendars`
                             SET
                                 `synced` = '" . getSyncTimestamp() . "'
                             WHERE
                                 `id` = '$pairingHash'
                     ");
-                } else {
-                    $sql->query("
+				} else {
+					$sql->query("
                         INSERT INTO `calendars`
                             (
                                 `id`,
@@ -169,44 +169,44 @@ 
                                 " . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'" . $sql->real_escape_string($_REQUEST['exclude_regexp']) . "'" : 'NULL') . "
                             )
                     ");
-                }
+				}
 
-                /* refresh calendar information from cache database */
-                $calendarCacheResponse = $sql->query("
+				/* refresh calendar information from cache database */
+				$calendarCacheResponse = $sql->query("
                     SELECT *
                         FROM `calendars`
                         WHERE
                             `id` = '$pairingHash'
                 ");
-                $calendarCache = $calendarCacheResponse->fetch_assoc();
+				$calendarCache = $calendarCacheResponse->fetch_assoc();
 
-                /* walk through $master_array and update the Canvas calendar to match the
+				/* 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...)
-                // TODO:0 the best window for syncing would be the term of the course in question, right? issue:12
-                // TODO:0 Arbitrarily selecting events in for a year on either side of today's date, probably a better system? issue:12
-                foreach ($ics->selectComponents(
-                    date('Y')-1, // startYear
-                    date('m'), // startMonth
-                    date('d'), // startDay
-                    date('Y')+1, // endYEar
-                    date('m'), // endMonth
-                    date('d'), // endDay
-                    'vevent', // cType
-                    false, // flat
-                    true, // any
-                    true // split
-                ) as $year) {
-                    foreach ($year as $month => $days) {
-                        foreach ($days as $day => $events) {
-                            foreach ($events as $i => $event) {
-                                /* does this event already exist in Canvas? */
-                                $eventHash = getEventHash($event);
-
-                                /* if the event should be included... */
-                                if (filterEvent($event, $calendarCache)) {
-                                    /* have we cached this event already? */
-                                    $eventCacheResponse = $sql->query("
+				// 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...)
+				// TODO:0 the best window for syncing would be the term of the course in question, right? issue:12
+				// TODO:0 Arbitrarily selecting events in for a year on either side of today's date, probably a better system? issue:12
+				foreach ($ics->selectComponents(
+					date('Y')-1, // startYear
+					date('m'), // startMonth
+					date('d'), // startDay
+					date('Y')+1, // endYEar
+					date('m'), // endMonth
+					date('d'), // endDay
+					'vevent', // cType
+					false, // flat
+					true, // any
+					true // split
+				) as $year) {
+					foreach ($year as $month => $days) {
+						foreach ($days as $day => $events) {
+							foreach ($events as $i => $event) {
+								/* does this event already exist in Canvas? */
+								$eventHash = getEventHash($event);
+
+								/* if the event should be included... */
+								if (filterEvent($event, $calendarCache)) {
+									/* have we cached this event already? */
+									$eventCacheResponse = $sql->query("
                                         SELECT *
                                             FROM `events`
                                             WHERE
@@ -215,11 +215,11 @@ 
                                     ");
 
 
-                                    /* if we already have the event cached in its current form, just update
+									/* if we already have the event cached in its current form, just update
                                        the timestamp */
-                                    $eventCache = $eventCacheResponse->fetch_assoc();
-                                    if ($eventCache) {
-                                        $sql->query("
+									$eventCache = $eventCacheResponse->fetch_assoc();
+									if ($eventCache) {
+										$sql->query("
                                             UPDATE `events`
                                                 SET
                                                     `synced` = '" . getSyncTimestamp() . "'
@@ -227,31 +227,31 @@ 
                                                     `id` = '{$eventCache['id']}'
                                         ");
 
-                                    /* otherwise, add this new event and cache it */
-                                    } else {
-                                        /* multi-day event instance start times need to be changed to _this_ date */
-                                        $start = new DateTime(iCalUtilityFunctions::_date2strdate($event->getProperty('DTSTART')));
-                                        $end = new DateTime(iCalUtilityFunctions::_date2strdate($event->getProperty('DTEND')));
-                                        if ($event->getProperty('X-RECURRENCE')) {
-                                            $start = new DateTime($event->getProperty('X-CURRENT-DTSTART')[1]);
-                                            $end = new DateTime($event->getProperty('X-CURRENT-DTEND')[1]);
-                                        }
-                                        $start->setTimeZone(new DateTimeZone(LOCAL_TIMEZONE));
-                                        $end->setTimeZone(new DateTimeZone(LOCAL_TIMEZONE));
-
-                                        $calendarEvent = $api->post(
-                                            "/calendar_events",
-                                            [
-                                                'calendar_event[context_code]' => "{$canvasContext['context']}_{$canvasObject['id']}",
-                                                'calendar_event[title]' => preg_replace('%^([^\]]+)(\s*\[[^\]]+\]\s*)+$%', '\\1', strip_tags($event->getProperty('SUMMARY'))),
-                                                'calendar_event[description]' => \Michelf\Markdown::defaultTransform(str_replace('\n', "\n\n", $event->getProperty('DESCRIPTION', 1))),
-                                                'calendar_event[start_at]' => $start->format(CANVAS_TIMESTAMP_FORMAT),
-                                                'calendar_event[end_at]' => $end->format(CANVAS_TIMESTAMP_FORMAT),
-                                                'calendar_event[location_name]' => $event->getProperty('LOCATION')
-                                            ]
-                                        );
-
-                                        $sql->query("
+									/* otherwise, add this new event and cache it */
+									} else {
+										/* multi-day event instance start times need to be changed to _this_ date */
+										$start = new DateTime(iCalUtilityFunctions::_date2strdate($event->getProperty('DTSTART')));
+										$end = new DateTime(iCalUtilityFunctions::_date2strdate($event->getProperty('DTEND')));
+										if ($event->getProperty('X-RECURRENCE')) {
+											$start = new DateTime($event->getProperty('X-CURRENT-DTSTART')[1]);
+											$end = new DateTime($event->getProperty('X-CURRENT-DTEND')[1]);
+										}
+										$start->setTimeZone(new DateTimeZone(LOCAL_TIMEZONE));
+										$end->setTimeZone(new DateTimeZone(LOCAL_TIMEZONE));
+
+										$calendarEvent = $api->post(
+											"/calendar_events",
+											[
+												'calendar_event[context_code]' => "{$canvasContext['context']}_{$canvasObject['id']}",
+												'calendar_event[title]' => preg_replace('%^([^\]]+)(\s*\[[^\]]+\]\s*)+$%', '\\1', strip_tags($event->getProperty('SUMMARY'))),
+												'calendar_event[description]' => \Michelf\Markdown::defaultTransform(str_replace('\n', "\n\n", $event->getProperty('DESCRIPTION', 1))),
+												'calendar_event[start_at]' => $start->format(CANVAS_TIMESTAMP_FORMAT),
+												'calendar_event[end_at]' => $end->format(CANVAS_TIMESTAMP_FORMAT),
+												'calendar_event[location_name]' => $event->getProperty('LOCATION')
+											]
+										);
+
+										$sql->query("
                                             INSERT INTO `events`
                                                 (
                                                     `calendar`,
@@ -266,105 +266,105 @@ 
                                                     '" . getSyncTimestamp() . "'
                                                 )
                                         ");
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* clean out previously synced events that are no longer correct */
-                $deletedEventsResponse = $sql->query("
+									}
+								}
+							}
+						}
+					}
+				}
+
+				/* clean out previously synced events that are no longer correct */
+				$deletedEventsResponse = $sql->query("
                     SELECT * FROM `events`
                         WHERE
                             `calendar` = '{$calendarCache['id']}' AND
                             `synced` != '" . getSyncTimestamp() . "'
                 ");
-                while ($deletedEventCache = $deletedEventsResponse->fetch_assoc()) {
-                    try {
-                        $deletedEvent = $api->delete(
-                            "/calendar_events/{$deletedEventCache['calendar_event[id]']}",
-                            [
-                                'cancel_reason' => getSyncTimestamp(),
-                                'as_user_id' => ($canvasContext['context'] == 'user' ? $canvasObject['id'] : '') // TODO: this feels skeevy -- like the empty string will break
-                            ]
-                        );
-                    } catch (Pest_Unauthorized $e) {
-                        /* if the event has been deleted in Canvas, we'll get an error when
+				while ($deletedEventCache = $deletedEventsResponse->fetch_assoc()) {
+					try {
+						$deletedEvent = $api->delete(
+							"/calendar_events/{$deletedEventCache['calendar_event[id]']}",
+							[
+								'cancel_reason' => getSyncTimestamp(),
+								'as_user_id' => ($canvasContext['context'] == 'user' ? $canvasObject['id'] : '') // TODO: this feels skeevy -- like the empty string will break
+							]
+						);
+					} catch (Pest_Unauthorized $e) {
+						/* if the event has been deleted in Canvas, we'll get an error when
                            we try to delete it a second time. We still need to delete it from
                            our cache database, however */
-                        postMessage('Cache out-of-sync', "calendar_event[{$deletedEventCache['calendar_event[id]']}] no longer exists and will be purged from cache.", NotificationMessage::INFO);
-                    } catch (Pest_ClientError $e) {
-                        postMessage(
-                            'API Client Error',
-                            '<pre>' . print_r(array(
-                                'Status' => $PEST->lastStatus(),
-                                'Error' => $PEST->lastBody(),
-                                'Verb' => $verb,
-                                'URL' => $url,
-                                'Data' => $data
-                            ), false) . '</pre>',
-                            NotificationMessage::ERROR
-                        );
-                        if (php_sapi_name() != 'cli') {
-                            $smarty->display('page.tpl')
-                        };
-                        exit;
-                    }
-                    $sql->query("
+						postMessage('Cache out-of-sync', "calendar_event[{$deletedEventCache['calendar_event[id]']}] no longer exists and will be purged from cache.", NotificationMessage::INFO);
+					} catch (Pest_ClientError $e) {
+						postMessage(
+							'API Client Error',
+							'<pre>' . print_r(array(
+								'Status' => $PEST->lastStatus(),
+								'Error' => $PEST->lastBody(),
+								'Verb' => $verb,
+								'URL' => $url,
+								'Data' => $data
+							), false) . '</pre>',
+							NotificationMessage::ERROR
+						);
+						if (php_sapi_name() != 'cli') {
+							$smarty->display('page.tpl')
+						};
+						exit;
+					}
+					$sql->query("
                         DELETE FROM `events`
                             WHERE
                                 `id` = '{$deletedEventCache['id']}'
                     ");
-                }
+				}
 
-                /* if this was a scheduled import (i.e. a sync), update that schedule */
-                if (isset($_REQUEST['schedule'])) {
-                    $sql->query("
+				/* if this was a scheduled import (i.e. a sync), update that schedule */
+				if (isset($_REQUEST['schedule'])) {
+					$sql->query("
                         UPDATE `schedules`
                             SET
                                 `synced` = '" . getSyncTimestamp() . "'
                             WHERE
                                 `id` = '{$_REQUEST['schedule']}'
                     ");
-                }
-                /* are we setting up a regular synchronization? */
-                if (isset($_REQUEST['sync']) && $_REQUEST['sync'] != SCHEDULE_ONCE) {
+				}
+				/* are we setting up a regular synchronization? */
+				if (isset($_REQUEST['sync']) && $_REQUEST['sync'] != SCHEDULE_ONCE) {
 
-                    // FIXME:0 CRON SYNC SETUP GOES HERE issue:15 issue:13
+					// FIXME:0 CRON SYNC SETUP GOES HERE issue:15 issue:13
 
-                    /* add to the cache database schedule, replacing any schedules for this
+					/* add to the cache database schedule, replacing any schedules for this
                        calendar that are already there */
-                    $schedulesResponse = $sql->query("
+					$schedulesResponse = $sql->query("
                         SELECT *
                             FROM `schedules`
                             WHERE
                                 `calendar` = '{$calendarCache['id']}'
                     ");
 
-                    if ($schedule = $schedulesResponse->fetch_assoc()) {
+					if ($schedule = $schedulesResponse->fetch_assoc()) {
 
-                        /* only need to worry if the cached schedule is different from the
+						/* only need to worry if the cached schedule is different from the
                            new one we just set */
-                        if ($shellArguments[INDEX_SCHEDULE] != $schedule['schedule']) {
-                            /* was this the last schedule to require this trigger? */
-                            $schedulesResponse = $sql->query("
+						if ($shellArguments[INDEX_SCHEDULE] != $schedule['schedule']) {
+							/* was this the last schedule to require this trigger? */
+							$schedulesResponse = $sql->query("
                                 SELECT *
                                     FROM `schedules`
                                     WHERE
                                         `calendar` != '{$calendarCache['id']}' AND
                                         `schedule` == '{$schedule['schedule']}'
                             ");
-                            /* 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';
-                                file_put_contents("/tmp/$filename", $crontabs);
-                                shell_exec("crontab /tmp/$filename");
-                                postMessage('Unused schedule', "removed schedule '{$schedule['schedule']}' from crontab", NotificationMessage::INFO);
-                            }
-
-                            $sql->query("
+							/* 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';
+								file_put_contents("/tmp/$filename", $crontabs);
+								shell_exec("crontab /tmp/$filename");
+								postMessage('Unused schedule', "removed schedule '{$schedule['schedule']}' from crontab", NotificationMessage::INFO);
+							}
+
+							$sql->query("
                                 UPDATE `schedules`
                                     SET
                                         `schedule` = '" . $shellArguments[INDEX_SCHEDULE] . "',
@@ -372,9 +372,9 @@ 
                                     WHERE
                                         `calendar` = '{$calendarCache['id']}'
                             ");
-                        }
-                    } else {
-                        $sql->query("
+						}
+					} else {
+						$sql->query("
                             INSERT INTO `schedules`
                                 (
                                     `calendar`,
@@ -387,46 +387,46 @@ 
                                     '" . getSyncTimestamp() . "'
                                 )
                         ");
-                    }
-                }
+					}
+				}
 
-                /* if we're ovewriting data (for example, if this is a recurring sync, we
+				/* if we're ovewriting data (for example, if this is a recurring sync, we
                    need to remove the events that were _not_ synced this in this round */
-                if (isset($_REQUEST['overwrite']) && $_REQUEST['overwrite'] == VALUE_OVERWRITE_CANVAS_CALENDAR) {
-                    // TODO: actually deal with this
-                }
-
-                // TODO: deal with messaging based on context
-
-                postMessage('Finished sync', getSyncTimestamp(), NotificationMessage::INFO);
-                exit;
-            } else {
-                postMessage(
-                    'Canvas Object  Not Found',
-                    'The object whose URL you submitted could not be found.<pre>' . print_r(array(
-                        'Canvas URL' => $_REQUEST['canvas_url'],
-                        'Canvas Context' => $canvasContext,
-                        'Canvas Object' => $canvasObject
-                    ), false) . '</pre>',
-                    NotificationMessage::ERROR
-                );
-            }
-        } else {
-            postMessage(
-                'ICS feed  Not Found',
-                'The calendar whose URL you submitted could not be found.<pre>' . $_REQUEST['cal'] . '</pre>',
-                NotificationMessage::ERROR
-            );
-        }
-    } else {
-        postMessage(
-            'Invalid Canvas URL',
-            'The Canvas URL you submitted could not be parsed.<pre>' . $_REQUEST['canvas_url'] . '</pre>',
-            NotificationMessage::ERROR
-        );
-        if (php_sapi_name() != 'cli') $smarty->display('page.tpl');
-        exit;
-    }
+				if (isset($_REQUEST['overwrite']) && $_REQUEST['overwrite'] == VALUE_OVERWRITE_CANVAS_CALENDAR) {
+					// TODO: actually deal with this
+				}
+
+				// TODO: deal with messaging based on context
+
+				postMessage('Finished sync', getSyncTimestamp(), NotificationMessage::INFO);
+				exit;
+			} else {
+				postMessage(
+					'Canvas Object  Not Found',
+					'The object whose URL you submitted could not be found.<pre>' . print_r(array(
+						'Canvas URL' => $_REQUEST['canvas_url'],
+						'Canvas Context' => $canvasContext,
+						'Canvas Object' => $canvasObject
+					), false) . '</pre>',
+					NotificationMessage::ERROR
+				);
+			}
+		} else {
+			postMessage(
+				'ICS feed  Not Found',
+				'The calendar whose URL you submitted could not be found.<pre>' . $_REQUEST['cal'] . '</pre>',
+				NotificationMessage::ERROR
+			);
+		}
+	} else {
+		postMessage(
+			'Invalid Canvas URL',
+			'The Canvas URL you submitted could not be parsed.<pre>' . $_REQUEST['canvas_url'] . '</pre>',
+			NotificationMessage::ERROR
+		);
+		if (php_sapi_name() != 'cli') $smarty->display('page.tpl');
+		exit;
+	}
 }
 
 ?>

Spacing +27 added lines, -27 removed lines

@@ -35,7 +35,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($metadata['CANVAS_INSTANCE_URL'], PHP_URL_HOST) . '/((about/(\d+))|(courses/(\d+)(/groups/(\d+))?)|(accounts/\d+/groups/(\d+))))%', $_REQUEST['canvas_url'], $matches)) {
+    if (preg_match('%(https?://)?('.parse_url($metadata['CANVAS_INSTANCE_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
@@ -106,14 +106,14 @@ 
             if ($canvasObject = $api->get($canvasContext['verification_url'])) {
                 /* calculate the unique pairing ID of this ICS feed and canvas object */
                 $pairingHash = $toolbox->getPairingHash($_REQUEST['cal'], $canvasContext['canonical_url']);
-                $log = Log::singleton('file', __DIR__ . "/logs/$pairingHash.log");
+                $log = Log::singleton('file', __DIR__."/logs/$pairingHash.log");
                 postMessage('Sync started', getSyncTimestamp(), NotificationMessage::INFO);
 
                 /* tell users that it's started and to cool their jets */
                 if (php_sapi_name() != 'cli') {
                     $smarty->assign([
                         'content' => '<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="' . $_SESSION[CANVAS_INSTANCE_URL] . "/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="' . $_SESSION[CANVAS_INSTANCE_URL]."/calendar?include_contexts={$canvasContext['context']}_{$canvasObject['id']}\">this calendar</a> in Canvas.</p>"
                     ]);
                     $smarty->display('page.tpl');
                 }
@@ -141,7 +141,7 @@ 
                     $sql->query("
                         UPDATE `calendars`
                             SET
-                                `synced` = '" . getSyncTimestamp() . "'
+                                `synced` = '" . getSyncTimestamp()."'
                             WHERE
                                 `id` = '$pairingHash'
                     ");
@@ -160,13 +160,13 @@ 
                             )
                             VALUES (
                                 '$pairingHash',
-                                '" . $sql->real_escape_string($ics->getProperty('X-WR-CALNAME')) . "',
+                                '".$sql->real_escape_string($ics->getProperty('X-WR-CALNAME'))."',
                                 '{$_REQUEST['cal']}',
                                 '{$canvasContext['canonical_url']}',
-                                '" . getSyncTimestamp() . "',
-                                '" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER) . "',
-                                " . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'" . $sql->real_escape_string($_REQUEST['include_regexp']) . "'" : 'NULL') . ",
-                                " . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'" . $sql->real_escape_string($_REQUEST['exclude_regexp']) . "'" : 'NULL') . "
+                                '".getSyncTimestamp()."',
+                                '" . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER)."',
+                                " . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'".$sql->real_escape_string($_REQUEST['include_regexp'])."'" : 'NULL').",
+                                " . ($_REQUEST['enable_regexp_filter'] == VALUE_ENABLE_REGEXP_FILTER ? "'".$sql->real_escape_string($_REQUEST['exclude_regexp'])."'" : 'NULL')."
                             )
                     ");
                 }
@@ -186,10 +186,10 @@ 
                 // TODO:0 the best window for syncing would be the term of the course in question, right? issue:12
                 // TODO:0 Arbitrarily selecting events in for a year on either side of today's date, probably a better system? issue:12
                 foreach ($ics->selectComponents(
-                    date('Y')-1, // startYear
+                    date('Y') - 1, // startYear
                     date('m'), // startMonth
                     date('d'), // startDay
-                    date('Y')+1, // endYEar
+                    date('Y') + 1, // endYEar
                     date('m'), // endMonth
                     date('d'), // endDay
                     'vevent', // cType
@@ -222,7 +222,7 @@ 
                                         $sql->query("
                                             UPDATE `events`
                                                 SET
-                                                    `synced` = '" . getSyncTimestamp() . "'
+                                                    `synced` = '" . getSyncTimestamp()."'
                                                 WHERE
                                                     `id` = '{$eventCache['id']}'
                                         ");
@@ -263,7 +263,7 @@ 
                                                     '{$calendarCache['id']}',
                                                     '{$calendarEvent['id']}',
                                                     '$eventHash',
-                                                    '" . getSyncTimestamp() . "'
+                                                    '".getSyncTimestamp()."'
                                                 )
                                         ");
                                     }
@@ -278,7 +278,7 @@ 
                     SELECT * FROM `events`
                         WHERE
                             `calendar` = '{$calendarCache['id']}' AND
-                            `synced` != '" . getSyncTimestamp() . "'
+                            `synced` != '".getSyncTimestamp()."'
                 ");
                 while ($deletedEventCache = $deletedEventsResponse->fetch_assoc()) {
                     try {
@@ -297,13 +297,13 @@ 
                     } catch (Pest_ClientError $e) {
                         postMessage(
                             'API Client Error',
-                            '<pre>' . print_r(array(
+                            '<pre>'.print_r(array(
                                 'Status' => $PEST->lastStatus(),
                                 'Error' => $PEST->lastBody(),
                                 'Verb' => $verb,
                                 'URL' => $url,
                                 'Data' => $data
-                            ), false) . '</pre>',
+                            ), false).'</pre>',
                             NotificationMessage::ERROR
                         );
                         if (php_sapi_name() != 'cli') {
@@ -323,7 +323,7 @@ 
                     $sql->query("
                         UPDATE `schedules`
                             SET
-                                `synced` = '" . getSyncTimestamp() . "'
+                                `synced` = '" . getSyncTimestamp()."'
                             WHERE
                                 `id` = '{$_REQUEST['schedule']}'
                     ");
@@ -357,8 +357,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");
                                 postMessage('Unused schedule', "removed schedule '{$schedule['schedule']}' from crontab", NotificationMessage::INFO);
@@ -367,8 +367,8 @@ 
                             $sql->query("
                                 UPDATE `schedules`
                                     SET
-                                        `schedule` = '" . $shellArguments[INDEX_SCHEDULE] . "',
-                                        `synced` = '" . getSyncTimestamp() . "'
+                                        `schedule` = '" . $shellArguments[INDEX_SCHEDULE]."',
+                                        `synced` = '" . getSyncTimestamp()."'
                                     WHERE
                                         `calendar` = '{$calendarCache['id']}'
                             ");
@@ -383,8 +383,8 @@ 
                                 )
                                 VALUES (
                                     '{$calendarCache['id']}',
-                                    '" . $shellArguments[INDEX_SCHEDULE] . "',
-                                    '" . getSyncTimestamp() . "'
+                                    '".$shellArguments[INDEX_SCHEDULE]."',
+                                    '" . getSyncTimestamp()."'
                                 )
                         ");
                     }
@@ -403,25 +403,25 @@ 
             } else {
                 postMessage(
                     'Canvas Object  Not Found',
-                    'The object whose URL you submitted could not be found.<pre>' . print_r(array(
+                    'The object whose URL you submitted could not be found.<pre>'.print_r(array(
                         'Canvas URL' => $_REQUEST['canvas_url'],
                         'Canvas Context' => $canvasContext,
                         'Canvas Object' => $canvasObject
-                    ), false) . '</pre>',
+                    ), false).'</pre>',
                     NotificationMessage::ERROR
                 );
             }
         } else {
             postMessage(
                 'ICS feed  Not Found',
-                'The calendar whose URL you submitted could not be found.<pre>' . $_REQUEST['cal'] . '</pre>',
+                'The calendar whose URL you submitted could not be found.<pre>'.$_REQUEST['cal'].'</pre>',
                 NotificationMessage::ERROR
             );
         }
     } else {
         postMessage(
             'Invalid Canvas URL',
-            'The Canvas URL you submitted could not be parsed.<pre>' . $_REQUEST['canvas_url'] . '</pre>',
+            'The Canvas URL you submitted could not be parsed.<pre>'.$_REQUEST['canvas_url'].'</pre>',
             NotificationMessage::ERROR
         );
         if (php_sapi_name() != 'cli') $smarty->display('page.tpl');

Braces +3 added lines, -1 removed lines

@@ -424,7 +424,9 @@
             'The Canvas URL you submitted could not be parsed.<pre>' . $_REQUEST['canvas_url'] . '</pre>',
             NotificationMessage::ERROR
         );
-        if (php_sapi_name() != 'cli') $smarty->display('page.tpl');
+        if (php_sapi_name() != 'cli') {
+        	$smarty->display('page.tpl');
+        }
         exit;
     }
 }

purge.php

Indentation +26 added lines, -26 removed lines

@@ -3,36 +3,36 @@
 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',
-        [
-            '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']}",
-                [
-                    'cancel_reason' => $metadata['APP_NAME'] . " course_url={$_REQUEST['course_url']}"
-                ]
-            );
-        }
-    } while ($events = $eventsApi->nextPage());
+	$events = $eventsApi->get(
+		'calendar_events',
+		[
+			'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']}",
+				[
+					'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

@@ -20,7 +20,7 @@ 
             $api->delete(
                 "calendar_events/{$event['id']}",
                 [
-                    'cancel_reason' => $metadata['APP_NAME'] . " course_url={$_REQUEST['course_url']}"
+                    'cancel_reason' => $metadata['APP_NAME']." course_url={$_REQUEST['course_url']}"
                 ]
             );
         }
@@ -31,7 +31,7 @@ 
     ]);
 } 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>'
+        '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>'
     ]);
 }
 

sync.php

Indentation +4 added lines, -4 removed lines

@@ -15,13 +15,13 @@
 ");
 
 while ($schedule = $schedulesResponse->fetch_assoc()) {
-    $calendarResponse = $sql->query("
+	$calendarResponse = $sql->query("
         SELECT *
             FROM `calendars`
             WHERE
                 `id` = '{$schedule['calendar']}'
     ");
-    if ($calendar = $calendarResponse->fetch_assoc()) {
-        echo shell_exec('php ' . __DIR__ . '/import.php ' . $calendar['ics_url'] . ' ' . $calendar['canvas_url'] . ' ' . $schedule['id']);
-    }
+	if ($calendar = $calendarResponse->fetch_assoc()) {
+		echo shell_exec('php ' . __DIR__ . '/import.php ' . $calendar['ics_url'] . ' ' . $calendar['canvas_url'] . ' ' . $schedule['id']);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     SELECT *
         FROM `schedules`
         WHERE
-            `schedule` = '" . $sql->real_escape_string($argv[1]) . "'
+            `schedule` = '" . $sql->real_escape_string($argv[1])."'
         ORDER BY
             `synced` ASC
 ");
@@ -22,6 +22,6 @@ 
                 `id` = '{$schedule['calendar']}'
     ");
     if ($calendar = $calendarResponse->fetch_assoc()) {
-        echo shell_exec('php ' . __DIR__ . '/import.php ' . $calendar['ics_url'] . ' ' . $calendar['canvas_url'] . ' ' . $schedule['id']);
+        echo shell_exec('php '.__DIR__.'/import.php '.$calendar['ics_url'].' '.$calendar['canvas_url'].' '.$schedule['id']);
     }
 }

src/SyncIntoCanvas/Filter.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 
     public function setEnabled($enabled)
     {
-        $this->enabled = (boolean) $enabled;
+        $this->enabled = (boolean)$enabled;
     }
 
     public function isEnabled()
@@ -41,7 +41,7 @@ 
 
     public function setIncludeExpression($regex)
     {
-        $this->include = (string) $regex;
+        $this->include = (string)$regex;
     }
 
     public function getIncludeExpression()
@@ -54,7 +54,7 @@ 
 
     public function setExcludeExpression($regex)
     {
-        $this->exclude = (string) $regex;
+        $this->exclude = (string)$regex;
     }
 
     public function getExcludeExpression()
@@ -74,12 +74,12 @@ 
                (
                    ( // if filtering is on, and there's an include pattern test that pattern...
                        $this->getIncludeExpression() &&
-                       preg_match('%' . $this->getIncludeExpression() . '%', $event->getProperty('SUMMARY'))
+                       preg_match('%'.$this->getIncludeExpression().'%', $event->getProperty('SUMMARY'))
                    )
                ) &&
                !( // if there is an exclude pattern, make sure that this event is NOT excluded
                    $this->getExcludeExpression() &&
-                   preg_match('%' . $this->getExcludeExpression() . '%', $event->getProperty('SUMMARY'))
+                   preg_match('%'.$this->getExcludeExpression().'%', $event->getProperty('SUMMARY'))
                )
            )
         );

Doc Comments +9 added lines

@@ -34,6 +34,9 @@ 
         $this->setExcludeExpression($exclude);
     }
 
+    /**
+     * @param boolean $enabled
+     */
     public function setEnabled($enabled)
     {
         $this->enabled = (boolean) $enabled;
@@ -44,6 +47,9 @@ 
         return $enabled;
     }
 
+    /**
+     * @param string|null $regex
+     */
     public function setIncludeExpression($regex)
     {
         $this->include = (string) $regex;
@@ -57,6 +63,9 @@ 
         return $this->include;
     }
 
+    /**
+     * @param string|null $regex
+     */
     public function setExcludeExpression($regex)
     {
         $this->exclude = (string) $regex;

Indentation +75 added lines, -75 removed lines

@@ -4,89 +4,89 @@
 
 class Filter
 {
-    /**
-     * Whether or not this filter is enabled
-     * @var boolean
-     */
-    protected $enabled = false;
+	/**
+	 * Whether or not this filter is enabled
+	 * @var boolean
+	 */
+	protected $enabled = false;
 
-    /**
-     * Regex to include (applied first)
-     * @var string
-     */
-    protected $include;
+	/**
+	 * Regex to include (applied first)
+	 * @var string
+	 */
+	protected $include;
 
-    /**
-     * Regex to exclude (applied second)
-     * @var string
-     */
-    protected $exclude;
+	/**
+	 * Regex to exclude (applied second)
+	 * @var string
+	 */
+	protected $exclude;
 
-    /**
-     * @param boolean $enabled
-     * @param string|null $include
-     * @param string|null $exclude
-     */
-    public function __construct($enabled, $include, $exclude)
-    {
-        $this->setEnabled($enabled);
-        $this->setIncludeExpression($include);
-        $this->setExcludeExpression($exclude);
-    }
+	/**
+	 * @param boolean $enabled
+	 * @param string|null $include
+	 * @param string|null $exclude
+	 */
+	public function __construct($enabled, $include, $exclude)
+	{
+		$this->setEnabled($enabled);
+		$this->setIncludeExpression($include);
+		$this->setExcludeExpression($exclude);
+	}
 
-    public function setEnabled($enabled)
-    {
-        $this->enabled = (boolean) $enabled;
-    }
+	public function setEnabled($enabled)
+	{
+		$this->enabled = (boolean) $enabled;
+	}
 
-    public function isEnabled()
-    {
-        return $enabled;
-    }
+	public function isEnabled()
+	{
+		return $enabled;
+	}
 
-    public function setIncludeExpression($regex)
-    {
-        $this->include = (string) $regex;
-    }
+	public function setIncludeExpression($regex)
+	{
+		$this->include = (string) $regex;
+	}
 
-    public function getIncludeExpression()
-    {
-        if (empty($this->include)) {
-            return false;
-        }
-        return $this->include;
-    }
+	public function getIncludeExpression()
+	{
+		if (empty($this->include)) {
+			return false;
+		}
+		return $this->include;
+	}
 
-    public function setExcludeExpression($regex)
-    {
-        $this->exclude = (string) $regex;
-    }
+	public function setExcludeExpression($regex)
+	{
+		$this->exclude = (string) $regex;
+	}
 
-    public function getExcludeExpression()
-    {
-        if (empty($this->exclude)) {
-            return false;
-        }
-        return $this->exclude;
-    }
+	public function getExcludeExpression()
+	{
+		if (empty($this->exclude)) {
+			return false;
+		}
+		return $this->exclude;
+	}
 
-    public function filter(Event $event)
-    {
-        return (
-            // include this event if filtering is off...
-            $this->isEnabled() == false ||
-            (
-               (
-                   ( // if filtering is on, and there's an include pattern test that pattern...
-                       $this->getIncludeExpression() &&
-                       preg_match('%' . $this->getIncludeExpression() . '%', $event->getProperty('SUMMARY'))
-                   )
-               ) &&
-               !( // if there is an exclude pattern, make sure that this event is NOT excluded
-                   $this->getExcludeExpression() &&
-                   preg_match('%' . $this->getExcludeExpression() . '%', $event->getProperty('SUMMARY'))
-               )
-           )
-        );
-    }
+	public function filter(Event $event)
+	{
+		return (
+			// include this event if filtering is off...
+			$this->isEnabled() == false ||
+			(
+			   (
+				   ( // if filtering is on, and there's an include pattern test that pattern...
+					   $this->getIncludeExpression() &&
+					   preg_match('%' . $this->getIncludeExpression() . '%', $event->getProperty('SUMMARY'))
+				   )
+			   ) &&
+			   !( // if there is an exclude pattern, make sure that this event is NOT excluded
+				   $this->getExcludeExpression() &&
+				   preg_match('%' . $this->getExcludeExpression() . '%', $event->getProperty('SUMMARY'))
+			   )
+		   )
+		);
+	}
 }

src/SyncIntoCanvas/CanvasContext.php

Indentation +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@
 
 class CanvasContext extends Enum
 {
-    const COURSE = 'course';
-    const USER = 'user';
-    const GROUP = 'group';
+	const COURSE = 'course';
+	const USER = 'user';
+	const GROUP = 'group';
 }