@@ -727,7 +727,7 @@ |
||
| 727 | 727 | */ |
| 728 | 728 | private function addJSGlobals() |
| 729 | 729 | { |
| 730 | - $this->body = $this->body.'<script> |
|
| 730 | + $this->body = $this->body.'<script> |
|
| 731 | 731 | var profilesUrl = \''.$this->profilesUrl.'\' |
| 732 | 732 | var loginUrl = \''.$this->loginUrl.'\' |
| 733 | 733 | var logoutUrl = \''.$this->logoutUrl.'\' |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 92 | 92 | $params = $this->manipulateParameters($request, $odata); |
| 93 | 93 | $areas = $dataTable->read($odata->filter, $odata->select, $odata->top, |
| 94 | - $odata->skip, $odata->orderby, $params); |
|
| 94 | + $odata->skip, $odata->orderby, $params); |
|
| 95 | 95 | if($areas === false) |
| 96 | 96 | { |
| 97 | 97 | $areas = array(); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 134 | 134 | $filter = $this->getFilterForPrimaryKey($args['name']); |
| 135 | 135 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
| 136 | - $odata->skip, $odata->orderby); |
|
| 136 | + $odata->skip, $odata->orderby); |
|
| 137 | 137 | if(empty($areas)) |
| 138 | 138 | { |
| 139 | 139 | return $response->withStatus(404); |
@@ -13,5 +13,5 @@ |
||
| 13 | 13 | ->withStatus(500) |
| 14 | 14 | ->withHeader('Content-Type', 'text/html') |
| 15 | 15 | ->write($exception->__toString()); |
| 16 | - } |
|
| 16 | + } |
|
| 17 | 17 | } |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | if($this->user === false || $this->user === null) |
| 26 | 26 | { |
| 27 | - $this->content['body'] = ' |
|
| 27 | + $this->content['body'] = ' |
|
| 28 | 28 | <div id="content"> |
| 29 | 29 | <div class="row"> |
| 30 | 30 | <div class="col-lg-12"> |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | else if(!isset($this->content['body'])) |
| 38 | 38 | { |
| 39 | - $this->content['body'] = $this->body; |
|
| 39 | + $this->content['body'] = $this->body; |
|
| 40 | 40 | } |
| 41 | 41 | //Add page JS just before rednering so it is after any added by the page explicitly |
| 42 | 42 | $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
@@ -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 | |