BurningFlipside / CommonCode

class.FlipsideCAPTCHA.php

Doc Comments +6 added lines

@@ -108,6 +108,9 @@ 
         $this->wwwUrl = $settings->getGlobalSetting('www_url', 'https://www.burningflipside.com');
     }
 
+    /**
+     * @param string $fieldName
+     */
     protected function getCaptchField($fieldName)
     {
         $dataset = DataSetFactory::getDataSetByName('profiles');
@@ -130,6 +133,9 @@ 
         return $this->getCaptchField('hint');
     }
 
+    /**
+     * @return string
+     */
     private function get_answer()
     {
         return $this->getCaptchField('answer');

Http/Rest/class.SerializationMiddleware.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
         }
     }
 
+    /**
+     * @param string $param
+     */
     private function getParamFromArrayIfSet($array, $param, $default = null)
     {
         if(isset($array[$param]))

Http/class.WebErrorHandler.php

Indentation +2 added lines, -2 removed lines

@@ -17,11 +17,11 @@
             return $response->withJson($exception, 400);
         }
         if (php_sapi_name() !== "cli") {
-          error_log($exception->__toString());
+            error_log($exception->__toString());
         }
         return $response
             ->withStatus(500)
             ->withHeader('Content-Type', 'text/html')
             ->write($exception->__toString());
-   }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         {
             return $response->withJson($exception, 400);
         }
-        if (php_sapi_name() !== "cli") {
+        if(php_sapi_name() !== "cli") {
           error_log($exception->__toString());
         }
         return $response

Braces +2 added lines, -1 removed lines

@@ -16,7 +16,8 @@
         {
             return $response->withJson($exception, 400);
         }
-        if (php_sapi_name() !== "cli") {
+        if (php_sapi_name() !== "cli")
+        {
           error_log($exception->__toString());
         }
         return $response

Data/class.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/class.Filter.php

Indentation +21 added lines, -21 removed lines

@@ -142,47 +142,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);
         }

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);
         }

Data/class.DataTableSessionHandler.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
 
     public function open($savePath, $sessionName)
     {
-       $this->dataTable = \DataSetFactory::getDataTableByNames($this->dataSetName, $this->dataTableName);
-       if($this->dataTable)
-       {
-           return true;
-       }
-       return false;
+        $this->dataTable = \DataSetFactory::getDataTableByNames($this->dataSetName, $this->dataTableName);
+        if($this->dataTable)
+        {
+            return true;
+        }
+        return false;
     }
 
     public function close()

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
     public function gc($maxlifetime)
     {
-        $date = date("Y-m-d H:i:s", time()-$maxlifetime);
+        $date = date("Y-m-d H:i:s", time() - $maxlifetime);
         $filter = new \Data\Filter("sessionLastAccess lt $date");
         return $this->dataTable->delete($filter);
     }

Auth/class.User.php

Doc Comments +1 added lines, -1 removed lines

@@ -311,7 +311,7 @@
      *
      * @param stdClass $data The user's new data
      *
-     * @return boolean true if the user's data was changed, false otherwise
+     * @return boolean|null true if the user's data was changed, false otherwise
      */
     public function editUser($data)
     {

Auth/class.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)

Data/class.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;
     }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         return $this->dataTable->create($data);
     }
 
-    public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false, $returnObj=false)
+    public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false, $returnObj = false)
     {
         $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params);
         if($res === false)
@@ -67,7 +67,7 @@ 
         return $this->dataTable->delete($filter);
     }
 
-    public function count($filter=false)
+    public function count($filter = false)
     {
         return $this->dataTable->count($filter);
     }