Completed
Push — master ( 474e6a...e2c749 )
by Patrick
03:31
created
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.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 1 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 1 patch
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.
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.
Data/class.CSVDataTable.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -9,33 +9,33 @@
 block discarded – undo
9 9
     public function __construct($file)
10 10
     {
11 11
         $this->data = array_map('str_getcsv', file($file));
12
-	$titles = array_shift($this->data);
13
-	$count = count($this->data);
14
-	for($i = 0; $i < $count; $i++)
15
-	{
12
+    $titles = array_shift($this->data);
13
+    $count = count($this->data);
14
+    for($i = 0; $i < $count; $i++)
15
+    {
16 16
             $this->data[$i] = array_combine($titles, $this->data[$i]);
17
-	}
17
+    }
18 18
     }
19 19
 
20 20
     public function count($filter = false)
21 21
     {
22 22
         if($filter)
23
-	{
23
+    {
24 24
             $res = $this->data;
25
-	    $res = $filter->filter_array($res);
26
-	    return count($res);
27
-	}
28
-	return count($this->data);
25
+        $res = $filter->filter_array($res);
26
+        return count($res);
27
+    }
28
+    return count($this->data);
29 29
     }
30 30
   
31 31
     public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
32 32
     {
33 33
         $res = $this->data;
34
-	if($filter !== false)
35
-	{
34
+    if($filter !== false)
35
+    {
36 36
             $res = $filter->filter_array($res);
37
-	}
38
-	return $res;
37
+    }
38
+    return $res;
39 39
     }
40 40
 
41 41
     public function create($data)
Please login to merge, or discard this patch.
Data/class.Filter.php 1 patch
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
             $res = array_filter($array, array($this, 'filterElement'));
187 187
             return array_values($res);
188 188
         }
Please login to merge, or discard this patch.
Data/class.DataTableSessionHandler.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
 
16 16
     public function open($savePath, $sessionName)
17 17
     {
18
-       $this->dataTable = \DataSetFactory::getDataTableByNames($this->dataSetName, $this->dataTableName);
19
-       if($this->dataTable)
20
-       {
21
-           return true;
22
-       }
23
-       return false;
18
+        $this->dataTable = \DataSetFactory::getDataTableByNames($this->dataSetName, $this->dataTableName);
19
+        if($this->dataTable)
20
+        {
21
+            return true;
22
+        }
23
+        return false;
24 24
     }
25 25
 
26 26
     public function close()
Please login to merge, or discard this patch.
Data/class.SQLDataSet.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -248,7 +248,7 @@
 block discarded – undo
248 248
         if($stmt === false)
249 249
         {
250 250
             if (php_sapi_name() !== "cli") {
251
-              error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
251
+                error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
252 252
             }
253 253
             return false;
254 254
         }
Please login to merge, or discard this patch.