diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 86931d6..4a3f0b4 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\IPs; use App\Models\Labels; use App\Models\OS; use App\Models\Pricing; @@ -54,7 +55,7 @@ class ServerController extends Controller ->Join('os as o', 's.os_id', '=', 'o.id') ->LeftJoin('yabs as y', 's.id', '=', 'y.server_id') ->LeftJoin('disk_speed as ds', 'y.id', '=', 'ds.id') - ->get(['pr.currency', 'pr.price', 'pr.term', 'pr.as_usd', 'pr.next_due_date', 'pr.service_id', 'p.name as provider_name', 'l.name as location', 'o.name as os_name', 'y.*', 'y.id as yabs_id', 'ds.*','s.*']); + ->get(['pr.currency', 'pr.price', 'pr.term', 'pr.as_usd', 'pr.next_due_date', 'pr.service_id', 'p.name as provider_name', 'l.name as location', 'o.name as os_name', 'y.*', 'y.id as yabs_id', 'ds.*', 's.*']); return view('servers.public-index', compact('servers')); } @@ -74,8 +75,8 @@ class ServerController extends Controller $request->validate([ 'hostname' => 'required|min:5', - 'ipv4' => 'nullable|ipv4', - 'ipv6' => 'nullable|ipv6', + 'ip1' => 'nullable|ip', + 'ip2' => 'nullable|ip', 'service_type' => 'numeric', 'server_type' => 'numeric', 'ram' => 'numeric', @@ -94,8 +95,6 @@ class ServerController extends Controller Server::create([ 'id' => $server_id, 'hostname' => $request->hostname, - 'ipv4' => $request->ipv4, - 'ipv6' => $request->ipv6, 'server_type' => $request->server_type, 'os_id' => $request->os_id, 'ssh' => $request->ssh_port, @@ -115,6 +114,30 @@ class ServerController extends Controller 'was_promo' => $request->was_promo ]); + if (!is_null($request->ip1)) { + IPs::create( + [ + 'id' => Str::random(8), + 'service_id' => $server_id, + 'address' => $request->ip1, + 'is_ipv4' => (filter_var($request->ip1, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) ? 0 : 1, + 'active' => 1 + ] + ); + } + + if (!is_null($request->ip2)) { + IPs::create( + [ + 'id' => Str::random(8), + 'service_id' => $server_id, + 'address' => $request->ip2, + 'is_ipv4' => (filter_var($request->ip2, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) ? 0 : 1, + 'active' => 1 + ] + ); + } + $pricing = new Pricing(); $as_usd = $pricing->convertToUSD($request->price, $request->currency); @@ -156,14 +179,18 @@ class ServerController extends Controller $network_speeds = json_decode(DB::table('network_speed') ->where('network_speed.server_id', '=', $server->id) - ->get(),true); + ->get(), true); + + $ip_addresses = json_decode(DB::table('ips as i') + ->where('i.service_id', '=', $server->id) + ->get(), true); $labels = DB::table('labels_assigned as l') ->join('labels', 'l.label_id', '=', 'labels.id') ->where('l.service_id', '=', $server->id) ->get(['labels.label']); - return view('servers.show', compact(['server', 'server_extras', 'network_speeds', 'labels'])); + return view('servers.show', compact(['server', 'server_extras', 'network_speeds', 'labels', 'ip_addresses'])); } public function edit(Server $server) @@ -176,12 +203,17 @@ class ServerController extends Controller ->get(['labels.id', 'labels.label']); $os = DB::table('os')->get(['*']); + + $ip_addresses = json_decode(DB::table('ips as i') + ->where('i.service_id', '=', $server->id) + ->get(), true); + $server = DB::table('servers as s') ->join('pricings as p', 's.id', '=', 'p.service_id') ->where('s.id', '=', $server->id) ->get(['s.*', 'p.*']); - return view('servers.edit', compact(['server', 'locations', 'providers', 'os', 'labels'])); + return view('servers.edit', compact(['server', 'locations', 'providers', 'os', 'labels', 'ip_addresses'])); } public function update(Request $request, Server $server) @@ -203,8 +235,6 @@ class ServerController extends Controller ->where('id', $request->server_id) ->update([ 'hostname' => $request->hostname, - 'ipv4' => $request->ipv4, - 'ipv6' => $request->ipv6, 'server_type' => $request->server_type, 'os_id' => $request->os_id, 'ssh' => $request->ssh, @@ -252,6 +282,20 @@ class ServerController extends Controller } } + $deleted = DB::table('ips')->where('service_id', '=', $server->id)->delete(); + + for ($i = 1; $i <= 8; $i++) {//Max of 8 ips + $obj = 'ip' . $i; + if (isset($request->$obj) && !is_null($request->$obj)) { + DB::insert('INSERT IGNORE INTO ips (id, address, service_id, is_ipv4) values (?, ?, ?, ?)', [ + Str::random(8), + $request->$obj, + $request->server_id, + (filter_var($request->$obj, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) ? 0 : 1 + ]); + } + } + return redirect()->route('servers.index') ->with('success', 'Server Updated Successfully.'); } @@ -267,6 +311,8 @@ class ServerController extends Controller Labels::deleteLabelsAssignedTo($server->id); + IPs::deleteIPsAssignedTo($server->id); + return redirect()->route('servers.index') ->with('success', 'Server was deleted Successfully.'); } diff --git a/app/Models/IPs.php b/app/Models/IPs.php index f98a0f4..8ebb264 100644 --- a/app/Models/IPs.php +++ b/app/Models/IPs.php @@ -4,6 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; class IPs extends Model { @@ -14,4 +15,10 @@ class IPs extends Model protected $fillable = ['id', 'active', 'service_id', 'address', 'is_ipv4']; public $incrementing = false; + + public static function deleteIPsAssignedTo($service_id) + { + DB::table('ips')->where('service_id', '=', $service_id)->delete(); + } + } diff --git a/database/migrations/2021_02_10_122904_create_servers_table.php b/database/migrations/2021_02_10_122904_create_servers_table.php index 5e4f896..7f23895 100644 --- a/database/migrations/2021_02_10_122904_create_servers_table.php +++ b/database/migrations/2021_02_10_122904_create_servers_table.php @@ -19,8 +19,6 @@ class CreateServersTable extends Migration $table->string('hostname'); $table->string('ns1')->nullable()->default(null); $table->string('ns2')->nullable()->default(null); - $table->string('ipv4')->nullable()->default(null); - $table->string('ipv6')->nullable()->default(null); $table->tinyInteger('server_type')->default(1); $table->integer('os_id')->default(0); $table->integer('provider_id')->default(9999); diff --git a/database/seeders/ServersSeeder.php b/database/seeders/ServersSeeder.php index edf0f9e..e18df1c 100644 --- a/database/seeders/ServersSeeder.php +++ b/database/seeders/ServersSeeder.php @@ -27,7 +27,6 @@ class ServersSeeder extends Seeder "provider_id" => 90, "location_id" => 35, "bandwidth" => 1000, - "ipv4" => '127.0.0.1', "cpu" => 1, "ram" => 512, "ram_type" => 'MB', @@ -46,7 +45,6 @@ class ServersSeeder extends Seeder "provider_id" => 90, "location_id" => 71, "bandwidth" => 2000, - "ipv4" => '127.0.0.1', "cpu" => 1, "ram" => 2048, "ram_type" => 'MB', @@ -88,5 +86,26 @@ class ServersSeeder extends Seeder ]; DB::table('pricings')->insert($pricing); + + $ips = [ + [ + "id" => Str::random(8), + "service_id" => $id1, + "address" => '127.0.0.1', + "is_ipv4" => 1, + "active" => 1, + "created_at" => Carbon::now() + ], + [ + "id" => Str::random(8), + "service_id" => $id2, + "address" => '127.0.0.1', + "is_ipv4" => 1, + "active" => 1, + "created_at" => Carbon::now() + ], + ]; + + DB::table('ips')->insert($ips); } } diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php index 84d913d..be757be 100644 --- a/resources/views/servers/create.blade.php +++ b/resources/views/servers/create.blade.php @@ -58,18 +58,19 @@
+

If you need to add more IPs go here.

-
IPv4
- +
IP
+
-
IPv6
- +
IP
+
diff --git a/resources/views/servers/edit.blade.php b/resources/views/servers/edit.blade.php index 98f3ae5..654830f 100644 --- a/resources/views/servers/edit.blade.php +++ b/resources/views/servers/edit.blade.php @@ -51,20 +51,6 @@
-
-
-
IPv4
- -
-
-
-
-
IPv6
- -
-
NS1 @@ -228,7 +214,7 @@
-
+
label @@ -266,7 +252,19 @@
-
+
+ @foreach($ip_addresses as $ip) +
+ + IP + ip{{{$loop->iteration}}} + 255 + {{ $ip['address'] }} + +
+ @endforeach +
+
active === 1) ? 'checked' : '' }}>
@else -

Please add a YABs to see Geekbench, disk and network speeds

+

Please add a YABs to + see Geekbench, disk and network speeds

@endif