gnumoksha / php-freeipa

bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -18,4 +18,4 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-include __DIR__ . '/src/autoload.php';
\ No newline at end of file
+include __DIR__.'/src/autoload.php';
\ No newline at end of file

src/autoload.php

Spacing +3 added lines, -3 removed lines

@@ -31,14 +31,14 @@ 
  * @return void
  * @link https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader-examples.md
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
 
     // project-specific namespace prefix
     $prefix = 'FreeIPA\\';
 
     // base directory for the namespace prefix
     // $base_dir = __DIR__ . '/src/';
-    $base_dir = __DIR__ . '/';
+    $base_dir = __DIR__.'/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
@@ -53,7 +53,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

src/APIAccess/Connection.php

Doc Comments +5 added lines, -5 removed lines

@@ -323,7 +323,7 @@ 
      * Get the server address (IP or hostname)
      *
      * @param void
-     * @return string|bool
+     * @return string|null
      * @sice GIT 0.1.0
      * @version GIT: 0.1.0
      * @see setIPAServer()
@@ -360,7 +360,7 @@ 
     /**
      * Get the full path of certificate file
      *
-     * @return string|bool
+     * @return string|null
      * @sice GIT 0.1.0
      * @version GIT: 0.1.0
      * @see setCertificateFile()
@@ -388,7 +388,7 @@ 
      * Get the string returned by cURL
      *
      * @param void
-     * @return string|bool
+     * @return string|null
      * @sice GIT 0.1.0
      * @version GIT: 0.1.0
      * @see setCurlReturn()
@@ -429,7 +429,7 @@ 
      * Get the cURL handler with options already defined
      *
      * @param bool $force force cURL to be initiated again
-     * @return mixed cURL handler
+     * @return boolean cURL handler
      * @sice GIT 0.1.0
      * @version GIT: 0.1.0
      * @see endCurl()
@@ -785,7 +785,7 @@ 
      * @param string $method required parameter that defines the method that will be executed in the server
      * @param array $args arguments for the method
      * @param array $options options for the method
-     * @return string|bool returns false if there is error in passed parameters
+     * @return false|string returns false if there is error in passed parameters
      * @sice GIT 0.1.0
      * @version GIT: 0.1.0
      * @link http://php.net/manual/en/function.json-encode.php

Indentation +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
                 break;
         }
         return($r);
-	}
+  }
 
     /**
      * Define a version that will be used in json sent to the server. The server will refuse

Spacing +34 added lines, -34 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;
         }
 
@@ -850,7 +850,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');
         }
 
@@ -863,10 +863,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),
             ),
         );
 
@@ -881,15 +881,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);
@@ -908,7 +908,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) {

Braces +1 added lines, -2 removed lines

@@ -189,8 +189,7 @@
 
         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");
         }
 

src/APIAccess/User.php

Spacing +11 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function find($args = array(), $options = array())
     {
-        if (!is_array($args) || !is_array($options)) {
+        if ( ! is_array($args) || ! is_array($options)) {
             return false;
         }
 
@@ -72,11 +72,11 @@ 
         $return_request = $this->getConnection()->buildRequest('user_find', $args, $final_options); //returns json and http code of response
         $json = $return_request[0];
 
-        if (empty($json->result) || !isset($json->result->count)) {
+        if (empty($json->result) || ! isset($json->result->count)) {
             throw new \Exception('Malformed json');
         }
 
-        if ($json->result->count < 1) {
+        if ($json->result->count<1) {
             return false;
         }
 
@@ -104,7 +104,7 @@ 
      */
     public function findBy($field = null, $value = null)
     {
-        if (!$field || !$value) {
+        if ( ! $field || ! $value) {
             return false;
         }
 
@@ -126,7 +126,7 @@ 
      */
     public function get($params = null, $options = array())
     {
-        if (!is_array($options)) {
+        if ( ! is_array($options)) {
             return false;
         }
 
@@ -150,7 +150,7 @@ 
         $return_request = $this->getConnection()->buildRequest('user_show', $final_params, $final_options, false);
         $json = $return_request[0];
 
-        if (!empty($json->error) && strtolower($json->error->name) == 'notfound') {
+        if ( ! empty($json->error) && strtolower($json->error->name) == 'notfound') {
             // user not found
             return false;
         }
@@ -160,7 +160,7 @@ 
         }
 
         // #TODO erase this code?
-        if (!isset($json->result->result)) {
+        if ( ! isset($json->result->result)) {
             return false;
         }
 
@@ -185,7 +185,7 @@ 
      */
     public function add($data)
     {
-        if (!$data || !isset($data['uid']) || empty($data['uid'])) {
+        if ( ! $data || ! isset($data['uid']) || empty($data['uid'])) {
             return false;
         }
 
@@ -204,7 +204,7 @@ 
 
         // The buildRequest() method already checks the field 'error', which is the only relevant to this API method
         $return_request = $this->getConnection()->buildRequest('user_add', $args, $final_options); //returns json and http code of response
-        if (!$return_request) {
+        if ( ! $return_request) {
             return false;
         }
 
@@ -239,7 +239,7 @@ 
      */
     public function modify($login = null, $data = array())
     {
-        if (!$login || !$data) {
+        if ( ! $login || ! $data) {
             return false;
         }
 
@@ -256,7 +256,7 @@ 
 
         // The buildRequest() method already checks the field 'error', which is the only relevant to this API method
         $return_request = $this->getConnection()->buildRequest('user_mod', $args, $final_options); //returns json and http code of response
-        if (!$return_request) {
+        if ( ! $return_request) {
             return false;
         }
 

src/APIAccess/Group.php

Spacing +9 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function add($name = null, $data = array())
     {
-        if (!$name || !$data) {
+        if ( ! $name || ! $data) {
             return false;
         }
 
@@ -77,7 +77,7 @@ 
 
         // The buildRequest() method already checks the field 'error', which is the only relevant to this API method
         $response = $this->getConnection()->buildRequest('group_add', $args, $final_options); //returns json and http code of response
-        if (!$response) {
+        if ( ! $response) {
             return false;
         }
 
@@ -102,7 +102,7 @@ 
      */
     public function addMember($group_name = null, $data = array())
     {
-        if (!$group_name || !$data) {
+        if ( ! $group_name || ! $data) {
             return false;
         }
 
@@ -122,22 +122,22 @@ 
         }
 
         $response = $this->getConnection()->buildRequest('group_add_member', $args, $final_options); //returns json and http code of response
-        if (!$response) {
+        if ( ! $response) {
             return false;
         }
         $returned_json = $response[0];
-        if (!$returned_json->result->completed) {
+        if ( ! $returned_json->result->completed) {
             $message = "Error while inserting members in group \"$group_name\".";
-            if (!empty($returned_json->result->failed->member->group) ||
-            !empty($returned_json->result->failed->member->user)) {
+            if ( ! empty($returned_json->result->failed->member->group) ||
+            ! empty($returned_json->result->failed->member->user)) {
                 $message .= 'Details: ';
             }
 
-            if (!empty($returned_json->result->failed->member->group)) {
+            if ( ! empty($returned_json->result->failed->member->group)) {
                 $message .= implode(' ', $returned_json->result->failed->member->group[0]);
             }
 
-            if (!empty($returned_json->result->failed->member->user)) {
+            if ( ! empty($returned_json->result->failed->member->user)) {
                 $message .= implode(' ', $returned_json->result->failed->member->user[0]);
             }
 

src/APIAccess/Main.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      */
     public function connection($server = null, $certificate = null)
     {
-        if (! $this->_connection) {
+        if ( ! $this->_connection) {
             $this->_connection = \FreeIPA\APIAccess\Connection::getInstance($server, $certificate);
         }
         return($this->_connection);

examples/all.php

Spacing +8 added lines, -8 removed lines

@@ -21,16 +21,16 @@ 
  * This file contains examples of utilization of this library
  */
 
-ini_set( 'display_errors', 1);
-ini_set( 'track_errors',   1);
-ini_set( 'html_errors',    1);
-error_reporting( E_ALL );
+ini_set('display_errors', 1);
+ini_set('track_errors', 1);
+ini_set('html_errors', 1);
+error_reporting(E_ALL);
 
-require_once( 'functions_utils.php' );
+require_once('functions_utils.php');
 
 $host = 'ipa.demo1.freeipa.org';
 // The certificate can be obtained in https://$host/ipa/config/ca.crt
-$certificate = __DIR__ . "/../certs/ipa.demo1.freeipa.org_ca.crt";
+$certificate = __DIR__."/../certs/ipa.demo1.freeipa.org_ca.crt";
 $user = 'admin';
 $password = 'Secret123';
 $search = 'test';
@@ -109,8 +109,8 @@ 
     if ($ret_search_users) {
         $t = count($ret_search_users);
         print "Found $t usuários. Names: ";
-        for ($i = 0; $i < $t; $i++) {
-            print $ret_search_users[$i]->uid[0] . " | ";
+        for ($i = 0; $i<$t; $i++) {
+            print $ret_search_users[$i]->uid[0]." | ";
         }
         _print();
     } else {

examples/functions_utils.php

Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
  * Print a message
  */
 function _print( $string = NULL ) {
-	if ( 'cli' == php_sapi_name() ) { // PHP is running in terminal
-		$line_end = PHP_EOL;
-	} else {
-		$line_end = '<br/>';
-	}
+  if ( 'cli' == php_sapi_name() ) { // PHP is running in terminal
+    $line_end = PHP_EOL;
+  } else {
+    $line_end = '<br/>';
+  }
 
-	if ( ! empty( $string ) ) {
-		$file   = basename( $_SERVER["PHP_SELF"] );
-		$output = date( 'd-m-Y_H:i:s ' ) . "[$file] $string $line_end";
-	} else {
-		$output = $line_end;
-	}
+  if ( ! empty( $string ) ) {
+    $file   = basename( $_SERVER["PHP_SELF"] );
+    $output = date( 'd-m-Y_H:i:s ' ) . "[$file] $string $line_end";
+  } else {
+    $output = $line_end;
+  }
 
-	print ( $output );
+  print ( $output );
 }

Spacing +6 added lines, -6 removed lines

@@ -3,19 +3,19 @@
 /**
  * Print a message
  */
-function _print( $string = NULL ) {
-	if ( 'cli' == php_sapi_name() ) { // PHP is running in terminal
+function _print($string = NULL) {
+	if ('cli' == php_sapi_name()) { // PHP is running in terminal
 		$line_end = PHP_EOL;
 	} else {
 		$line_end = '<br/>';
 	}
 
-	if ( ! empty( $string ) ) {
-		$file   = basename( $_SERVER["PHP_SELF"] );
-		$output = date( 'd-m-Y_H:i:s ' ) . "[$file] $string $line_end";
+	if ( ! empty($string)) {
+		$file   = basename($_SERVER["PHP_SELF"]);
+		$output = date('d-m-Y_H:i:s ')."[$file] $string $line_end";
 	} else {
 		$output = $line_end;
 	}
 
-	print ( $output );
+	print ($output);
 }