MichaelJ2324 / sugarcrm-restv10-sdk

src/Client/Interfaces/ClientInterface.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      * @param $EntryPoint - EPInterface Class Name
      * @return $this
      */
-    public function registerEntryPoint($function,$EntryPoint);
+    public function registerEntryPoint($function, $EntryPoint);
 
     /**
      * Login to the configured SugarCRM server
@@ -57,7 +57,7 @@ 
      * @param $client_id
      * @return boolean
      */
-    public static function storeToken($token,$client_id);
+    public static function storeToken($token, $client_id);
 
     /**
      * Get an SDK Clients authentication Token from Storage

src/Helpers/Helpers.php

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     public static function getSDKEntryPointRegistry(){
         $entryPoints = array();
         require __DIR__.DIRECTORY_SEPARATOR.'registry.php';
-        foreach ($entryPoints as $funcName => $className) {
+        foreach ($entryPoints as $funcName => $className){
             $className = "SugarAPI\\SDK\\EntryPoint\\" . $className;
             $entryPoints[$funcName] = $className;
         }

Spacing +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@ 
      * @return string
      */
     public static function configureAPIURL($instance){
-        if (strpos($instance,"http")===FALSE){
+        if (strpos($instance, "http")===FALSE){
             $instance = "http://".$instance;
         }
-        if (strpos($instance,"rest/v10")!==FALSE){
+        if (strpos($instance, "rest/v10")!==FALSE){
             $instance = str_replace("rest/v10", "", $instance);
         }
         return rtrim($instance, "/").self::API_URL;
@@ -39,8 +39,8 @@ 
     public static function getSDKEntryPointRegistry(){
         $entryPoints = array();
         require __DIR__.DIRECTORY_SEPARATOR.'registry.php';
-        foreach ($entryPoints as $funcName => $className) {
-            $className = "SugarAPI\\SDK\\EntryPoint\\" . $className;
+        foreach ($entryPoints as $funcName => $className){
+            $className = "SugarAPI\\SDK\\EntryPoint\\".$className;
             $entryPoints[$funcName] = $className;
         }
         return $entryPoints;

examples/BulkAPI.php

Braces +3 added lines, -3 removed lines

@@ -22,17 +22,17 @@
         echo "<h3>Requests Completed</h3><pre>";
         print_r($response->getBody());
         echo "</pre>";
-    }else{
+    } else{
         echo "<h3>Request Failed</h3><pre>";
         print_r($response);
         echo "</pre>";
     }
 
-}catch (\SugarAPI\SDK\Exception\Authentication\AuthenticationException $ex){
+} catch (\SugarAPI\SDK\Exception\Authentication\AuthenticationException $ex){
     echo "Credentials:<pre>";
     print_r($SugarAPI->getCredentials());
     echo "</pre> Error Message: ";
     print $ex->getMessage();
-}catch (\SugarAPI\SDK\Exception\SDKException $ex){
+} catch (\SugarAPI\SDK\Exception\SDKException $ex){
     echo $ex->__toString();
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 try{
-    $SugarAPI = new \SugarAPI\SDK\SugarAPI('instances.this/Ent/7700/',array('username' => 'admin','password'=>'asdf'));
+    $SugarAPI = new \SugarAPI\SDK\SugarAPI('instances.this/Ent/7700/', array('username' => 'admin', 'password'=>'asdf'));
     $SugarAPI->login();
 
     $Accounts = $SugarAPI->filterRecords('Accounts')->setData(array('max_num'=> 5));

examples/Login.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-try {
+try{
     $SugarAPI = new \SugarAPI\SDK\SugarAPI('instances.this/Ent/7621/', array(
         'username' => 'admin',
         'password' => 'asdf'
@@ -18,10 +18,10 @@ 
         'username' => 'admin',
         'password' => 'asdf'
     ));
-    if ($SugarAPI2->authenticated()) {
+    if ($SugarAPI2->authenticated()){
         echo "Authenticated!";
         print_r($SugarAPI2->getToken());
     }
-} catch(\SugarAPI\SDK\Exception\SDKException $ex){
+}catch (\SugarAPI\SDK\Exception\SDKException $ex){
     print_r($ex->getMessage());
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-try {
+try{
     $SugarAPI = new \SugarAPI\SDK\SugarAPI('instances.this/Ent/7621/', array(
         'username' => 'admin',
         'password' => 'asdf'
@@ -18,7 +18,7 @@ 
         'username' => 'admin',
         'password' => 'asdf'
     ));
-    if ($SugarAPI2->authenticated()) {
+    if ($SugarAPI2->authenticated()){
         echo "Authenticated!";
         print_r($SugarAPI2->getToken());
     }

src/EntryPoint/Abstracts/DELETE/AbstractDeleteEntryPoint.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
-        $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
+        $this->setResponse(new JSON($this->Request->getResponse(), $this->Request->getCurlObject()));
         return $this;
     }
 

Braces +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = NULL) {
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

src/EntryPoint/Abstracts/PUT/AbstractPutEntryPoint.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
-        $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
+        $this->setResponse(new JSON($this->Request->getResponse(), $this->Request->getCurlObject()));
         return $this;
     }
 

Braces +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = NULL) {
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

src/EntryPoint/Abstracts/GET/AbstractGetEntryPoint.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
-        $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
+        $this->setResponse(new JSON($this->Request->getResponse(), $this->Request->getCurlObject()));
         return $this;
     }
 

Braces +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = NULL) {
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

src/EntryPoint/Abstracts/POST/AbstractPostEntryPoint.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
-        $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
+        $this->setResponse(new JSON($this->Request->getResponse(), $this->Request->getCurlObject()));
         return $this;
     }
 

Braces +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
 
 abstract class AbstractPostFileEntryPoint extends AbstractEntryPoint {
 
-    public function __construct($url, array $options = array()) {
+    public function __construct($url, array $options = array()){
         $this->setRequest(new POSTFile());
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = null){
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         parent::__construct($url, $options);
     }
 
-    public function execute($data = null) {
+    public function execute($data = NULL) {
         parent::execute($data);
         $this->setResponse(new JSON($this->Request->getResponse(),$this->Request->getCurlObject()));
         return $this;

src/EntryPoint/Abstracts/AbstractEntryPoint.php

Spacing +32 added lines, -32 removed lines

@@ -116,12 +116,12 @@ 
     protected $accessToken;
 
 
-    public function __construct($baseUrl,array $options = array()){
+    public function __construct($baseUrl, array $options = array()){
         $this->baseUrl = $baseUrl;
 
-        if (!empty($options)) {
+        if (!empty($options)){
             $this->setOptions($options);
-        }elseif(!$this->requiresOptions()){
+        }elseif (!$this->requiresOptions()){
             $this->configureURL();
         }
     }
@@ -147,7 +147,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setAuth($accessToken) {
+    public function setAuth($accessToken){
         $this->accessToken = $accessToken;
         return $this;
     }
@@ -155,7 +155,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setUrl($url) {
+    public function setUrl($url){
         $this->Url = $url;
         return $this;
     }
@@ -163,7 +163,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setRequest(RequestInterface $Request) {
+    public function setRequest(RequestInterface $Request){
         $this->Request = $Request;
         return $this;
     }
@@ -171,7 +171,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setResponse(ResponseInterface $Response) {
+    public function setResponse(ResponseInterface $Response){
         $this->Response = $Response;
         return $this;
     }
@@ -219,13 +219,13 @@ 
      * @throws InvalidURLException
      */
     public function execute($data = NULL){
-        $data =  ($data === NULL?$this->Data:$data);
+        $data = ($data===NULL?$this->Data:$data);
         $this->configureData($data);
-        if ($this->verifyOptions() && is_object($this->Request)) {
+        if ($this->verifyOptions() && is_object($this->Request)){
             $this->configureRequest();
             $this->Request->send();
         }else{
-            throw new InvalidRequestException(get_called_class(),"Request property not configured");
+            throw new InvalidRequestException(get_called_class(), "Request property not configured");
         }
         return $this;
     }
@@ -233,7 +233,7 @@ 
     /**
      * @inheritdoc
      */
-    public function authRequired() {
+    public function authRequired(){
         return $this->_AUTH_REQUIRED;
     }
 
@@ -243,10 +243,10 @@ 
      * @throws RequiredDataException
      */
     protected function configureRequest(){
-        if ($this->verifyUrl()) {
+        if ($this->verifyUrl()){
             $this->Request->setURL($this->Url);
         }
-        if ($this->verifyData() && !empty($this->Data)) {
+        if ($this->verifyData() && !empty($this->Data)){
             $this->Request->setBody($this->Data);
         }
         $this->configureAuth();
@@ -256,7 +256,7 @@ 
      * Configures the authentication header on the Request object
      */
     protected function configureAuth(){
-        if ($this->authRequired()) {
+        if ($this->authRequired()){
             $this->Request->addHeader('OAuth-Token', $this->accessToken);
         }
     }
@@ -266,7 +266,7 @@ 
      * @var $data
      */
     protected function configureData($data){
-        if (!empty($this->_REQUIRED_DATA)&&is_array($data)){
+        if (!empty($this->_REQUIRED_DATA) && is_array($data)){
             $data = $this->configureDefaultData($data);
         }
         $this->setData($data);
@@ -278,7 +278,7 @@ 
      * @return array
      */
     protected function configureDefaultData(array $data){
-        foreach($this->_REQUIRED_DATA as $property => $value){
+        foreach ($this->_REQUIRED_DATA as $property => $value){
             if (!isset($data[$property]) && $value!==NULL){
                 $data[$property] = $value;
             }
@@ -293,18 +293,18 @@ 
      */
     protected function configureURL(){
         $url = $this->_URL;
-        if ($this->requiresOptions()) {
+        if ($this->requiresOptions()){
             $urlParts = explode("/", $this->_URL);
             $o = 0;
-            foreach ($urlParts as $key => $part) {
-                if (strpos($part, "$") !== FALSE) {
-                    if (isset($this->Options[$o])) {
+            foreach ($urlParts as $key => $part){
+                if (strpos($part, "$")!==FALSE){
+                    if (isset($this->Options[$o])){
                         $urlParts[$key] = $this->Options[$o];
                         $o++;
                     }
                 }
             }
-            $url = implode($urlParts,"/");
+            $url = implode($urlParts, "/");
         }
         $url = $this->baseUrl.$url;
         $this->setUrl($url);
@@ -316,9 +316,9 @@ 
      * @throws InvalidURLException
      */
     protected function verifyUrl(){
-        $UrlArray = explode("?",$this->Url);
-        if (strpos($UrlArray[0],"$") !== FALSE){
-            throw new InvalidURLException(get_called_class(),"Configured URL is ".$this->Url);
+        $UrlArray = explode("?", $this->Url);
+        if (strpos($UrlArray[0], "$")!==FALSE){
+            throw new InvalidURLException(get_called_class(), "Configured URL is ".$this->Url);
         }
         return true;
     }
@@ -329,11 +329,11 @@ 
      * @throws RequiredOptionsException
      */
     protected function verifyOptions(){
-        $urlVarCount = substr_count($this->_URL,"$");
+        $urlVarCount = substr_count($this->_URL, "$");
         $optionCount = 0;
         $optionCount += count($this->Options);
         if ($urlVarCount>$optionCount){
-            throw new RequiredOptionsException(get_called_class(),"URL requires $urlVarCount options, only $optionCount provided.");
+            throw new RequiredOptionsException(get_called_class(), "URL requires $urlVarCount options, only $optionCount provided.");
         }
         return true;
     }
@@ -344,7 +344,7 @@ 
      * @throws RequiredDataException
      */
     protected function verifyData(){
-        if (isset($this->_DATA_TYPE)||!empty($this->_DATA_TYPE)) {
+        if (isset($this->_DATA_TYPE) || !empty($this->_DATA_TYPE)){
             $this->verifyDataType();
         }
         if (!empty($this->_REQUIRED_DATA)){
@@ -359,8 +359,8 @@ 
      * @throws RequiredDataException
      */
     protected function verifyDataType(){
-        if (gettype($this->Data) !== $this->_DATA_TYPE) {
-            throw new RequiredDataException(get_called_class(),"Valid DataType is {$this->_DATA_TYPE}");
+        if (gettype($this->Data)!==$this->_DATA_TYPE){
+            throw new RequiredDataException(get_called_class(), "Valid DataType is {$this->_DATA_TYPE}");
         }
         return true;
     }
@@ -372,13 +372,13 @@ 
      */
     protected function verifyRequiredData(){
         $errors = array();
-        foreach($this->_REQUIRED_DATA as $property => $defaultValue){
+        foreach ($this->_REQUIRED_DATA as $property => $defaultValue){
             if (!isset($this->Data[$property])){
                 $errors[] = $property;
             }
         }
         if (count($errors)>0){
-            throw new RequiredDataException(get_called_class(),"Missing data for ".implode(",",$errors));
+            throw new RequiredDataException(get_called_class(), "Missing data for ".implode(",", $errors));
         }
         return true;
     }
@@ -388,7 +388,7 @@ 
      * @return bool
      */
     protected function requiresOptions(){
-        return strpos($this->_URL,"$") === FALSE?FALSE:TRUE;
+        return strpos($this->_URL, "$")===FALSE?FALSE:TRUE;
     }
 
 }
\ No newline at end of file

Braces +18 added lines, -18 removed lines

@@ -119,9 +119,9 @@ 
     public function __construct($baseUrl,array $options = array()){
         $this->baseUrl = $baseUrl;
 
-        if (!empty($options)) {
+        if (!empty($options)){
             $this->setOptions($options);
-        }elseif(!$this->requiresOptions()){
+        } elseif(!$this->requiresOptions()){
             $this->configureURL();
         }
     }
@@ -147,7 +147,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setAuth($accessToken) {
+    public function setAuth($accessToken){
         $this->accessToken = $accessToken;
         return $this;
     }
@@ -155,7 +155,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setUrl($url) {
+    public function setUrl($url){
         $this->Url = $url;
         return $this;
     }
@@ -163,7 +163,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setRequest(RequestInterface $Request) {
+    public function setRequest(RequestInterface $Request){
         $this->Request = $Request;
         return $this;
     }
@@ -171,7 +171,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setResponse(ResponseInterface $Response) {
+    public function setResponse(ResponseInterface $Response){
         $this->Response = $Response;
         return $this;
     }
@@ -221,10 +221,10 @@ 
     public function execute($data = NULL){
         $data =  ($data === NULL?$this->Data:$data);
         $this->configureData($data);
-        if ($this->verifyOptions() && is_object($this->Request)) {
+        if ($this->verifyOptions() && is_object($this->Request)){
             $this->configureRequest();
             $this->Request->send();
-        }else{
+        } else{
             throw new InvalidRequestException(get_called_class(),"Request property not configured");
         }
         return $this;
@@ -233,7 +233,7 @@ 
     /**
      * @inheritdoc
      */
-    public function authRequired() {
+    public function authRequired(){
         return $this->_AUTH_REQUIRED;
     }
 
@@ -243,10 +243,10 @@ 
      * @throws RequiredDataException
      */
     protected function configureRequest(){
-        if ($this->verifyUrl()) {
+        if ($this->verifyUrl()){
             $this->Request->setURL($this->Url);
         }
-        if ($this->verifyData() && !empty($this->Data)) {
+        if ($this->verifyData() && !empty($this->Data)){
             $this->Request->setBody($this->Data);
         }
         $this->configureAuth();
@@ -256,7 +256,7 @@ 
      * Configures the authentication header on the Request object
      */
     protected function configureAuth(){
-        if ($this->authRequired()) {
+        if ($this->authRequired()){
             $this->Request->addHeader('OAuth-Token', $this->accessToken);
         }
     }
@@ -293,12 +293,12 @@ 
      */
     protected function configureURL(){
         $url = $this->_URL;
-        if ($this->requiresOptions()) {
+        if ($this->requiresOptions()){
             $urlParts = explode("/", $this->_URL);
             $o = 0;
-            foreach ($urlParts as $key => $part) {
-                if (strpos($part, "$") !== FALSE) {
-                    if (isset($this->Options[$o])) {
+            foreach ($urlParts as $key => $part){
+                if (strpos($part, "$") !== FALSE){
+                    if (isset($this->Options[$o])){
                         $urlParts[$key] = $this->Options[$o];
                         $o++;
                     }
@@ -344,7 +344,7 @@ 
      * @throws RequiredDataException
      */
     protected function verifyData(){
-        if (isset($this->_DATA_TYPE)||!empty($this->_DATA_TYPE)) {
+        if (isset($this->_DATA_TYPE)||!empty($this->_DATA_TYPE)){
             $this->verifyDataType();
         }
         if (!empty($this->_REQUIRED_DATA)){
@@ -359,7 +359,7 @@ 
      * @throws RequiredDataException
      */
     protected function verifyDataType(){
-        if (gettype($this->Data) !== $this->_DATA_TYPE) {
+        if (gettype($this->Data) !== $this->_DATA_TYPE){
             throw new RequiredDataException(get_called_class(),"Valid DataType is {$this->_DATA_TYPE}");
         }
         return true;

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
      * Whether or not Authentication is Required
      * @var bool
      */
-    protected $_AUTH_REQUIRED = true;
+    protected $_AUTH_REQUIRED = TRUE;
 
     /**
      * The URL for the EntryPoint
@@ -320,7 +320,7 @@ 
         if (strpos($UrlArray[0],"$") !== FALSE){
             throw new InvalidURLException(get_called_class(),"Configured URL is ".$this->Url);
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -335,7 +335,7 @@ 
         if ($urlVarCount>$optionCount){
             throw new RequiredOptionsException(get_called_class(),"URL requires $urlVarCount options, only $optionCount provided.");
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -350,7 +350,7 @@ 
         if (!empty($this->_REQUIRED_DATA)){
             $this->verifyRequiredData();
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -362,7 +362,7 @@ 
         if (gettype($this->Data) !== $this->_DATA_TYPE) {
             throw new RequiredDataException(get_called_class(),"Valid DataType is {$this->_DATA_TYPE}");
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -380,7 +380,7 @@ 
         if (count($errors)>0){
             throw new RequiredDataException(get_called_class(),"Missing data for ".implode(",",$errors));
         }
-        return true;
+        return TRUE;
     }
 
     /**