@@ -481,7 +481,7 @@  | 
                                                    ||
| 481 | 481 | * 'client_error_msg' is set so it can be displayed by the  | 
                                                        
| 482 | 482 | * printOIDCErrorPage() function.  | 
                                                        
| 483 | 483 | *  | 
                                                        
| 484 | - * @return bool True if the various parameters related to the OIDC  | 
                                                        |
| 484 | + * @return null|boolean True if the various parameters related to the OIDC  | 
                                                        |
| 485 | 485 | * session are present. False otherwise.  | 
                                                        
| 486 | 486 | */  | 
                                                        
| 487 | 487 | function verifyOIDCParams()  | 
                                                        
@@ -7,10 +7,10 @@  | 
                                                    ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 8 | 8 | */  | 
                                                        
| 9 | 9 | |
| 10 | -use CILogon\Service\Util;  | 
                                                        |
| 11 | 10 | use CILogon\Service\Content;  | 
                                                        
| 12 | 11 | use CILogon\Service\DBService;  | 
                                                        
| 13 | 12 | use CILogon\Service\Loggit;  | 
                                                        
| 13 | +use CILogon\Service\Util;  | 
                                                        |
| 14 | 14 | |
| 15 | 15 | // The full URL of the 'oauth2/init' OAuth 2.0 (OIDC) script  | 
                                                        
| 16 | 16 |  define('AUTHORIZE_URL', 'http://localhost:8080/oauth2/dbService?action=createTransaction'); | 
                                                        
@@ -5,9 +5,9 @@  | 
                                                    ||
| 5 | 5 | require_once __DIR__ . '/../vendor/autoload.php';  | 
                                                        
| 6 | 6 | require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 7 | 7 | |
| 8 | -use CILogon\Service\Util;  | 
                                                        |
| 9 | 8 | use CILogon\Service\Content;  | 
                                                        
| 10 | 9 | use CILogon\Service\Loggit;  | 
                                                        
| 10 | +use CILogon\Service\Util;  | 
                                                        |
| 11 | 11 | |
| 12 | 12 | Util::startPHPSession();  | 
                                                        
| 13 | 13 | |
@@ -7,11 +7,11 @@  | 
                                                    ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 8 | 8 | */  | 
                                                        
| 9 | 9 | |
| 10 | -use CILogon\Service\Util;  | 
                                                        |
| 11 | 10 | use CILogon\Service\Content;  | 
                                                        
| 12 | -use CILogon\Service\PortalCookie;  | 
                                                        |
| 13 | 11 | use CILogon\Service\DBService;  | 
                                                        
| 14 | 12 | use CILogon\Service\Loggit;  | 
                                                        
| 13 | +use CILogon\Service\PortalCookie;  | 
                                                        |
| 14 | +use CILogon\Service\Util;  | 
                                                        |
| 15 | 15 | |
| 16 | 16 | // The full URL of the 'oauth/authorized' OAuth script  | 
                                                        
| 17 | 17 |  define('AUTHORIZED_URL', 'http://localhost:8080/oauth/authorized'); | 
                                                        
@@ -137,6 +137,7 @@  | 
                                                    ||
| 137 | 137 | *  | 
                                                        
| 138 | 138 | * @param OAuth2Provider An exsiting OAuth2Provider object  | 
                                                        
| 139 | 139 | * @param League\OAuth2\Client\Token\AccessToken An oauth2 token  | 
                                                        
| 140 | + * @param OAuth2Provider $oauth2  | 
                                                        |
| 140 | 141 | * @return string A GitHub user's primary email address, or empty string  | 
                                                        
| 141 | 142 | * if no such email address exists.  | 
                                                        
| 142 | 143 | */  | 
                                                        
@@ -7,8 +7,8 @@  | 
                                                    ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 8 | 8 | */  | 
                                                        
| 9 | 9 | |
| 10 | -use CILogon\Service\Util;  | 
                                                        |
| 11 | 10 | use CILogon\Service\OAuth2Provider;  | 
                                                        
| 11 | +use CILogon\Service\Util;  | 
                                                        |
| 12 | 12 | use League\OAuth2\Client\Token\AccessToken;  | 
                                                        
| 13 | 13 | |
| 14 | 14 | /**  | 
                                                        
@@ -7,9 +7,9 @@  | 
                                                    ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 8 | 8 | */  | 
                                                        
| 9 | 9 | |
| 10 | -use CILogon\Service\Util;  | 
                                                        |
| 11 | 10 | use CILogon\Service\Content;  | 
                                                        
| 12 | 11 | use CILogon\Service\Loggit;  | 
                                                        
| 12 | +use CILogon\Service\Util;  | 
                                                        |
| 13 | 13 | |
| 14 | 14 | /**  | 
                                                        
| 15 | 15 | * printLogonPage  | 
                                                        
@@ -5,10 +5,10 @@  | 
                                                    ||
| 5 | 5 | require_once __DIR__ . '/vendor/autoload.php';  | 
                                                        
| 6 | 6 | require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 7 | 7 | |
| 8 | -use CILogon\Service\Util;  | 
                                                        |
| 9 | 8 | use CILogon\Service\Content;  | 
                                                        
| 10 | -use CILogon\Service\ShibError;  | 
                                                        |
| 11 | 9 | use CILogon\Service\Loggit;  | 
                                                        
| 10 | +use CILogon\Service\ShibError;  | 
                                                        |
| 11 | +use CILogon\Service\Util;  | 
                                                        |
| 12 | 12 | |
| 13 | 13 | Util::startPHPSession();  | 
                                                        
| 14 | 14 | |
@@ -7,9 +7,9 @@  | 
                                                    ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 8 | 8 | */  | 
                                                        
| 9 | 9 | |
| 10 | -use CILogon\Service\Util;  | 
                                                        |
| 11 | 10 | use CILogon\Service\Content;  | 
                                                        
| 12 | 11 | use CILogon\Service\PortalCookie;  | 
                                                        
| 12 | +use CILogon\Service\Util;  | 
                                                        |
| 13 | 13 | |
| 14 | 14 | /**  | 
                                                        
| 15 | 15 | * printMainCookiesPage  | 
                                                        
@@ -5,8 +5,8 @@  | 
                                                    ||
| 5 | 5 | require_once __DIR__ . '/../../vendor/autoload.php';  | 
                                                        
| 6 | 6 | require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 7 | 7 | |
| 8 | -use CILogon\Service\Util;  | 
                                                        |
| 9 | 8 | use CILogon\Service\Loggit;  | 
                                                        
| 9 | +use CILogon\Service\Util;  | 
                                                        |
| 10 | 10 | |
| 11 | 11 | Util::startPHPSession();  | 
                                                        
| 12 | 12 | |
@@ -7,8 +7,8 @@  | 
                                                    ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php';  | 
                                                        
| 8 | 8 | */  | 
                                                        
| 9 | 9 | |
| 10 | -use CILogon\Service\Util;  | 
                                                        |
| 11 | 10 | use CILogon\Service\Content;  | 
                                                        
| 11 | +use CILogon\Service\Util;  | 
                                                        |
| 12 | 12 | |
| 13 | 13 | /**  | 
                                                        
| 14 | 14 | * printLogonPage  |