@@ -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'); |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | $aboutUrl = $this->settings->getGlobalSetting('about_url', $wwwUri.'/about'); |
| 36 | 36 | $this->content['header']['right']['About'] = array( |
| 37 | - 'url' => $aboutUrl, |
|
| 38 | - 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 37 | + 'url' => $aboutUrl, |
|
| 38 | + 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 39 | 39 | 'Burning Flipside' => $wwwUri.'/about/event', |
| 40 | 40 | 'AAR, LLC' => $wwwUri.'/organization/aar', |
| 41 | 41 | 'Privacy Policy' => $wwwUri.'/about/privacy' |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $this->resetUrl = $this->settings->getGlobalSetting('reset_url', $this->profilesUrl.'/reset.php'); |
| 47 | 47 | $this->loginUrl = $this->settings->getGlobalSetting('login_url', $this->profilesUrl.'/login.php'); |
| 48 | 48 | |
| 49 | - if($this->user === false || $this->user === null) |
|
| 49 | + if($this->user === false || $this->user === null) |
|
| 50 | 50 | { |
| 51 | 51 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
| 52 | 52 | { |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | { |
| 170 | 170 | if(!isset($this->content['notifications'])) |
| 171 | 171 | { |
| 172 | - $this->content['notifications'] = array(); |
|
| 172 | + $this->content['notifications'] = array(); |
|
| 173 | 173 | } |
| 174 | 174 | array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
| 175 | 175 | } |
@@ -182,9 +182,9 @@ discard block |
||
| 182 | 182 | { |
| 183 | 183 | if(!isset($this->content['body'])) |
| 184 | 184 | { |
| 185 | - $this->content['body'] = $this->body; |
|
| 185 | + $this->content['body'] = $this->body; |
|
| 186 | 186 | } |
| 187 | - //Add page JS just before rednering so it is after any added by the page explicitly |
|
| 187 | + //Add page JS just before rednering so it is after any added by the page explicitly |
|
| 188 | 188 | $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
| 189 | 189 | return $this->twig->render($this->templateName, $this->content); |
| 190 | 190 | } |