@@ -19,23 +19,29 @@ discard block |
||
19 | 19 | <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationHomeLinkWrapper" aria-hidden="false"> |
20 | 20 | <?php if (strpos($url,'admin') !== false) : ?> |
21 | 21 | <a href="/admin/" id="navigationHomeLink">Home</a> |
22 | - <?php else : ?> |
|
22 | + <?php else { |
|
23 | + : ?> |
|
23 | 24 | <a href="/" id="navigationHomeLink">Home</a> |
24 | - <?php endif; ?> |
|
25 | + <?php endif; |
|
26 | +} |
|
27 | +?> |
|
25 | 28 | </div> |
26 | 29 | |
27 | 30 | <?php /* Checks to see if the page is the admin portal and then displays the admin home link. */ ?> |
28 | 31 | <?php $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; ?> |
29 | 32 | <?php if (strpos($url,'admin') !== false) : ?> |
30 | 33 | <?php /* No link for you! */ ?> |
31 | - <?php else : ?> |
|
34 | + <?php else { |
|
35 | + : ?> |
|
32 | 36 | <?php /* Browse Jobs */ ?> |
33 | 37 | <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationBrowseLinkWrapper" aria-hidden="false"> |
34 | 38 | <a href="#BrowseJobs" id="navigationBrowseLink" onclick="JobPostAPI.showBrowseJobs();TalentCloudAPI.setNav('navigationBrowseLinkWrapper');"> |
35 | 39 | Browse Jobs |
36 | 40 | </a> |
37 | 41 | </div> |
38 | - <?php endif; ?> |
|
42 | + <?php endif; |
|
43 | +} |
|
44 | +?> |
|
39 | 45 | |
40 | 46 | <?php /* Dashboard */ ?> |
41 | 47 | <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationDashboardLinkWrapper" aria-hidden="true"> |
@@ -61,11 +67,14 @@ discard block |
||
61 | 67 | <a href="#CreateEditProfile" id="navigationProfileLink" onclick="CreateEditProfileAPI.showCreateEditProfile();TalentCloudAPI.setNav('navigationProfileLinkWrapper');"> |
62 | 68 | My Profile |
63 | 69 | </a> |
64 | - <?php else : ?> |
|
70 | + <?php else { |
|
71 | + : ?> |
|
65 | 72 | <a href="#MyProfile" id="navigationProfileLink" onclick="JobSeekerAPI.showMyJobSeekerProfile();TalentCloudAPI.setNav('navigationProfileLinkWrapper');"> |
66 | 73 | My Profile |
67 | 74 | </a> |
68 | - <?php endif; ?> |
|
75 | + <?php endif; |
|
76 | +} |
|
77 | +?> |
|
69 | 78 | |
70 | 79 | </div> |
71 | 80 | |
@@ -75,18 +84,24 @@ discard block |
||
75 | 84 | <a href="javascript:void(0)" id="navigationPosterLink" onclick="CreateJobPosterAPI.showCreateJobPosterForm(this);TalentCloudAPI.setNav('navigationPosterLinkWrapper');">Job Poster |
76 | 85 | </a> |
77 | 86 | </div> |
78 | - <?php else : ?> |
|
87 | + <?php else { |
|
88 | + : ?> |
|
79 | 89 | <?php /* No link for you! */ ?> |
80 | - <?php endif; ?> |
|
90 | + <?php endif; |
|
91 | +} |
|
92 | +?> |
|
81 | 93 | |
82 | 94 | <?php /* Register */ |
83 | 95 | if (strpos($url,'admin') !== false) : ?> |
84 | 96 | <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationRegisterLinkWrapper" aria-hidden="true"> |
85 | 97 | <?php echo("<a href=\"\" id=\"navigationRegisterLink\">Register</a>"); ?> |
86 | 98 | </div> |
87 | - <?php else : ?> |
|
99 | + <?php else { |
|
100 | + : ?> |
|
88 | 101 | <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationRegisterLinkWrapper" aria-hidden="false"> |
89 | - <?php echo("<a href=\"https://account.gccollab.ca/register?redirect_uri=https%3A%2F%2Ftc.gccollab.ca%2F\" id=\"navigationRegisterLink\">Register</a>"); ?> |
|
102 | + <?php echo("<a href=\"https://account.gccollab.ca/register?redirect_uri=https%3A%2F%2Ftc.gccollab.ca%2F\" id=\"navigationRegisterLink\">Register</a>"); |
|
103 | +} |
|
104 | +?> |
|
90 | 105 | </div> |
91 | 106 | <?php endif; ?> |
92 | 107 | |
@@ -102,9 +117,12 @@ discard block |
||
102 | 117 | |
103 | 118 | <?php if ($hasUser!=null) : ?> |
104 | 119 | <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationLoginLinkWrapper" aria-hidden="true"> |
105 | - <?php else :?> |
|
120 | + <?php else { |
|
121 | + :?> |
|
106 | 122 | <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationLoginLinkWrapper" aria-hidden="false"> |
107 | - <?php endif; ?> |
|
123 | + <?php endif; |
|
124 | +} |
|
125 | +?> |
|
108 | 126 | <?php |
109 | 127 | $loginLink = ""; |
110 | 128 | $loginLink .= OPENID_URI.AUTH_URI; |
@@ -119,13 +137,16 @@ discard block |
||
119 | 137 | ?> |
120 | 138 | </div> |
121 | 139 | |
122 | - <?php else : ?> |
|
140 | + <?php else { |
|
141 | + : ?> |
|
123 | 142 | |
124 | 143 | <?php if ($hasUser!=null) : ?> |
125 | 144 | <div class="page-hero__navigation-item box med-1of5 lg-1of6 hidden" id="navigationLoginLinkWrapper"> |
126 | 145 | <?php else :?> |
127 | 146 | <div class="page-hero__navigation-item box med-1of5 lg-1of6" id="navigationLoginLinkWrapper"> |
128 | - <?php endif; ?> |
|
147 | + <?php endif; |
|
148 | +} |
|
149 | +?> |
|
129 | 150 | <?php |
130 | 151 | $loginLink = ""; |
131 | 152 | $loginLink .= OPENID_URI.AUTH_URI; |
@@ -156,9 +177,12 @@ discard block |
||
156 | 177 | <div id="h1"> |
157 | 178 | <?php if (strpos($url,'admin') !== false) : ?> |
158 | 179 | <h1 class="visuallyHidden">Talent Cloud - Admin Portal</h1> |
159 | - <?php else : ?> |
|
180 | + <?php else { |
|
181 | + : ?> |
|
160 | 182 | <h1 class="visuallyHidden">Talent Cloud - Applicant Portal</h1> |
161 | - <?php endif; ?> |
|
183 | + <?php endif; |
|
184 | +} |
|
185 | +?> |
|
162 | 186 | </div> |
163 | 187 | |
164 | 188 | <div class="landing-hero" id="landingHero"> |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | try{ |
45 | 45 | $oidc->authenticate(); |
46 | - }catch(Jumbojett\OpenIDConnectClientException $e){ |
|
46 | + } catch(Jumbojett\OpenIDConnectClientException $e){ |
|
47 | 47 | echo($e->getMessage()); |
48 | 48 | } |
49 | 49 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | header("Refresh:0; url=\"".REDIRECT_URI.""); |
64 | 64 | } |
65 | -}else{ |
|
65 | +} else{ |
|
66 | 66 | $_SESSION['openid_connect_state'] = $state; |
67 | 67 | $_SESSION['openid_connect_nonce'] = $nonce; |
68 | 68 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | echo("UserAPI.storeSessionUser(".json_encode($userInfo).");"); |
109 | 109 | echo("UserAPI.login();"); |
110 | 110 | } |
111 | - }else{ |
|
111 | + } else{ |
|
112 | 112 | echo("UserAPI.login();"); |
113 | 113 | } |
114 | 114 | //var isExistingUser = UserAPI.authenticate(UserAPI.getSessionUserAsJSON()); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | try{ |
45 | 45 | $oidc->authenticate(); |
46 | - }catch(Jumbojett\OpenIDConnectClientException $e){ |
|
46 | + } catch(Jumbojett\OpenIDConnectClientException $e){ |
|
47 | 47 | echo($e->getMessage()); |
48 | 48 | } |
49 | 49 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | } |
62 | 62 | header("Refresh:0; url=\"".REDIRECT_URI_ADMIN."\""); |
63 | 63 | } |
64 | -}else{ |
|
64 | +} else{ |
|
65 | 65 | $_SESSION['openid_connect_state'] = $state; |
66 | 66 | $_SESSION['openid_connect_nonce'] = $nonce; |
67 | 67 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | echo("UserAPI.storeSessionUser(".json_encode($userInfo).");"); |
108 | 108 | echo("UserAPI.login(true);"); |
109 | 109 | } |
110 | - }else{ |
|
110 | + } else{ |
|
111 | 111 | echo("UserAPI.login(false);"); |
112 | 112 | } |
113 | 113 | //var isExistingUser = UserAPI.authenticate(UserAPI.getSessionUserAsJSON()); |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | header('HTTP/1.0 401 Unauthorized'); |
9 | 9 | echo 'Text to send if user hits Cancel button'; |
10 | 10 | exit; |
11 | - }else{ |
|
11 | + } else{ |
|
12 | 12 | if ($_SERVER['PHP_AUTH_USER'] == 'test' && $_SERVER['PHP_AUTH_PW'] == 'test') { |
13 | 13 | header("Access-Control-Allow-Origin: *"); |
14 | 14 | header("Content-Type: application/json"); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $result = array('user' => 'test','pass' => 'test'); |
26 | 26 | $json = json_encode($result); |
27 | 27 | echo($json); |
28 | - }else{ |
|
28 | + } else{ |
|
29 | 29 | $result1 = array('user' => 'test','pass' => 'test'); |
30 | 30 | $result2 = array('user' => 'test1','pass' => 'test1'); |
31 | 31 | $result3 = array('user' => 'test2','pass' => 'test2'); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | echo(""); |
56 | 56 | break; |
57 | 57 | } |
58 | - }else{ |
|
58 | + } else{ |
|
59 | 59 | header('WWW-Authenticate: Basic realm="My Realm"'); |
60 | 60 | header('HTTP/1.0 401 Unauthorized'); |
61 | 61 | echo 'Authorization declined'; |
@@ -47,7 +47,7 @@ |
||
47 | 47 | |
48 | 48 | $json = json_encode($jobApplicationWithAnswers, JSON_PRETTY_PRINT); |
49 | 49 | echo($json); |
50 | - }else{ |
|
50 | + } else{ |
|
51 | 51 | $result = array(); |
52 | 52 | $json = json_encode($result, JSON_PRETTY_PRINT); |
53 | 53 | echo($json); |
@@ -51,23 +51,23 @@ discard block |
||
51 | 51 | |
52 | 52 | echo($json); |
53 | 53 | |
54 | - }else{ |
|
54 | + } else{ |
|
55 | 55 | header('HTTP/1.0 401 Unauthorized'); |
56 | 56 | echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT); |
57 | 57 | exit; |
58 | 58 | } |
59 | 59 | |
60 | - }else{ |
|
60 | + } else{ |
|
61 | 61 | header('HTTP/1.0 401 Unauthorized'); |
62 | 62 | echo json_encode(array("failed"=>"No user id provided"),JSON_FORCE_OBJECT); |
63 | 63 | exit; |
64 | 64 | } |
65 | - }else{ |
|
65 | + } else{ |
|
66 | 66 | header('HTTP/1.0 401 Unauthorized'); |
67 | 67 | echo json_encode(array("failed"=>'Invalid token, please reauthorize user'),JSON_FORCE_OBJECT); |
68 | 68 | exit; |
69 | 69 | } |
70 | - }else{ |
|
70 | + } else{ |
|
71 | 71 | header('HTTP/1.0 401 Unauthorized'); |
72 | 72 | echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT); |
73 | 73 | exit; |
@@ -98,23 +98,23 @@ discard block |
||
98 | 98 | $json = json_encode($result, JSON_PRETTY_PRINT); |
99 | 99 | |
100 | 100 | echo($json); |
101 | - }else{ |
|
101 | + } else{ |
|
102 | 102 | header('HTTP/1.0 401 Unauthorized'); |
103 | 103 | echo json_encode(array("failed"=>"Invalid token"),JSON_FORCE_OBJECT); |
104 | 104 | exit; |
105 | 105 | } |
106 | - }else{ |
|
106 | + } else{ |
|
107 | 107 | header('HTTP/1.0 400 Bad Request'); |
108 | 108 | echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT); |
109 | 109 | exit; |
110 | 110 | } |
111 | 111 | |
112 | - }else{ |
|
112 | + } else{ |
|
113 | 113 | header('HTTP/1.0 400 Bad Request'); |
114 | 114 | echo json_encode(array("failed"=>"Bad Reqest"),JSON_FORCE_OBJECT); |
115 | 115 | exit; |
116 | 116 | } |
117 | - }else{ |
|
117 | + } else{ |
|
118 | 118 | header('HTTP/1.0 401 Unauthorized'); |
119 | 119 | echo json_encode(array("failed"=>'No authorization token provided'),JSON_FORCE_OBJECT); |
120 | 120 | exit; |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $result = LookupController::getLookupDataByLocaleAndType($locale,$lookupType); |
35 | 35 | $json = json_encode($result, JSON_PRETTY_PRINT); |
36 | 36 | echo($json); |
37 | - }else{ |
|
37 | + } else{ |
|
38 | 38 | $result = array(); |
39 | 39 | $json = json_encode($result, JSON_PRETTY_PRINT); |
40 | 40 | echo($json); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $json = json_encode($result, JSON_PRETTY_PRINT); |
38 | 38 | header("Content-length:".strlen($json)); |
39 | 39 | echo($json); |
40 | - }else{ |
|
40 | + } else{ |
|
41 | 41 | $result = array(); |
42 | 42 | $json = json_encode($result, JSON_PRETTY_PRINT); |
43 | 43 | echo($json); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $result = JobPosterController::createJobPoster($jobPoster); |
107 | 107 | $json = json_encode($result, JSON_PRETTY_PRINT); |
108 | 108 | echo($json); |
109 | - }else{ |
|
109 | + } else{ |
|
110 | 110 | $result = array(); |
111 | 111 | $json = json_encode($result, JSON_PRETTY_PRINT); |
112 | 112 | echo($json); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $json = json_encode($result, JSON_PRETTY_PRINT); |
37 | 37 | header("Content-length:".strlen($json)); |
38 | 38 | echo($json); |
39 | - }else{ |
|
39 | + } else{ |
|
40 | 40 | $result = array(); |
41 | 41 | $json = json_encode($result, JSON_PRETTY_PRINT); |
42 | 42 | echo($json); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $json = json_encode($result, JSON_PRETTY_PRINT); |
52 | 52 | header("Content-length:".strlen($json)); |
53 | 53 | echo($json); |
54 | - }else{ |
|
54 | + } else{ |
|
55 | 55 | $result = array(); |
56 | 56 | $json = json_encode($result, JSON_PRETTY_PRINT); |
57 | 57 | echo($json); |