Merge pull request #60 from adityawbwce/main

#46 and #48 fix

Author: scop

modules/servers/upCloudVps/lib/configOptions.php

@@ -32,18 +32,9 @@ public function configs(){
     'Default Location' => ['Type' => 'dropdown', 'Options' => $this->getZoneLocation()],
     'Plan' => ['Type' => 'dropdown', 'Options' => $this->getVmplans()],
     'Template' => ['Type' => 'dropdown', 'Options' => $this->getTemplateIds()],
-    //'Backup' => ['Type' => 'dropdown', 'Options' => $this->getBackups()],
-    //'Networking' => ['Type' => 'dropdown', 'Options' => $this->getNetworking()],
     ];
   }
 
-  private function getNetworking()
-  {
-      $nw['ipv4only'] = "Public IPv4 Only";
-      $nw['default'] = "Public Default (IPv4, IPv6 & Utility)";
-      return $nw;
-  }
-
   private function createCustomConfigurableOptions($product)
   {
     $currencyId = Capsule::table('tblcurrencies')->where('default', '1')->first()->id;
@@ -78,7 +69,6 @@ private function createGlobalConfigurableOptions($product)
         $this->createLocationFields($groupId, $zones, $currencyId);
         $this->createTemplateFields($groupId, $pomTemplates, $currencyId, $currencyCode);
         $this->createBackupFields($groupId, $this->getBackups());
-        $this->createIPFields($groupId, $this->getNetworking());
     }
   }
 
@@ -92,16 +82,6 @@ private function createBackupFields($groupId, $backup){
     }
   }
 
-  private function createIPFields($groupId, $ips){
-    $optionId = Capsule::table('tblproductconfigoptions')->where('gid', $groupId)->where('optionname', 'ipaddress|IP Address')->first()->id;
-    if(!$optionId){
-      $optionId = Capsule::table('tblproductconfigoptions')->insertGetId(['gid' => $groupId, 'optionname' => 'ipaddress|IP Address', 'optiontype' => 1]);
-      foreach ($ips as $id => $val) {
-          Capsule::table('tblproductconfigoptionssub')->updateOrInsert(['optionname' => $id.'|'.$val], ['configid' => $optionId]);
-      }
-    }
-  }
-
   private function createRAMFields($groupId, $currencyId, $currencyCode){
     $mems = array();
       for ($i = 4; $i <= 64; $i += 1) {

modules/servers/upCloudVps/lib/vmManager.php

@@ -62,11 +62,11 @@ public function create(){
     $OsUUID = $this->params['configoptions']['template'] ?? $this->params['configoption3'];
     $sshkey = $this->params['customfields']['ssh_key'];
     $user_data = $this->params['customfields']['userData'];
-    $Hostname = $this->params['domain'] ?? 'client' . $this->params['serviceid'] . '.' . $_SERVER['SERVER_NAME'];
+    $Hostname = !empty($this->params['domain']) ? $this->params['domain'] : 'client' . $this->params['serviceid'] . '.' . $_SERVER['SERVER_NAME'];
     $sshkey = empty($sshkey) ? "na" : $sshkey;
     $user_data = empty($user_data) ? "na" : $user_data;
     $backup = $this->params['configoptions']['backup'];
-    $networking = $this->params['configoptions']['ipaddress'];
+    $networking = "ipv4only";
 
     if($Plan == "custom"){
       $ram = $this->params['configoptions']['ram'];