@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | |
43 | 43 | $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about'); |
44 | 44 | $this->content['header']['right']['About'] = array( |
45 | - 'url' => $this->aboutUrl, |
|
46 | - 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
45 | + 'url' => $this->aboutUrl, |
|
46 | + 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
47 | 47 | 'Burning Flipside' => $this->wwwUrl.'/about/event', |
48 | 48 | 'AAR, LLC' => $this->wwwUrl.'/organization/aar', |
49 | 49 | 'Privacy Policy' => $this->wwwUrl.'/about/privacy' |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $this->content['urls']['loginUrl'] = $this->loginUrl; |
60 | 60 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
61 | 61 | |
62 | - if($this->user === false || $this->user === null) |
|
62 | + if($this->user === false || $this->user === null) |
|
63 | 63 | { |
64 | 64 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
65 | 65 | { |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | { |
183 | 183 | if(!isset($this->content['notifications'])) |
184 | 184 | { |
185 | - $this->content['notifications'] = array(); |
|
185 | + $this->content['notifications'] = array(); |
|
186 | 186 | } |
187 | 187 | array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
188 | 188 | } |
@@ -195,9 +195,9 @@ discard block |
||
195 | 195 | { |
196 | 196 | if(!isset($this->content['body'])) |
197 | 197 | { |
198 | - $this->content['body'] = $this->body; |
|
198 | + $this->content['body'] = $this->body; |
|
199 | 199 | } |
200 | - //Add page JS just before rednering so it is after any added by the page explicitly |
|
200 | + //Add page JS just before rednering so it is after any added by the page explicitly |
|
201 | 201 | $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
202 | 202 | return $this->twig->render($this->templateName, $this->content); |
203 | 203 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
61 | 61 | |
62 | 62 | if($this->user === false || $this->user === null) |
63 | - { |
|
63 | + { |
|
64 | 64 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
65 | 65 | { |
66 | 66 | $this->addLink('Login', $this->loginUrl); |
@@ -108,6 +108,9 @@ discard block |
||
108 | 108 | $this->wwwUrl = $this->settings->getGlobalSetting('www_url', 'https://www.burningflipside.com/'); |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param string $fieldName |
|
113 | + */ |
|
111 | 114 | protected function getCaptchField($fieldName) |
112 | 115 | { |
113 | 116 | $dataset = DataSetFactory::getDataSetByName('profiles'); |
@@ -130,6 +133,9 @@ discard block |
||
130 | 133 | return $this->getCaptchField('hint'); |
131 | 134 | } |
132 | 135 | |
136 | + /** |
|
137 | + * @return string |
|
138 | + */ |
|
133 | 139 | private function get_answer() |
134 | 140 | { |
135 | 141 | return $this->getCaptchField('answer'); |