GCTC-NTGC / TalentCloud

public_html/inc/common/header-nav.php

Braces +40 added lines, -16 removed lines

@@ -19,23 +19,29 @@ 
             <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationHomeLinkWrapper" aria-hidden="false">
                 <?php if (strpos($url,'admin') !== false) : ?>
                     <a href="/admin/" id="navigationHomeLink">Home</a>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <a href="/" id="navigationHomeLink">Home</a>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             </div>
 
             <?php /* Checks to see if the page is the admin portal and then displays the admin home link. */ ?>
             <?php $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; ?>
             <?php if (strpos($url,'admin') !== false) : ?>
                 <?php /* No link for you! */ ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php /* Browse Jobs */ ?>
                 <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationBrowseLinkWrapper" aria-hidden="false">
                     <a href="#BrowseJobs" id="navigationBrowseLink" onclick="JobPostAPI.showBrowseJobs();TalentCloudAPI.setNav('navigationBrowseLinkWrapper');">
                         Browse Jobs
                     </a>
                 </div>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php /* Dashboard */ ?>
             <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationDashboardLinkWrapper" aria-hidden="true">
@@ -61,11 +67,14 @@ 
                     <a href="#CreateEditProfile" id="navigationProfileLink" onclick="CreateEditProfileAPI.showCreateEditProfile();TalentCloudAPI.setNav('navigationProfileLinkWrapper');">
                         My Profile
                     </a>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <a href="#MyProfile" id="navigationProfileLink" onclick="JobSeekerAPI.showMyJobSeekerProfile();TalentCloudAPI.setNav('navigationProfileLinkWrapper');">
                         My Profile
                     </a>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
 
             </div>
 
@@ -75,18 +84,24 @@ 
                     <a href="javascript:void(0)" id="navigationPosterLink" onclick="CreateJobPosterAPI.showCreateJobPosterForm(this);TalentCloudAPI.setNav('navigationPosterLinkWrapper');">Job Poster
                     </a>
                 </div>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php /* No link for you! */ ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php /* Register */
                 if (strpos($url,'admin') !== false) : ?>
                     <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationRegisterLinkWrapper" aria-hidden="true">
                         <?php echo("<a href=\"\" id=\"navigationRegisterLink\">Register</a>"); ?>
                     </div>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationRegisterLinkWrapper" aria-hidden="false">
-                        <?php echo("<a href=\"https://account.gccollab.ca/register?redirect_uri=https%3A%2F%2Ftc.gccollab.ca%2F\" id=\"navigationRegisterLink\">Register</a>"); ?>
+                        <?php echo("<a href=\"https://account.gccollab.ca/register?redirect_uri=https%3A%2F%2Ftc.gccollab.ca%2F\" id=\"navigationRegisterLink\">Register</a>");
+}
+?>
                     </div>
                 <?php endif; ?>
 
@@ -102,9 +117,12 @@ 
 
                 <?php if ($hasUser!=null) : ?>
                     <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationLoginLinkWrapper" aria-hidden="true">
-                <?php else :?>
+                <?php else {
+    :?>
                     <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationLoginLinkWrapper" aria-hidden="false">
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                         <?php
                             $loginLink = "";
                             $loginLink .= OPENID_URI.AUTH_URI;
@@ -119,13 +137,16 @@ 
                         ?>
                     </div>
 
-            <?php else : ?>
+            <?php else {
+    : ?>
 
                 <?php if ($hasUser!=null) : ?>
                     <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationLoginLinkWrapper">
                 <?php else :?>
                     <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationLoginLinkWrapper">
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                         <?php
                             $loginLink = "";
                             $loginLink .= OPENID_URI.AUTH_URI;
@@ -156,9 +177,12 @@ 
     <div id="h1">
         <?php if (strpos($url,'admin') !== false) : ?>
             <h1 class="visuallyHidden">Talent Cloud - Admin Portal</h1>
-        <?php else : ?>
+        <?php else {
+    : ?>
             <h1 class="visuallyHidden">Talent Cloud - Applicant Portal</h1>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
     </div>
 
     <div class="landing-hero" id="landingHero">

public_html/index.php

Braces +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 
         try{
             $oidc->authenticate();
-        }catch(Jumbojett\OpenIDConnectClientException $e){
+        } catch(Jumbojett\OpenIDConnectClientException $e){
             echo($e->getMessage());
         }
 
@@ -62,7 +62,7 @@ 
 
         header("Refresh:0; url=\"".REDIRECT_URI."");
     }
-}else{
+} else{
     $_SESSION['openid_connect_state'] = $state;
     $_SESSION['openid_connect_nonce'] = $nonce;
 }
@@ -108,7 +108,7 @@ 
                 echo("UserAPI.storeSessionUser(".json_encode($userInfo).");");
                 echo("UserAPI.login();");
             }
