smtech / canvas-ics-sync

common.inc.php

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

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

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

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

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

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

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'))
                )
            )
         );

src/SyncIntoCanvas/Schedule.php

Spacing +3 added lines, -3 removed lines

@@ -14,11 +14,11 @@
         if (empty($this->syncTimestamp)) {
             $timestamp = new DateTime();
             $this->syncTimestamp =
-                $timestamp->format(Constants::SYNC_TIMESTAMP_FORMAT) .
-                Constants::SEPARATOR . md5(
+                $timestamp->format(Constants::SYNC_TIMESTAMP_FORMAT).
+                Constants::SEPARATOR.md5(
                     (php_sapi_name() == 'cli' ?
                         'cli' : $_SERVER['REMOTE_ADDR']
-                    ) . time()
+                    ).time()
                 );
         }
         return $this->syncTimestamp;