Merge pull request #45 from solusio/replacing-dir-with-rootdir-for-whmcs-8-compatibility

redikultsevsilver · web-flow · commit 54a07f96d134 · 2021-07-01T14:31:25.000+07:00
Replacing __DIR__ with ROOTDIR for WHMCS 8 compatibility
diff --git a/modules/servers/solusvmpro/VERSION b/modules/servers/solusvmpro/VERSION
@@ -1 +1 @@
-4.1.3
+4.1.4
diff --git a/modules/servers/solusvmpro/console.php b/modules/servers/solusvmpro/console.php
@@ -3,9 +3,9 @@
 define( "CLIENTAREA", true );
 require( "../../../init.php" );
 
-require_once __DIR__ . '/lib/Curl.php';
-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
-require_once __DIR__ . '/lib/SolusVM.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
diff --git a/modules/servers/solusvmpro/get_client_data.php b/modules/servers/solusvmpro/get_client_data.php
@@ -4,9 +4,9 @@
 require( "../../../init.php" );
 session_start();
 
-require_once __DIR__ . '/lib/Curl.php';
-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
-require_once __DIR__ . '/lib/SolusVM.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
diff --git a/modules/servers/solusvmpro/html5console.php b/modules/servers/solusvmpro/html5console.php
@@ -3,9 +3,9 @@
 define("CLIENTAREA", true);
 require("../../../init.php");
 
-require_once __DIR__ . '/lib/Curl.php';
-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
-require_once __DIR__ . '/lib/SolusVM.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
diff --git a/modules/servers/solusvmpro/lib/SolusVM.php b/modules/servers/solusvmpro/lib/SolusVM.php
@@ -103,7 +103,7 @@ public function __construct( $params, $debug = false ) {
         $this->pid       = $this->getParam( "pid" ); # Product/Service ID
 
         //Parse Ini file
-        $config_file  = dirname(__DIR__) . '/configure.ini';
+        $config_file  = dirname(ROOTDIR) . '/modules/servers/solusvmpro/configure.ini';
         $this->configIni = parse_ini_file( $config_file );
 
     }
diff --git a/modules/servers/solusvmpro/solusvmpro.php b/modules/servers/solusvmpro/solusvmpro.php
@@ -5,9 +5,9 @@
  *
  */
 
-require_once __DIR__ . '/lib/Curl.php';
-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
-require_once __DIR__ . '/lib/SolusVM.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
@@ -16,8 +16,8 @@
     die( "This file cannot be accessed directly" );
 }
 
-if ( file_exists( __DIR__ . "/custom.php" ) ) {
-    require_once( __DIR__ . "/custom.php" );
+if ( file_exists( ROOTDIR . "/custom.php" ) ) {
+    require_once( ROOTDIR . "/modules/servers/solusvmpro/custom.php" );
 }
 
 SolusVM::loadLang();
diff --git a/modules/servers/solusvmpro/svm_control.php b/modules/servers/solusvmpro/svm_control.php
@@ -5,9 +5,9 @@
 require("../../../init.php");
 session_start();
 
-require_once __DIR__ . '/lib/Curl.php';
-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
-require_once __DIR__ . '/lib/SolusVM.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;
diff --git a/modules/servers/solusvmpro/vnc.php b/modules/servers/solusvmpro/vnc.php
@@ -3,9 +3,9 @@
 define( "CLIENTAREA", true );
 require( "../../../init.php" );
 
-require_once __DIR__ . '/lib/Curl.php';
-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';
-require_once __DIR__ . '/lib/SolusVM.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';
+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use SolusVM\SolusVM;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function __construct( $params, $debug = false ) {`
`103`	`103`	`$this->pid = $this->getParam( "pid" ); # Product/Service ID`
`104`	`104`
`105`	`105`	`//Parse Ini file`
`106`		`- $config_file = dirname(__DIR__) . '/configure.ini';`
	`106`	`+ $config_file = dirname(ROOTDIR) . '/modules/servers/solusvmpro/configure.ini';`
`107`	`107`	`$this->configIni = parse_ini_file( $config_file );`
`108`	`108`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
`8`		`-require_once __DIR__ . '/lib/Curl.php';`
`9`		`-require_once __DIR__ . '/lib/CaseInsensitiveArray.php';`
`10`		`-require_once __DIR__ . '/lib/SolusVM.php';`
	`8`	`+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/Curl.php';`
	`9`	`+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/CaseInsensitiveArray.php';`
	`10`	`+require_once ROOTDIR . '/modules/servers/solusvmpro/lib/SolusVM.php';`
`11`	`11`
`12`	`12`	`use Illuminate\Database\Capsule\Manager as Capsule;`
`13`	`13`	`use SolusVM\SolusVM;`
`@@ -16,8 +16,8 @@`
`16`	`16`	`die( "This file cannot be accessed directly" );`
`17`	`17`	`}`
`18`	`18`
`19`		`-if ( file_exists( __DIR__ . "/custom.php" ) ) {`
`20`		`- require_once( __DIR__ . "/custom.php" );`
	`19`	`+if ( file_exists( ROOTDIR . "/custom.php" ) ) {`
	`20`	`+ require_once( ROOTDIR . "/modules/servers/solusvmpro/custom.php" );`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`SolusVM::loadLang();`