-        }else{
+        } else{
             echo("UserAPI.login();");
         }
         //var isExistingUser = UserAPI.authenticate(UserAPI.getSessionUserAsJSON());

public_html/admin/index.php

Braces +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 
         try{
             $oidc->authenticate();
-        }catch(Jumbojett\OpenIDConnectClientException $e){
+        } catch(Jumbojett\OpenIDConnectClientException $e){
             echo($e->getMessage());
         }
 
@@ -61,7 +61,7 @@ 
         }
         header("Refresh:0; url=\"".REDIRECT_URI_ADMIN."\"");
     }
-}else{
+} else{
     $_SESSION['openid_connect_state'] = $state;
     $_SESSION['openid_connect_nonce'] = $nonce;
 }
@@ -107,7 +107,7 @@ 
                 echo("UserAPI.storeSessionUser(".json_encode($userInfo).");");
                 echo("UserAPI.login(true);");
             }
-            }else{
+            } else{
                 echo("UserAPI.login(false);");
             }
         //var isExistingUser = UserAPI.authenticate(UserAPI.getSessionUserAsJSON());

public_html/tc/index.php

Braces +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
         header('HTTP/1.0 401 Unauthorized');
         echo 'Text to send if user hits Cancel button';
         exit;
-    }else{
+    } else{
         if ($_SERVER['PHP_AUTH_USER'] == 'test' && $_SERVER['PHP_AUTH_PW'] == 'test') {
             header("Access-Control-Allow-Origin: *");
             header("Content-Type: application/json");
@@ -25,7 +25,7 @@ 
                         $result = array('user' => 'test','pass' => 'test');
                         $json = json_encode($result);
                         echo($json);
-                    }else{
+                    } else{
                         $result1 = array('user' => 'test','pass' => 'test');
                         $result2 = array('user' => 'test1','pass' => 'test1');
                         $result3 = array('user' => 'test2','pass' => 'test2');
@@ -55,7 +55,7 @@ 
                     echo("");
                     break;
             }
-        }else{
+        } else{
             header('WWW-Authenticate: Basic realm="My Realm"');
             header('HTTP/1.0 401 Unauthorized');
             echo 'Authorization declined';

public_html/tc/services/JobApplicationByJobAndUser.php

Braces +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 
                 $json = json_encode($jobApplicationWithAnswers, JSON_PRETTY_PRINT);
                 echo($json);
-            }else{
+            } else{
                 $result = array();
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);

public_html/tc/services/Authentication.php

Switch Indentation +62 added lines, -62 removed lines

