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');">Create 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/tc/controller/UserController.php

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
             $newUser->setUser_role(ROLE_APPLICANT);
             $newUser->setIs_confirmed(true);
             $user = UserController::registerUser($newUser);
-        } else {
+        }else {
             throw new Exception("Unable to access openId userInfo");
         }
         return $user;
@@ -105,7 +105,7 @@ 
         //if user_id is not null, then log the user in automatically
         if ($existingUser) {
             return $existingUser;
-        } else {
+        }else {
             return null;
             /*
               //if user_id is null, then the user is not registered and we should register them automatically
@@ -143,7 +143,7 @@ 
                 $jobSeekerProfile = new JobSeekerProfile();
                 JobSeekerController::addJobSeekerProfile($jobSeekerProfile, $userId);
             }
-        } else if ($user->getUser_role() === ROLE_ADMIN) {
+        }else if ($user->getUser_role() === ROLE_ADMIN) {
 
             $userId = $user->getUser_id();
 
@@ -186,7 +186,7 @@ 
             if ($oldUser->getEmail() != $updatedUser->getEmail()) {
                 $confEmailSent = UserController::confirmEmail($updatedUser);
                 $updatedUser->setIs_confirmed(false);
-            } else {
+            }else {
                 $updatedUser->setIs_confirmed($oldUser->getIs_confirmed());
             }
             $updateSuccessful = UserDAO::updateUser($updatedUser); //do updates