BurningFlipside / CommonCode

Auth/LDAPGettableObject.php

Indentation +14 added lines, -14 removed lines

@@ -35,20 +35,20 @@
     {
         if(isset($this->labeleduri))
         {
-             //Have multiple emails
-             if($propName === 'mail')
-             {
-                 return $this->getFieldSingleValue('labeleduri');
-             }
-             if($propName === 'allMail')
-             {
-                 $tmp = $this->getField('mail');
-                 if(isset($tmp['count']))
-                 {
-                     unset($tmp['count']);
-                 }
-                 return $tmp;
-             }
+                //Have multiple emails
+                if($propName === 'mail')
+                {
+                    return $this->getFieldSingleValue('labeleduri');
+                }
+                if($propName === 'allMail')
+                {
+                    $tmp = $this->getField('mail');
+                    if(isset($tmp['count']))
+                    {
+                        unset($tmp['count']);
+                    }
+                    return $tmp;
+                }
         }
         $tmp = $this->getValueWithDefault($propName);
         if($tmp !== false)

Settings.php

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     public function getDataSetData($dataSetName)
     {
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
-	{
+        {
             return false;
         }
         return \FlipsideSettings::$dataset[$dataSetName];

Indentation +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         {
             require $GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php';
             return;
-	}
+    }
         if(file_exists('/var/www/secure_settings/class.FlipsideSettings.php'))
         {
             require '/var/www/secure_settings/class.FlipsideSettings.php';
@@ -72,7 +72,7 @@ 
     public function getDataSetData($dataSetName)
     {
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
-	{
+    {
             return false;
         }
         return \FlipsideSettings::$dataset[$dataSetName];

Log/LogService.php

Braces +4 added lines, -2 removed lines

@@ -27,9 +27,11 @@
     {
         // build a replacement array with braces around the context keys
         $replace = array();
-        foreach ($context as $key => $val) {
+        foreach ($context as $key => $val)
+        {
             // check that the value can be casted to string
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')))
+            {
                 $replace['{' . $key . '}'] = $val;
             }
         }

Data/ObjectDataTable.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $objCount = count($res);
         for($i = 0; $i < $objCount; $i++)
         {
-           $res[$i] = new $this->className($res[$i]);
+            $res[$i] = new $this->className($res[$i]);
         }
         return $res;
     }

Data/CSVDataTable.php

Indentation +14 added lines, -14 removed lines

@@ -9,33 +9,33 @@
     public function __construct($file)
     {
         $this->data = array_map('str_getcsv', file($file));
-	$titles = array_shift($this->data);
-	$count = count($this->data);
-	for($i = 0; $i < $count; $i++)
-	{
+    $titles = array_shift($this->data);
+    $count = count($this->data);
+    for($i = 0; $i < $count; $i++)
+    {
             $this->data[$i] = array_combine($titles, $this->data[$i]);
-	}
+    }
     }
 
     public function count($filter = false)
     {
         if($filter)
-	{
+    {
             $res = $this->data;
-	    $res = $filter->filter_array($res);
-	    return count($res);
-	}
-	return count($this->data);
+        $res = $filter->filter_array($res);
+        return count($res);
+    }
+    return count($this->data);
     }
   
     public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
         $res = $this->data;
-	if($filter !== false)
-	{
+    if($filter !== false)
+    {
             $res = $filter->filter_array($res);
-	}
-	return $res;
+    }
+    return $res;
     }
 
     public function create($data)

Braces +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function count($filter = false)
     {
         if($filter)
-	{
+        {
             $res = $this->data;
 	    $res = $filter->filter_array($res);
 	    return count($res);

Data/SQLDataSet.php

Indentation +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
         if($stmt === false)
         {
             if (php_sapi_name() !== "cli") {
-              error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
+                error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;
         }

Braces +4 added lines, -2 removed lines

@@ -254,7 +254,8 @@ 
         $stmt = $this->pdo->query($sql);
         if($stmt === false)
         {
-            if (php_sapi_name() !== "cli") {
+            if (php_sapi_name() !== "cli")
+            {
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;
@@ -304,7 +305,8 @@ 
         $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);";
         if($this->pdo->exec($sql) === false)
         {
-            if (php_sapi_name() !== "cli") {
+            if (php_sapi_name() !== "cli")
+            {
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
             }
             return false;

Data/MongoDataSet.php

Braces +5 added lines, -2 removed lines

@@ -141,9 +141,12 @@
     {
         $namespace = $this->db_name.'.'.$collectionName;
         $dbWrite = new \MongoDB\Driver\BulkWrite();
-        try {
+        try
+        {
             $dbWrite->update($criteria, $new_object, $options);
-        } catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) {
+        }
+        catch(\MongoDB\Driver\Exception\InvalidArgumentException $e)
+        {
             if(isset($new_object['$set']['']))
             {
                 unset($new_object['$set']['']);

Data/Filter.php

Braces +5 added lines, -5 removed lines

@@ -145,7 +145,7 @@ 
 	for($i = 0; $i < $count; $i++)
 	{
             if($this->children[$i] === 'and' || $this->children[$i] === 'or')
-	    {
+            {
                 array_push($res, $this->children[$i]);
 	    }
 	    else
@@ -161,14 +161,14 @@ 
 	while($count >= 3)
 	{
 	    if($res[1] === 'and')
-            {
+	    {
                 $var1 = array_shift($res);
                 array_shift($res);
                 $var2 = array_shift($res);
 	        $res = array_merge(array($var1 && $var2), $res);
             }
-	    else if($res[1] === 'or')
-            {
+            else if($res[1] === 'or')
+	    {
                 $var1 = array_shift($res);
                 array_shift($res);
                 $var2 = array_shift($res);
@@ -182,7 +182,7 @@ 
     public function filter_array(&$array)
     {
         if(is_array($array))
-	{
+        {
             $res = array_filter($array, array($this, 'filterElement'));
             return array_values($res);
         }

Indentation +24 added lines, -24 removed lines

@@ -146,47 +146,47 @@ 
     {
         $res = array();
         $count = count($this->children);
-	for($i = 0; $i < $count; $i++)
-	{
+    for($i = 0; $i < $count; $i++)
+    {
             if($this->children[$i] === 'and' || $this->children[$i] === 'or')
-	    {
+        {
                 array_push($res, $this->children[$i]);
-	    }
-	    else
-	    {
+        }
+        else
+        {
                 $tmp = $this->children[$i]->php_compare($element);
-		array_push($res, $tmp);
-	    }
-	}
-	if($count === 1)
-	{
+        array_push($res, $tmp);
+        }
+    }
+    if($count === 1)
+    {
             return $res[0];
-	}
-	while($count >= 3)
-	{
-	    if($res[1] === 'and')
+    }
+    while($count >= 3)
+    {
+        if($res[1] === 'and')
             {
                 $var1 = array_shift($res);
                 array_shift($res);
                 $var2 = array_shift($res);
-	        $res = array_merge(array($var1 && $var2), $res);
+            $res = array_merge(array($var1 && $var2), $res);
             }
-	    else if($res[1] === 'or')
+        else if($res[1] === 'or')
             {
                 $var1 = array_shift($res);
                 array_shift($res);
                 $var2 = array_shift($res);
                 $res = array_merge(array($var1 || $var2), $res);
-	    }
-	    $count = count($res);
-	}
+        }
+        $count = count($res);
+    }
         return $res[0];
     }
 
     public function filter_array(&$array)
     {
         if(is_array($array))
-	{
+    {
             $res = array_filter($array, array($this, 'filterElement'));
             return array_values($res);
         }
@@ -195,10 +195,10 @@ 
 
     public function contains(string $substr)
     {
-	if($this->string === null)
-	{
+    if($this->string === null)
+    {
             return null;
-	}
+    }
         return strstr($this->string, $substr) !== false;
     }
 

Http/LoginRequiredPage.php

Indentation +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
     {
         if($this->user === false || $this->user === null)
         {
-          $this->content['body'] = '
+            $this->content['body'] = '
             <div id="content">
               <div class="row">
                 <div class="col-lg-12">
@@ -36,7 +36,7 @@ 
         }
         else if(!isset($this->content['body']))
         {
-          $this->content['body'] = $this->body;
+            $this->content['body'] = $this->body;
         }
         //Add page JS just before rednering so it is after any added by the page explicitly
         $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js');