@@ -29,108 +29,108 @@
     $requestParams = substr($requestURI,strlen($context)+1);
     
     switch ($requestMethod) {
-    case 'GET':
-        if(isset($_SERVER["HTTP_AUTHORIZATION"])){
-            $jwt = JWTUtils::getTokenFromRequest($_SERVER["HTTP_AUTHORIZATION"]);
+        case 'GET':
+            if(isset($_SERVER["HTTP_AUTHORIZATION"])){
+                $jwt = JWTUtils::getTokenFromRequest($_SERVER["HTTP_AUTHORIZATION"]);
 
-            $open_id = Utils::getParameterFromRequest($requestParams, $user_id_param_index);
+                $open_id = Utils::getParameterFromRequest($requestParams, $user_id_param_index);
 
-            if(strlen($requestParams) > 1){
+                if(strlen($requestParams) > 1){
 
-                if(strlen($open_id) > 0){
+                    if(strlen($open_id) > 0){
 
-                    $user = new User();
+                        $user = new User();
 
-                    $user->setOpen_id($open_id);
+                        $user->setOpen_id($open_id);
 
-                    if(JWTUtils::validateJWT($jwt, $user)){
+                        if(JWTUtils::validateJWT($jwt, $user)){
 
-                        $result = UserController::getUserByOpenId($user);
+                            $result = UserController::getUserByOpenId($user);
 
-                        $json = json_encode($result, JSON_PRETTY_PRINT);
+                            $json = json_encode($result, JSON_PRETTY_PRINT);
 
-                        echo($json);
+                            echo($json);
+
+                        }else{
+                            header('HTTP/1.0 401 Unauthorized');
+                            echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT);
+                            exit;
+                        }
 
                     }else{
                         header('HTTP/1.0 401 Unauthorized');
-                        echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT);
+                        echo json_encode(array("failed"=>"No user id provided"),JSON_FORCE_OBJECT);
                         exit;
                     }
-
                 }else{
                     header('HTTP/1.0 401 Unauthorized');
-                    echo json_encode(array("failed"=>"No user id provided"),JSON_FORCE_OBJECT);
+                    echo json_encode(array("failed"=>'Invalid token, please reauthorize user'),JSON_FORCE_OBJECT);
                     exit;
                 }
             }else{
                 header('HTTP/1.0 401 Unauthorized');
-                echo json_encode(array("failed"=>'Invalid token, please reauthorize user'),JSON_FORCE_OBJECT);
+                echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT);
                 exit;
             }
-        }else{
-            header('HTTP/1.0 401 Unauthorized');
-            echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT);
-            exit;
-        }
-        break;
-    case 'POST':
-        if(isset($_SERVER["HTTP_AUTHORIZATION"])){
-            $jwt = JWTUtils::getTokenFromRequest($_SERVER["HTTP_AUTHORIZATION"]);
+            break;
+        case 'POST':
+            if(isset($_SERVER["HTTP_AUTHORIZATION"])){
+                $jwt = JWTUtils::getTokenFromRequest($_SERVER["HTTP_AUTHORIZATION"]);
         
-            $jsonBody = file_get_contents('php://input');
-            if(strlen($jsonBody) > 1){
+                $jsonBody = file_get_contents('php://input');
+                if(strlen($jsonBody) > 1){
                 
-                $credentials = json_decode($jsonBody, TRUE); //convert JSON into array
-                //var_dump($credentials);
-                if($credentials !== null){
+                    $credentials = json_decode($jsonBody, TRUE); //convert JSON into array
+                    //var_dump($credentials);
+                    if($credentials !== null){
 
-                    $user = new User();
+                        $user = new User();
 
-                    $user->setOpen_id($credentials["sub"]);
-                    $user->setName($credentials["name"]);
-                    $user->setEmail($credentials["email"]);
-                    $user->setUser_role($credentials["user_role"]);
+                        $user->setOpen_id($credentials["sub"]);
+                        $user->setName($credentials["name"]);
+                        $user->setEmail($credentials["email"]);
+                        $user->setUser_role($credentials["user_role"]);
 
-                    if(JWTUtils::validateJWT($jwt, $user)){
+                        if(JWTUtils::validateJWT($jwt, $user)){
                         
-                        $result = UserController::getUserByOpenId($user);
+                            $result = UserController::getUserByOpenId($user);
 
-                        $json = json_encode($result, JSON_PRETTY_PRINT);
+                            $json = json_encode($result, JSON_PRETTY_PRINT);
 
-                        echo($json);
+                            echo($json);
+                        }else{
+                            header('HTTP/1.0 401 Unauthorized');
+                            echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT);
+                            exit;
+                        }
                     }else{
-                        header('HTTP/1.0 401 Unauthorized');
-                        echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT);
+                        header('HTTP/1.0 400 Bad Request');
+                        echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT);
                         exit;
                     }
+                
                 }else{
                     header('HTTP/1.0 400 Bad Request');
                     echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT);
                     exit;
                 }
-                
             }else{
-                header('HTTP/1.0 400 Bad Request');
-                echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT);
+                header('HTTP/1.0 401 Unauthorized');
+                echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT);
                 exit;
             }
