Completed
Push — develop ( 0daf89...446de4 )
by Patrick
04:27 queued 02:25
created
Log/class.LogService.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,9 +27,11 @@
 block discarded – undo
27 27
     {
28 28
         // build a replacement array with braces around the context keys
29 29
         $replace = array();
30
-        foreach ($context as $key => $val) {
30
+        foreach ($context as $key => $val)
31
+        {
31 32
             // check that the value can be casted to string
32
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
33
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')))
34
+            {
33 35
                 $replace['{' . $key . '}'] = $val;
34 36
             }
35 37
         }
Please login to merge, or discard this patch.
Http/Rest/class.DataTableAPI.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
Http/class.WebSite.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,9 @@  discard block
 block discarded – undo
13 13
         $settings = array("settings"=>["determineRouteBeforeAppMiddleware"=>true]);
14 14
         parent::__construct($settings);
15 15
         $c = $this->getContainer();
16
-        $c['errorHandler'] = function($c) { return new WebErrorHandler();};
16
+        $c['errorHandler'] = function($c)
17
+        {
18
+return new WebErrorHandler();};
17 19
         $this->add(new AuthMiddleware());
18 20
         $this->add(new ODataMiddleware());
19 21
     }
@@ -25,7 +27,9 @@  discard block
 block discarded – undo
25 27
 
26 28
     public function registerAPI($uri, $api)
27 29
     {
28
-        $group = $this->group($uri, function() use($api){$api->setup($this);});
30
+        $group = $this->group($uri, function() use($api)
31
+        {
32
+$api->setup($this);});
29 33
         $group->add(new \Http\Rest\SerializationMiddleware());
30 34
         $group->add(new \Http\Rest\CORSMiddleware($this->getContainer()));
31 35
     }
Please login to merge, or discard this patch.
Email/class.AmazonSES.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,10 +42,13 @@  discard block
 block discarded – undo
42 42
             $args = array();
43 43
             $args['RawMessage'] = array();
44 44
             $args['RawMessage']['Data'] = $email->getRawMessage();
45
-            try {
45
+            try
46
+            {
46 47
                 $res = $this->ses->sendRawEmail($args);
47 48
                 return $res;
48
-            } catch(\Exception $e) {
49
+            }
50
+            catch(\Exception $e)
51
+            {
49 52
                 return false;
50 53
             }
51 54
         }
@@ -66,9 +69,12 @@  discard block
 block discarded – undo
66 69
             $args['Message']['Body']['Text']['Data'] = $email->getTextBody();
67 70
             $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody();
68 71
             $args['ReplyToAddresses'] = array($email->getReplyTo());
69
-            try {
72
+            try
73
+            {
70 74
                 return $this->ses->sendEmail($args);
71
-            } catch(\Exception $e) {
75
+            }
76
+            catch(\Exception $e)
77
+            {
72 78
                 return false;
73 79
             }
74 80
         }
Please login to merge, or discard this patch.
Http/class.LoginRequiredPage.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.
Http/class.WebPage.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
61 61
 
62 62
 	if($this->user === false || $this->user === null)
63
-        {
63
+	{
64 64
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
65 65
             {
66 66
                 $this->addLink('Login', $this->loginUrl);
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.
Http/class.WebErrorHandler.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,8 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Data/class.Filter.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -142,47 +142,47 @@
 block discarded – undo
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
             return array_filter($array, array($this, 'filterElement'));
187 187
         }
188 188
         return array();
Please login to merge, or discard this patch.
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
182 182
     public function filter_array(&$array)
183 183
     {
184 184
         if(is_array($array))
185
-	{
185
+        {
186 186
             return array_filter($array, array($this, 'filterElement'));
187 187
         }
188 188
         return array();
Please login to merge, or discard this patch.
Data/class.FilterClause.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -222,15 +222,15 @@
 block discarded – undo
222 222
 
223 223
     public function php_compare($value)
224 224
     {
225
-	if(is_array($value))
226
-	{
225
+    if(is_array($value))
226
+    {
227 227
             return $this->php_compare($value[$this->var1]);
228
-	}
228
+    }
229 229
         switch($this->op)
230 230
         {
231 231
             case '!=':
232 232
                 return $value != $this->var2;
233
-	    case '=':
233
+        case '=':
234 234
                 return $value == $this->var2;
235 235
             case '<':
236 236
                 return $value < $this->var2;
Please login to merge, or discard this patch.