From 00f43a190f1363b58b8a93c703962f7210fea7fe Mon Sep 17 00:00:00 2001
From: Elesei <elesei@elesei.com>
Date: Wed, 12 Dec 2018 11:29:53 +0200
Subject: [PATCH 1/5] add gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e782c7a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+modules/servers/solusvmpro/.idea

From e8771553274fb013f4679a851e273e834f8c8581 Mon Sep 17 00:00:00 2001
From: Elesei <elesei@elesei.com>
Date: Wed, 12 Dec 2018 11:35:48 +0200
Subject: [PATCH 2/5] reformat code

---
 modules/servers/solusvmpro/lib/SolusVM.php | 1068 ++++++++++----------
 1 file changed, 551 insertions(+), 517 deletions(-)

diff --git a/modules/servers/solusvmpro/lib/SolusVM.php b/modules/servers/solusvmpro/lib/SolusVM.php
index 7545305..555c001 100644
--- a/modules/servers/solusvmpro/lib/SolusVM.php
+++ b/modules/servers/solusvmpro/lib/SolusVM.php
@@ -28,201 +28,208 @@ class SolusVM {
     public $cpHostname;
 
 
-    public function __construct( $params, $debug = false ) {
+    public function __construct($params, $debug = false)
+    {
 
-        if ( $debug === true ) {
-            ini_set( 'display_errors', 1 );
-            ini_set( 'display_startup_errors', 1 );
-            error_reporting( E_ALL );
+        if ($debug === true) {
+            ini_set('display_errors', 1);
+            ini_set('display_startup_errors', 1);
+            error_reporting(E_ALL);
         }
 
-        if ( is_array( $params ) ) {
+        if (is_array($params)) {
             $this->params = $params;
         }
 
-        $this->modType = strtolower( $this->getParam( "configoption1" ) );
-        if ( ! $this->modType ) {
+        $this->modType = strtolower($this->getParam("configoption1"));
+        if (!$this->modType) {
             $this->modType = "admin";
         }
 
-        if ( $this->getParam( "serverid" ) == "0" || $this->getParam( "serverid" ) == "" ) {
-            $masterPart     = explode( "-", $this->getParam( "configoption3" ) );
+        if ($this->getParam("serverid") == "0" || $this->getParam("serverid") == "") {
+            $masterPart = explode("-", $this->getParam("configoption3"));
             $this->masterID = $masterPart[0];
         } else {
-            $this->masterID = $this->getParam( "serverid" );
+            $this->masterID = $this->getParam("serverid");
         }
 
         ## Grab the variables we need from the database to connect to the correct master
-        $row = Capsule::table( 'tblservers' )->where( 'id', $this->masterID )->first();
+        $row = Capsule::table('tblservers')->where('id', $this->masterID)->first();
         $this->cpHostname = $row->hostname;
 
-        $this->idkey   = decrypt( $row->password );
-        $this->extData = $this->serverExtra( array( 'master' => $this->masterID ) );
+        $this->idkey = decrypt($row->password);
+        $this->extData = $this->serverExtra(array('master' => $this->masterID));
 
-        if ( $this->getExtData( "connect-via-hostname" ) == "yes" ) {
+        if ($this->getExtData("connect-via-hostname") == "yes") {
             $conaddr = $row->hostname;
         } else {
             $conaddr = $row->ipaddress;
         }
 
         $cport = 0;
-        if ( $this->getExtData( "port" ) ) {
-            $cport = $this->getExtData( "port" );
+        if ($this->getExtData("port")) {
+            $cport = $this->getExtData("port");
         }
-        if ( $row->secure ) {
-            if ( ! $cport ) {
+        if ($row->secure) {
+            if (!$cport) {
                 $cport = "5656";
             }
-            $this->url    = "https://" . $conaddr . ":" . $cport . "/api/" . $this->modType . "/command.php";
+            $this->url = "https://" . $conaddr . ":" . $cport . "/api/" . $this->modType . "/command.php";
             $this->fwdurl = "https://" . $conaddr . ":" . $cport;
         } else {
-            if ( ! $cport ) {
+            if (!$cport) {
                 $cport = "5353";
             }
-            $this->url    = "http://" . $conaddr . ":" . $cport . "/api/" . $this->modType . "/command.php/";
+            $this->url = "http://" . $conaddr . ":" . $cport . "/api/" . $this->modType . "/command.php/";
             $this->fwdurl = "http://" . $conaddr . ":" . $cport;
         }
 
-        if ( ! $this->getExtData( "connect-timeout" ) ) {
+        if (!$this->getExtData("connect-timeout")) {
             $this->extData["connect-timeout"] = "100";
         }
-        if ( ! $this->getExtData( "connect-data-timeout" ) ) {
+        if (!$this->getExtData("connect-data-timeout")) {
             $this->extData["connect-data-timeout"] = "100";
         }
 
         $this->username = $row->username;
 
-        $this->configOption                   = $this->getParam( "configoptions" );
-        $this->configOptionVirtualizationType = $this->getParam( "configoption5" );
-        $this->configOptionDefaultNode        = $this->getParam( "configoption2" );
-        $this->configOptionOperatingSystem    = $this->getParam( "configoption6" );
-        $this->configOptionUsernamePrefix     = $this->getParam( "configoption7" );
+        $this->configOption = $this->getParam("configoptions");
+        $this->configOptionVirtualizationType = $this->getParam("configoption5");
+        $this->configOptionDefaultNode = $this->getParam("configoption2");
+        $this->configOptionOperatingSystem = $this->getParam("configoption6");
+        $this->configOptionUsernamePrefix = $this->getParam("configoption7");
 
-        $this->serviceid = $this->getParam( "serviceid" ); # Unique ID of the product/service in the WHMCS Database
-        $this->pid       = $this->getParam( "pid" ); # Product/Service ID
+        $this->serviceid = $this->getParam("serviceid"); # Unique ID of the product/service in the WHMCS Database
+        $this->pid = $this->getParam("pid"); # Product/Service ID
 
         //Parse Ini file
-        $config_file  = dirname(__DIR__) . '/configure.ini';
-        $this->configIni = parse_ini_file( $config_file );
+        $config_file = dirname(__DIR__) . '/configure.ini';
+        $this->configIni = parse_ini_file($config_file);
 
     }
 
-    public function getParam( $name ) {
-        if ( isset( $this->params[ $name ] ) ) {
-            return $this->params[ $name ];
+    public function getParam($name)
+    {
+        if (isset($this->params[$name])) {
+            return $this->params[$name];
         }
 
         return "";
     }
 
-    public function getExtData( $name ) {
-        if ( isset( $this->extData[ $name ] ) ) {
-            return $this->extData[ $name ];
+    public function getExtData($name)
+    {
+        if (isset($this->extData[$name])) {
+            return $this->extData[$name];
         }
 
         return "";
     }
 
-    public function apiCall( $faction, $postVars = array() ) {
+    public function apiCall($faction, $postVars = array())
+    {
         $this->result = '';
 
-        if ( $faction == "fwdurl" ) {
+        if ($faction == "fwdurl") {
             $result = $this->fwdurl;
-            $this->debugLog( 'solusvmpro', $faction, '', $result, '', array() );
+            $this->debugLog('solusvmpro', $faction, '', $result, '', array());
 
             return $result;
         }
 
-        $error      = '';
+        $error = '';
         $postfields = array();
 
-        foreach ( $postVars as $z => $x ) {
-            $postfields[ $z ] = $x;
+        foreach ($postVars as $z => $x) {
+            $postfields[$z] = $x;
         }
 
-        $postfields["id"]     = $this->username;
-        $postfields["key"]    = $this->idkey;
+        $postfields["id"] = $this->username;
+        $postfields["key"] = $this->idkey;
         $postfields['action'] = $faction;
 
         $curl = new Curl();
-        $curl->setTimeout( $this->getExtData( "connect-timeout" ) );
-        $curl->setConnectTimeout( $this->getExtData( "connect-data-timeout" ) );
-        $curl->setHeader( 'Expect', '' );
-        if ( $this->getExtData( "htpasswd-username" ) && $this->getExtData( "htpasswd-password" ) ) {
-            $curl->setBasicAuthentication( $this->getExtData( 'htpasswd-username' ), $this->getExtData( 'htpasswd-password' ) );
+        $curl->setTimeout($this->getExtData("connect-timeout"));
+        $curl->setConnectTimeout($this->getExtData("connect-data-timeout"));
+        $curl->setHeader('Expect', '');
+        if ($this->getExtData("htpasswd-username") && $this->getExtData("htpasswd-password")) {
+            $curl->setBasicAuthentication($this->getExtData('htpasswd-username'), $this->getExtData('htpasswd-password'));
         }
 
-        if ( $this->getExtData( "ssl_verifypeer" ) == "no" ) {
+        if ($this->getExtData("ssl_verifypeer") == "no") {
             $curl->setOpt(CURLOPT_SSL_VERIFYPEER, false);
         }
 
-        if ( $this->getExtData( "ssl_verifyhost" ) == "no" ) {
+        if ($this->getExtData("ssl_verifyhost") == "no") {
             $curl->setOpt(CURLOPT_SSL_VERIFYHOST, false);
         }
 
-        $curl->post( $this->url, $postfields );
+        $curl->post($this->url, $postfields);
         $result = $curl->rawResponse;
 
         ## This will give you the debug output if debug=on is defined in the servers hash field
-        if ( $this->getExtData( "debug" ) == "on" ) {
-            if ( $_SESSION['adminid'] ) {
-                print_r( $postfields );
-                print_r( array( "master" => $this->masterID, "usertype" => $this->modType ) );
+        if ($this->getExtData("debug") == "on") {
+            if ($_SESSION['adminid']) {
+                print_r($postfields);
+                print_r(array("master" => $this->masterID, "usertype" => $this->modType));
                 echo "<strong>httpStatusCode:</strong> " . $curl->httpStatusCode . "</br><br>";
                 echo "<strong>effectiveUrl:</strong> " . $curl->effectiveUrl . "</br><br>";
             }
         }
         $curl->close();
 
-        $this->debugLog( 'solusvmpro', $faction, $postfields, $result, $error, array( $postfields["id"], $postfields["key"] ) );
+        $this->debugLog('solusvmpro', $faction, $postfields, $result, $error, array($postfields["id"], $postfields["key"]));
 
         $this->rawResult = $result;
-        $this->result    = $this->sortReturn( $result );
+        $this->result = $this->sortReturn($result);
 
         return $result;
 
     }
 
-    public function sortReturn( $data ) {
-        preg_match_all( '/<(.*?)>([^<]+)<\/\\1>/i', $data, $matches );
+    public function sortReturn($data)
+    {
+        preg_match_all('/<(.*?)>([^<]+)<\/\\1>/i', $data, $matches);
         $result = array();
-        foreach ( $matches[1] as $k => $v ) {
-            $result[ $v ] = $matches[2][ $k ];
+        foreach ($matches[1] as $k => $v) {
+            $result[$v] = $matches[2][$k];
         }
-        $this->debugLog( 'solusvmpro', 'process', $data, $result, $result, '' );
+        $this->debugLog('solusvmpro', 'process', $data, $result, $result, '');
 
         return $result;
     }
 
-    public function serverExtra( $mServer = array() ) {
-        if ( ! isset( $mServer["master"] ) ) {
+    public function serverExtra($mServer = array())
+    {
+        if (!isset($mServer["master"])) {
             return array();
         }
         $results = array();
 
-        $masterPart = explode( "-", $mServer["master"] );
+        $masterPart = explode("-", $mServer["master"]);
 
-        $row = Capsule::table( 'tblservers' )->where( 'id', $masterPart[0] )->first();
+        $row = Capsule::table('tblservers')->where('id', $masterPart[0])->first();
 
         ## check we have some vars
-        if ( $row ) {
-            $data    = htmlspecialchars_decode( $row->accesshash );
-            $results = $this->sortReturn( $data );
+        if ($row) {
+            $data = htmlspecialchars_decode($row->accesshash);
+            $results = $this->sortReturn($data);
         }
 
-        if ( ! is_array( $results ) ) {
+        if (!is_array($results)) {
             return array();
         }
 
         return $results;
     }
 
-    public function passwordGen( $length = 10, $chars = 'abcdefghijklmnopqrstuvwxyzABCEFGHIJKLMNOPQRSTUVWXYZ1234567890' ) {
-        $chars_length = ( strlen( $chars ) - 1 );
-        $string       = $chars{rand( 0, $chars_length )};
-        for ( $i = 1; $i < $length; $i = strlen( $string ) ) {
-            $r = $chars{rand( 0, $chars_length )};
-            if ( $r != $string{$i - 1} ) {
+    public function passwordGen($length = 10, $chars = 'abcdefghijklmnopqrstuvwxyzABCEFGHIJKLMNOPQRSTUVWXYZ1234567890')
+    {
+        $chars_length = (strlen($chars) - 1);
+        $string = $chars{rand(0, $chars_length)};
+        for ($i = 1; $i < $length; $i = strlen($string)) {
+            $r = $chars{rand(0, $chars_length)};
+            if ($r != $string{$i - 1}) {
                 $string .= $r;
             }
         }
@@ -230,13 +237,14 @@ public function passwordGen( $length = 10, $chars = 'abcdefghijklmnopqrstuvwxyzA
         return $string;
     }
 
-    public function getUsername() {
-        $clientData = $this->getParam( "clientsdetails" );
+    public function getUsername()
+    {
+        $clientData = $this->getParam("clientsdetails");
 
-        if ( $this->getExtData( "username-prefix" ) ) {
-            $clientUsername = $this->getExtData( "username-prefix" ) . $clientData["id"];
+        if ($this->getExtData("username-prefix")) {
+            $clientUsername = $this->getExtData("username-prefix") . $clientData["id"];
         } else {
-            if ( $this->configOptionUsernamePrefix ) {
+            if ($this->configOptionUsernamePrefix) {
                 $clientUsername = $this->configOptionUsernamePrefix . $clientData["id"];
             } else {
                 $clientUsername = "vmuser" . $clientData["id"];
@@ -246,31 +254,32 @@ public function getUsername() {
         return $clientUsername;
     }
 
-    public function getBuildNode() {
+    public function getBuildNode()
+    {
 
         $buildNode = '';
         ## Lets check if we are using an overide flag for the node type and set the node we need
-        if ( $this->configOptionVirtualizationType == "OpenVZ" ) {
-            if ( $this->getExtData( "default-openvz-node" ) ) {
-                $buildNode = $this->getExtData( "default-openvz-node" );
+        if ($this->configOptionVirtualizationType == "OpenVZ") {
+            if ($this->getExtData("default-openvz-node")) {
+                $buildNode = $this->getExtData("default-openvz-node");
             } else {
                 $buildNode = $this->configOptionDefaultNode;
             }
-        } else if ( $this->configOptionVirtualizationType == "Xen-PV" ) {
-            if ( $this->getExtData( "default-xen-node" ) ) {
-                $buildNode = $this->getExtData( "default-xen-node" );
+        } else if ($this->configOptionVirtualizationType == "Xen-PV") {
+            if ($this->getExtData("default-xen-node")) {
+                $buildNode = $this->getExtData("default-xen-node");
             } else {
                 $buildNode = $this->configOptionDefaultNode;
             }
-        } else if ( $this->configOptionVirtualizationType == "KVM" ) {
-            if ( $this->getExtData( "default-kvm-node" ) ) {
-                $buildNode = $this->getExtData( "default-kvm-node" );
+        } else if ($this->configOptionVirtualizationType == "KVM") {
+            if ($this->getExtData("default-kvm-node")) {
+                $buildNode = $this->getExtData("default-kvm-node");
             } else {
                 $buildNode = $this->configOptionDefaultNode;
             }
-        } else if ( $this->configOptionVirtualizationType == "Xen-HVM" ) {
-            if ( $this->getExtData( "default-hvm-node" ) ) {
-                $buildNode = $this->getExtData( "default-hvm-node" );
+        } else if ($this->configOptionVirtualizationType == "Xen-HVM") {
+            if ($this->getExtData("default-hvm-node")) {
+                $buildNode = $this->getExtData("default-hvm-node");
             } else {
                 $buildNode = $this->configOptionDefaultNode;
             }
@@ -279,58 +288,60 @@ public function getBuildNode() {
         return $buildNode;
     }
 
-    public function getBuildOperatingSystem() {
+    public function getBuildOperatingSystem()
+    {
 
         $configType = '';
 
         ## Check to see if an OS selecter is being used via config options
-        if ( $this->configOptionVirtualizationType == "OpenVZ" ) {
-            if ( $this->getExtData( "openvz-os-selector-name" ) ) {
-                $configType = $this->getExtData( "openvz-os-selector-name" );
+        if ($this->configOptionVirtualizationType == "OpenVZ") {
+            if ($this->getExtData("openvz-os-selector-name")) {
+                $configType = $this->getExtData("openvz-os-selector-name");
             } else {
                 $configType = "Operating System";
             }
-        } else if ( $this->configOptionVirtualizationType == "Xen-PV" ) {
-            if ( $this->getExtData( "xenpv-os-selector-name" ) ) {
-                $configType = $this->getExtData( "xenpv-os-selector-name" );
+        } else if ($this->configOptionVirtualizationType == "Xen-PV") {
+            if ($this->getExtData("xenpv-os-selector-name")) {
+                $configType = $this->getExtData("xenpv-os-selector-name");
             } else {
                 $configType = "Operating System";
             }
-        } else if ( $this->configOptionVirtualizationType == "Xen-HVM" ) {
-            if ( $this->getExtData( "xenhvm-os-selector-name" ) ) {
-                $configType = $this->getExtData( "xenhvm-os-selector-name" );
+        } else if ($this->configOptionVirtualizationType == "Xen-HVM") {
+            if ($this->getExtData("xenhvm-os-selector-name")) {
+                $configType = $this->getExtData("xenhvm-os-selector-name");
             } else {
                 $configType = "Operating System";
             }
-        } else if ( $this->configOptionVirtualizationType == "KVM" ) {
-            if ( $this->getExtData( "kvm-os-selector-name" ) ) {
-                $configType = $this->getExtData( "kvm-os-selector-name" );
+        } else if ($this->configOptionVirtualizationType == "KVM") {
+            if ($this->getExtData("kvm-os-selector-name")) {
+                $configType = $this->getExtData("kvm-os-selector-name");
             } else {
                 $configType = "Operating System";
             }
         }
 
-        if ( ! isset( $this->configOption[ $configType ] ) ) {
+        if (!isset($this->configOption[$configType])) {
             $buildOperatingSystem = $this->configOptionOperatingSystem;
         } else {
-            $ossplit              = explode( "|", $this->configOption[ $configType ] );
+            $ossplit = explode("|", $this->configOption[$configType]);
             $buildOperatingSystem = $ossplit[0];
         }
 
         return $buildOperatingSystem;
     }
 
-    public function getCPGroup() {
+    public function getCPGroup()
+    {
 
         ## Control Panel Chooser
-        if ( $this->getExtData( "control-panel-selector-name" ) ) {
-            $configTypeCP = $this->getExtData( "control-panel-selector-name" );
+        if ($this->getExtData("control-panel-selector-name")) {
+            $configTypeCP = $this->getExtData("control-panel-selector-name");
         } else {
             $configTypeCP = "Control Panel";
         }
 
-        if ( isset( $this->configOption[ $configTypeCP ] ) ) {
-            $cpsplit = explode( "|", $this->configOption[ $configTypeCP ] );
+        if (isset($this->configOption[$configTypeCP])) {
+            $cpsplit = explode("|", $this->configOption[$configTypeCP]);
             $cpGroup = $cpsplit[0];
         } else {
             $cpGroup = "";
@@ -339,47 +350,48 @@ public function getCPGroup() {
         return $cpGroup;
     }
 
-    public function getBuildGroup() {
+    public function getBuildGroup()
+    {
 
         ################################################
         ## Group selector
 
         $configTypeG = '';
 
-        if ( $this->configOptionVirtualizationType == "OpenVZ" ) {
-            if ( $this->getExtData( "openvz-group-selector-name" ) ) {
-                $configTypeG = $this->getExtData( "openvz-group-selector-name" );
+        if ($this->configOptionVirtualizationType == "OpenVZ") {
+            if ($this->getExtData("openvz-group-selector-name")) {
+                $configTypeG = $this->getExtData("openvz-group-selector-name");
             } else {
                 $configTypeG = "Location";
             }
-        } else if ( $this->configOptionVirtualizationType == "Xen-PV" ) {
-            if ( $this->getExtData( "xenpv-group-selector-name" ) ) {
-                $configTypeG = $this->getExtData( "xenpv-group-selector-name" );
+        } else if ($this->configOptionVirtualizationType == "Xen-PV") {
+            if ($this->getExtData("xenpv-group-selector-name")) {
+                $configTypeG = $this->getExtData("xenpv-group-selector-name");
             } else {
                 $configTypeG = "Location";
             }
-        } else if ( $this->configOptionVirtualizationType == "Xen-HVM" ) {
-            if ( $this->getExtData( "xenhvm-group-selector-name" ) ) {
-                $configTypeG = $this->getExtData( "xenhvm-group-selector-name" );
+        } else if ($this->configOptionVirtualizationType == "Xen-HVM") {
+            if ($this->getExtData("xenhvm-group-selector-name")) {
+                $configTypeG = $this->getExtData("xenhvm-group-selector-name");
             } else {
                 $configTypeG = "Location";
             }
-        } else if ( $this->configOptionVirtualizationType == "KVM" ) {
-            if ( $this->getExtData( "kvm-group-selector-name" ) ) {
-                $configTypeG = $this->getExtData( "kvm-group-selector-name" );
+        } else if ($this->configOptionVirtualizationType == "KVM") {
+            if ($this->getExtData("kvm-group-selector-name")) {
+                $configTypeG = $this->getExtData("kvm-group-selector-name");
             } else {
                 $configTypeG = "Location";
             }
         }
 
-        if ( ! isset( $this->configOption[ $configTypeG ] ) ) {
-            $splitGroup            = explode( "|", $this->getParam( "configoption9" ) );
+        if (!isset($this->configOption[$configTypeG])) {
+            $splitGroup = explode("|", $this->getParam("configoption9"));
             $configOptionNodeGroup = $splitGroup[0];
 
             $buildGroup = $configOptionNodeGroup;
 
         } else {
-            $groupsplit = explode( "|", $this->configOption[ $configTypeG ] );
+            $groupsplit = explode("|", $this->configOption[$configTypeG]);
             $buildGroup = $groupsplit[0];
 
         }
@@ -388,130 +400,137 @@ public function getBuildGroup() {
 
     }
 
-    public function getCmem() {
-        if ( $this->getExtData( "custom-config-memory" ) ) {
-            $custom_config_memory = $this->getExtData( "custom-config-memory" );
+    public function getCmem()
+    {
+        if ($this->getExtData("custom-config-memory")) {
+            $custom_config_memory = $this->getExtData("custom-config-memory");
         } else {
             $custom_config_memory = "Memory";
         }
 
-        if ( ! isset( $this->configOption[ $custom_config_memory ] ) ) {
+        if (!isset($this->configOption[$custom_config_memory])) {
             $cmem = "";
         } else {
-            $memsplit = explode( "|", $this->configOption[ $custom_config_memory ] );
-            $cmem     = $memsplit[0];
+            $memsplit = explode("|", $this->configOption[$custom_config_memory]);
+            $cmem = $memsplit[0];
         }
 
         return $cmem;
     }
 
-    public function getCdisk() {
+    public function getCdisk()
+    {
 
-        if ( $this->getExtData( "custom-config-diskspace" ) ) {
-            $custom_config_diskspace = $this->getExtData( "custom-config-diskspace" );
+        if ($this->getExtData("custom-config-diskspace")) {
+            $custom_config_diskspace = $this->getExtData("custom-config-diskspace");
         } else {
             $custom_config_diskspace = "Disk Space";
         }
 
-        if ( ! isset( $this->configOption[ $custom_config_diskspace ] ) ) {
+        if (!isset($this->configOption[$custom_config_diskspace])) {
             $cdisk = "";
         } else {
-            $disksplit = explode( "|", $this->configOption[ $custom_config_diskspace ] );
-            $cdisk     = $disksplit[0];
+            $disksplit = explode("|", $this->configOption[$custom_config_diskspace]);
+            $cdisk = $disksplit[0];
         }
 
         return $cdisk;
     }
 
-    public function getCbandwidth() {
-        if ( $this->getExtData( "custom-config-bandwidth" ) ) {
-            $custom_config_bandwidth = $this->getExtData( "custom-config-bandwidth" );
+    public function getCbandwidth()
+    {
+        if ($this->getExtData("custom-config-bandwidth")) {
+            $custom_config_bandwidth = $this->getExtData("custom-config-bandwidth");
         } else {
             $custom_config_bandwidth = "Bandwidth";
         }
 
-        if ( ! isset( $this->configOption[ $custom_config_bandwidth ] ) ) {
+        if (!isset($this->configOption[$custom_config_bandwidth])) {
             $cbandwidth = "";
         } else {
-            $bandwidthsplit = explode( "|", $this->configOption[ $custom_config_bandwidth ] );
-            $cbandwidth     = $bandwidthsplit[0];
+            $bandwidthsplit = explode("|", $this->configOption[$custom_config_bandwidth]);
+            $cbandwidth = $bandwidthsplit[0];
         }
 
         return $cbandwidth;
     }
 
-    public function getCcpu() {
-        if ( $this->getExtData( "custom-config-cpu" ) ) {
-            $custom_config_cpu = $this->getExtData( "custom-config-cpu" );
+    public function getCcpu()
+    {
+        if ($this->getExtData("custom-config-cpu")) {
+            $custom_config_cpu = $this->getExtData("custom-config-cpu");
         } else {
             $custom_config_cpu = "CPU";
         }
 
-        if ( ! isset( $this->configOption[ $custom_config_cpu ] ) ) {
+        if (!isset($this->configOption[$custom_config_cpu])) {
             $ccpu = "";
         } else {
-            $cpusplit = explode( "|", $this->configOption[ $custom_config_cpu ] );
-            $ccpu     = $cpusplit[0];
+            $cpusplit = explode("|", $this->configOption[$custom_config_cpu]);
+            $ccpu = $cpusplit[0];
         }
 
         return $ccpu;
     }
 
-    public function getCextraip() {
-        if ( $this->getExtData( "custom-config-extraip" ) ) {
-            $custom_config_extraip = $this->getExtData( "custom-config-extraip" );
+    public function getCextraip()
+    {
+        if ($this->getExtData("custom-config-extraip")) {
+            $custom_config_extraip = $this->getExtData("custom-config-extraip");
         } else {
             $custom_config_extraip = "Extra IP Address";
         }
 
-        if ( ! isset( $this->configOption[ $custom_config_extraip ] ) ) {
+        if (!isset($this->configOption[$custom_config_extraip])) {
             $cextraip = "";
         } else {
-            $extraipsplit = explode( "|", $this->configOption[ $custom_config_extraip ] );
-            $cextraip     = $extraipsplit[0];
+            $extraipsplit = explode("|", $this->configOption[$custom_config_extraip]);
+            $cextraip = $extraipsplit[0];
         }
 
         return $cextraip;
     }
 
-    public function getCnspeed() {
-        if ( $this->getExtData( "custom-config-nspeed" ) ) {
-            $custom_config_nspeed = $this->getExtData( "custom-config-nspeed" );
+    public function getCnspeed()
+    {
+        if ($this->getExtData("custom-config-nspeed")) {
+            $custom_config_nspeed = $this->getExtData("custom-config-nspeed");
         } else {
             $custom_config_nspeed = "Network Speed";
         }
 
-        if ( ! isset( $this->configOption[ $custom_config_nspeed ] ) ) {
+        if (!isset($this->configOption[$custom_config_nspeed])) {
             $cextraspeed = "";
         } else {
-            $extraspeedsplit = explode( "|", $this->configOption[ $custom_config_nspeed ] );
-            $cextraspeed     = $extraspeedsplit[0];
+            $extraspeedsplit = explode("|", $this->configOption[$custom_config_nspeed]);
+            $cextraspeed = $extraspeedsplit[0];
         }
 
         return $cextraspeed;
     }
 
-    public function getHostname() {
+    public function getHostname()
+    {
         ## Sort the hostname
-        $domain = $this->getParam( 'domain' );
-        if ( ! empty( $domain ) ) {
-            $currentHostname         = $this->getParam( 'domain' );
-            $currentHostnameLastChar = substr( $currentHostname, - 1 );
-            if ( ! strcmp( $currentHostnameLastChar, "." ) ) {
-                $newHostname = substr( $currentHostname, 0, - 1 );
-                $this->setHostname( $newHostname );
+        $domain = $this->getParam('domain');
+        if (!empty($domain)) {
+            $currentHostname = $this->getParam('domain');
+            $currentHostnameLastChar = substr($currentHostname, -1);
+            if (!strcmp($currentHostnameLastChar, ".")) {
+                $newHostname = substr($currentHostname, 0, -1);
+                $this->setHostname($newHostname);
             } else {
-                $newHostname = $this->getParam( 'domain' );
+                $newHostname = $this->getParam('domain');
             }
         } else {
-            if ( $this->getExtData( "default-hostname" ) ) {
-                $newHostname = $this->getExtData( "default-hostname" );
+            if ($this->getExtData("default-hostname")) {
+                $newHostname = $this->getExtData("default-hostname");
             } else {
                 $newHostname = "vps.server.com";
             }
         }
 
-        if ( $newHostname == "" ) {
+        if ($newHostname == "") {
             $newHostname = "vps.server.com";
         }
 
@@ -519,307 +538,311 @@ public function getHostname() {
 
     }
 
-    public function getNewDataPassword() {
-        if ( $this->getParam( 'password' ) == 'auto-generated' || $this->getParam( 'password' ) == "" ) {
+    public function getNewDataPassword()
+    {
+        if ($this->getParam('password') == 'auto-generated' || $this->getParam('password') == "") {
             $this->params['password'] = $this->passwordGen();
-            $passwordenc              = encrypt( $this->params['password'] );
-            Capsule::table( 'tblhosting' )
-                   ->where( 'id', $this->serviceid )
-                   ->update(
-                       [
-                           'password' => $passwordenc,
-                       ]
-                   );
-        }
-        $newData         = Capsule::table( 'tblhosting' )->where( 'id', $this->serviceid )->first();
-        $newDataPassword = decrypt( $newData->password );
+            $passwordenc = encrypt($this->params['password']);
+            Capsule::table('tblhosting')
+                ->where('id', $this->serviceid)
+                ->update(
+                    [
+                        'password' => $passwordenc,
+                    ]
+                );
+        }
+        $newData = Capsule::table('tblhosting')->where('id', $this->serviceid)->first();
+        $newDataPassword = decrypt($newData->password);
 
         return $newDataPassword;
     }
 
 
-    public function removeipTerminatedProduct() {
-        if ( $this->getExtData( "removeip-terminated-product" ) != "no" ) {
+    public function removeipTerminatedProduct()
+    {
+        if ($this->getExtData("removeip-terminated-product") != "no") {
             ## remove the ip's
-            Capsule::table( 'tblhosting' )
-                   ->where( 'id', $this->serviceid )
-                   ->update(
-                       [
-                           'dedicatedip' => '',
-                           'assignedips' => '',
-
-                       ]
-                   );
+            Capsule::table('tblhosting')
+                ->where('id', $this->serviceid)
+                ->update(
+                    [
+                        'dedicatedip' => '',
+                        'assignedips' => '',
+
+                    ]
+                );
         }
 
     }
 
-    public function removevserveridTerminatedProduct() {
-        if ( $this->getExtData( "removevserverid-terminated-product" ) != "no" ) {
-            $this->setCustomfieldsValue( 'vserverid', "" );
+    public function removevserveridTerminatedProduct()
+    {
+        if ($this->getExtData("removevserverid-terminated-product") != "no") {
+            $this->setCustomfieldsValue('vserverid', "");
         }
     }
 
-    public function setCustomfieldsValue( $field, $value ) {
-        $value = (string) $value;
-
-        $res = Capsule::table( 'tblcustomfields' )->where( 'relid', $this->pid )->where( 'fieldname', $field )->first();
-        if ( $res ) {
-            $fieldValue = Capsule::table( 'tblcustomfieldsvalues' )->where( 'relid', $this->serviceid )->where( 'fieldid', $res->id )->first();
-            if ( $fieldValue ) {
-                if ( $fieldValue->value !== $value ) {
-                    Capsule::table( 'tblcustomfieldsvalues' )
-                           ->where( 'relid', $this->serviceid )
-                           ->where( 'fieldid', $res->id )
-                           ->update(
-                               [
-                                   'value' => $value,
-                               ]
-                           );
+    public function setCustomfieldsValue($field, $value)
+    {
+        $value = (string)$value;
+
+        $res = Capsule::table('tblcustomfields')->where('relid', $this->pid)->where('fieldname', $field)->first();
+        if ($res) {
+            $fieldValue = Capsule::table('tblcustomfieldsvalues')->where('relid', $this->serviceid)->where('fieldid', $res->id)->first();
+            if ($fieldValue) {
+                if ($fieldValue->value !== $value) {
+                    Capsule::table('tblcustomfieldsvalues')
+                        ->where('relid', $this->serviceid)
+                        ->where('fieldid', $res->id)
+                        ->update(
+                            [
+                                'value' => $value,
+                            ]
+                        );
                 }
             } else {
-                Capsule::table( 'tblcustomfieldsvalues' )
-                       ->insert(
-                           [
-                               'relid'   => $this->serviceid,
-                               'fieldid' => $res->id,
-                               'value'   => $value,
-                           ]
-                       );
+                Capsule::table('tblcustomfieldsvalues')
+                    ->insert(
+                        [
+                            'relid' => $this->serviceid,
+                            'fieldid' => $res->id,
+                            'value' => $value,
+                        ]
+                    );
             }
         }
     }
 
-    public function clientAreaCalculations( $result ) {
+    public function clientAreaCalculations($result)
+    {
         global $_LANG;
 
-            $cparams = array(
-                "displaymemorybar"     => 0,
-                "displayhddbar"        => 0,
-                "displaybandwidthbar"  => 0,
-                "displaygraphs"        => 0,
-                "displayips"           => 0,
-                "displayhtml5console"  => 0,
-                "displayconsole"       => 0,
-                "displayvnc"           => 0,
-                "displayvncpassword"   => 0,
-                "displaypanelbutton"   => 0,
-                "displayrootpassword"  => 0,
-                "displayhostname"      => 0,
-                "displayreboot"        => 0,
-                "displayshutdown"      => 0,
-                "displayboot"          => 0,
-                "displayclientkeyauth" => 0,
-                "clientkeyautherror"   => 0,
-                "displaytrafficgraph"  => 0,
-                "displayloadgraph"     => 0,
-                "displaymemorygraph"   => 0,
-                "displayrescuemode"    => 0,
-            );
+        $cparams = array(
+            "displaymemorybar" => 0,
+            "displayhddbar" => 0,
+            "displaybandwidthbar" => 0,
+            "displaygraphs" => 0,
+            "displayips" => 0,
+            "displayhtml5console" => 0,
+            "displayconsole" => 0,
+            "displayvnc" => 0,
+            "displayvncpassword" => 0,
+            "displaypanelbutton" => 0,
+            "displayrootpassword" => 0,
+            "displayhostname" => 0,
+            "displayreboot" => 0,
+            "displayshutdown" => 0,
+            "displayboot" => 0,
+            "displayclientkeyauth" => 0,
+            "clientkeyautherror" => 0,
+            "displaytrafficgraph" => 0,
+            "displayloadgraph" => 0,
+            "displaymemorygraph" => 0,
+            "displayrescuemode" => 0,
+        );
 
-            $vstatusAr = array(
-                'online'  => array(
-                    'msg'   => $_LANG['solusvmpro_online'],
-                    'color' => ( isset($this->configIni['statusOnlineColor'] ) ? $this->configIni['statusOnlineColor'] : '0C0')
-                ),
-                'offline' => array(
-                    'msg'   => $_LANG['solusvmpro_offline'],
-                    'color' => ( isset($this->configIni['statusOfflineColor'] ) ? $this->configIni['statusOfflineColor'] : 'F00')
-                ),
-                'disabled' => array(
-                    'msg'   => $_LANG['solusvmpro_suspended'],
-                    'color' => ( isset($this->configIni['statusDisabledColor'] ) ? $this->configIni['statusDisabledColor'] : '000')
-                ),
-                'unavailable' => array(
-                    'msg'   => $_LANG['solusvmpro_unavailable'],
-                    'color' => ( isset($this->configIni['statusUnavailableColor'] ) ? $this->configIni['statusUnavailableColor'] : '000')
-                )
-            );
+        $vstatusAr = array(
+            'online' => array(
+                'msg' => $_LANG['solusvmpro_online'],
+                'color' => (isset($this->configIni['statusOnlineColor']) ? $this->configIni['statusOnlineColor'] : '0C0')
+            ),
+            'offline' => array(
+                'msg' => $_LANG['solusvmpro_offline'],
+                'color' => (isset($this->configIni['statusOfflineColor']) ? $this->configIni['statusOfflineColor'] : 'F00')
+            ),
+            'disabled' => array(
+                'msg' => $_LANG['solusvmpro_suspended'],
+                'color' => (isset($this->configIni['statusDisabledColor']) ? $this->configIni['statusDisabledColor'] : '000')
+            ),
+            'unavailable' => array(
+                'msg' => $_LANG['solusvmpro_unavailable'],
+                'color' => (isset($this->configIni['statusUnavailableColor']) ? $this->configIni['statusUnavailableColor'] : '000')
+            )
+        );
 
-            if ( $result["status"] == "success" ) {
-                $vstatus = '<span style="color: #'.$vstatusAr[$result["state"]]['color'].'"><strong>' . $vstatusAr[$result["state"]]['msg'] . '</strong></span>';
+        if ($result["status"] == "success") {
+            $vstatus = '<span style="color: #' . $vstatusAr[$result["state"]]['color'] . '"><strong>' . $vstatusAr[$result["state"]]['msg'] . '</strong></span>';
+        } else {
+            $vstatus = '<span style="color: #' . $vstatusAr['unavailable']['color'] . '"><strong>' . $vstatusAr['unavailable']['msg'] . '</strong></span>';
+        }
+
+        $cparams["displaystatus"] = $vstatus;
+        $cparams["node"] = $result["node"];
+
+        if ($result["state"] == "online" || $result["state"] == "offline") {
+            //Bandwidth graph
+            $bandwidthData = explode(",", $result["bandwidth"]);
+            $usedBwPercentage = $bandwidthData[3];
+            $bandwidthData[1] = $bandwidthData[1] / 1024;
+            $bandwidthData[2] = $bandwidthData[2] / 1024;
+            $bandwidthData[0] = $bandwidthData[0] / 1024;
+            $bwUsed = $this->bwFormat($bandwidthData[1]);
+            $bwFree = $this->bwFormat($bandwidthData[2]);
+            $bwTotal = $this->bwFormat($bandwidthData[0]);
+
+            $bwGraphColor = "#";
+            if ($usedBwPercentage < 75) {
+                $bwGraphColor .= (isset($this->configIni['pbSuccessColor']) ? $this->configIni['pbSuccessColor'] : '36e22d');
+            } else if ($usedBwPercentage > 90) {
+                $bwGraphColor .= (isset($this->configIni['pbDangerColor']) ? $this->configIni['pbDangerColor'] : 'f82812');
             } else {
-                $vstatus = '<span style="color: #'.$vstatusAr['unavailable']['color'].'"><strong>' . $vstatusAr['unavailable']['msg'] . '</strong></span>';
+                $bwGraphColor .= (isset($this->configIni['pbWarningColor']) ? $this->configIni['pbWarningColor'] : 'f8aa12');
             }
 
-            $cparams["displaystatus"] = $vstatus;
-            $cparams["node"] = $result["node"];
-
-            if ($result["state"] == "online" || $result["state"] == "offline") {
-                //Bandwidth graph
-                $bandwidthData    = explode(",", $result["bandwidth"]);
-                $usedBwPercentage = $bandwidthData[3];
-                $bandwidthData[1] = $bandwidthData[1] / 1024;
-                $bandwidthData[2] = $bandwidthData[2] / 1024;
-                $bandwidthData[0] = $bandwidthData[0] / 1024;
-                $bwUsed           = $this->bwFormat($bandwidthData[1]);
-                $bwFree           = $this->bwFormat($bandwidthData[2]);
-                $bwTotal          = $this->bwFormat($bandwidthData[0]);
-
-                $bwGraphColor = "#";
-                if ($usedBwPercentage < 75) {
-                    $bwGraphColor .= (isset($this->configIni['pbSuccessColor']) ? $this->configIni['pbSuccessColor'] : '36e22d');
-                } else if ($usedBwPercentage > 90) {
-                    $bwGraphColor .= (isset($this->configIni['pbDangerColor']) ? $this->configIni['pbDangerColor'] : 'f82812');
-                } else {
-                    $bwGraphColor .= (isset($this->configIni['pbWarningColor']) ? $this->configIni['pbWarningColor'] : 'f8aa12');
-                }
-
-                if ($this->getExtData("bwusage") != "disable") {
-
-                    $cparams["displaybandwidthbar"] = 1;
-                    $cparams["bandwidthpercent"]    = $usedBwPercentage;
-                    $cparams["bandwidthcolor"]      = $bwGraphColor;
-                    $cparams["bandwidthused"]       = $bwUsed;
-                    $cparams["bandwidthtotal"]      = $bwTotal;
-                    $cparams["bandwidthfree"]       = $bwFree;
-                }
+            if ($this->getExtData("bwusage") != "disable") {
 
-                //Memory graph
-                if ($result["type"] == "openvz") {
-                    if ($this->getExtData("memusage") != "disable") {
-                        $memData           = explode(",", $result["memory"]);
-                        $usedMemPercentage = $memData[3];
-                        $memData[1]        = $memData[1] / 1024;
-                        $memData[2]        = $memData[2] / 1024;
-                        $memData[0]        = $memData[0] / 1024;
-                        $memUsed           = $this->bwFormat($memData[1]);
-                        $memFree           = $this->bwFormat($memData[2]);
-                        $memTotal          = $this->bwFormat($memData[0]);
-
-                        $memGraphColor = "#";
-                        if ($usedMemPercentage < 75) {
-                            $memGraphColor .= (isset($this->configIni['pbSuccessColor']) ? $this->configIni['pbSuccessColor'] : '36e22d');
-                        } else if ($usedMemPercentage > 90) {
-                            $memGraphColor .= (isset($this->configIni['pbDangerColor']) ? $this->configIni['pbDangerColor'] : 'f82812');
-                        } else {
-                            $memGraphColor .= (isset($this->configIni['pbWarningColor']) ? $this->configIni['pbWarningColor'] : 'f8aa12');
-                        }
+                $cparams["displaybandwidthbar"] = 1;
+                $cparams["bandwidthpercent"] = $usedBwPercentage;
+                $cparams["bandwidthcolor"] = $bwGraphColor;
+                $cparams["bandwidthused"] = $bwUsed;
+                $cparams["bandwidthtotal"] = $bwTotal;
+                $cparams["bandwidthfree"] = $bwFree;
+            }
 
-                        $cparams["displaymemorybar"] = 1;
-                        $cparams["memorypercent"]    = $usedMemPercentage;
-                        $cparams["memorycolor"]      = $memGraphColor;
-                        $cparams["memoryused"]       = $memUsed;
-                        $cparams["memorytotal"]      = $memTotal;
-                        $cparams["memoryfree"]       = $memFree;
+            //Memory graph
+            if ($result["type"] == "openvz") {
+                if ($this->getExtData("memusage") != "disable") {
+                    $memData = explode(",", $result["memory"]);
+                    $usedMemPercentage = $memData[3];
+                    $memData[1] = $memData[1] / 1024;
+                    $memData[2] = $memData[2] / 1024;
+                    $memData[0] = $memData[0] / 1024;
+                    $memUsed = $this->bwFormat($memData[1]);
+                    $memFree = $this->bwFormat($memData[2]);
+                    $memTotal = $this->bwFormat($memData[0]);
+
+                    $memGraphColor = "#";
+                    if ($usedMemPercentage < 75) {
+                        $memGraphColor .= (isset($this->configIni['pbSuccessColor']) ? $this->configIni['pbSuccessColor'] : '36e22d');
+                    } else if ($usedMemPercentage > 90) {
+                        $memGraphColor .= (isset($this->configIni['pbDangerColor']) ? $this->configIni['pbDangerColor'] : 'f82812');
+                    } else {
+                        $memGraphColor .= (isset($this->configIni['pbWarningColor']) ? $this->configIni['pbWarningColor'] : 'f8aa12');
                     }
-                }
 
-                //HDD graph
-                if ($result["type"] == "openvz" || $result["type"] == "xen") {
-                    if ($this->getExtData("diskusage") != "disable") {
-                        $hddData           = explode(",", $result["hdd"]);
-                        $usedHddPercentage = $hddData[3];
-                        $hddData[1]        = $hddData[1] / 1024;
-                        $hddData[2]        = $hddData[2] / 1024;
-                        $hddData[0]        = $hddData[0] / 1024;
-                        $hddUsed           = $this->bwFormat($hddData[1]);
-                        $hddFree           = $this->bwFormat($hddData[2]);
-                        $hddTotal          = $this->bwFormat($hddData[0]);
-
-                        $hddGraphColor = "#";
-                        if ($usedHddPercentage < 75) {
-                            $hddGraphColor .= (isset($this->configIni['pbSuccessColor']) ? $this->configIni['pbSuccessColor'] : '36e22d');
-                        } else if ($usedHddPercentage > 90) {
-                            $hddGraphColor .= (isset($this->configIni['pbDangerColor']) ? $this->configIni['pbDangerColor'] : 'f82812');
-                        } else {
-                            $hddGraphColor .= (isset($this->configIni['pbWarningColor']) ? $this->configIni['pbWarningColor'] : 'f8aa12');
-                        }
+                    $cparams["displaymemorybar"] = 1;
+                    $cparams["memorypercent"] = $usedMemPercentage;
+                    $cparams["memorycolor"] = $memGraphColor;
+                    $cparams["memoryused"] = $memUsed;
+                    $cparams["memorytotal"] = $memTotal;
+                    $cparams["memoryfree"] = $memFree;
+                }
+            }
 
-                        $cparams["displayhddbar"] = 1;
-                        $cparams["hddpercent"]    = $usedHddPercentage;
-                        $cparams["hddcolor"]      = $hddGraphColor;
-                        $cparams["hddused"]       = $hddUsed;
-                        $cparams["hddtotal"]      = $hddTotal;
-                        $cparams["hddfree"]       = $hddFree;
+            //HDD graph
+            if ($result["type"] == "openvz" || $result["type"] == "xen") {
+                if ($this->getExtData("diskusage") != "disable") {
+                    $hddData = explode(",", $result["hdd"]);
+                    $usedHddPercentage = $hddData[3];
+                    $hddData[1] = $hddData[1] / 1024;
+                    $hddData[2] = $hddData[2] / 1024;
+                    $hddData[0] = $hddData[0] / 1024;
+                    $hddUsed = $this->bwFormat($hddData[1]);
+                    $hddFree = $this->bwFormat($hddData[2]);
+                    $hddTotal = $this->bwFormat($hddData[0]);
+
+                    $hddGraphColor = "#";
+                    if ($usedHddPercentage < 75) {
+                        $hddGraphColor .= (isset($this->configIni['pbSuccessColor']) ? $this->configIni['pbSuccessColor'] : '36e22d');
+                    } else if ($usedHddPercentage > 90) {
+                        $hddGraphColor .= (isset($this->configIni['pbDangerColor']) ? $this->configIni['pbDangerColor'] : 'f82812');
+                    } else {
+                        $hddGraphColor .= (isset($this->configIni['pbWarningColor']) ? $this->configIni['pbWarningColor'] : 'f8aa12');
                     }
+
+                    $cparams["displayhddbar"] = 1;
+                    $cparams["hddpercent"] = $usedHddPercentage;
+                    $cparams["hddcolor"] = $hddGraphColor;
+                    $cparams["hddused"] = $hddUsed;
+                    $cparams["hddtotal"] = $hddTotal;
+                    $cparams["hddfree"] = $hddFree;
                 }
             }
+        }
+
+        if ($this->getExtData("graphs") != "disable") {
+            $cparams["displaygraphs"] = 1;
+        }
+        if ($this->getExtData("iplist") != "disable") {
+            $cparams["displayips"] = 1;
+            $cparams["ipcsv"] = $result["ipaddresses"];
+        }
+        $cparams["mainip"] = $result["mainipaddress"];
 
-            if ( $this->getExtData( "graphs" ) != "disable" ) {
-                $cparams["displaygraphs"] = 1;
+        if ($result["type"] == "openvz" || $result["type"] == "xen") {
+            if ($this->getExtData("serialconsole") != "disable") {
+                $cparams["displayconsole"] = 1;
             }
-            if ( $this->getExtData( "iplist" ) != "disable" ) {
-                $cparams["displayips"] = 1;
-                $cparams["ipcsv"]      = $result["ipaddresses"];
+            if ($this->getExtData("rootpassword") != "disable") {
+                $cparams["displayrootpassword"] = 1;
             }
-            $cparams["mainip"] = $result["mainipaddress"];
-
-            if ( $result["type"] == "openvz" || $result["type"] == "xen" ) {
-                if ( $this->getExtData( "serialconsole" ) != "disable" ) {
-                    $cparams["displayconsole"] = 1;
-                }
-                if ( $this->getExtData( "rootpassword" ) != "disable" ) {
-                    $cparams["displayrootpassword"] = 1;
-                }
-                if ( $this->getExtData( "hostname" ) != "disable" ) {
-                    $cparams["displayhostname"] = 1;
-                }
-                if ( $this->getExtData( "html5serialconsole" ) != "disable" ) {
-                    $cparams["displayhtml5console"] = 1;
-                }
-            } else {
-                if ( $this->getExtData( "vnc" ) != "disable" ) {
-                    $cparams["displayvnc"] = 1;
-                }
-                if ( $this->getExtData( "vncpassword" ) != "disable" ) {
-                    $cparams["displayvncpassword"] = 1;
-                }
+            if ($this->getExtData("hostname") != "disable") {
+                $cparams["displayhostname"] = 1;
             }
-
-            if ( $result['type'] == 'kvm' ) {
-                $cparams['displayrescuemode'] = 1;
-                $cparams['rescuemode'] = $result['rescuemode'];
+            if ($this->getExtData("html5serialconsole") != "disable") {
+                $cparams["displayhtml5console"] = 1;
             }
-
-            if ( $this->getExtData( "controlpanelbutton" ) != "" ) {
-                $cparams["displaypanelbutton"] = 1;
-                $cparams["controlpanellink"]   = $this->getExtData( "controlpanelbutton" );
+        } else {
+            if ($this->getExtData("vnc") != "disable") {
+                $cparams["displayvnc"] = 1;
             }
+            if ($this->getExtData("vncpassword") != "disable") {
+                $cparams["displayvncpassword"] = 1;
+            }
+        }
+
+        if ($result['type'] == 'kvm') {
+            $cparams['displayrescuemode'] = 1;
+            $cparams['rescuemode'] = $result['rescuemode'];
+        }
 
+        if ($this->getExtData("controlpanelbutton") != "") {
+            $cparams["displaypanelbutton"] = 1;
+            $cparams["controlpanellink"] = $this->getExtData("controlpanelbutton");
+        }
 
-            if ( $this->getExtData( "reboot" ) != "disable" ) {
-                $cparams["displayreboot"] = 1;
-            }
 
-            if ( $this->getExtData( "shutdown" ) != "disable" ) {
-                $cparams["displayshutdown"] = 1;
-            }
+        if ($this->getExtData("reboot") != "disable") {
+            $cparams["displayreboot"] = 1;
+        }
 
-            if ( $this->getExtData( "boot" ) != "disable" ) {
-                $cparams["displayboot"] = 1;
-            }
+        if ($this->getExtData("shutdown") != "disable") {
+            $cparams["displayshutdown"] = 1;
+        }
 
-            if ( $this->getExtData( "clientkeyauth" ) != "" ) {
-                $cparams["displayclientkeyauth"] = 1;
-            }
+        if ($this->getExtData("boot") != "disable") {
+            $cparams["displayboot"] = 1;
+        }
 
-            if ( $this->getExtData( "clientkeyauthreturnurl" ) != "" ) {
-                $cparams["clientkeyauthreturnurl"] = $this->getExtData( "clientkeyauthreturnurl" );
-            }
+        if ($this->getExtData("clientkeyauth") != "") {
+            $cparams["displayclientkeyauth"] = 1;
+        }
 
+        if ($this->getExtData("clientkeyauthreturnurl") != "") {
+            $cparams["clientkeyauthreturnurl"] = $this->getExtData("clientkeyauthreturnurl");
+        }
 
 
-        if ( $this->getExtData( "graphs" ) != "disable" ) {
-            $url = $this->apiCall( "fwdurl" );
+        if ($this->getExtData("graphs") != "disable") {
+            $url = $this->apiCall("fwdurl");
 
-            if ( isset( $result["trafficgraph"] ) ) {
+            if (isset($result["trafficgraph"])) {
                 $cparams["displaytrafficgraph"] = 1;
-                $cparams["trafficgraphurl"]     = $url . $result['trafficgraph'];
+                $cparams["trafficgraphurl"] = $url . $result['trafficgraph'];
 
-                if ( $result["type"] == "kvm" || $result["type"] == "xen"){
+                if ($result["type"] == "kvm" || $result["type"] == "xen") {
                     $cparams["displayhddgraph"] = 1;
                     $result['hddgraph'] = str_replace("bandwidth", "io", $result['trafficgraph']);
-                    $cparams["hddgraphurl"]     = $url . $result['hddgraph'];
+                    $cparams["hddgraphurl"] = $url . $result['hddgraph'];
                 }
             }
-            if ( isset( $result["loadgraph"] ) ) {
+            if (isset($result["loadgraph"])) {
                 $cparams["displayloadgraph"] = 1;
-                $cparams["loadgraphurl"]     = $url . $result['loadgraph'];
+                $cparams["loadgraphurl"] = $url . $result['loadgraph'];
             }
-            if ( isset( $result["memorygraph"] ) ) {
+            if (isset($result["memorygraph"])) {
                 $cparams["displaymemorygraph"] = 1;
-                $cparams["memorygraphurl"]     = $url . $result['memorygraph'];
+                $cparams["memorygraphurl"] = $url . $result['memorygraph'];
             }
             $cparams["displaygraphs"] = 1;
         }
@@ -827,41 +850,42 @@ public function clientAreaCalculations( $result ) {
         return $cparams;
     }
 
-    public function clientAreaCommands() {
+    public function clientAreaCommands()
+    {
 
-        if ( $_POST['logintosolusvm'] ) {
+        if ($_POST['logintosolusvm']) {
 
-            if ( $this->getExtData( "clientkeyauthreturnurl" ) != "" ) {
-                $sysurl                            = $this->getExtData( "clientkeyauthreturnurl" );
-                $cparams["clientkeyauthreturnurl"] = $this->getExtData( "clientkeyauthreturnurl" );
+            if ($this->getExtData("clientkeyauthreturnurl") != "") {
+                $sysurl = $this->getExtData("clientkeyauthreturnurl");
+                $cparams["clientkeyauthreturnurl"] = $this->getExtData("clientkeyauthreturnurl");
             } else {
-                $query  = Capsule::table( 'tblconfiguration' )->where( 'setting', 'SystemURL' )->first();
+                $query = Capsule::table('tblconfiguration')->where('setting', 'SystemURL')->first();
                 $sysurl = $query->value;
             }
 
             $vserverID = '';
-            if ( isset( $this->getParam( "customfields" )["vserverid"] ) && $this->getParam( "customfields" )["vserverid"] !== '' ) {
-                $vserverID = $this->getParam( "customfields" )["vserverid"];
+            if (isset($this->getParam("customfields")["vserverid"]) && $this->getParam("customfields")["vserverid"] !== '') {
+                $vserverID = $this->getParam("customfields")["vserverid"];
             } else {
                 $vserverID = $this->params['vserver'];
             }
 
             $callArray = array(
                 "vserverid" => $vserverID,
-                "forward"   => "1",
-                "returnurl" => $sysurl . "clientarea.php?action=productdetails&id=" . $this->getParam( 'serviceid' ),
+                "forward" => "1",
+                "returnurl" => $sysurl . "clientarea.php?action=productdetails&id=" . $this->getParam('serviceid'),
             );
 
-            $this->apiCall( 'client-key-login', $callArray );
+            $this->apiCall('client-key-login', $callArray);
             $slogin = $this->result;
 
-            if ( $slogin["status"] == "success" ) {
+            if ($slogin["status"] == "success") {
 
-                $callArray = array( "vserverid" => $this->getParam( "vserverid" ) );
+                $callArray = array("vserverid" => $this->getParam("vserverid"));
                 ## Do the connection
-                $master_url = $this->apiCall( 'fwdurl', $callArray );
+                $master_url = $this->apiCall('fwdurl', $callArray);
 
-                header( "Location: " . $master_url . "/auth.php?_a=" . $slogin["hasha"] . "&_b=" . $slogin["hashb"] );
+                header("Location: " . $master_url . "/auth.php?_a=" . $slogin["hasha"] . "&_b=" . $slogin["hashb"]);
                 exit();
             } else {
                 $cparams["clientkeyautherror"] = 1;
@@ -870,24 +894,25 @@ public function clientAreaCommands() {
     }
 
 
-    public static function dns_verify_rdns_section( $host = "" ) {
+    public static function dns_verify_rdns_section($host = "")
+    {
         $is_valid = false;
-        if ( strlen( $host ) <= 256 && strlen( $host ) >= 4 ) {
-            if ( $host[0] != "-" ) {
-                if ( substr( $host, - 1 ) != "-" ) {
-                    $split_host = explode( ".", $host );
-                    $secs       = count( $split_host );
-                    if ( $secs >= 1 ) {
+        if (strlen($host) <= 256 && strlen($host) >= 4) {
+            if ($host[0] != "-") {
+                if (substr($host, -1) != "-") {
+                    $split_host = explode(".", $host);
+                    $secs = count($split_host);
+                    if ($secs >= 1) {
                         $q = 0;
-                        foreach ( $split_host as $section ) {
-                            $rmvchar = array( '-', ' ' );
-                            if ( preg_match( '/^[a-zA-Z0-9\-]{0,30}$/i', $section ) ) {
-                                if ( ctype_alnum( str_replace( $rmvchar, '', $section ) ) ) {
-                                    $q ++;
+                        foreach ($split_host as $section) {
+                            $rmvchar = array('-', ' ');
+                            if (preg_match('/^[a-zA-Z0-9\-]{0,30}$/i', $section)) {
+                                if (ctype_alnum(str_replace($rmvchar, '', $section))) {
+                                    $q++;
                                 }
                             }
                         }
-                        if ( $q == $secs ) {
+                        if ($q == $secs) {
                             $is_valid = true;
                         }
                     }
@@ -898,10 +923,11 @@ public static function dns_verify_rdns_section( $host = "" ) {
         return $is_valid;
     }
 
-    public static function validateRootPassword( $newRootPassword ) {
+    public static function validateRootPassword($newRootPassword)
+    {
         $is_valid = false;
-        if ( strlen( $newRootPassword ) > 5 ) {
-            if ( preg_match( '/^[a-zA-Z0-9\-_]{0,50}$/i', $newRootPassword ) ) {
+        if (strlen($newRootPassword) > 5) {
+            if (preg_match('/^[a-zA-Z0-9\-_]{0,50}$/i', $newRootPassword)) {
                 $is_valid = true;
             }
         }
@@ -909,10 +935,11 @@ public static function validateRootPassword( $newRootPassword ) {
         return $is_valid;
     }
 
-    public static function validateVNCPassword( $newVNCPassword ) {
+    public static function validateVNCPassword($newVNCPassword)
+    {
         $is_valid = false;
-        if ( strlen( $newVNCPassword ) > 5 ) {
-            if ( preg_match( '/^[a-zA-Z0-9\-_]{0,50}$/i', $newVNCPassword ) ) {
+        if (strlen($newVNCPassword) > 5) {
+            if (preg_match('/^[a-zA-Z0-9\-_]{0,50}$/i', $newVNCPassword)) {
                 $is_valid = true;
             }
         }
@@ -920,71 +947,73 @@ public static function validateVNCPassword( $newVNCPassword ) {
         return $is_valid;
     }
 
-    public static function getParamsFromServiceID( $servid, $uid = null ) {
+    public static function getParamsFromServiceID($servid, $uid = null)
+    {
 
-        $ownerRow = Capsule::table( 'tblhosting' )->where( 'id', $servid )->where( 'userid', $uid )->first();
-        if ( ! $ownerRow ) {
+        $ownerRow = Capsule::table('tblhosting')->where('id', $servid)->where('userid', $uid)->first();
+        if (!$ownerRow) {
             return false;
         }
 
-        if ( ! is_null( $uid ) && $uid != $ownerRow->userid ) {
+        if (!is_null($uid) && $uid != $ownerRow->userid) {
             return false;
         }
 
-        $vserverFieldRow = Capsule::table( 'tblcustomfields' )->where( 'relid', $ownerRow->packageid )->where( 'fieldname', 'vserverid' )->first();
-        if ( ! $vserverFieldRow ) {
+        $vserverFieldRow = Capsule::table('tblcustomfields')->where('relid', $ownerRow->packageid)->where('fieldname', 'vserverid')->first();
+        if (!$vserverFieldRow) {
             return false;
         }
 
-        $vserverValueRow = Capsule::table( 'tblcustomfieldsvalues' )->where( 'fieldid', $vserverFieldRow->id )->where( 'relid', $ownerRow->id )->first();
+        $vserverValueRow = Capsule::table('tblcustomfieldsvalues')->where('fieldid', $vserverFieldRow->id)->where('relid', $ownerRow->id)->first();
 
-        if ( ! $vserverValueRow ) {
+        if (!$vserverValueRow) {
             return false;
         }
 
-        if ( ! is_numeric( $vserverValueRow->value ) ) {
+        if (!is_numeric($vserverValueRow->value)) {
             return false;
         }
 
         $serverid = $ownerRow->server;
-        if ( $serverid == "0" || $serverid == "" ) {
-            $productRow = Capsule::table( 'tblproducts' )->where( 'id', $ownerRow->packageid )->first();
-            $masterPart = explode( "-", $productRow->configoption3 );
-            $serverid   = $masterPart[0];
+        if ($serverid == "0" || $serverid == "") {
+            $productRow = Capsule::table('tblproducts')->where('id', $ownerRow->packageid)->first();
+            $masterPart = explode("-", $productRow->configoption3);
+            $serverid = $masterPart[0];
         }
 
         return array(
-            'serverid'  => $serverid,
-            'vserver'   => $vserverValueRow->value,
+            'serverid' => $serverid,
+            'vserver' => $vserverValueRow->value,
             'serviceid' => $vserverValueRow->relid,
-            'pid'       => $vserverFieldRow->relid,
+            'pid' => $vserverFieldRow->relid,
         );
 
     }
 
-    public static function getParamsFromVserviceID( $vserverid, $uid ) {
+    public static function getParamsFromVserviceID($vserverid, $uid)
+    {
         /** @var stdClass $hosting */
-        foreach ( Capsule::table( 'tblhosting' )->where( 'userid', $uid )->get() as $hosting ) {
+        foreach (Capsule::table('tblhosting')->where('userid', $uid)->get() as $hosting) {
 
-            $vserverFieldRow = Capsule::table( 'tblcustomfields' )->where( 'relid', $hosting->packageid )->where( 'fieldname', 'vserverid' )->first();
-            if ( ! $vserverFieldRow ) {
+            $vserverFieldRow = Capsule::table('tblcustomfields')->where('relid', $hosting->packageid)->where('fieldname', 'vserverid')->first();
+            if (!$vserverFieldRow) {
                 continue;
             }
 
-            $vserverValueRow = Capsule::table( 'tblcustomfieldsvalues' )->where( 'fieldid', $vserverFieldRow->id )->where( 'relid', $hosting->id )->first();
+            $vserverValueRow = Capsule::table('tblcustomfieldsvalues')->where('fieldid', $vserverFieldRow->id)->where('relid', $hosting->id)->first();
 
-            if ( ! $vserverValueRow ) {
+            if (!$vserverValueRow) {
                 continue;
             }
 
-            if ( $vserverid == $vserverValueRow->value ) {
+            if ($vserverid == $vserverValueRow->value) {
                 $serverid = $hosting->server;
 
                 return array(
-                    'serverid'  => $serverid,
-                    'vserver'   => $vserverid,
+                    'serverid' => $serverid,
+                    'vserver' => $vserverid,
                     'serviceid' => $vserverValueRow->relid,
-                    'pid'       => $vserverFieldRow->relid,
+                    'pid' => $vserverFieldRow->relid,
                 );
             }
 
@@ -993,62 +1022,66 @@ public static function getParamsFromVserviceID( $vserverid, $uid ) {
         return false;
     }
 
-    public function bwFormat( $size ) {
-        $bytes  = array( ' KB', ' MB', ' GB', ' TB' );
+    public function bwFormat($size)
+    {
+        $bytes = array(' KB', ' MB', ' GB', ' TB');
         $resVal = '';
-        foreach ( $bytes as $val ) {
+        foreach ($bytes as $val) {
             $resVal = $val;
-            if ( $size >= 1024 ) {
+            if ($size >= 1024) {
                 $size = $size / 1024;
             } else {
                 break;
             }
         }
 
-        return round( $size, 1 ) . $resVal;
+        return round($size, 1) . $resVal;
     }
 
-    public function setHostname( $newhostname ) {
-        if ( ! empty( $this->serviceid ) ) {
-            Capsule::table( 'tblhosting' )
-                   ->where( 'id', $this->serviceid )
-                   ->update(
-                       [
-                           'domain' => $newhostname,
-                       ]
-                   );
+    public function setHostname($newhostname)
+    {
+        if (!empty($this->serviceid)) {
+            Capsule::table('tblhosting')
+                ->where('id', $this->serviceid)
+                ->update(
+                    [
+                        'domain' => $newhostname,
+                    ]
+                );
         }
     }
 
-    public function getVT() {
+    public function getVT()
+    {
         $vt = '';
-        if ( $this->configOptionVirtualizationType == "OpenVZ" ) {
+        if ($this->configOptionVirtualizationType == "OpenVZ") {
             $vt = "openvz";
-        } elseif ( $this->configOptionVirtualizationType == "Xen-PV" ) {
+        } elseif ($this->configOptionVirtualizationType == "Xen-PV") {
             $vt = "xen";
-        } elseif ( $this->configOptionVirtualizationType == "Xen-HVM" ) {
+        } elseif ($this->configOptionVirtualizationType == "Xen-HVM") {
             $vt = "xen hvm";
-        } elseif ( $this->configOptionVirtualizationType == "KVM" ) {
+        } elseif ($this->configOptionVirtualizationType == "KVM") {
             $vt = "kvm";
         }
 
         return $vt;
     }
 
-    public static function loadLang( $lang = null ) {
+    public static function loadLang($lang = null)
+    {
         global $_LANG, $CONFIG;
 
-        $langDir                = __DIR__ . '/../lang/';
-        $availableLangsFullPath = glob( $langDir . '*.php' );
-        $availableLangs         = array();
-        foreach ( $availableLangsFullPath as $availableLang ) {
-            $availableLangs[] = strtolower( basename( $availableLang ) );
+        $langDir = __DIR__ . '/../lang/';
+        $availableLangsFullPath = glob($langDir . '*.php');
+        $availableLangs = array();
+        foreach ($availableLangsFullPath as $availableLang) {
+            $availableLangs[] = strtolower(basename($availableLang));
         }
 
-        if ( empty( $lang ) ) {
-            if ( isset( $_SESSION['Language'] ) ) {
+        if (empty($lang)) {
+            if (isset($_SESSION['Language'])) {
                 $language = $_SESSION['Language'];
-            } else if ( isset( $_SESSION['adminlang'] ) ) {
+            } else if (isset($_SESSION['adminlang'])) {
                 $language = $_SESSION['adminlang'];
             } else {
                 $language = $CONFIG['Language'];
@@ -1057,19 +1090,20 @@ public static function loadLang( $lang = null ) {
             $language = $lang;
         }
 
-        $language = strtolower( $language ) . '.php';
+        $language = strtolower($language) . '.php';
 
-        if ( ! in_array( $language, $availableLangs ) ) {
+        if (!in_array($language, $availableLangs)) {
             $language = 'english.php';
         }
-        require_once( $langDir . $language );
+        require_once($langDir . $language);
     }
 
-    public function debugLog( $module, $action, $requestString, $responseData, $processedData, $replaceVars ) {
-        if ( !$this->configIni[ 'debug' ] ){
+    public function debugLog($module, $action, $requestString, $responseData, $processedData, $replaceVars)
+    {
+        if (!$this->configIni['debug']) {
             return;
         }
-        logModuleCall( $module, $action, $requestString, $responseData, $processedData, $replaceVars );
+        logModuleCall($module, $action, $requestString, $responseData, $processedData, $replaceVars);
     }
 }
 

From f47c0915b150e4c5d2764f1b05c2d272476cf8de Mon Sep 17 00:00:00 2001
From: Elesei <elesei@elesei.com>
Date: Wed, 12 Dec 2018 11:37:48 +0200
Subject: [PATCH 3/5] Adding the ability to check both POST and GET variable

---
 modules/servers/solusvmpro/lib/SolusVM.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/servers/solusvmpro/lib/SolusVM.php b/modules/servers/solusvmpro/lib/SolusVM.php
index 555c001..ec332a3 100644
--- a/modules/servers/solusvmpro/lib/SolusVM.php
+++ b/modules/servers/solusvmpro/lib/SolusVM.php
@@ -852,8 +852,8 @@ public function clientAreaCalculations($result)
 
     public function clientAreaCommands()
     {
-
-        if ($_POST['logintosolusvm']) {
+        global $whmcs;
+        if ($whmcs->get_req_var('logintosolusvm') === 'Manage') {
 
             if ($this->getExtData("clientkeyauthreturnurl") != "") {
                 $sysurl = $this->getExtData("clientkeyauthreturnurl");

From 2063a198e394cb3cd61bf7686b3929a63019e2fd Mon Sep 17 00:00:00 2001
From: Elesei <elesei@elesei.com>
Date: Wed, 12 Dec 2018 13:51:18 +0200
Subject: [PATCH 4/5] add count update services

---
 modules/servers/solusvmpro/configure.ini.example | 1 +
 modules/servers/solusvmpro/solusvmpro.php        | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/servers/solusvmpro/configure.ini.example b/modules/servers/solusvmpro/configure.ini.example
index 100dbba..a9f82fb 100644
--- a/modules/servers/solusvmpro/configure.ini.example
+++ b/modules/servers/solusvmpro/configure.ini.example
@@ -6,6 +6,7 @@ debug = true
 ; UsageUpdate
 ;enableUsageUpdate = true
 ;updateIntervalDay = 2
+;updateServiceCount = 100
 
 ; Theme Customizations
 ; Virtual Server color status (hex color)
diff --git a/modules/servers/solusvmpro/solusvmpro.php b/modules/servers/solusvmpro/solusvmpro.php
index 7ef383e..9754067 100644
--- a/modules/servers/solusvmpro/solusvmpro.php
+++ b/modules/servers/solusvmpro/solusvmpro.php
@@ -1152,11 +1152,14 @@ function solusvmpro_UsageUpdate($params)
     if (!isset($solusvm->configIni['enableUsageUpdate']) || !$solusvm->configIni['enableUsageUpdate']) {
         return false;
     }
-    $ownerRowsHosting = Capsule::table('tblhosting')->where('domainstatus', 'Active')->where('server', $params['serverid']);
+    $ownerRowsHosting = Capsule::table('tblhosting')->whereIn('domainstatus', ['Active', 'Suspended'])->where('server', $params['serverid']);
 
     if (isset($solusvm->configIni['updateIntervalDay'])) {
         $ownerRowsHosting->whereRaw('lastupdate < DATE_ADD(CURDATE(),INTERVAL -' . $solusvm->configIni['updateIntervalDay'] . ' DAY)');
     }
+    if (isset($solusvm->configIni['updateServiceCount'])) {
+        $ownerRowsHosting->limit($solusvm->configIni['updateServiceCount'])->orderBy('lastupdate');
+    }
     $ownerRows = $ownerRowsHosting->get();
 
     if ($ownerRows) {

From 4ad92bcec8a6e34a0f1f95bf637cc1b9bfe44f8f Mon Sep 17 00:00:00 2001
From: Elesei <elesei@elesei.com>
Date: Tue, 4 Jun 2019 20:19:58 +0300
Subject: [PATCH 5/5] fix error ipv6
 https://github.com/plesk/SolusVM-WHMCS-Module/issues/28

---
 modules/servers/solusvmpro/solusvmpro.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/servers/solusvmpro/solusvmpro.php b/modules/servers/solusvmpro/solusvmpro.php
index 9754067..2370078 100644
--- a/modules/servers/solusvmpro/solusvmpro.php
+++ b/modules/servers/solusvmpro/solusvmpro.php
@@ -728,6 +728,13 @@ function solusvmpro_ChangePackage( $params ) {
                 $ips = $ipaddresses[0]->assignedips;
 
                 $lines_arr = explode(PHP_EOL, $ips);
+                $ipsV4 = [];
+                foreach($lines_arr as $ip) {
+                    if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                        $ipsV4[] = $ip;
+                    }
+                }
+                $lines_arr = $ipsV4;
                 $num_current_ips = count($lines_arr);
                 if( empty($lines_arr[0]) ){
                     $num_current_ips -= 1;