-        }else{
-            header('HTTP/1.0 401 Unauthorized');
-            echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT);
-            exit;
-        }
-        break;
-    case 'DELETE':
-        //Here Handle DELETE Request 
-        break;
-    case 'PUT':
-        //Here Handle PUT Request 
-        break;
-    case 'OPTIONS':
-        //Here Handle OPTIONS/Pre-flight requests
-        header("Access-Control-Allow-Headers: Accept, Content-Type, Access-Control-Allow-Origin, x-access-token");
-        header("Access-Control-Allow-Methods: GET,POST");
-        echo("");
-        break;
+            break;
+        case 'DELETE':
+            //Here Handle DELETE Request 
+            break;
+        case 'PUT':
+            //Here Handle PUT Request 
+            break;
+        case 'OPTIONS':
+            //Here Handle OPTIONS/Pre-flight requests
+            header("Access-Control-Allow-Headers: Accept, Content-Type, Access-Control-Allow-Origin, x-access-token");
+            header("Access-Control-Allow-Methods: GET,POST");
+            echo("");
+            break;
    }
    ?>
\ No newline at end of file

Braces +8 added lines, -8 removed lines

@@ -51,23 +51,23 @@ 
 
                         echo($json);
 
-                    }else{
+                    } else{
                         header('HTTP/1.0 401 Unauthorized');
                         echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT);
                         exit;
                     }
 
-                }else{
+                } else{
                     header('HTTP/1.0 401 Unauthorized');
                     echo json_encode(array("failed"=>"No user id provided"),JSON_FORCE_OBJECT);
                     exit;
                 }
-            }else{
+            } else{
                 header('HTTP/1.0 401 Unauthorized');
                 echo json_encode(array("failed"=>'Invalid token, please reauthorize user'),JSON_FORCE_OBJECT);
                 exit;
             }
-        }else{
+        } else{
             header('HTTP/1.0 401 Unauthorized');
             echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT);
             exit;
@@ -98,23 +98,23 @@ 
                         $json = json_encode($result, JSON_PRETTY_PRINT);
 
                         echo($json);
-                    }else{
+                    } else{
                         header('HTTP/1.0 401 Unauthorized');
                         echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT);
                         exit;
                     }
-                }else{
+                } else{
                     header('HTTP/1.0 400 Bad Request');
                     echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT);
                     exit;
                 }
                 
-            }else{
+            } else{
                 header('HTTP/1.0 400 Bad Request');
                 echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT);
                 exit;
             }
-        }else{
+        } else{
             header('HTTP/1.0 401 Unauthorized');
             echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT);
             exit;

public_html/tc/services/Lookup.php

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 $result = LookupController::getLookupDataByLocaleAndType($locale,$lookupType);
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);
-            }else{
+            } else{
                 $result = array();
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);

public_html/tc/services/JobPoster.php

Braces +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 header("Content-length:".strlen($json));
                 echo($json);
-            }else{
+            } else{
                 $result = array();
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);
@@ -106,7 +106,7 @@ 
                 $result = JobPosterController::createJobPoster($jobPoster);
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);
-            }else{
+            } else{
                 $result = array();
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);

public_html/tc/services/Content.php

Braces +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
             $json = json_encode($result, JSON_PRETTY_PRINT);
             header("Content-length:".strlen($json));
             echo($json);
-            }else{
+            } else{
                 $result = array();
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);
@@ -51,7 +51,7 @@ 
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 header("Content-length:".strlen($json));
                 echo($json);
-            }else{
+            } else{
                 $result = array();
                 $json = json_encode($result, JSON_PRETTY_PRINT);
                 echo($json);