Fixed issue where http_response_code() would not properly return value

jaredhendrickson13 · jaredhendrickson13 · commit 5b84b5601c0f · 2020-01-25T20:49:12.000-07:00
diff --git a/pfSense-pkg-API/files/etc/inc/apicalls.inc b/pfSense-pkg-API/files/etc/inc/apicalls.inc
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/add/address/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/add/address/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_aliases_add_address();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/add/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/add/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_aliases_add();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/delete/address/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/delete/address/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_aliases_delete_address();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/delete/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/delete/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_aliases_delete();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_aliases();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/modify/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/aliases/modify/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_aliases_modify();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/rules/add/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/rules/add/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_rules_add();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/rules/delete/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/rules/delete/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_rules_delete();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/rules/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/rules/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_rules();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/virtualips/add/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/virtualips/add/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_virtualips_add();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/virtualips/delete/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/virtualips/delete/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_virtualips_delete();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/virtualips/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/firewall/virtualips/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_firewall_virtualips();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/add/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/add/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_interfaces_add();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_interfaces();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/add/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/add/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_interfaces_vlans_add();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/delete/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/delete/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_interfaces_vlans_delete();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_interfaces_vlans();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/modify/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/interfaces/vlans/modify/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_interfaces_vlans_modify();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/routing/gateways/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/routing/gateways/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_routing_gateways();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/dhcpd/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/dhcpd/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_dhcpd_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/dhcpd/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/dhcpd/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_dhcpd_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/dhcpd/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/dhcpd/stop/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_dhcpd_stop();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/dpinger/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/dpinger/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_dpinger_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/dpinger/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/dpinger/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_dpinger_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/dpinger/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/dpinger/stop/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_dpinger_stop();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/ntpd/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/ntpd/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_ntpd_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/ntpd/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/ntpd/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_ntpd_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/ntpd/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/ntpd/stop/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_ntpd_stop();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/sshd/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/sshd/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_sshd_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/sshd/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/sshd/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_sshd_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/sshd/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/sshd/stop/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_sshd_stop();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/stop/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_stop();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/syslogd/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/syslogd/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_syslogd_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/syslogd/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/syslogd/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_syslogd_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/syslogd/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/syslogd/stop/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_syslogd_stop();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/add/hosts/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/add/hosts/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_unbound_add_hosts();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/delete/hosts/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/delete/hosts/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_unbound_delete_hosts();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_unbound();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/modify/hosts/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/modify/hosts/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_unbound_modify_hosts();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/restart/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/restart/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_unbound_restart();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/start/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/start/index.php
@@ -6,5 +6,5 @@
 # RUN API CALL
 $resp = api_services_unbound_start();
 http_response_code($resp["code"]);
-echo $resp;
-exit();
+echo json_encode($resp) . PHP_EOL;
+exit();
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/stop/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/services/unbound/stop/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/status/carp/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/status/carp/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/status/carp/modify/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/status/carp/modify/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/system/arp/delete/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/system/arp/delete/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/system/arp/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/system/arp/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/system/config/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/system/config/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/system/version/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/system/version/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/add/groups/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/add/groups/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/add/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/add/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/add/privs/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/add/privs/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/delete/groups/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/delete/groups/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/delete/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/delete/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/delete/privs/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/delete/privs/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/index.php
diff --git a/pfSense-pkg-API/files/usr/local/www/api/v1/users/modify/index.php b/pfSense-pkg-API/files/usr/local/www/api/v1/users/modify/index.php
