@@ -142,47 +142,47 @@ |
||
| 142 | 142 | { |
| 143 | 143 | $res = array(); |
| 144 | 144 | $count = count($this->children); |
| 145 | - for($i = 0; $i < $count; $i++) |
|
| 146 | - { |
|
| 145 | + for($i = 0; $i < $count; $i++) |
|
| 146 | + { |
|
| 147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
| 148 | - { |
|
| 148 | + { |
|
| 149 | 149 | array_push($res, $this->children[$i]); |
| 150 | - } |
|
| 151 | - else |
|
| 152 | - { |
|
| 150 | + } |
|
| 151 | + else |
|
| 152 | + { |
|
| 153 | 153 | $tmp = $this->children[$i]->php_compare($element); |
| 154 | - array_push($res, $tmp); |
|
| 155 | - } |
|
| 156 | - } |
|
| 157 | - if($count === 1) |
|
| 158 | - { |
|
| 154 | + array_push($res, $tmp); |
|
| 155 | + } |
|
| 156 | + } |
|
| 157 | + if($count === 1) |
|
| 158 | + { |
|
| 159 | 159 | return $res[0]; |
| 160 | - } |
|
| 161 | - while($count >= 3) |
|
| 162 | - { |
|
| 163 | - if($res[1] === 'and') |
|
| 160 | + } |
|
| 161 | + while($count >= 3) |
|
| 162 | + { |
|
| 163 | + if($res[1] === 'and') |
|
| 164 | 164 | { |
| 165 | 165 | $var1 = array_shift($res); |
| 166 | 166 | array_shift($res); |
| 167 | 167 | $var2 = array_shift($res); |
| 168 | - $res = array_merge(array($var1 && $var2), $res); |
|
| 168 | + $res = array_merge(array($var1 && $var2), $res); |
|
| 169 | 169 | } |
| 170 | - else if($res[1] === 'or') |
|
| 170 | + else if($res[1] === 'or') |
|
| 171 | 171 | { |
| 172 | 172 | $var1 = array_shift($res); |
| 173 | 173 | array_shift($res); |
| 174 | 174 | $var2 = array_shift($res); |
| 175 | 175 | $res = array_merge(array($var1 || $var2), $res); |
| 176 | - } |
|
| 177 | - $count = count($res); |
|
| 178 | - } |
|
| 176 | + } |
|
| 177 | + $count = count($res); |
|
| 178 | + } |
|
| 179 | 179 | return $res[0]; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | public function filter_array(&$array) |
| 183 | 183 | { |
| 184 | 184 | if(is_array($array)) |
| 185 | - { |
|
| 185 | + { |
|
| 186 | 186 | $res = array_filter($array, array($this, 'filterElement')); |
| 187 | 187 | return array_values($res); |
| 188 | 188 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | for($i = 0; $i < $count; $i++) |
| 146 | 146 | { |
| 147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
| 148 | - { |
|
| 148 | + { |
|
| 149 | 149 | array_push($res, $this->children[$i]); |
| 150 | 150 | } |
| 151 | 151 | else |
@@ -161,14 +161,14 @@ discard block |
||
| 161 | 161 | while($count >= 3) |
| 162 | 162 | { |
| 163 | 163 | if($res[1] === 'and') |
| 164 | - { |
|
| 164 | + { |
|
| 165 | 165 | $var1 = array_shift($res); |
| 166 | 166 | array_shift($res); |
| 167 | 167 | $var2 = array_shift($res); |
| 168 | 168 | $res = array_merge(array($var1 && $var2), $res); |
| 169 | 169 | } |
| 170 | - else if($res[1] === 'or') |
|
| 171 | - { |
|
| 170 | + else if($res[1] === 'or') |
|
| 171 | + { |
|
| 172 | 172 | $var1 = array_shift($res); |
| 173 | 173 | array_shift($res); |
| 174 | 174 | $var2 = array_shift($res); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | public function filter_array(&$array) |
| 183 | 183 | { |
| 184 | 184 | if(is_array($array)) |
| 185 | - { |
|
| 185 | + { |
|
| 186 | 186 | $res = array_filter($array, array($this, 'filterElement')); |
| 187 | 187 | return array_values($res); |
| 188 | 188 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | { |
| 79 | 79 | if(isset($res['extended']) && isset($res['extended']['jpegphoto'])) |
| 80 | 80 | { |
| 81 | - $res['extended']['jpegphoto']=true; |
|
| 81 | + $res['extended']['jpegphoto'] = true; |
|
| 82 | 82 | } |
| 83 | 83 | FlipSession::setVar('AuthMethod', get_class($this->methods[$i])); |
| 84 | 84 | FlipSession::setVar('AuthData', $res); |
@@ -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'); |
@@ -17,11 +17,11 @@ |
||
| 17 | 17 | return $response->withJson($exception, 400); |
| 18 | 18 | } |
| 19 | 19 | if (php_sapi_name() !== "cli") { |
| 20 | - error_log($exception->__toString()); |
|
| 20 | + error_log($exception->__toString()); |
|
| 21 | 21 | } |
| 22 | 22 | return $response |
| 23 | 23 | ->withStatus(500) |
| 24 | 24 | ->withHeader('Content-Type', 'text/html') |
| 25 | 25 | ->write($exception->__toString()); |
| 26 | - } |
|
| 26 | + } |
|
| 27 | 27 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | { |
| 17 | 17 | return $response->withJson($exception, 400); |
| 18 | 18 | } |
| 19 | - if (php_sapi_name() !== "cli") { |
|
| 19 | + if(php_sapi_name() !== "cli") { |
|
| 20 | 20 | error_log($exception->__toString()); |
| 21 | 21 | } |
| 22 | 22 | return $response |
@@ -16,7 +16,8 @@ |
||
| 16 | 16 | { |
| 17 | 17 | return $response->withJson($exception, 400); |
| 18 | 18 | } |
| 19 | - if (php_sapi_name() !== "cli") { |
|
| 19 | + if (php_sapi_name() !== "cli") |
|
| 20 | + { |
|
| 20 | 21 | error_log($exception->__toString()); |
| 21 | 22 | } |
| 22 | 23 | return $response |
@@ -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'); |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | $twigSettings = array(); |
| 24 | 24 | if(\file_exists('/var/php_cache/twig')) |
| 25 | - { |
|
| 25 | + { |
|
| 26 | 26 | $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig'); |
| 27 | 27 | $twigSettings['cache'] = $twigCache; |
| 28 | 28 | //$twigSettings = array('cache' => $twigCache, 'debug' => true); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
| 71 | 71 | |
| 72 | 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 | { |
| 76 | 76 | $this->addLink('Login', $this->loginUrl); |
@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | use \Psr\Http\Message\ServerRequestInterface as Request; |
| 5 | 5 | use \Psr\Http\Message\ResponseInterface as Response; |
| 6 | 6 | |
| 7 | -require __DIR__ . '/../vendor/autoload.php'; |
|
| 8 | -require_once(__DIR__ . '/../static.js_css.php'); |
|
| 7 | +require __DIR__.'/../vendor/autoload.php'; |
|
| 8 | +require_once(__DIR__.'/../static.js_css.php'); |
|
| 9 | 9 | |
| 10 | 10 | class WebPage |
| 11 | 11 | { |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | public function __construct($title) |
| 18 | 18 | { |
| 19 | - \Sentry\init(['dsn' => 'https://[email protected]/4283882' ]); |
|
| 19 | + \Sentry\init(['dsn' => 'https://[email protected]/4283882']); |
|
| 20 | 20 | $this->settings = \Flipside\Settings::getInstance(); |
| 21 | 21 | $this->loader = new \Twig\Loader\FilesystemLoader(dirname(__FILE__).'/../templates'); |
| 22 | 22 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $this->content['css'] = array($uri); |
| 113 | 113 | return; |
| 114 | 114 | } |
| 115 | - array_push($this->content['css'],$uri); |
|
| 115 | + array_push($this->content['css'], $uri); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $this->content['js'] = array($uri); |
| 128 | 128 | return; |
| 129 | 129 | } |
| 130 | - array_push($this->content['js'],$uri); |
|
| 130 | + array_push($this->content['js'], $uri); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | { |
| 181 | 181 | $data['menu'] = $submenu; |
| 182 | 182 | } |
| 183 | - $this->content['header']['right'] = array($name => $data)+$this->content['header']['right']; |
|
| 183 | + $this->content['header']['right'] = array($name => $data) + $this->content['header']['right']; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** Notification that is green for success */ |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | public function setup($app) |
| 23 | 23 | { |
| 24 | - \Sentry\init(['dsn' => 'https://[email protected]/4283882' ]); |
|
| 24 | + \Sentry\init(['dsn' => 'https://[email protected]/4283882']); |
|
| 25 | 25 | return $app->any('[/]', $this); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -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 | } |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | { |
| 90 | 90 | $this->addValueByColName($res[0], $tmp, $colName, $row[$colName]); |
| 91 | 91 | } |
| 92 | - $tmp = $tmp+array_fill_keys(range(0,max(array_keys($tmp))),false); |
|
| 92 | + $tmp = $tmp + array_fill_keys(range(0, max(array_keys($tmp))), false); |
|
| 93 | 93 | ksort($tmp); |
| 94 | 94 | $res[] = $tmp; |
| 95 | 95 | } |
@@ -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); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | if(isset($array[$i])) |
| 22 | 22 | { |
| 23 | - $sheat->setCellValueByColumnAndRow($i+1, $row, $array[$i]); |
|
| 23 | + $sheat->setCellValueByColumnAndRow($i + 1, $row, $array[$i]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | } |