final namespace decision, small curl bug fix

oposs · Feb 25, 2022 · 8c9b0bd · 8c9b0bd
1 parent 30188f8
commit 8c9b0bd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 /.gitignore export-ignore
-/img export-ignore
+/img export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-.idea
+.idea
diff --git a/Readme.md b/Readme.md
@@ -12,7 +12,7 @@ Make sure you met the following requirements beforehand:
 - PHP CURL and JSON
 
 ```
-composer require oetiker/silverstripe-hcaptcha dev
+composer require oposs/silverstripe-hcaptcha dev
 ```
 
 And set hCaptcha as your default spamprotector:
@@ -44,7 +44,7 @@ In php:
 
 ```injectablephp
 
-use Oetiker\hCaptcha\hCaptchaProtector\Forms
+use Oposs\hCaptcha\hCaptchaProtector\Forms
 
 new hCaptchaField('SpamProtection', 'SpamProtection', null);
 

diff --git a/lang/de.yml b/lang/de.yml
@@ -1,5 +1,5 @@
 en:
-  Oetiker\hCaptcha\Forms\hCaptchaField:
+  Oposs\hCaptcha\Forms\hCaptchaField:
     EMPTY: "Bitte captcha beantworten. Wenn nicht sichtbar, Javascript von js.hcaptcha.com erlauben"
     NOSCRIPT: "Javascript muss aktiv sein um dieses Formular absenden zu können"
     VALIDATE_ERROR: "Captcha konnte nicht verfiziert werden"

diff --git a/lang/en.yml b/lang/en.yml
@@ -1,5 +1,5 @@
 en:
-  Oetiker\hCaptcha\Forms\hCaptchaField:
+  Oposs\hCaptcha\Forms\hCaptchaField:
     EMPTY: "Please answer the captcha, if you do not see the captcha please enable JavaScript"
     NOSCRIPT: "You must enable JavaScript to submit this form"
     VALIDATE_ERROR: "Captcha could not be validated"

diff --git a/src/Froms/hCaptchaField.php b/src/Froms/hCaptchaField.php
@@ -41,7 +41,7 @@ class hCaptchaField extends FormField
     public function __construct($name, $title = null, $value = null)
     {
         // Set default title
-        if ($title === null) $title = _t('Oetiker\hCaptcha\Forms\hCaptchaField.DEFAULT_TITLE', 'Spam protection');
+        if ($title === null) $title = _t('Oposs\hCaptcha\Forms\hCaptchaField.DEFAULT_TITLE', 'Spam protection');
         parent::__construct($name, $title, $value);
     }
 
@@ -57,7 +57,7 @@ public function validate($validator): bool
 
         // Empty response
         if (!isset($captchaResponse)) {
-            $validator->validationError($this->name, _t('Oetiker\hCaptcha\Forms\hCaptchaField.EMPTY', '_Please answer the captcha, if you do not see the captcha you must enable JavaScript'));
+            $validator->validationError($this->name, _t('Oposs\hCaptcha\Forms\hCaptchaField.EMPTY', '_Please answer the captcha, if you do not see the captcha you must enable JavaScript'));
             return false;
         }
 
@@ -71,10 +71,10 @@ public function validate($validator): bool
         if ($submit_remote_ip) $validatorRequest['remoteip'] = Controller::curr()->getRequest()->getIP();
 
         $curlOptions = [
-            'CURLOPT_URL' => 'https://hcaptcha.com/siteverify',
-            'CURLOPT_POST' => true,
-            'CURLOPT_POSTFIELDS' => http_build_query($validatorRequest),
-            'CURLOPT_RETURNTRANSFER' => true,
+            CURLOPT_URL => 'https://hcaptcha.com/siteverify',
+            CURLOPT_POST => true,
+            CURLOPT_POSTFIELDS => http_build_query($validatorRequest),
+            CURLOPT_RETURNTRANSFER => true,
         ];
         $verify = curl_init();
         curl_setopt_array($verify, $curlOptions);
@@ -84,7 +84,7 @@ public function validate($validator): bool
         if ($responseData->success) {
             return true;
         } else {
-            $validator->validationError($this->name, _t('Oetiker\hCaptcha\Forms\hCaptchaField.VALIDATE_ERROR', '_Captcha could not be validated'));
+            $validator->validationError($this->name, _t('Oposs\hCaptcha\Forms\hCaptchaField.VALIDATE_ERROR', '_Captcha could not be validated'));
             return false;
         }
 

diff --git a/templates/Oposs/hCaptcha/Forms/hCaptchaField.ss b/templates/Oposs/hCaptcha/Forms/hCaptchaField.ss
@@ -1,5 +1,5 @@
 <noscript>
-    <p><%t Oetiker\hCaptcha\Forms\hCaptchaField.NOSCRIPT "You must enable JavaScript to submit this form" %></p>
+    <p><%t Oposs\hCaptcha\Forms\hCaptchaField.NOSCRIPT "You must enable JavaScript to submit this form" %></p>
 </noscript>
 
 <div class="h-captcha"