@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | $twigSettings = array(); |
| 24 | 24 | if(\file_exists('/var/php_cache/twig')) |
| 25 | - { |
|
| 26 | - $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig'); |
|
| 27 | - $twigSettings['cache'] = $twigCache; |
|
| 28 | - //$twigSettings = array('cache' => $twigCache, 'debug' => true); |
|
| 25 | + { |
|
| 26 | + $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig'); |
|
| 27 | + $twigSettings['cache'] = $twigCache; |
|
| 28 | + //$twigSettings = array('cache' => $twigCache, 'debug' => true); |
|
| 29 | 29 | } |
| 30 | 30 | //$twigSettings['debug'] = true; |
| 31 | 31 | |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about'); |
| 54 | 54 | $this->content['header']['right']['About'] = array( |
| 55 | - 'url' => $this->aboutUrl, |
|
| 56 | - 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 55 | + 'url' => $this->aboutUrl, |
|
| 56 | + 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 57 | 57 | 'Burning Flipside' => $this->wwwUrl.'/about/event', |
| 58 | 58 | 'AAR, LLC' => $this->wwwUrl.'/organization/aar', |
| 59 | 59 | 'Privacy Policy' => $this->wwwUrl.'/about/privacy' |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $this->content['urls']['loginUrl'] = $this->loginUrl; |
| 70 | 70 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
| 71 | 71 | |
| 72 | - if($this->user === false || $this->user === null) |
|
| 72 | + if($this->user === false || $this->user === null) |
|
| 73 | 73 | { |
| 74 | 74 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
| 75 | 75 | { |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | { |
| 204 | 204 | if(!isset($this->content['notifications'])) |
| 205 | 205 | { |
| 206 | - $this->content['notifications'] = array(); |
|
| 206 | + $this->content['notifications'] = array(); |
|
| 207 | 207 | } |
| 208 | 208 | array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
| 209 | 209 | } |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | { |
| 217 | 217 | if(!isset($this->content['body'])) |
| 218 | 218 | { |
| 219 | - $this->content['body'] = $this->body; |
|
| 219 | + $this->content['body'] = $this->body; |
|
| 220 | 220 | } |
| 221 | 221 | //Add page JS just before rednering so it is after any added by the page explicitly |
| 222 | 222 | // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
@@ -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); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $this->addLink('Home', '..'); |
| 50 | 50 | if($this->user === false || $this->user === null) |
| 51 | 51 | { |
| 52 | - $this->content['body'] = ' |
|
| 52 | + $this->content['body'] = ' |
|
| 53 | 53 | <div id="content"> |
| 54 | 54 | <div class="row"> |
| 55 | 55 | <div class="col-lg-12"> |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | else if($this->isAdmin() === false) |
| 63 | 63 | { |
| 64 | - $this->content['body'] = ' |
|
| 64 | + $this->content['body'] = ' |
|
| 65 | 65 | <div id="content"> |
| 66 | 66 | <div class="row"> |
| 67 | 67 | <div class="col-lg-12"> |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | </div> |
| 71 | 71 | </div> |
| 72 | 72 | '; |
| 73 | - $this->content['header'] = array(); |
|
| 74 | - $this->content['cards'] = array(); |
|
| 73 | + $this->content['header'] = array(); |
|
| 74 | + $this->content['cards'] = array(); |
|
| 75 | 75 | } |
| 76 | 76 | return parent::getContent(); |
| 77 | 77 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | { |
| 32 | 32 | return null; |
| 33 | 33 | } |
| 34 | - $data = $this->getArray($array); |
|
| 34 | + $data = $this->getArray($array); |
|
| 35 | 35 | $ssheat = new Spreadsheet(); |
| 36 | 36 | $sheat = $ssheat->getActiveSheet(); |
| 37 | 37 | $keys = array_shift($data); |