BurningFlipside / CommonCode

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

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

Http/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

Http/Rest/RestAPI.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     public function setup($app)
     {
-        \Sentry\init(['dsn' => 'https://8d76f6c4cb3b409bbe7ed4300e054afd@sentry.io/4283882' ]);
+        \Sentry\init(['dsn' => 'https://8d76f6c4cb3b409bbe7ed4300e054afd@sentry.io/4283882']);
         return $app->any('[/]', $this);
     }
 

Serialize/SpreadSheetSerializer.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
             {
                 $this->addValueByColName($res[0], $tmp, $colName, $row[$colName]);
             }
-            $tmp = $tmp+array_fill_keys(range(0,max(array_keys($tmp))),false);
+            $tmp = $tmp + array_fill_keys(range(0, max(array_keys($tmp))), false);
             ksort($tmp);
             $res[] = $tmp;
         }

Email/DBEmail.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
     {
         if(isset($this->dbData['from']))
         {
-            return $this->dbData['from'];;
+            return $this->dbData['from']; ;
         }
         return parent::getFromAddress();
     }
@@ -30,7 +30,7 @@ 
     {
         if(isset($this->dbData['replyTo']))
         {
-            return $this->dbData['replyTo'];;
+            return $this->dbData['replyTo']; ;
         }
         return parent::getReplyTo();
     }
@@ -59,7 +59,7 @@ 
         return $this->textBody;
     }
 
-    protected function getBodyFromDB($html=true)
+    protected function getBodyFromDB($html = true)
     {
         $vars = $this->getSubstituteVars();
         $rawText = $this->getRawBodyText($html);
@@ -74,7 +74,7 @@ 
             $end = strpos($rawText, "</script>");
             if($index === 0)
             {
-                $rawText = substr($rawText, $end+9);
+                $rawText = substr($rawText, $end + 9);
             }
         }
         return strtr(strip_tags($rawText), $vars);

Email/AmazonSES.php

Braces +10 added lines, -4 removed lines

@@ -42,10 +42,13 @@ 
             $args = array();
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = $email->getRawMessage();
-            try {
+            try
+            {
                 $res = $this->ses->sendRawEmail($args);
                 return $res;
-            } catch(\Exception $e) {
+            }
+            catch(\Exception $e)
+            {
                 return false;
             }
         }
@@ -66,9 +69,12 @@ 
             $args['Message']['Body']['Text']['Data'] = $email->getTextBody();
             $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody();
             $args['ReplyToAddresses'] = array($email->getReplyTo());
-            try {
+            try
+            {
                 return $this->ses->sendEmail($args);
-            } catch(\Exception $e) {
+            }
+            catch(\Exception $e)
+            {
                 return false;
             }
         }

Email/SMTPServer.php

Spacing +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
             return array($address);
         }
         $ret = array();
-        $ret[0] = trim(substr($address, $pos+1), '>');
-        $ret[1] = substr($address, 0, $pos-1);
+        $ret[0] = trim(substr($address, $pos + 1), '>');
+        $ret[1] = substr($address, 0, $pos - 1);
         return $ret;
     }
 

Auth/LDAPAuthenticator.php

Doc Comments +3 added lines, -3 removed lines

@@ -233,7 +233,7 @@ 
      *
      * @param \stdClass	$data The AuthData from the session
      *
-     * @return null|\Auth\LDAPUser The LDAPUser represented by this data
+     * @return LDAPUser The LDAPUser represented by this data
      */
     public function getUser($data)
     {
@@ -245,7 +245,7 @@ 
      *
      * @param string $name The Group's name
      *
-     * @return null|\Auth\LDAPGroup The LDAPGroup represented by the name or null if not found
+     * @return null|LDAPGroup The LDAPGroup represented by the name or null if not found
      */
     public function getGroupByName($name)
     {
@@ -329,7 +329,7 @@ 
     }
 
     /**
-     * @param boolean|\Data\Filter $filter The filter to user when reading users
+     * @param \Flipside\Data\Filter $filter The filter to user when reading users
      * @param boolean|array   $select The fields to return
      * @param boolean|integer $top The number of records to return
      * @param boolean|integer $skip The number of records to skip