v1.1.3 - Shell safety

Author: Ente

README.md

@@ -33,7 +33,7 @@ Then: `require_once "/path/to/vendor/autoload.php";` & `use Technitium\DNSServer
 require_once "/vendor/autoload.php";
 use Technitium\DNSServer\API;
 
-$api = new API();
+$api = new API("path/to/env", "env-name");
 
 // Get all zones
 $zones = $api->zones()->get();
@@ -64,7 +64,7 @@ if($api->apps->downloadAndInstall($sampleApp["name"], $sampleApp["url"])) {
 require_once "/vendor/autoload.php";
 use Technitium\DNSServer\API;
 
-$api = new API();
+$api = new API("path/to/env", "env-name");
 // You have to set <bool>$bypass to true to use this feature
 echo var_dump($api->sendCall(data: array("field" => "value"), endpoint: "admin/users/list", skip: false, bypass: true))
 
@@ -87,7 +87,7 @@ $ddns->updateRecords($path_to_configJSON);
 
 // OR
 
-$ddns_result = new DDNS(new API(), file_get_contents($path_to_configJSON)); // starts automatically updating the records
+$ddns_result = new DDNS(new API("path/to/env"), file_get_contents($path_to_configJSON)); // starts automatically updating the records
 
 // OR
 $api = new API();
@@ -115,14 +115,19 @@ require_once "/vendor/autoload.php";
 use Technitium\DNSServer\API;
 use Technitium\DNSServer\API\Helper\DDNS;
 
-DDNS(new API(), file_get_contents("/my/config.json"));
+DDNS(new API("path/to/env"), file_get_contents("/my/config.json"));
 DDNS(new API(__DIR__), file_get_contents("/my/config2.json"));
 DDNS(new API(__DIR__ . "/configurations", ".env-custom"), file_get_contents("/my/config3.json"));
 
 ```
 
 ## Changes
 
+### v1.1.3: Shell safe
+
+- Library is now shell safe (you are now required to specify the path to the `.env` file)
+- Silenced most $_SERVER['argv'] warnings when running the library in shell
+
 ### v1.1.2: Quality
 
 - Added more documentation to the classes

composer.json

@@ -2,7 +2,7 @@
     "name": "ente/technitium-dnsserver-php-api",
     "type": "library",
     "license": "GPL-3.0-only",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "authors": [
         {
             "name": "Ente",

src/API.dnsserver.ente.php

@@ -39,7 +39,7 @@ class API {
     const PREFIX_GET = "&token=";
     const PREFIX_POST = "?token=";
 
-    public function __construct($confPath = null, $name = null){
+    public function __construct($confPath, $name = null){
         $this->loader();
         $this->loadConf($confPath, $name);
         $this->setProtocol();
@@ -59,8 +59,11 @@ private function setProtocol(){
      * @param mixed $name The name of the .env file. (optional)
      * @return void
      */
-    private function loadConf($path = null, $name = null){
+    private function loadConf($path, $name = null){
         $this->conf = $name ?? ".env";
+        if(!isset($_SERVER)){
+            $path = __DIR__;
+        }
         $this->path = $path ?? $_SERVER["DOCUMENT_ROOT"];
         $this->fullPath = $this->path . "/" . $this->conf;
         if($path != null){

src/helper/Log.Helper.API.dnsserver.ente.php

@@ -29,14 +29,19 @@ public function __toString(): string {
      */
     public static function error_rep($message, $method = null){
         $error_file = self::logrotate(); // file on your fs, e.g. /var/www/html/error.log
-        $version = @file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/VERSION") ?? "N/A"; //optional value
+        $version = NULL;
         if($method == null){
             $method = @$_SERVER["REQUEST_METHOD"];
         }
+        $uri = @$_SERVER["REQUEST_URI"];
+        $host = @$_SERVER["HTTP_HOST"];
+        $port = @$_SERVER["SERVER_PORT"];
+        $script = @$_SERVER["SCRIPT_FILENAME"];
+        $name = @$_SERVER["SERVER_NAME"] ?? "N/A";
         $addr = @$_SERVER["SERVER_ADDR"] ?? "N/A";
         $rhost = @$_SERVER["REMOTE_HOST"] ?? "N/A";
         $time = date("[d.m.Y | H:i:s]");
-        error_log("{$time} \"{$message}\"\nURL: {$_SERVER["HTTP_HOST"]}{$_SERVER["REQUEST_URI"]} \nVersion: {$version} Server IP:{$addr} - Server Name: {$_SERVER["SERVER_NAME"]} - Request Method: '{$method}'\nRemote Addresse: {$_SERVER["REMOTE_ADDR"]} - Remote Name: '{$rhost}' - Remote Port: {$_SERVER["REMOTE_PORT"]}\nScript Name: '{$_SERVER["SCRIPT_FILENAME"]}'\n=======================\n", 3, $error_file);
+        error_log("{$time} \"{$message}\"\nURL: {$host}{$uri} \nVersion: {$version} Server IP:{$addr} - Server Name: {$name} - Request Method: '{$method}'\nRemote Addresse: {$addr} - Remote Name: '{$rhost}' - Remote Port: {$port}\nScript Name: '{$script}'\n=======================\n", 3, $error_file);
 
     }