Completed
Push — master ( 47f050...014b6a )
by Patrick
39s
created
cron.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 /**
15 15
  * This cron script recompiles the Browscap cache
16 16
  */
17
-ini_set('memory_limit','-1');      // turn off memory limit for this script
18
-set_time_limit(120);               // change to 2 minutes for this script
17
+ini_set('memory_limit', '-1'); // turn off memory limit for this script
18
+set_time_limit(120); // change to 2 minutes for this script
19 19
 
20 20
 require('vendor/autoload.php');
21 21
 
Please login to merge, or discard this patch.
Auth/LDAPGettableObject.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -35,20 +35,20 @@
 block discarded – undo
35 35
     {
36 36
         if(isset($this->labeleduri))
37 37
         {
38
-             //Have multiple emails
39
-             if($propName === 'mail')
40
-             {
41
-                 return $this->getFieldSingleValue('labeleduri');
42
-             }
43
-             if($propName === 'allMail')
44
-             {
45
-                 $tmp = $this->getField('mail');
46
-                 if(isset($tmp['count']))
47
-                 {
48
-                     unset($tmp['count']);
49
-                 }
50
-                 return $tmp;
51
-             }
38
+                //Have multiple emails
39
+                if($propName === 'mail')
40
+                {
41
+                    return $this->getFieldSingleValue('labeleduri');
42
+                }
43
+                if($propName === 'allMail')
44
+                {
45
+                    $tmp = $this->getField('mail');
46
+                    if(isset($tmp['count']))
47
+                    {
48
+                        unset($tmp['count']);
49
+                    }
50
+                    return $tmp;
51
+                }
52 52
         }
53 53
         $tmp = $this->getValueWithDefault($propName);
54 54
         if($tmp !== false)
Please login to merge, or discard this patch.
Settings.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
     public function getDataSetData($dataSetName)
73 73
     {
74 74
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
75
-	{
75
+        {
76 76
             return false;
77 77
         }
78 78
         return \FlipsideSettings::$dataset[$dataSetName];
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         {
31 31
             require $GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php';
32 32
             return;
33
-	}
33
+    }
34 34
         if(file_exists('/var/www/secure_settings/class.FlipsideSettings.php'))
35 35
         {
36 36
             require '/var/www/secure_settings/class.FlipsideSettings.php';
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     public function getDataSetData($dataSetName)
73 73
     {
74 74
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
75
-	{
75
+    {
76 76
             return false;
77 77
         }
78 78
         return \FlipsideSettings::$dataset[$dataSetName];
Please login to merge, or discard this patch.
Log/LogService.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
         \Psr\Log\LogLevel::WARNING,
13 13
         \Psr\Log\LogLevel::NOTICE);
14 14
 
15
-    public function __construct($params=false)
15
+    public function __construct($params = false)
16 16
     {
17 17
         if(isset($params['defaultLogLevels']))
18 18
         {
@@ -27,10 +27,10 @@  discard block
 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
             // check that the value can be casted to string
32
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
33
-                $replace['{' . $key . '}'] = $val;
32
+            if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
33
+                $replace['{'.$key.'}'] = $val;
34 34
             }
35 35
         }
36 36
 
Please login to merge, or discard this 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.
Log/PHPLog.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 
4 4
 class PHPLog extends LogService
5 5
 {
6
-    public function __construct($params=false)
6
+    public function __construct($params = false)
7 7
     {
8 8
         parent::__construct($params);
9 9
     }
Please login to merge, or discard this patch.
Data/ObjectDataTable.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
         $objCount = count($res);
49 49
         for($i = 0; $i < $objCount; $i++)
50 50
         {
51
-           $res[$i] = new $this->className($res[$i]);
51
+            $res[$i] = new $this->className($res[$i]);
52 52
         }
53 53
         return $res;
54 54
     }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         return $this->dataTable->create($data);
35 35
     }
36 36
 
37
-    public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false, $returnObj=false)
37
+    public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false, $returnObj = false)
38 38
     {
39 39
         $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params);
40 40
         if($res === false)
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         return $this->dataTable->delete($filter);
68 68
     }
69 69
 
70
-    public function count($filter=false)
70
+    public function count($filter = false)
71 71
     {
72 72
         return $this->dataTable->count($filter);
73 73
     }
Please login to merge, or discard this patch.
Data/CSVDataTable.php 2 patches
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.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     public function count($filter = false)
21 21
     {
22 22
         if($filter)
23
-	{
23
+        {
24 24
             $res = $this->data;
25 25
 	    $res = $filter->filter_array($res);
26 26
 	    return count($res);
Please login to merge, or discard this patch.
Data/SQLDataSet.php 3 patches
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.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -254,7 +254,8 @@  discard block
 block discarded – undo
254 254
         $stmt = $this->pdo->query($sql);
255 255
         if($stmt === false)
256 256
         {
257
-            if (php_sapi_name() !== "cli") {
257
+            if (php_sapi_name() !== "cli")
258
+            {
258 259
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
259 260
             }
260 261
             return false;
@@ -304,7 +305,8 @@  discard block
 block discarded – undo
304 305
         $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);";
305 306
         if($this->pdo->exec($sql) === false)
306 307
         {
307
-            if (php_sapi_name() !== "cli") {
308
+            if (php_sapi_name() !== "cli")
309
+            {
308 310
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
309 311
             }
310 312
             return false;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
         $stmt = $this->pdo->query($sql);
261 261
         if($stmt === false)
262 262
         {
263
-            if (php_sapi_name() !== "cli") {
263
+            if(php_sapi_name() !== "cli") {
264 264
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
265 265
             }
266 266
             return false;
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
         $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);";
311 311
         if($this->pdo->exec($sql) === false)
312 312
         {
313
-            if (php_sapi_name() !== "cli") {
313
+            if(php_sapi_name() !== "cli") {
314 314
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
315 315
             }
316 316
             return false;
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
         return $this->pdo->errorInfo();
368 368
     }
369 369
 
370
-    public function quote(string $string, int $type = \PDO::PARAM_STR): string|false
370
+    public function quote(string $string, int $type = \PDO::PARAM_STR): string | false
371 371
     {
372 372
         return $this->pdo->quote($string, $type);
373 373
     }
Please login to merge, or discard this patch.
Data/MongoDataSet.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,9 +141,12 @@
 block discarded – undo
141 141
     {
142 142
         $namespace = $this->db_name.'.'.$collectionName;
143 143
         $dbWrite = new \MongoDB\Driver\BulkWrite();
144
-        try {
144
+        try
145
+        {
145 146
             $dbWrite->update($criteria, $new_object, $options);
146
-        } catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) {
147
+        }
148
+        catch(\MongoDB\Driver\Exception\InvalidArgumentException $e)
149
+        {
147 150
             if(isset($new_object['$set']['']))
148 151
             {
149 152
                 unset($new_object['$set']['']);
Please login to merge, or discard this patch.