5

Author: eugenefvdm

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `whmcs-api` will be documented in this file.
 
+## v0.0.5 - 2021-10-27
+
+- refactor to remove return statements in getclientbyphonenumber as return statement might lead to abnormal program termination via the include system
+
 ## v0.0.4 - 2021-10-27
 
 - handling of space in telephone numbers

src/getclientbyphonenumber.php

@@ -11,7 +11,7 @@
 if (!defined("WHMCS"))
     die("This file cannot be accessed directly");
 
-try {    
+try {
     // First check for the actual number
     $phoneNumber = $_REQUEST['phonenumber'];
 
@@ -20,40 +20,41 @@
         ->first();
 
     if ($client) {
+
         $apiresults = [
             "result"   => "success",
             "message"  => "ok",
             'clientid' => $client->id,
         ];
 
-        return;
-    }
+    } else {
+        // ...then check for the number but without spaces    
+        $phoneNumberWithoutSpaces = str_replace(' ', '', $_REQUEST['phonenumber']);
 
-    // ...then check for the number but without spaces    
-    $phoneNumberWithoutSpaces = str_replace(' ', '', $_REQUEST['phonenumber']);
+        $client = Capsule::table('tblclients')->where("phonenumber", $phoneNumberWithoutSpaces)->first();
 
-    $client = Capsule::table('tblclients')->where("phonenumber", $phoneNumberWithoutSpaces)->first();
+        if ($client) {
+            $apiresults = [
+                "result"   => "success",
+                "message"  => "ok",
+                'clientid' => $client->id,
+            ];
 
-    if ($client) {
-        $apiresults = [
-            "result"   => "success",
-            "message"  => "ok",
-            'clientid' => $client->id,
-        ];
+        } else {
 
-        return;
+            $apiresults = [
+                "result"  => "error",
+                "message" => "a client with number $phoneNumber was not found",
+            ];
+        }
+            
     }
 
-    $apiresults = [
-        "result"  => "error",
-        "message" => "a client with number $phoneNumber was not found",
-    ];
-
+    
 } catch (Exception $e) {
 
     $apiresults = [
-        "result" => "exception",
+        "result" => "error",
         "message" => $e->getMessage(),
     ];
-
 }