smtech / canvas-management

enrollment/enroll-users.php

Spacing +1 added lines, -2 removed lines

@@ -148,8 +148,7 @@
                         $enrollment = $toolbox->api_post(
                             (
                                 $courseEnrollment ?
-                                "/courses/{$_REQUEST['course']}/enrollments" :
-                                "/sections/{$_REQUEST['section']}/enrollments"
+                                "/courses/{$_REQUEST['course']}/enrollments" : "/sections/{$_REQUEST['section']}/enrollments"
                             ),
                             array(
                                 'enrollment[user_id]' => $user['id'],

Switch Indentation +151 added lines, -151 removed lines

@@ -31,180 +31,180 @@
 }
 
 switch ($step) {
-    case $STEP_CONFIRM:
-        try {
-            $users = $toolbox->explodeCommaAndNewlines($_REQUEST['users']);
-
-            if (empty($_REQUEST['course'])) {
-                $toolbox->smarty_addMessage(
-                    'Course',
-                    'was not selected, so no enrollments can happen',
-                    NotificationMessage::ERROR
-                );
-                $step = $STEP_INSTRUCTIONS;
-            } else {
-                $sections = $toolbox->cache_get("courses/{$_REQUEST['course']}");
-                if (empty($sections)) {
-                    $section = array();
-                    $courses = $toolbox->api_get(
-                        'accounts/1/courses',
-                        array(
-                            'search_term' => $_REQUEST['course']
-                        )
+        case $STEP_CONFIRM:
+            try {
+                $users = $toolbox->explodeCommaAndNewlines($_REQUEST['users']);
+
+                if (empty($_REQUEST['course'])) {
+                    $toolbox->smarty_addMessage(
+                        'Course',
+                        'was not selected, so no enrollments can happen',
+                        NotificationMessage::ERROR
                     );
-                    foreach ($courses as $course) {
-                        $courseSections = $toolbox->api_get("courses/{$course['id']}/sections");
-                        if ($courseSections->count() == 0) {
-                            /* we have only the "magic" default section */
-                            $sections[] = array('course' => $course);
-                        } else {
-                            foreach ($courseSections as $section) {
-                                $sections[] = array(
-                                    'course' => $course,
-                                    'section' => $section
-                                );
+                    $step = $STEP_INSTRUCTIONS;
+                } else {
+                    $sections = $toolbox->cache_get("courses/{$_REQUEST['course']}");
+                    if (empty($sections)) {
+                        $section = array();
+                        $courses = $toolbox->api_get(
+                            'accounts/1/courses',
+                            array(
+                                'search_term' => $_REQUEST['course']
+                            )
+                        );
+                        foreach ($courses as $course) {
+                            $courseSections = $toolbox->api_get("courses/{$course['id']}/sections");
+                            if ($courseSections->count() == 0) {
+                                /* we have only the "magic" default section */
+                                $sections[] = array('course' => $course);
+                            } else {
+                                foreach ($courseSections as $section) {
+                                    $sections[] = array(
+                                        'course' => $course,
+                                        'section' => $section
+                                    );
+                                }
                             }
                         }
+                        $toolbox->cache_set("courses/{$_REQUEST['course']}", $sections, $CACHE_LIFETIME);
                     }
-                    $toolbox->cache_set("courses/{$_REQUEST['course']}", $sections, $CACHE_LIFETIME);
-                }
 
-                if (empty($sections)) {
-                    $toolbox->smarty_addMessage(
-                        'No Courses',
-                        "matched your search term '{$_REQUEST['course']}'.",
-                        NotificationMessage::WARNING
-                    );
-                    $step = $STEP_INSTRUCTIONS;
+                    if (empty($sections)) {
+                        $toolbox->smarty_addMessage(
+                            'No Courses',
+                            "matched your search term '{$_REQUEST['course']}'.",
+                            NotificationMessage::WARNING
+                        );
+                        $step = $STEP_INSTRUCTIONS;
+                    }
                 }
-            }
 
-            if ($step == $STEP_CONFIRM) {
-                if (!empty($users)) {
-                    $confirm = array();
-                    foreach ($users as $term) {
-                        $confirm[$term] = $toolbox->cache_get("users/$term");
-                        if ($confirm[$term] === false) {
-                            $found = $toolbox->api_get(
-                                'accounts/1/users',
-                                [
-                                    'search_term' => $term,
-                                    'include[]' => 'term'
-                                ]
-                            );
-                            foreach ($found as $user) {
-                                if (!stripos($user['sis_user_id'], '-advisor')) {
-                                    $confirm[$term][] = $user;
+                if ($step == $STEP_CONFIRM) {
+                    if (!empty($users)) {
+                        $confirm = array();
+                        foreach ($users as $term) {
+                            $confirm[$term] = $toolbox->cache_get("users/$term");
+                            if ($confirm[$term] === false) {
+                                $found = $toolbox->api_get(
+                                    'accounts/1/users',
+                                    [
+                                        'search_term' => $term,
+                                        'include[]' => 'term'
+                                    ]
+                                );
+                                foreach ($found as $user) {
+                                    if (!stripos($user['sis_user_id'], '-advisor')) {
+                                        $confirm[$term][] = $user;
+                                    }
                                 }
+                                $toolbox->cache_set("users/$term", $confirm[$term], $CACHE_LIFETIME);
                             }
-                            $toolbox->cache_set("users/$term", $confirm[$term], $CACHE_LIFETIME);
                         }
-                    }
 
-                    $toolbox->smarty_assign([
-                        'sections' => $sections,
-                        'terms' => $toolbox->getTermList(),
-                        'accounts' => $toolbox->getAccountList(),
-                        'confirm' => $confirm,
-                        'roles' => $toolbox->api_get('accounts/1/roles'), // TODO make this account-specific
-                        'formHidden'=> [
-                            'step' => $STEP_ENROLL
-                        ]
-                    ]);
-                    $toolbox->smarty_display(basename(__FILE__, '.php') . '/confirm.tpl');
-                    break;
-                } else {
-                    $toolbox->smarty_addMessage(
-                        'Users',
-                        'were not selected, so no enrollments can happen.',
-                        NotificationMessage::ERROR
-                    );
-                    $step = $STEP_INSTRUCTIONS;
-                }
-            }
-        } catch (Pest_Exception $e) {
-            $toolbox->exceptionErrorMessage($e);
-        }
-
-        /* flow into $STEP_ENROLL (and $STEP_INSTRUCTIONS) */
-
-    case $STEP_ENROLL:
-        try {
-            if ($step == $STEP_ENROLL) {
-                $courseEnrollment = false;
-                if (empty($_REQUEST['section'])) {
-                    if (!empty($_REQUEST['course'])) {
-                        $courseEnrollment = true;
+                        $toolbox->smarty_assign([
+                            'sections' => $sections,
+                            'terms' => $toolbox->getTermList(),
+                            'accounts' => $toolbox->getAccountList(),
+                            'confirm' => $confirm,
+                            'roles' => $toolbox->api_get('accounts/1/roles'), // TODO make this account-specific
+                            'formHidden'=> [
+                                'step' => $STEP_ENROLL
+                            ]
+                        ]);
+                        $toolbox->smarty_display(basename(__FILE__, '.php') . '/confirm.tpl');
+                        break;
                     } else {
                         $toolbox->smarty_addMessage(
-                            'Course or Section',
-                            'Missing from enrollment request.',
+                            'Users',
+                            'were not selected, so no enrollments can happen.',
                             NotificationMessage::ERROR
                         );
                         $step = $STEP_INSTRUCTIONS;
                     }
                 }
+            } catch (Pest_Exception $e) {
+                $toolbox->exceptionErrorMessage($e);
+            }
 
-                if (empty($_REQUEST['users'])) {
-                    $toolbox->smarty_addMessage(
-                        'Users',
-                        'missing from enrollment request.',
-                        NotificationMessage::ERROR
-                    );
-                } elseif ($step == $STEP_ENROLL) {
-                    $count = 0;
-                    foreach ($_REQUEST['users'] as $user) {
-                        $enrollment = $toolbox->api_post(
-                            (
-                                $courseEnrollment ?
-                                "/courses/{$_REQUEST['course']}/enrollments" :
-                                "/sections/{$_REQUEST['section']}/enrollments"
-                            ),
-                            array(
-                                'enrollment[user_id]' => $user['id'],
-                                'enrollment[role_id]' => $user['role'],
-                                'enrollment[enrollment_state]' => 'active',
-                                'enrollment[notify]' => (empty($user['notify']) ? 'false' : $user['notify'])
-                            )
-                        );
-                        if (!empty($enrollment['id'])) {
-                            $count++;
-                        } // FIXME should really list errors, no?
-                    }
+            /* flow into $STEP_ENROLL (and $STEP_INSTRUCTIONS) */
 
-                    if ($courseEnrollment) {
-                        $course = $_REQUEST['course'];
-                    } else {
-                        $section = $toolbox->api_get("sections/{$_REQUEST['section']}");
-                        $course = $section['course_id'];
+        case $STEP_ENROLL:
+            try {
+                if ($step == $STEP_ENROLL) {
+                    $courseEnrollment = false;
+                    if (empty($_REQUEST['section'])) {
+                        if (!empty($_REQUEST['course'])) {
+                            $courseEnrollment = true;
+                        } else {
+                            $toolbox->smarty_addMessage(
+                                'Course or Section',
+                                'Missing from enrollment request.',
+                                NotificationMessage::ERROR
+                            );
+                            $step = $STEP_INSTRUCTIONS;
+                        }
                     }
 
-                    // FIXME no longer have the course ID… link is broken
-                    $toolbox->smarty_addMessage(
-                        'Success',
-                        "<a target=\"_top\" href=\"{$_SESSION[CANVAS_INSTANCE_URL]}/courses/$course/users\">$count users enrolled</a>",
-                        NotificationMessage::GOOD
-                    );
+                    if (empty($_REQUEST['users'])) {
+                        $toolbox->smarty_addMessage(
+                            'Users',
+                            'missing from enrollment request.',
+                            NotificationMessage::ERROR
+                        );
+                    } elseif ($step == $STEP_ENROLL) {
+                        $count = 0;
+                        foreach ($_REQUEST['users'] as $user) {
+                            $enrollment = $toolbox->api_post(
+                                (
+                                    $courseEnrollment ?
+                                    "/courses/{$_REQUEST['course']}/enrollments" :
+                                    "/sections/{$_REQUEST['section']}/enrollments"
+                                ),
+                                array(
+                                    'enrollment[user_id]' => $user['id'],
+                                    'enrollment[role_id]' => $user['role'],
+                                    'enrollment[enrollment_state]' => 'active',
+                                    'enrollment[notify]' => (empty($user['notify']) ? 'false' : $user['notify'])
+                                )
+                            );
+                            if (!empty($enrollment['id'])) {
+                                $count++;
+                            } // FIXME should really list errors, no?
+                        }
+
+                        if ($courseEnrollment) {
+                            $course = $_REQUEST['course'];
+                        } else {
+                            $section = $toolbox->api_get("sections/{$_REQUEST['section']}");
+                            $course = $section['course_id'];
+                        }
 
-                    $_REQUEST = array();
+                        // FIXME no longer have the course ID… link is broken
+                        $toolbox->smarty_addMessage(
+                            'Success',
+                            "<a target=\"_top\" href=\"{$_SESSION[CANVAS_INSTANCE_URL]}/courses/$course/users\">$count users enrolled</a>",
+                            NotificationMessage::GOOD
+                        );
+
+                        $_REQUEST = array();
+                    }
                 }
+            } catch (Pest_Exception $e) {
+                $toolbox->exceptionErrorMessage($e);
             }
-        } catch (Pest_Exception $e) {
-            $toolbox->exceptionErrorMessage($e);
-        }
-
-        /* fall through to STEP_INSTRUCTION */
-
-    case $STEP_INSTRUCTIONS:
-    default:
-        if (!empty($_REQUEST['users'])) {
-            $toolbox->smarty_assign('users', $_REQUEST['users']);
-        }
-        if (!empty($_REQUEST['course'])) {
-            $toolbox->smarty_assign('course', $_REQUEST['course']);
-        }
-
-        $toolbox->smarty_assign('roles', $roles);
-        $toolbox->smarty_assign('formHidden', array('step' => $STEP_CONFIRM));
-        $toolbox->smarty_display(basename(__FILE__, '.php') . '/instructions.tpl');
+
+            /* fall through to STEP_INSTRUCTION */
+
+        case $STEP_INSTRUCTIONS:
+        default:
+            if (!empty($_REQUEST['users'])) {
+                $toolbox->smarty_assign('users', $_REQUEST['users']);
+            }
+            if (!empty($_REQUEST['course'])) {
+                $toolbox->smarty_assign('course', $_REQUEST['course']);
+            }
+
+            $toolbox->smarty_assign('roles', $roles);
+            $toolbox->smarty_assign('formHidden', array('step' => $STEP_CONFIRM));
+            $toolbox->smarty_display(basename(__FILE__, '.php') . '/instructions.tpl');
 }

index.php

Spacing +4 added lines, -6 removed lines

@@ -8,8 +8,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! */
@@ -25,7 +24,7 @@ 
     @session_unset();
     @session_start();
     @session_regenerate_id(true);
-    $_SESSION[Toolbox::class] =& $toolbox;
+    $_SESSION[Toolbox::class] = & $toolbox;
     session_write_close();
     $toolbox->lti_authenticate();
     exit;
@@ -39,8 +38,7 @@ 
 /* if not authenticated, default to showing credentials */
 } else {
     $action = (empty($action) ?
-        ACTION_CONFIG :
-        $action
+        ACTION_CONFIG : $action
     );
 }
 
@@ -49,7 +47,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 {

custom-preferences/apply-enrollment-rules.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
                             /* ...and purge users who should not be enrolled */
                             } elseif (!isset($potentialDuplicates[$enrollment['user']['id']])) {
                                 if (empty($enrollment['id'])) {
-                                    $toolbox->smarty_addMessage('No enrollment to delete', '<pre>'. print_r($enrollment, true) . '</pre>', NotificationMessage::WARNING);
+                                    $toolbox->smarty_addMessage('No enrollment to delete', '<pre>' . print_r($enrollment, true) . '</pre>', NotificationMessage::WARNING);
                                 } else {
                                     $toolbox->api_delete(
                                         "courses/$courseId/enrollments/{$enrollment['id']}",

custom-preferences/force-notifications.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         if ($step == STEP_FORCE) {
             try {
                 $notificationPreferences = [];
-                foreach($_REQUEST['notification_preferences'] as $notification => $settings) {
+                foreach ($_REQUEST['notification_preferences'] as $notification => $settings) {
                     if (!empty($settings['enabled']) && $settings['enabled']) {
                         $notificationPreferences[$notification]['frequency'] = $settings['frequency'];
                     }

custom-preferences/faculty-journal.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             $user['name']
         ];
     } else {
-        foreach($views as $view) {
+        foreach ($views as $view) {
             if (preg_match('%.*/user_notes\??.*%', $view['url']) && !preg_match('/Advisory%20Group/', $view['url'])) {
                 preg_match('/.*course_name=(.*)/', $view['url'], $match);
                 $timestamp = new DateTime($view['created_at'], new DateTimeZone('America/New_York'));

common.inc.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 if (empty($_SESSION[Toolbox::class])) {
     $_SESSION[Toolbox::class] = Toolbox::fromConfiguration(CONFIG_FILE);
 }
-$toolbox =& $_SESSION[Toolbox::class];
+$toolbox = & $_SESSION[Toolbox::class];
 
 /* set the Tool Consumer's instance URL, if present */
 if (empty($_SESSION[CANVAS_INSTANCE_URL])) {