@@ -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 | } |
@@ -236,9 +236,9 @@ |
||
236 | 236 | * |
237 | 237 | * @return string The link |
238 | 238 | */ |
239 | - public function createLink($linkName, $linkTarget = '#', $class=false) |
|
239 | + public function createLink($linkName, $linkTarget = '#', $class = false) |
|
240 | 240 | { |
241 | - $data = array('href'=>$linkTarget); |
|
241 | + $data = array('href'=>$linkTarget); |
|
242 | 242 | if($class !== false) |
243 | 243 | { |
244 | 244 | $data['class'] = $class; |
@@ -11,6 +11,9 @@ |
||
11 | 11 | $this->setTemplateName('admin.html'); |
12 | 12 | } |
13 | 13 | |
14 | + /** |
|
15 | + * @param string $adminGroup |
|
16 | + */ |
|
14 | 17 | protected function userIsAdmin($adminGroup) |
15 | 18 | { |
16 | 19 | if($this->user === false || $this->user === null) |
@@ -78,6 +78,9 @@ discard block |
||
78 | 78 | $this->loader->addPath($dir, $namespace); |
79 | 79 | } |
80 | 80 | |
81 | + /** |
|
82 | + * @param string $name |
|
83 | + */ |
|
81 | 84 | public function setTemplateName($name) |
82 | 85 | { |
83 | 86 | $this->templateName = $name; |
@@ -112,7 +115,6 @@ discard block |
||
112 | 115 | * Add a JavaScript file from a set of files known to the framework |
113 | 116 | * |
114 | 117 | * @param string $jsFileID the ID of the JS file |
115 | - * @param boolean $async Can the JS file be loaded asynchronously? |
|
116 | 118 | */ |
117 | 119 | public function addWellKnownJS($jsFileID) |
118 | 120 | { |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $this->loginUrl = $this->settings->getGlobalSetting('login_url', $this->profilesUrl.'/login.php'); |
48 | 48 | |
49 | 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 | { |
53 | 53 | $this->addLink('Login', $this->loginUrl); |
@@ -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 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $this->content['css'] = array($uri); |
90 | 90 | return; |
91 | 91 | } |
92 | - array_push($this->content['css'],$uri); |
|
92 | + array_push($this->content['css'], $uri); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $this->content['js'] = array($uri); |
105 | 105 | return; |
106 | 106 | } |
107 | - array_push($this->content['js'],$uri); |
|
107 | + array_push($this->content['js'], $uri); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | { |
147 | 147 | $data['menu'] = $submenu; |
148 | 148 | } |
149 | - $this->content['header']['right'] = array($name => $data)+$this->content['header']['right']; |
|
149 | + $this->content['header']['right'] = array($name => $data) + $this->content['header']['right']; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | /** Notification that is green for success */ |
@@ -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'); |