Merge pull request #630 from ucfopen/dev/v2-8-2

2.8.2 - Fix for bogging down scanning larger courses

Author: bagofarms

config/settings.php

@@ -3,7 +3,7 @@
 define('ENV_PROD', 'prod');
 define('ENV_DEV', 'dev');
 
-define('UDOIT_VERSION', '2.8.0');
+define('UDOIT_VERSION', '2.8.2');
 
 // SET UP AUTOLOADER (uses autoload rules from composer)
 require_once(__DIR__.'/../vendor/autoload.php');

lib/Udoit.php

@@ -553,7 +553,14 @@ protected static function apiGetAllLinks($api_key, $url)
         $results = [];
         $cur_page = 1;
         do {
-            $response = static::apiGet("{$url}&page=1&per_page={$per_page}", $api_key)->send();
+            if (strpos($url, 'page=') === false) {
+                $url .= "&page={$cur_page}";
+            }
+            if (strpos($url, 'per_page=') === false) {
+                $url .= "&per_page={$per_page}";
+            }
+            
+            $response = static::apiGet($url, $api_key)->send();
             if (isset($response->body->errors) && count($response->body->errors) > 0) {
                 foreach ($response->body->errors as $error) {
                     $logger->addError("Canvas API responded with an error for {$url}: $error->message");