Merge pull request #268 from bYemma/develop

MODX3: Change modRest to http client in StopForumSpam service
Sterc · Aug 18, 2022 · 13fe6eb · 13fe6eb
2 parents 2694ec5 + 9cc0dc7
commit 13fe6eb
Showing 1 changed file with 43 additions and 19 deletions.
diff --git a/core/components/formit/src/FormIt/Service/StopForumSpam.php b/core/components/formit/src/FormIt/Service/StopForumSpam.php
@@ -2,10 +2,18 @@
 
 namespace Sterc\FormIt\Service;
 
+
+use Exception;
+use SimpleXMLElement;
+use MODX\Revolution\modX;
+use Psr\Http\Client\ClientExceptionInterface;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+
 class StopForumSpam
 {
     /**
-     * @var \modX $modx
+     * @var modX $modx
      */
     public $modx = null;
 
@@ -17,7 +25,7 @@ class StopForumSpam
     /**
      * StopForumSpam constructor.
      *
-     * @param \modX $modx
+     * @param modX $modx
      * @param array $config
      */
     public function __construct($modx, $config = [])
@@ -86,35 +94,51 @@ public function check($ip = '', $email = '', $username = '')
      */
     public function request($params = [])
     {
-        $loaded = $this->getClient();
-        if (!$loaded) {
-            $this->modx->log(\modX::LOG_LEVEL_ERROR, '[StopForumSpam] Could not load REST client.');
+        $client = $this->modx->services->get(ClientInterface::class);
+        $factory = $this->modx->services->get(RequestFactoryInterface::class);
 
-            return true;
+        $uri = $this->config['host'] . $this->config['path'];
+        if (strtoupper($this->config['method']) == 'GET') {
+            $uri .= (strpos($uri, '?') > 0) ? '&' : '?';
+            $uri .= http_build_query($params);
         }
 
-        $response = $this->modx->rest->request($this->config['host'], $this->config['path'], $this->config['method'], $params);
-        $responseXml = $response->toXml();
+        $request = $factory->createRequest($this->config['method'], $uri);
+
+        if (strtoupper($this->config['method']) == 'POST') {
+            $request->getBody()->write(json_encode($params));
+        }
+
+        try {
+            $response = $client->sendRequest($request)->withHeader('Accept', 'text/xml');
+        } catch (ClientExceptionInterface $e) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, '[StopForumSpam] Could not load response from: ' . $this->config['host']);
+            $this->modx->log(modX::LOG_LEVEL_ERROR, '[StopForumSpam] Error: ' . $e->getMessage());
+            return true;
+        }
+
+        $responseXml = $this->toXml($response->getBody()->getContents());
 
         return $responseXml;
     }
 
     /**
-     * Get the REST Client
+     *  Interprets the response string of XML into an object 
      *
-     * @return \modRestClient|bool
+     * @return SimpleXMLElement
      */
-    private function getClient()
+    private function toXml($response)
     {
-        if (empty($this->modx->rest)) {
-            $this->modx->getService('rest', 'rest.modRestClient');
-            $loaded = $this->modx->rest->getConnection();
+        $xml = null;
 
-            if (!$loaded) {
-                return false;
-            }
+        try {
+            $xml = simplexml_load_string($response);
+        } catch (Exception $e) {
+            $this->modx->log(xPDO::LOG_LEVEL_ERROR, 'Could not parse XML response from provider: ' . $response);
         }
-
-        return $this->modx->rest;
+        if (!$xml) {
+            $xml = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><error><message>' . $this->modx->lexicon('provider_err_blank_response') . '</message></error>');
+        }
+        return $xml;
     }
 }