SP-983 PSR-1 and PSR-2 cleanup

bitpay · Jun 19, 2024 · 880509d · 880509d
1 parent 3c7cff0
commit 880509d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/modules/gateways/bitpaycheckout.php b/modules/gateways/bitpaycheckout.php
@@ -80,8 +80,7 @@ function ($table) {
  * @return array
  */
 
-if (!function_exists('bitpaycheckout_config'))
-{
+if (!function_exists('bitpaycheckout_config')) {
     function bitpaycheckout_config()
     {
         return array(
@@ -119,7 +118,7 @@ function bitpaycheckout_config()
                 'Type' => 'dropdown',
                 'Options' => 'Modal,Redirect',
                 'Description' => 'Select <b>Modal</b> to keep the user on the invoice page, or  <b>Redirect</b> to have them view the invoice at BitPay.com, and be redirected after payment.<br>',
-            ),            
+            ),
         );
     }
 }
@@ -137,7 +136,9 @@ function bitpaycheckout_link($config_params)
     $curpage = basename($_SERVER["SCRIPT_FILENAME"]);
 
     $curpage = str_replace("/", "", $curpage);
-    if ($curpage != 'viewinvoice.php'): return;endif;
+    if ($curpage != 'viewinvoice.php') {
+        return;
+    }
     ?>
     <script src="https://bitpay.com/bitpay.min.js" type="text/javascript"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
@@ -273,7 +274,7 @@ function redirectURL($url){
         }, false);
         function showModal(){
             //show the modal
-            <?php if ($bitpay_checkout_endpoint == 'Test'): ?>
+            <?php if ($bitpay_checkout_endpoint == 'Test') : ?>
                 bitpay.enableTestMode()
             <?php endif;?>
                 bitpay.showInvoice('<?php echo $basicInvoice->getId(); ?>');

diff --git a/modules/gateways/bitpaycheckout/callback/bitpaycheckout_ipn.php b/modules/gateways/bitpaycheckout/callback/bitpaycheckout_ipn.php
@@ -19,6 +19,7 @@
  */
 
 use WHMCS\Database\Capsule;
+
 // Require libraries needed for gateway module functions.
 require_once  '../../../../init.php';
 require_once  '../../../../includes/gatewayfunctions.php';
@@ -31,7 +32,8 @@
 define("TEST_URL", 'https://test.bitpay.com/invoices/');
 define("PROD_URL", 'https://bitpay.com/invoices/');
 
-function checkInvoiceStatus($url) {
+function checkInvoiceStatus($url)
+{
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
@@ -47,10 +49,10 @@ function checkInvoiceStatus($url) {
 $file = 'bitpay.txt';
 $err = "bitpay_err.txt";
 
-file_put_contents($file,"===========INCOMING IPN=========================",FILE_APPEND);
-file_put_contents($file,date('d.m.Y H:i:s'),FILE_APPEND);
-file_put_contents($file,print_r($response, true),FILE_APPEND);
-file_put_contents($file,"===========END OF IPN===========================",FILE_APPEND);
+file_put_contents($file, "===========INCOMING IPN=========================", FILE_APPEND);
+file_put_contents($file, date('d.m.Y H:i:s'), FILE_APPEND);
+file_put_contents($file, print_r($response, true), FILE_APPEND);
+file_put_contents($file, "===========END OF IPN===========================", FILE_APPEND);
 
 $order_status = $data['status'];
 $order_invoice = $data['id'];
@@ -93,16 +95,16 @@ function checkInvoiceStatus($url) {
                         ['transaction_id', '=', $order_invoice],
                     ])
                     ->update($update);
-            } catch (Exception $e ) {
-                file_put_contents($file,$e,FILE_APPEND);
+            } catch (Exception $e) {
+                file_put_contents($file, $e, FILE_APPEND);
             }
 
             addInvoicePayment(
-            $orderid,
-            $order_invoice,
-            $price,
-            0,
-            'bitpaycheckout'
+                $orderid,
+                $order_invoice,
+                $price,
+                0,
+                'bitpaycheckout'
             );
             break;
 
@@ -118,8 +120,8 @@ function checkInvoiceStatus($url) {
                         ['paymentmethod', '=', 'bitpaycheckout'],
                     ])
                     ->update($update);
-            } catch (Exception $e ) {
-                file_put_contents($file,$e,FILE_APPEND);
+            } catch (Exception $e) {
+                file_put_contents($file, $e, FILE_APPEND);
             }
 
             #update the bitpay_invoice table
@@ -132,8 +134,8 @@ function checkInvoiceStatus($url) {
                         ['transaction_id', '=', $order_invoice],
                     ])
                     ->update($update);
-            } catch (Exception $e ) {
-                file_put_contents($file,$e,FILE_APPEND);
+            } catch (Exception $e) {
+                file_put_contents($file, $e, FILE_APPEND);
             }
             break;
 
@@ -145,8 +147,8 @@ function checkInvoiceStatus($url) {
                 Capsule::table($table)
                     ->where('transaction_id', '=', $order_invoice)
                     ->delete();
-            } catch (Exception $e ) {
-                file_put_contents($file,$e,FILE_APPEND);
+            } catch (Exception $e) {
+                file_put_contents($file, $e, FILE_APPEND);
             }
             break;
 
@@ -163,8 +165,8 @@ function checkInvoiceStatus($url) {
                             ['paymentmethod', '=', 'bitpaycheckout'],
                         ])
                         ->update($update);
-                } catch (Exception $e ) {
-                    file_put_contents($file,$e,FILE_APPEND);
+                } catch (Exception $e) {
+                    file_put_contents($file, $e, FILE_APPEND);
                 }
 
                 #update the bitpay invoice table
@@ -177,11 +179,12 @@ function checkInvoiceStatus($url) {
                             ['transaction_id', '=', $order_invoice],
                         ])
                         ->update($update);
-                } catch (Exception $e ) {
-                    file_put_contents($file,$e,FILE_APPEND);
+                } catch (Exception $e) {
+                    file_put_contents($file, $e, FILE_APPEND);
                 }
                 break;
             }
     }
-http_response_code(200);
+
+    http_response_code(200);
 }