| 
                                                        @@ -1,18 +1,18 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    1
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1
                                                                                                                                                                                                 | 
                                                             <?php  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    2
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    2
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    3
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -$provider = require __DIR__ . '/provider.php';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    3
                                                                                                                                                                                                 | 
                                                            +$provider = require __DIR__.'/provider.php';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    4
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    4
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    5
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    5
                                                                                                                                                                                                 | 
                                                             if (!empty($_GET['error'])) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    6
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    6
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    7
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    7
                                                                                                                                                                                                 | 
                                                                 // Got an error, probably user denied access  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    8
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -    exit('Got error: ' . htmlspecialchars($_GET['error'], ENT_QUOTES, 'UTF-8')); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    8
                                                                                                                                                                                                 | 
                                                            +    exit('Got error: '.htmlspecialchars($_GET['error'], ENT_QUOTES, 'UTF-8')); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    9
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    9
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    10
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    10
                                                                                                                                                                                                 | 
                                                             } elseif (empty($_GET['code'])) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    11
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    11
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    12
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    12
                                                                                                                                                                                                 | 
                                                                 // If we don't have an authorization code then get one  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    13
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    13
                                                                                                                                                                                                 | 
                                                                 $authUrl = $provider->getAuthorizationUrl();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    14
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    14
                                                                                                                                                                                                 | 
                                                                 $_SESSION['oauth2state'] = $provider->getState();   | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    15
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -    header('Location: ' . $authUrl); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    15
                                                                                                                                                                                                 | 
                                                            +    header('Location: '.$authUrl); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    16
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    16
                                                                                                                                                                                                 | 
                                                                 exit;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    17
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    17
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    18
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    18
                                                                                                                                                                                                 | 
                                                             } elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) { | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.