Pleets / dronephp

src/Network/Rest/Basic.php

Spacing +3 added lines, -3 removed lines

@@ -29,8 +29,8 @@ 
             $ht = $this->http;
 
             $this->http->writeStatus($ht::HTTP_UNAUTHORIZED);
-            header('WWW-Authenticate: Basic realm="'.$this->realm.'"');
-            die('Error ' . $ht::HTTP_UNAUTHORIZED .' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
+            header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
+            die('Error ' . $ht::HTTP_UNAUTHORIZED . ' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
         }
     }
 
@@ -76,7 +76,7 @@ 
     public function response()
     {
         $status = http_response_code();
-        $this->response = 'Error ' . $status .' (' . $this->http->getStatusText($status) . ')!!';
+        $this->response = 'Error ' . $status . ' (' . $this->http->getStatusText($status) . ')!!';
         echo $this->response;
     }
 }
\ No newline at end of file

src/Network/Rest/Digest.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
             $ht = $this->http;
 
             $this->http->writeStatus($ht::HTTP_UNAUTHORIZED);
-            header('WWW-Authenticate: Digest realm="'.$this->realm.'",qop="auth",nonce="'.uniqid().'",opaque="'.md5($this->realm).'"');
-            die('Error ' . $ht::HTTP_UNAUTHORIZED .' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
+            header('WWW-Authenticate: Digest realm="' . $this->realm . '",qop="auth",nonce="' . uniqid() . '",opaque="' . md5($this->realm) . '"');
+            die('Error ' . $ht::HTTP_UNAUTHORIZED . ' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
         }
     }
 
@@ -50,8 +50,8 @@ 
         }
 
         $A1 = md5($data['username'] . ':' . $this->realm . ':' . $this->whiteList[$data['username']]);
-        $A2 = md5($_SERVER['REQUEST_METHOD'].':'.$data['uri']);
-        $valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
+        $A2 = md5($_SERVER['REQUEST_METHOD'] . ':' . $data['uri']);
+        $valid_response = md5($A1 . ':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $A2);
 
         if ($data['response'] != $valid_response)
         {
@@ -97,7 +97,7 @@ 
     public function response()
     {
         $status = http_response_code();
-        $this->response = 'Error ' . $status .' (' . $this->http->getStatusText($status) . ')!!';
+        $this->response = 'Error ' . $status . ' (' . $this->http->getStatusText($status) . ')!!';
         echo $this->response;
     }
 }
\ No newline at end of file

src/Network/Rest/AbstractRest.php

Spacing +2 added lines, -2 removed lines

@@ -156,8 +156,8 @@
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-            $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set' . $option))
+            $this->{'set' . $option}($value);
         }
 
         # HTTP instance

Braces +6 added lines, -4 removed lines

@@ -127,8 +127,9 @@ 
      */
     public function setWhiteList(array $whiteList)
     {
-        if (empty($whiteList))
-            throw new \RuntimeException("Empty whitelist!");
+        if (empty($whiteList)) {
+                    throw new \RuntimeException("Empty whitelist!");
+        }
 
         $this->whiteList = $whiteList;
     }
@@ -156,8 +157,9 @@ 
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-            $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option)) {
+                        $this->{'set'.$option}($value);
+            }
         }
 
         # HTTP instance

src/Network/Server.php

Braces +6 added lines, -4 removed lines

@@ -64,11 +64,13 @@
      */
     public static function getClientIP()
     {
-        if (!empty($_SERVER['HTTP_CLIENT_IP']))
-            return $_SERVER['HTTP_CLIENT_IP'];
+        if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+                    return $_SERVER['HTTP_CLIENT_IP'];
+        }
 
-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
-            return $_SERVER['HTTP_X_FORWARDED_FOR'];
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                    return $_SERVER['HTTP_X_FORWARDED_FOR'];
+        }
 
         return $_SERVER['REMOTE_ADDR'];
     }

src/Pear/Mail.php

Indentation +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         if (\PEAR::isError($mail))
         {
             $this->error(
-            	$mail->getCode(), $mail->getMessage()
+                $mail->getCode(), $mail->getMessage()
             );
 
             return false;

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      */
     public function send($from, $to, $subject, $body)
     {
-        $headers = array (
+        $headers = array(
             'From'         => $from,
             'To'           => $to,
             'Subject'      => $subject,
@@ -123,7 +123,7 @@ 
 
         $smtp = \Mail::factory(
             'smtp',
-            array ('host' => $this->host, 'auth' => false)
+            array('host' => $this->host, 'auth' => false)
         );
 
         $mail = $smtp->send($to, $headers, $body);

Braces +12 added lines, -8 removed lines

@@ -74,18 +74,21 @@ 
     {
         @include_once 'System.php';
 
-        if (!class_exists('System', false))
-            throw new \RuntimeException("PEAR is not installed in your system!");
+        if (!class_exists('System', false)) {
+                    throw new \RuntimeException("PEAR is not installed in your system!");
+        }
 
         include_once 'Net/SMTP.php';
 
-        if (!class_exists('\Net_SMTP', false))
-            throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        if (!class_exists('\Net_SMTP', false)) {
+                    throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        }
 
         @include_once 'Mail.php';
 
-        if (!class_exists('\Mail', false))
-            throw new \RuntimeException("PEAR::Mail is not installed!");
+        if (!class_exists('\Mail', false)) {
+                    throw new \RuntimeException("PEAR::Mail is not installed!");
+        }
     }
 
     /**
@@ -98,8 +101,9 @@ 
      */
     protected function error($code, $message = null)
     {
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        }
     }
 
     /**

src/Util/ParamTrait.php

Braces +3 added lines, -2 removed lines

@@ -70,8 +70,9 @@
     {
         $parameters = $this->getParams();
 
-        if (array_key_exists($param, $parameters))
-            return true;
+        if (array_key_exists($param, $parameters)) {
+                    return true;
+        }
 
         return false;
     }

src/Exception/Storage.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
             if (!empty($string))
             {
-                $data   = json_decode($string, true);
+                $data = json_decode($string, true);
 
                 # json_encode can return TRUE, FALSE or NULL (http://php.net/manual/en/function.json-decode.php)
                 if (is_null($data) || $data === false)

Braces +10 added lines, -8 removed lines

@@ -69,8 +69,7 @@ 
                     return false;
                 }
             }
-        }
-        else
+        } else
         {
             $directory = strstr($this->outputFile, basename($this->outputFile), true);
 
@@ -86,17 +85,20 @@ 
             "object"  => serialize($exception)
         ];
 
-        if (!function_exists('mb_detect_encoding'))
-            throw new \RuntimeException("mbstring library is not installed!");
+        if (!function_exists('mb_detect_encoding')) {
+                    throw new \RuntimeException("mbstring library is not installed!");
+        }
 
         /*
          * Encodes to UTF8 all messages. It ensures JSON encoding.
          */
-        if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true))
-            $data[$id]["message"] = utf8_encode($data[$id]["message"]);
+        if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true)) {
+                    $data[$id]["message"] = utf8_encode($data[$id]["message"]);
+        }
 
-        if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true))
-            $data[$id]["object"] = utf8_decode($data[$id]["object"]);
+        if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true)) {
+                    $data[$id]["object"] = utf8_decode($data[$id]["object"]);
+        }
 
         if (($encoded_data = json_encode($data)) === false)
         {

src/Mvc/AbstractionModule.php

Braces +3 added lines, -2 removed lines

@@ -80,7 +80,8 @@
 
         $class = "module/" . $module . "/source/" . implode("/", $nm) . ".php";
 
-        if (file_exists($class))
-            include $class;
+        if (file_exists($class)) {
+                    include $class;
+        }
     }
 }
\ No newline at end of file

src/Mvc/AbstractionController.php

Spacing +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
         if ($_SERVER['REQUEST_METHOD'] != 'JSON')
             throw new \LogicException("Request method is not JSON");
 
-        $input =  file_get_contents('php://input');
+        $input = file_get_contents('php://input');
         $array = explode("&", $input);
 
         $result = array();

Braces +32 added lines, -24 removed lines

@@ -150,8 +150,9 @@ 
      */
     public function getPost()
     {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST))
-            $_POST = json_decode(file_get_contents('php://input'), true);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST)) {
+                    $_POST = json_decode(file_get_contents('php://input'), true);
+        }
 
         return (array) $_POST;
     }
@@ -165,8 +166,9 @@ 
      */
     public function getJson()
     {
-        if ($_SERVER['REQUEST_METHOD'] != 'JSON')
-            throw new \LogicException("Request method is not JSON");
+        if ($_SERVER['REQUEST_METHOD'] != 'JSON') {
+                    throw new \LogicException("Request method is not JSON");
+        }
 
         $input =  file_get_contents('php://input');
         $array = explode("&", $input);
@@ -254,8 +256,9 @@ 
         $this->module = new $fqn($module, $this);
 
         # detects method change inside Module.php
-        if (!is_null($this->getMethod()))
-            $method = $this->getMethod();
+        if (!is_null($this->getMethod())) {
+                    $method = $this->getMethod();
+        }
 
         if (!is_null($method) && $this->initExecution)
         {
@@ -265,8 +268,9 @@ 
 
                 $reflection = new \ReflectionMethod($this, $method);
 
-                if (!$reflection->isPublic())
-                    throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'");
+                if (!$reflection->isPublic()) {
+                                    throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'");
+                }
 
                 $this->method = $method;
 
@@ -282,8 +286,7 @@ 
                     $layoutManager = new Layout($layout_params);
                     $layoutManager->fromController($this);
                 }
-            }
-            else {
+            } else {
                 $class = __CLASS__;
                 throw new Exception\PageNotFoundException("The method '$method' doesn't exists in the control class '$class'");
             }
@@ -308,8 +311,9 @@ 
     public function isXmlHttpRequest()
     {
         # non standard (HTTP_X_REQUESTED_WITH is not a part of PHP)
-        if (isset($_SERVER['HTTP_X_REQUESTED_WITH']))
-            return true;
+        if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
+                    return true;
+        }
         return false;
     }
 
@@ -320,8 +324,9 @@ 
      */
     public function isPost()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "POST")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                    return true;
+        }
         return false;
     }
 
@@ -332,8 +337,9 @@ 
      */
     public function isGet()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "GET")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "GET") {
+                    return true;
+        }
         return false;
     }
 
@@ -357,10 +363,11 @@ 
             $i = 1;
             foreach ($params as $item)
             {
-                if ($i % 2 != 0)
-                    $vars[] = $item;
-                else
-                    $values[] = $item;
+                if ($i % 2 != 0) {
+                                    $vars[] = $item;
+                } else {
+                                    $values[] = $item;
+                }
                 $i++;
             }
 
@@ -368,10 +375,11 @@ 
 
             for ($i = 0; $i < $vars_count; $i++)
             {
-                if (array_key_exists($i, $values))
-                    $_GET[$vars[$i]] = $values[$i];
-                else
-                    $_GET[$vars[$i]] = '';
+                if (array_key_exists($i, $values)) {
+                                    $_GET[$vars[$i]] = $values[$i];
+                } else {
+                                    $_GET[$vars[$i]] = '';
+                }
             }
 
             unset($_GET["params"]);