Mirrors/my-idlers
1
0
Fork 0
mirror of https://github.com/cp6/my-idlers.git synced 2024-11-16 15:33:44 +01:00
Code Issues Projects Releases Wiki Activity

Added/Updated validation on store and update

Browse Source 
Added/Updated validation on store and update
Updated update method in shared, server, seedboxes, reseller and misc
This commit is contained in:
cp6 2022-10-20 11:06:44 +11:00
parent c45df61f10
commit a649f1749e
12 changed files with 289 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/DNSController.php
View File

@ -34,9 +34,13 @@ class DNSController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'hostname' => 'required|min:2', 'hostname' => 'required|string|min:2',
'address' => 'required|min:2', 'address' => 'required|string|min:2',
'dns_type' => 'required' 'dns_type' => 'required|string',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$dns_id = Str::random(8); $dns_id = Str::random(8);
@ -90,9 +94,13 @@ class DNSController extends Controller
public function update(Request $request, DNS $dn) public function update(Request $request, DNS $dn)
{ {
$request->validate([ $request->validate([
'hostname' => 'required|min:2', 'hostname' => 'required|string|min:2',
'address' => 'required|min:2', 'address' => 'required|string|min:2',
'dns_type' => 'required' 'dns_type' => 'required|string',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$dn->update([ $dn->update([

35
app/Http/Controllers/DomainsController.php
View File

@ -34,11 +34,20 @@ class DomainsController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'domain' => 'required|min:2', 'domain' => 'required|string|min:2',
'extension' => 'required|min:2', 'extension' => 'required|string|min:2',
'provider_id' => 'numeric', 'ns1' => 'sometimes|nullable|min:2',
'ns2' => 'sometimes|nullable|min:2',
'ns3' => 'sometimes|nullable|min:2',
'provider_id' => 'integer',
'payment_term' => 'integer',
'price' => 'numeric', 'price' => 'numeric',
'next_due_date' => 'required|date' 'next_due_date' => 'required|date',
'owned_since' => 'sometimes|nullable|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$domain_id = Str::random(8); $domain_id = Str::random(8);
@ -74,10 +83,20 @@ class DomainsController extends Controller
public function update(Request $request, Domains $domain) public function update(Request $request, Domains $domain)
{ {
$request->validate([ $request->validate([
'domain' => 'required|min:2', 'domain' => 'required|string|min:2',
'extension' => 'required|min:2', 'extension' => 'required|string|min:2',
'provider_id' => 'numeric', 'ns1' => 'sometimes|nullable|min:2',
'price' => 'numeric' 'ns2' => 'sometimes|nullable|min:2',
'ns3' => 'sometimes|nullable|min:2',
'provider_id' => 'integer',
'payment_term' => 'integer',
'price' => 'numeric',
'next_due_date' => 'required|date',
'owned_since' => 'sometimes|nullable|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$pricing = new Pricing(); $pricing = new Pricing();

3
app/Http/Controllers/IPsController.php
View File

@ -31,7 +31,8 @@ class IPsController extends Controller
{ {
$request->validate([ $request->validate([
'address' => 'required|ip|min:2', 'address' => 'required|ip|min:2',
'ip_type' => 'required' 'ip_type' => 'required|string|size:4',
'service_id' => 'required|string'
]); ]);
$ip_id = Str::random(8); $ip_id = Str::random(8);

2
app/Http/Controllers/LabelsController.php
View File

@ -25,7 +25,7 @@ class LabelsController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'label' => 'required|min:2' 'label' => 'required|string|min:2'
]); ]);
Labels::create([ Labels::create([

2
app/Http/Controllers/LocationsController.php
View File

@ -24,7 +24,7 @@ class LocationsController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'location_name' => 'required|min:2' 'location_name' => 'required|string|min:2'
]); ]);
Locations::create([ Locations::create([

18
app/Http/Controllers/MiscController.php
View File

@ -32,9 +32,11 @@ class MiscController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'name' => 'required|min:3', 'name' => 'required|string|min:3',
'price' => 'required|numeric', 'price' => 'required|numeric',
'owned_since' => 'date', 'payment_term' => 'required|integer',
'currency' => 'required|string|size:3',
'owned_since' => 'sometimes|nullable|date',
'next_due_date' => 'required|date' 'next_due_date' => 'required|date'
]); ]);
@ -65,13 +67,15 @@ class MiscController extends Controller
public function update(Request $request, Misc $misc) public function update(Request $request, Misc $misc)
{ {
$request->validate([ $request->validate([
'name' => 'required', 'name' => 'required|string|min:3',
'owned_since' => 'date', 'price' => 'required|numeric',
'payment_term' => 'required|integer',
'currency' => 'required|string|size:3',
'owned_since' => 'sometimes|nullable|date',
'next_due_date' => 'required|date'
]); ]);
DB::table('misc_services') $misc->update([
->where('id', $misc->id)
->update([
'name' => $request->name, 'name' => $request->name,
'owned_since' => $request->owned_since, 'owned_since' => $request->owned_since,
'active' => (isset($request->is_active)) ? 1 : 0 'active' => (isset($request->is_active)) ? 1 : 0

2
app/Http/Controllers/OsController.php
View File

@ -22,7 +22,7 @@ class OsController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'os_name' => 'required|min:2' 'os_name' => 'required|string|min:2'
]); ]);
OS::create([ OS::create([

2
app/Http/Controllers/ProvidersController.php
View File

@ -24,7 +24,7 @@ class ProvidersController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'provider_name' => 'required|min:2' 'provider_name' => 'required|string|min:2'
]); ]);
Providers::create([ Providers::create([

80
app/Http/Controllers/ResellerController.php
View File

@ -31,26 +31,27 @@ class ResellerController extends Controller
{ {
$request->validate([ $request->validate([
'domain' => 'required|min:4', 'domain' => 'required|min:4',
'reseller_type' => 'required', 'reseller_type' => 'required|string',
'dedicated_ip' => 'present', 'disk' => 'integer',
'accounts' => 'numeric', 'os_id' => 'integer',
'server_type' => 'numeric', 'provider_id' => 'integer',
'ram' => 'numeric', 'location_id' => 'integer',
'disk' => 'numeric',
'os_id' => 'numeric',
'provider_id' => 'numeric',
'location_id' => 'numeric',
'price' => 'numeric', 'price' => 'numeric',
'payment_term' => 'numeric', 'payment_term' => 'integer',
'was_promo' => 'numeric', 'was_promo' => 'integer',
'owned_since' => 'date', 'owned_since' => 'sometimes|nullable|date',
'domains' => 'numeric', 'accounts' => 'integer',
'sub_domains' => 'numeric', 'domains' => 'integer',
'bandwidth' => 'numeric', 'sub_domains' => 'integer',
'email' => 'numeric', 'bandwidth' => 'integer',
'ftp' => 'numeric', 'email' => 'integer',
'db' => 'numeric', 'ftp' => 'integer',
'next_due_date' => 'required|date' 'db' => 'integer',
'next_due_date' => 'required|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$reseller_id = Str::random(8); $reseller_id = Str::random(8);
@ -106,30 +107,31 @@ class ResellerController extends Controller
public function update(Request $request, Reseller $reseller) public function update(Request $request, Reseller $reseller)
{ {
$request->validate([ $request->validate([
'id' => 'required|size:8',
'domain' => 'required|min:4', 'domain' => 'required|min:4',
'reseller_type' => 'required', 'reseller_type' => 'required|string',
'dedicated_ip' => 'present', 'disk' => 'integer',
'server_type' => 'numeric', 'os_id' => 'integer',
'disk' => 'numeric', 'provider_id' => 'integer',
'os_id' => 'numeric', 'location_id' => 'integer',
'provider_id' => 'numeric',
'location_id' => 'numeric',
'price' => 'numeric', 'price' => 'numeric',
'payment_term' => 'numeric', 'payment_term' => 'integer',
'was_promo' => 'numeric', 'was_promo' => 'integer',
'owned_since' => 'date', 'owned_since' => 'sometimes|nullable|date',
'domains' => 'numeric', 'accounts' => 'integer',
'sub_domains' => 'numeric', 'domains' => 'integer',
'bandwidth' => 'numeric', 'sub_domains' => 'integer',
'email' => 'numeric', 'bandwidth' => 'integer',
'ftp' => 'numeric', 'email' => 'integer',
'db' => 'numeric' 'ftp' => 'integer',
'db' => 'integer',
'next_due_date' => 'required|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
DB::table('reseller_hosting') $reseller->update([
->where('id', $request->id)
->update([
'main_domain' => $request->domain, 'main_domain' => $request->domain,
'reseller_type' => $request->reseller_type, 'reseller_type' => $request->reseller_type,
'provider_id' => $request->provider_id, 'provider_id' => $request->provider_id,

60
app/Http/Controllers/SeedBoxesController.php
View File

@ -29,19 +29,23 @@ class SeedBoxesController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'title' => 'required|string', 'title' => 'required|string|min:2',
'hostname' => 'string|nullable', 'hostname' => 'sometimes|nullable|string|min:2',
'seed_box_type' => 'required', 'seed_box_type' => 'required|string',
'provider_id' => 'numeric', 'provider_id' => 'integer',
'location_id' => 'numeric', 'location_id' => 'integer',
'price' => 'numeric', 'price' => 'numeric',
'payment_term' => 'numeric', 'payment_term' => 'integer',
'was_promo' => 'numeric', 'was_promo' => 'integer',
'owned_since' => 'date', 'owned_since' => 'sometimes|nullable|date',
'disk' => 'numeric', 'disk' => 'integer',
'bandwidth' => 'numeric', 'bandwidth' => 'integer',
'port_speed' => 'numeric', 'port_speed' => 'integer',
'next_due_date' => 'required|date' 'next_due_date' => 'required|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$seedbox_id = Str::random(8); $seedbox_id = Str::random(8);
@ -91,24 +95,26 @@ class SeedBoxesController extends Controller
public function update(Request $request, SeedBoxes $seedbox) public function update(Request $request, SeedBoxes $seedbox)
{ {
$request->validate([ $request->validate([
'id' => 'required|size:8', 'title' => 'required|string|min:2',
'title' => 'required|string', 'hostname' => 'sometimes|nullable|string|min:2',
'hostname' => 'string|nullable', 'seed_box_type' => 'required|string',
'seed_box_type' => 'required', 'provider_id' => 'integer',
'disk' => 'numeric', 'location_id' => 'integer',
'provider_id' => 'numeric',
'location_id' => 'numeric',
'price' => 'numeric', 'price' => 'numeric',
'payment_term' => 'numeric', 'payment_term' => 'integer',
'was_promo' => 'numeric', 'was_promo' => 'integer',
'owned_since' => 'date', 'owned_since' => 'sometimes|nullable|date',
'bandwidth' => 'numeric', 'disk' => 'integer',
'port_speed' => 'numeric' 'bandwidth' => 'integer',
'port_speed' => 'integer',
'next_due_date' => 'required|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
DB::table('seedboxes') $seedbox->update([
->where('id', $seedbox->id)
->update([
'title' => $request->title, 'title' => $request->title,
'hostname' => $request->hostname, 'hostname' => $request->hostname,
'seed_box_type' => $request->seed_box_type, 'seed_box_type' => $request->seed_box_type,

79
app/Http/Controllers/ServerController.php
View File

@ -18,9 +18,7 @@ class ServerController extends Controller
public function index() public function index()
{ {
$servers = Server::allActiveServers(); $servers = Server::allActiveServers();
$non_active_servers = Server::allNonActiveServers(); $non_active_servers = Server::allNonActiveServers();
return view('servers.index', compact(['servers', 'non_active_servers'])); return view('servers.index', compact(['servers', 'non_active_servers']));
} }
@ -43,22 +41,30 @@ class ServerController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'hostname' => 'required|min:5', 'hostname' => 'required|min:5',
'ip1' => 'nullable|ip', 'ip1' => 'sometimes|nullable|ip',
'ip2' => 'nullable|ip', 'ip2' => 'sometimes|nullable|ip',
'service_type' => 'numeric', 'ns1' => 'sometimes|nullable|string',
'server_type' => 'numeric', 'ns2' => 'sometimes|nullable|string',
'ram' => 'numeric', 'service_type' => 'integer',
'disk' => 'numeric', 'server_type' => 'integer',
'os_id' => 'numeric', 'ssh_port' => 'integer',
'provider_id' => 'numeric', 'bandwidth' => 'integer',
'location_id' => 'numeric', 'ram' => 'required|numeric',
'price' => 'numeric', 'disk' => 'required|integer',
'cpu' => 'numeric', 'os_id' => 'required|integer',
'was_promo' => 'numeric', 'provider_id' => 'required|integer',
'next_due_date' => 'required|date' 'location_id' => 'required|integer',
'price' => 'required|numeric',
'cpu' => 'required|integer',
'was_promo' => 'integer',
'next_due_date' => 'required|date',
'owned_since' => 'sometimes|nullable|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$server_id = Str::random(8); $server_id = Str::random(8);
@ -123,22 +129,31 @@ class ServerController extends Controller
{ {
$request->validate([ $request->validate([
'hostname' => 'required|min:5', 'hostname' => 'required|min:5',
'ram' => 'numeric', 'ip1' => 'sometimes|nullable|ip',
'disk' => 'numeric', 'ip2' => 'sometimes|nullable|ip',
'os_id' => 'numeric', 'ns1' => 'sometimes|nullable|string',
'provider_id' => 'numeric', 'ns2' => 'sometimes|nullable|string',
'location_id' => 'numeric', 'service_type' => 'integer',
'price' => 'numeric', 'server_type' => 'integer',
'cpu' => 'numeric', 'ssh_port' => 'integer',
'was_promo' => 'numeric', 'bandwidth' => 'integer',
'next_due_date' => 'date' 'ram' => 'required|numeric',
'disk' => 'required|integer',
'os_id' => 'required|integer',
'provider_id' => 'required|integer',
'location_id' => 'required|integer',
'price' => 'required|numeric',
'cpu' => 'required|integer',
'was_promo' => 'integer',
'next_due_date' => 'required|date',
'owned_since' => 'sometimes|nullable|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$server_id = $request->server_id; $server->update([
DB::table('servers')
->where('id', $server_id)
->update([
'hostname' => $request->hostname, 'hostname' => $request->hostname,
'server_type' => $request->server_type, 'server_type' => $request->server_type,
'os_id' => $request->os_id, 'os_id' => $request->os_id,
@ -161,6 +176,8 @@ class ServerController extends Controller
'show_public' => (isset($request->show_public)) ? 1 : 0 'show_public' => (isset($request->show_public)) ? 1 : 0
]); ]);
$server_id = $request->server_id;
$pricing = new Pricing(); $pricing = new Pricing();
$as_usd = $pricing->convertToUSD($request->price, $request->currency); $as_usd = $pricing->convertToUSD($request->price, $request->currency);
@ -209,7 +226,7 @@ class ServerController extends Controller
{//NOTICE: Selecting servers is not cached yet {//NOTICE: Selecting servers is not cached yet
$all_servers = Server::where('has_yabs', 1)->get(); $all_servers = Server::where('has_yabs', 1)->get();
if (isset($all_servers[1])){ if (isset($all_servers[1])) {
return view('servers.choose-compare', compact('all_servers')); return view('servers.choose-compare', compact('all_servers'));
} }

76
app/Http/Controllers/SharedController.php
View File

@ -29,24 +29,26 @@ class SharedController extends Controller
{ {
$request->validate([ $request->validate([
'domain' => 'required|min:4', 'domain' => 'required|min:4',
'shared_type' => 'required', 'shared_type' => 'required|string',
'server_type' => 'numeric', 'disk' => 'integer',
'ram' => 'numeric', 'os_id' => 'integer',
'disk' => 'numeric', 'provider_id' => 'integer',
'os_id' => 'numeric', 'location_id' => 'integer',
'provider_id' => 'numeric',
'location_id' => 'numeric',
'price' => 'numeric', 'price' => 'numeric',
'payment_term' => 'numeric', 'payment_term' => 'integer',
'was_promo' => 'numeric', 'was_promo' => 'integer',
'owned_since' => 'date', 'owned_since' => 'sometimes|nullable|date',
'domains' => 'numeric', 'domains' => 'integer',
'sub_domains' => 'numeric', 'sub_domains' => 'integer',
'bandwidth' => 'numeric', 'bandwidth' => 'integer',
'email' => 'numeric', 'email' => 'integer',
'ftp' => 'numeric', 'ftp' => 'integer',
'db' => 'numeric', 'db' => 'integer',
'next_due_date' => 'required|date' 'next_due_date' => 'required|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
$shared_id = Str::random(8); $shared_id = Str::random(8);
@ -103,30 +105,30 @@ class SharedController extends Controller
public function update(Request $request, Shared $shared) public function update(Request $request, Shared $shared)
{ {
$request->validate([ $request->validate([
'id' => 'required|size:8',
'domain' => 'required|min:4', 'domain' => 'required|min:4',
'shared_type' => 'required', 'shared_type' => 'required|string',
'dedicated_ip' => 'present', 'disk' => 'integer',
'server_type' => 'numeric', 'os_id' => 'integer',
'disk' => 'numeric', 'provider_id' => 'integer',
'os_id' => 'numeric', 'location_id' => 'integer',
'provider_id' => 'numeric',
'location_id' => 'numeric',
'price' => 'numeric', 'price' => 'numeric',
'payment_term' => 'numeric', 'payment_term' => 'integer',
'was_promo' => 'numeric', 'was_promo' => 'integer',
'owned_since' => 'date', 'owned_since' => 'sometimes|nullable|date',
'domains' => 'numeric', 'domains' => 'integer',
'sub_domains' => 'numeric', 'sub_domains' => 'integer',
'bandwidth' => 'numeric', 'bandwidth' => 'integer',
'email' => 'numeric', 'email' => 'integer',
'ftp' => 'numeric', 'ftp' => 'integer',
'db' => 'numeric' 'db' => 'integer',
'next_due_date' => 'required|date',
'label1' => 'sometimes|nullable|string',
'label2' => 'sometimes|nullable|string',
'label3' => 'sometimes|nullable|string',
'label4' => 'sometimes|nullable|string',
]); ]);
DB::table('shared_hosting') $shared->update([
->where('id', $request->id)
->update([
'main_domain' => $request->domain, 'main_domain' => $request->domain,
'shared_type' => $request->shared_type, 'shared_type' => $request->shared_type,
'provider_id' => $request->provider_id, 'provider_id' => $request->provider_id,