@@ -41,8 +41,8 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about'); |
| 43 | 43 | $this->content['header']['right']['About'] = array( |
| 44 | - 'url' => $this->aboutUrl, |
|
| 45 | - 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 44 | + 'url' => $this->aboutUrl, |
|
| 45 | + 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 46 | 46 | 'Burning Flipside' => $this->wwwUrl.'/about/event', |
| 47 | 47 | 'AAR, LLC' => $this->wwwUrl.'/organization/aar', |
| 48 | 48 | 'Privacy Policy' => $this->wwwUrl.'/about/privacy' |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $this->content['urls']['loginUrl'] = $this->loginUrl; |
| 59 | 59 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
| 60 | 60 | |
| 61 | - if($this->user === false || $this->user === null) |
|
| 61 | + if($this->user === false || $this->user === null) |
|
| 62 | 62 | { |
| 63 | 63 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
| 64 | 64 | { |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | { |
| 182 | 182 | if(!isset($this->content['notifications'])) |
| 183 | 183 | { |
| 184 | - $this->content['notifications'] = array(); |
|
| 184 | + $this->content['notifications'] = array(); |
|
| 185 | 185 | } |
| 186 | 186 | array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
| 187 | 187 | } |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | { |
| 195 | 195 | if(!isset($this->content['body'])) |
| 196 | 196 | { |
| 197 | - $this->content['body'] = $this->body; |
|
| 197 | + $this->content['body'] = $this->body; |
|
| 198 | 198 | } |
| 199 | 199 | //Add page JS just before rednering so it is after any added by the page explicitly |
| 200 | 200 | // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
@@ -39,11 +39,11 @@ |
||
| 39 | 39 | { |
| 40 | 40 | if(isset($this->params['user'])) |
| 41 | 41 | { |
| 42 | - $this->pdo = new \PDO($this->params['dsn'], $this->params['user'], $this->params['pass']); |
|
| 43 | - } |
|
| 44 | - else |
|
| 45 | - { |
|
| 46 | - $this->pdo = new \PDO($this->params['dsn']); |
|
| 42 | + $this->pdo = new \PDO($this->params['dsn'], $this->params['user'], $this->params['pass']); |
|
| 43 | + } |
|
| 44 | + else |
|
| 45 | + { |
|
| 46 | + $this->pdo = new \PDO($this->params['dsn']); |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |