gnumoksha / php-freeipa

src/APIAccess/Connection.php

Spacing +35 added lines, -35 removed lines

@@ -112,7 +112,7 @@ 
      * @access public
      * @sice GIT 0.1.0
      */
-    protected $certificate_file  = null;
+    protected $certificate_file = null;
 
     /**
      * @var array curl_http_header HTTP header that will be used with cURL
@@ -147,7 +147,7 @@ 
      * @access protected
      * @sice GIT 0.1.0
      */
-    protected $user_logged  = false;
+    protected $user_logged = false;
     
     /**
      * @var string|null $json_request String that contains the last json request what will be (or was) sent to the server
@@ -196,14 +196,14 @@ 
      * @throws \Exception caso o método setCertificateFile() retorne false
      */
     private function __construct($server = null, $certificate = null) {
-        if (! function_exists('curl_init')) {
+        if ( ! function_exists('curl_init')) {
             throw new \Exception('Unable to find cURL');
         }
         
-        if ( ! empty($server) && ! $this->setIPAServer($server) ) {
+        if ( ! empty($server) && ! $this->setIPAServer($server)) {
             throw new \Exception("Error while validating the server");
         }
-        else if ( ! empty($certificate) && ! $this->setCertificateFile($certificate) ) {
+        else if ( ! empty($certificate) && ! $this->setCertificateFile($certificate)) {
             throw new \Exception("Error while validating the certificate");
         }
         
@@ -257,7 +257,7 @@ 
     {
         switch ($force_new) {
             case false:
-                if (! isset(self::$_instance)) {
+                if ( ! isset(self::$_instance)) {
                     self::$_instance = new self($server, $certificate);
                 }
                 $r = self::$_instance;
@@ -310,12 +310,12 @@ 
      */
     public function setIPAServer($host = null)
     {
-        if (empty($host) || is_null($host) || !is_string($host)) {
+        if (empty($host) || is_null($host) || ! is_string($host)) {
             return false;
         }
         $this->ipa_server = $host;
-        $this->jsonrpc_url = 'https://' . $host . '/ipa/session/json';
-        $this->jsonrpc_login_url = 'https://' . $host . '/ipa/session/login_password';
+        $this->jsonrpc_url = 'https://'.$host.'/ipa/session/json';
+        $this->jsonrpc_login_url = 'https://'.$host.'/ipa/session/login_password';
         return true;
     }
 
@@ -346,11 +346,11 @@ 
      */
     public function setCertificateFile($file)
     {
-        if (empty($file) || is_null($file) || !is_string($file)) {
+        if (empty($file) || is_null($file) || ! is_string($file)) {
             return false;
-        } else if (!file_exists($file)) {
+        } else if ( ! file_exists($file)) {
             throw new \Exception("Certificate file doesn't exists");
-        } else if (!is_readable($file)) {
+        } else if ( ! is_readable($file)) {
             throw new \Exception("Certificate file can't be read");
         }
         $this->certificate_file = $file;
@@ -531,7 +531,7 @@ 
      */
     public function curlHaveError()
     {
-        return ( curl_errno($this->curl_handler) ) ? true : false;
+        return (curl_errno($this->curl_handler)) ? true : false;
     }
 
     /**
@@ -615,14 +615,14 @@ 
             return true;
         }
         
-        if (!$user || !$password) {
+        if ( ! $user || ! $password) {
             return false;
         }
         
-        if (! $this->getIPAServer()) {
+        if ( ! $this->getIPAServer()) {
             throw new \Exception("Error while validating the server");
         }
-        if (! $this->getCertificateFile()) {
+        if ( ! $this->getCertificateFile()) {
             throw new \Exception("Error while validating the certificate");
         }
 
@@ -648,11 +648,11 @@ 
         //$password = urlencode($password);
 
         curl_setopt($this->curl_handler, CURLOPT_HTTPHEADER, $this->curl_http_header);
-        curl_setopt($this->curl_handler, CURLOPT_URL,        $this->jsonrpc_login_url);
+        curl_setopt($this->curl_handler, CURLOPT_URL, $this->jsonrpc_login_url);
         curl_setopt($this->curl_handler, CURLOPT_POSTFIELDS, "user=$user&password=$password");
         // I need header for get the value for X-IPA-Rejection-Reason field
         // and as workaround_for_auth
-        if (! $this->curl_debug) {
+        if ( ! $this->curl_debug) {
             curl_setopt($this->curl_handler, CURLOPT_HEADER, true);
         }
 
@@ -670,7 +670,7 @@ 
 
         // I need header for get the value for X-IPA-Rejection-Reason field
         // and as workaround_for_auth
-        if (!$this->curl_debug) {
+        if ( ! $this->curl_debug) {
             curl_setopt($this->curl_handler, CURLOPT_HEADER, false);
         }
 
@@ -695,15 +695,15 @@ 
                 $auth_info['message'] .= 'Unable to find user in the server. ';
             } else {
                 $auth_info['message'] .= 'Generic error in authentication. ';
-                if (! empty($ipa_error_description)) {
-                    $auth_info['message'] .= "The server returned \"" . $ipa_error_description . "\". ";
+                if ( ! empty($ipa_error_description)) {
+                    $auth_info['message'] .= "The server returned \"".$ipa_error_description."\". ";
                 }
             }
         } else if ('200' != $auth_info['http_code']) {
             $auth_info['authenticate'] = false;
-            $auth_info['message'] = "The response returned the HTTP code \"" . $auth_info['http_code'] . "\" that is not acceptable. ";
-            if (!empty($ipa_error_description)) {
-                $auth_info['message'] .= "The server returned \"" . $ipa_error_description . "\". ";
+            $auth_info['message'] = "The response returned the HTTP code \"".$auth_info['http_code']."\" that is not acceptable. ";
+            if ( ! empty($ipa_error_description)) {
+                $auth_info['message'] .= "The server returned \"".$ipa_error_description."\". ";
             }
         } else {
             $auth_info['authenticate'] = true;
@@ -768,11 +768,11 @@ 
      */
     public function isAssociativeArray($var, $force = true)
     {
-        if (!is_array($var)) {
+        if ( ! is_array($var)) {
             return false;
         }
 
-        if (!empty($var) || $force) {
+        if ( ! empty($var) || $force) {
             return array_diff_key($var, array_keys(array_keys($var)));
         }
 
@@ -792,7 +792,7 @@ 
      */
     public function buildJsonRequest($method = null, $args = array(), $options = array())
     {
-        if (!$method || !is_array($args) || !$this->isAssociativeArray($options, false)) {
+        if ( ! $method || ! is_array($args) || ! $this->isAssociativeArray($options, false)) {
             return false;
         }
 
@@ -821,7 +821,7 @@ 
         );
 
         // JSON_PRETTY_PRINT constant unavaiable in PHP < 5.4.0
-        if (!defined('JSON_PRETTY_PRINT')) {define('JSON_PRETTY_PRINT', 128);}
+        if ( ! defined('JSON_PRETTY_PRINT')) {define('JSON_PRETTY_PRINT', 128); }
 
         $this->json_request = json_encode($return, JSON_PRETTY_PRINT);
         return $this->json_request;
@@ -853,7 +853,7 @@ 
      */
     public function buildRequest($method = null, $params = array(), $options = array(), $exceptionInError = true)
     {
-        if (!$this->userLogged()) {
+        if ( ! $this->userLogged()) {
             throw new \Exception('User is not logged in');
         }
 
@@ -866,10 +866,10 @@ 
             CURLOPT_URL => $this->jsonrpc_url,
             CURLOPT_POSTFIELDS => $json,
             CURLOPT_HTTPHEADER => array(
-                'referer:https://' . $this->ipa_server . '/ipa/ui/index.html',
+                'referer:https://'.$this->ipa_server.'/ipa/ui/index.html',
                 'Content-Type:application/json',
                 'Accept:applicaton/json',
-                'Content-Length: ' . strlen($json),
+                'Content-Length: '.strlen($json),
             ),
         );
 
@@ -884,15 +884,15 @@ 
         if ($this->curlHaveError()) {
             throw new \Exception('Error in cURL request');
         }
-        if (!$response_http_code || '200' != $response_http_code) {
+        if ( ! $response_http_code || '200' != $response_http_code) {
             throw new \Exception("The value \"$response_http_code\" is not a valid response code");
         }
         if (empty($json_retorno) || empty($object_json_returned)) {
             #TODO criar exceção para passar os dados do erro ao inves do json puro. Vide arquivo exemplos_retornos.txt
             throw new \Exception("Erro in json return. Value is ${json_retorno}");
         }
-        if ($exceptionInError && !empty($object_json_returned->error)) {
-            throw new \Exception("Error in request. Details: " . $object_json_returned->error->message, $object_json_returned->error->code);
+        if ($exceptionInError && ! empty($object_json_returned->error)) {
+            throw new \Exception("Error in request. Details: ".$object_json_returned->error->message, $object_json_returned->error->code);
         }
 
         return array($object_json_returned, $response_http_code);
@@ -911,7 +911,7 @@ 
     {
         $ret = $this->buildRequest('ping'); // receives json and http response code
         $json = $ret[0];
-        if (!empty($json->error) || empty($json->result) || empty($json->result->summary) || !is_string($json->result->summary)) {
+        if ( ! empty($json->error) || empty($json->result) || empty($json->result->summary) || ! is_string($json->result->summary)) {
             return false;
         }
         if ($return_string) {