Fixed merge conflict with APIResponse.inc, removed old Makefile and pkg-plist as these are generated dynamically now

Author: jaredhendrickson13

pfSense-pkg-API/Makefile

@@ -524,33 +524,45 @@ function get($id, $data=[], $all=false) {
             "status" => "bad request",
             "code" => 400,
             "return" => $id,
-            "message" => "NTPd orphan value must be between 1 and 15"
+            "message" => "Invalid unbound host value"
         ],
         2047 => [
             "status" => "bad request",
             "code" => 400,
             "return" => $id,
-            "message" => "Unknown NTPd interface specified"
+            "message" => "Invalid unbound domain value"
         ],
         2048 => [
             "status" => "bad request",
             "code" => 400,
             "return" => $id,
-            "message" => "NTPd timeserver value is required"
+            "message" => "NTPd orphan value must be between 1 and 15"
         ],
         2049 => [
             "status" => "bad request",
             "code" => 400,
             "return" => $id,
-            "message" => "NTPd timeserver must be valid IP address or hostname"
+            "message" => "Unknown NTPd interface specified"
         ],
         2050 => [
             "status" => "bad request",
             "code" => 400,
             "return" => $id,
-            "message" => "Maximum limit of 10 NTPd timeservers exceeded"
+            "message" => "NTPd timeserver value is required"
         ],
         2051 => [
+            "status" => "bad request",
+            "code" => 400,
+            "return" => $id,
+            "message" => "NTPd timeserver must be valid IP address or hostname"
+        ],
+        2052 => [
+            "status" => "bad request",
+            "code" => 400,
+            "return" => $id,
+            "message" => "Maximum limit of 10 NTPd timeservers exceeded"
+        ],
+        2053 => [
             "status" => "bad request",
             "code" => 400,
             "return" => $id,

pfSense-pkg-API/files/etc/inc/api/framework/APIResponse.inc

@@ -52,7 +52,7 @@ class APIServicesNTPdTimeServerCreate extends APIModel {
     private function __validate_timeserver_limit() {
         # Before adding a new timeserver, ensure we are not already at our maximum limit
         if (count($this->timeservers) >= 10) {
-            $this->errors[] = APIResponse\get(2050);
+            $this->errors[] = APIResponse\get(2052);
         }
     }
 
@@ -65,10 +65,10 @@ class APIServicesNTPdTimeServerCreate extends APIModel {
             if (is_ipaddr($this->initial_data["timeserver"]) or is_hostname($this->initial_data["timeserver"])) {
                 $this->timeservers[] = $this->initial_data['timeserver'];
             } else {
-                $this->errors[] = APIResponse\get(2049);
+                $this->errors[] = APIResponse\get(2051);
             }
         } else {
-            $this->errors[] = APIResponse\get(2048);
+            $this->errors[] = APIResponse\get(2050);
         }
     }
 

pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdTimeServerCreate.inc

@@ -80,7 +80,7 @@ class APIServicesNTPdTimeServerDelete extends APIModel {
         }
         # Otherwise, return error if the request name server does not exist
         else {
-            $this->errors[] = APIResponse\get(2051);
+            $this->errors[] = APIResponse\get(2053);
         }
     }
 

pfSense-pkg-API/files/etc/inc/api/models/APIServicesNTPdTimeServerDelete.inc

@@ -69,7 +69,7 @@ class APIServicesNTPdUpdate extends APIModel {
                 if (in_array($if, $this->__get_interfaces())) {
                     $this->validated_data["interface"][] = $if;
                 } else {
-                    $this->errors[] = APIResponse\get(2047);
+                    $this->errors[] = APIResponse\get(2049);
                 }
             }
 
@@ -113,7 +113,7 @@ class APIServicesNTPdUpdate extends APIModel {
             }
             # If our limit was exceeded return an error
             else {
-                $this->errors[] = APIResponse\get(2050);
+                $this->errors[] = APIResponse\get(2052);
             }
         }
     }
@@ -125,7 +125,7 @@ class APIServicesNTPdUpdate extends APIModel {
             if ($this->initial_data['orphan'] >= 1 and $this->initial_data['orphan'] <= 15) {
                 $this->validated_data["orphan"] = $this->initial_data['orphan'];
             } else {
-                $this->errors[] = APIResponse\get(2046);
+                $this->errors[] = APIResponse\get(2048);
             }
         }
     }