From 12c9ea82a1447014701142e2bc59e9c5f603fb79 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Mon, 25 Jan 2021 13:28:18 +1100
Subject: [PATCH 01/19] Fixed delete labels

Fixed delete labels
---
 class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/class.php b/class.php
index db5d040..8e09f06 100644
--- a/class.php
+++ b/class.php
@@ -1168,7 +1168,7 @@ class idlers extends helperFunctions
         $this->outputString('<form id="editSharedHostingForm" method="post">');
 
         $this->rowColOpen('form-row', 'col-8');
-        $this->outputString('<label for="sh_me_delete">Delete server data</label>');
+        $this->outputString('<label for="sh_me_delete">Delete shared hosting data</label>');
         $this->tagClose('div');
         $this->colOpen('col-4');
         $this->outputString('<label class="switch"><input type="checkbox" name="sh_me_delete" id="sh_me_delete"><span class="slider round"></span></label>');
@@ -1285,7 +1285,7 @@ class idlers extends helperFunctions
         $this->outputString('<form id="editDomainForm" method="post">');
 
         $this->rowColOpen('form-row', 'col-8');
-        $this->outputString('<label for="d_me_delete">Delete server data</label>');
+        $this->outputString('<label for="d_me_delete">Delete domain data</label>');
         $this->tagClose('div');
         $this->colOpen('col-4');
         $this->outputString('<label class="switch"><input type="checkbox" name="d_me_delete" id="d_me_delete"><span class="slider round"></span></label>');

From a89d125f7c798f286bf5805e03b7cb850bb8674e Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Mon, 25 Jan 2021 13:32:46 +1100
Subject: [PATCH 02/19] Domain terms annual & above

Domain terms options to be Annual, Biennial and Triennial
---
 class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/class.php b/class.php
index 8e09f06..cd52793 100644
--- a/class.php
+++ b/class.php
@@ -198,6 +198,13 @@ class elementHelpers extends idlersConfig
         $this->selectOption('Triennial (3 years)', '6');
     }
 
+    protected function domainTermSelectOptions()
+    {
+        $this->selectOption('Annual (yearly)', '4', true);
+        $this->selectOption('Biennial (2 years)', '5');
+        $this->selectOption('Triennial (3 years)', '6');
+    }
+
     protected function CurrencySelectOptions()
     {
         $this->selectOption('AUD', 'AUD');
@@ -1318,7 +1325,7 @@ class idlers extends helperFunctions
         $this->tagOpen('div', 'input-group');
         $this->inputPrepend('Term');
         $this->selectElement('d_me_term');
-        $this->termSelectOptions();
+        $this->domainTermSelectOptions();
         $this->tagClose('select');
         $this->tagClose('div', 3);
 

From ee8651b82eaafb364dbb9c5d33e5ea12bcf94c1d Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Tue, 26 Jan 2021 00:15:46 +1100
Subject: [PATCH 03/19] Fixed all speed tests being bust cases query failure

Added has_st col (has speed test) this means you can now have YABs data, YABs data but no speedtest (becasue they were all busy) or no YABs data.
---
 class.php  | 32 +++++++++++++++++++++++++-------
 update.sql | 16 +++++++++++++++-
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/class.php b/class.php
index cd52793..5774c95 100644
--- a/class.php
+++ b/class.php
@@ -693,13 +693,13 @@ class idlers extends helperFunctions
 
     public function serverData(string $id)
     {
-        $select = $this->dbConnect()->prepare("SELECT `has_yabs` FROM `servers` WHERE `id` = ? LIMIT 1;");
+        $select = $this->dbConnect()->prepare("SELECT `has_yabs`, `has_st` FROM `servers` WHERE `id` = ? LIMIT 1;");
         $select->execute([$id]);
         $row = $select->fetch();
-        if ($row['has_yabs'] == 1) {
+        if ($row['has_yabs'] == 1 && $row['has_st'] == 1) {
             $select = $this->dbConnect()->prepare("
               SELECT servers.id as server_id,hostname,ipv4,ipv6,`cpu`,cpu_type,cpu_freq,ram,ram_type,swap,swap_type,`disk`,disk_type,bandwidth,bandwidth_type,gb5_single,gb5_multi,gb5_id,aes_ni,amd_v,
-              is_dedicated,is_cpu_dedicated,was_special,os,ssh_port,still_have,tags,notes,virt,has_yabs,ns1,ns2,DATE_FORMAT(`owned_since`, '%M %Y') as owned_since, `owned_since` as owned_since_raw, `4k`,`4k_type`,`64k`,`64k_type`,`512k`,`512k_type`,`1m`,`1m_type`,
+              is_dedicated,is_cpu_dedicated,was_special,os,ssh_port,still_have,tags,notes,virt,has_yabs,has_st,ns1,ns2,DATE_FORMAT(`owned_since`, '%M %Y') as owned_since, `owned_since` as owned_since_raw, `4k`,`4k_type`,`64k`,`64k_type`,`512k`,`512k_type`,`1m`,`1m_type`,
               loc.name as location,send,send_type,recieve,recieve_type,price,currency,term,as_usd,per_month,next_dd,pr.name as provider
               FROM servers INNER JOIN disk_speed ds on servers.id = ds.server_id
               INNER JOIN speed_tests st on servers.id = st.server_id INNER JOIN locations loc on servers.location = loc.id
@@ -711,6 +711,17 @@ class idlers extends helperFunctions
             $speed_tests = $sel_st->fetchAll(PDO::FETCH_ASSOC);
             $final = array_merge($speed_tests, $data);
             return json_encode($final);
+        } elseif ($row['has_yabs'] == 1 && $row['has_st'] == 0) {
+            $select = $this->dbConnect()->prepare("
+              SELECT servers.id as server_id,hostname,ipv4,ipv6,`cpu`,cpu_type,cpu_freq,ram,ram_type,swap,swap_type,`disk`,disk_type,bandwidth,bandwidth_type,gb5_single,gb5_multi,gb5_id,aes_ni,amd_v,
+              is_dedicated,is_cpu_dedicated,was_special,os,ssh_port,still_have,tags,notes,virt,has_yabs,has_st,ns1,ns2,DATE_FORMAT(`owned_since`, '%M %Y') as owned_since, `owned_since` as owned_since_raw, `4k`,`4k_type`,`64k`,`64k_type`,`512k`,`512k_type`,`1m`,`1m_type`,
+              loc.name as location,price,currency,term,as_usd,per_month,next_dd,pr.name as provider
+              FROM servers INNER JOIN disk_speed ds on servers.id = ds.server_id
+            INNER JOIN locations loc on servers.location = loc.id
+              INNER JOIN providers pr on servers.provider = pr.id INNER JOIN pricing on servers.id = pricing.server_id WHERE servers.id = ? LIMIT 1;");
+            $select->execute([$id]);
+            $data = $select->fetchAll(PDO::FETCH_ASSOC)[0];
+            return json_encode($data);
         } else {
             $select = $this->dbConnect()->prepare("
                SELECT servers.id as server_id,hostname,ipv4,ipv6,`cpu`,cpu_type,cpu_freq,ram,ram_type,swap,swap_type,`disk`,disk_type,
@@ -1891,6 +1902,7 @@ class idlers extends helperFunctions
             $ipv6 = $data['ipv6'];
         }
         ($data['has_yabs'] == 1) ? $has_yabs = true : $has_yabs = false;
+        ($data['has_st'] == 1) ? $has_st = true : $has_st = false;
         $this->tagOpen('div', 'modal-header');
         $this->HTMLphrase('h4', 'modal-title w-100', $data['hostname'], 'view_more_header');
         $this->outputString('<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
@@ -2109,7 +2121,7 @@ class idlers extends helperFunctions
         $this->colOpen('col-2');
         $this->HTMLphrase('p', 'm-value', $data['virt']);
         $this->tagClose('div', 2);
-        if ($has_yabs) {
+        if ($has_yabs && $has_st) {
             $this->rowColOpen('row m-section-row', 'col-12 text-center');
             $this->HTMLphrase('p', 'm-section-text', 'Network test');
             $this->tagClose('div', 2);
@@ -2137,7 +2149,7 @@ class idlers extends helperFunctions
         $this->rowColOpen('row m-section-row', 'col-12 text-center');
         $this->htmlPhrase('p', 'm-section-text', 'Notes');
         $this->outputString("<textarea class='form-control' id='server_notes' name='server_notes' rows='4' cols='40' maxlength='255' disabled>");
-        if (is_null($data['notes']) || empty($data['notes'])){
+        if (is_null($data['notes']) || empty($data['notes'])) {
             $this->outputString('');
         } else {
             $this->outputString($data['notes']);
@@ -2164,11 +2176,11 @@ class idlers extends helperFunctions
             $this->tagClose('div');
             $this->colOpen('col-12 col-md-6');
             $this->outputString('<a class="btn btn-third" id="closeViewMoreModal" role="button" data-dismiss="modal">Close</a>');
-            $this->tagClose('div',2);
+            $this->tagClose('div', 2);
         } else {
             $this->rowColOpen('row text-center', 'col-12');
             $this->outputString('<a class="btn btn-third" id="closeViewMoreModal" role="button" data-dismiss="modal">Close</a>');
-            $this->tagClose('div',2);
+            $this->tagClose('div', 2);
         }
     }
 
@@ -2918,6 +2930,7 @@ class itemInsert extends idlers
             $geekbench_multi = $this->intValue($array[$gb_m]);
             $geek_full_url = explode(' ', preg_replace('!\s+!', ' ', $array[$gb_url]));
             $gb5_id = substr($geek_full_url[3], strrpos($geek_full_url[3], '/') + 1);//
+            $has_a_speed_test = false;
             for ($i = $start_st; $i <= $end_st; $i++) {
                 if (strpos($array[$i], 'busy') !== false) {
                     //Has a "busy" result, No insert
@@ -2927,8 +2940,13 @@ class itemInsert extends idlers
                     $recieve_as_mbps = $this->networkSpeedAsMbps($this->yabsSpeedValues($data)['receive_type'], $this->yabsSpeedValues($data)['receive']);
                     $insert = $this->dbConnect()->prepare('INSERT INTO `speed_tests` (`server_id`, `location`, `send`, `send_type`,`send_as_mbps`, `recieve`,`recieve_type`, `recieve_as_mbps`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)');
                     $insert->execute([$this->item_id, $this->yabsSpeedLoc($data)['location'], $this->yabsSpeedValues($data)['send'], $this->yabsSpeedValues($data)['send_type'], $send_as_mbps, $this->yabsSpeedValues($data)['receive'], $this->yabsSpeedValues($data)['receive_type'], $recieve_as_mbps]);
+                    $has_a_speed_test = true;
                 }
             }
+            if ($has_a_speed_test) {
+                $update_st = $this->dbConnect()->prepare('UPDATE `servers` SET `has_st` = 1 WHERE `id` = ? LIMIT 1;');
+                $update_st->execute([$this->item_id]);
+            }
             ($ram_type == 'GB') ? $ram_mb = $this->GBtoMB($ram) : $ram_mb = $ram;
             ($swap_type == 'GB') ? $swap_mb = $this->GBtoMB($swap) : $swap_mb = $swap;
             ($disk_type == 'TB') ? $disk_gb = $this->TBtoGB($disk) : $disk_gb = $disk;
diff --git a/update.sql b/update.sql
index df9097f..2764157 100644
--- a/update.sql
+++ b/update.sql
@@ -11,4 +11,18 @@ ALTER TABLE `disk_speed`
     DROP PRIMARY KEY;
 
 ALTER TABLE `disk_speed`
-    ADD UNIQUE INDEX `Index 1` (`server_id`, `datetime`);
\ No newline at end of file
+    ADD UNIQUE INDEX `Index 1` (`server_id`, `datetime`);
+
+ALTER TABLE `servers`
+    ADD COLUMN `has_st` TINYINT(1) NULL DEFAULT '0' AFTER `has_yabs`;
+
+UPDATE servers t1
+    JOIN
+    (
+        SELECT server_id
+        FROM speed_tests
+        GROUP BY server_id
+        HAVING COUNT(*) > 0
+    ) t2
+    ON t1.id = t2.server_id
+SET t1.has_st = 1;
\ No newline at end of file

From 78e9152bb7961d515871acf8cf3928ac9f179bbb Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Tue, 26 Jan 2021 00:44:22 +1100
Subject: [PATCH 04/19] Fixed no location or provider causing uneven cards

Fixed no location or provider causing uneven cards
---
 assets/css/style.css |  4 ++++
 class.php            | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index f0c188b..fef00f6 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1110,6 +1110,10 @@ button.close {
     visibility: hidden
 }
 
+.no-loc, .no-prov {
+    visibility: hidden
+}
+
 .form-control:focus {
     color: #495057;
     background-color: #fff;
diff --git a/class.php b/class.php
index 5774c95..6a45a14 100644
--- a/class.php
+++ b/class.php
@@ -879,10 +879,18 @@ class idlers extends helperFunctions
         $this->tagOpen('div', 'card-body');
         $this->HTMLphrase('h6', 'price', '$' . $data['price'] . ' ' . $data['currency'] . ' ' . $this->paymentTerm($data['term']));
         $this->rowColOpen('row text-center', 'col-12');
-        $this->HTMLphrase('h6', 'provider', $data['provider']);
+        if (is_null($data['provider']) || empty($data['provider'])) {
+            $this->HTMLphrase('h6', 'provider no-prov', '&nbsp;');
+        } else {
+            $this->HTMLphrase('h6', 'provider', $data['provider']);
+        }
         $this->tagClose('div', 2);
         $this->rowColOpen('row text-center', 'col-12');
-        $this->HTMLphrase('h6', 'location', $data['location']);
+        if (is_null($data['location']) || empty($data['location'])) {
+            $this->HTMLphrase('h6', 'location no-loc', '&nbsp;');
+        } else {
+            $this->HTMLphrase('h6', 'location', $data['location']);
+        }
         $this->tagClose('div', 2);
         $this->rowColOpen('row text-center', 'col-12');
         $this->HTMLphrase('p', $dd_class, "Due in {$this->processDueDate($data['id'], $data['term'], $data['next_dd'])} days");
@@ -2776,7 +2784,7 @@ class idlers extends helperFunctions
         $this->tagClose('form');
         $this->rowColOpen('row text-center', 'col-12');
         $this->outputString('<a class="btn btn-third" role="button" data-dismiss="modal">Close YABs</a>');
-        $this->tagClose('div',2);
+        $this->tagClose('div', 2);
     }
 
 }

From f53b2bb4794695636fa946f78a32bb179da72a78 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Tue, 26 Jan 2021 16:13:42 +1100
Subject: [PATCH 05/19] IPv4 field no longer required

Made IPv4 field no longer required
---
 class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/class.php b/class.php
index 6a45a14..7fe5198 100644
--- a/class.php
+++ b/class.php
@@ -1706,7 +1706,7 @@ class idlers extends helperFunctions
         $this->rowColOpen('form-row', 'col-12 col-md-6');
         $this->tagOpen('div', 'input-group');
         $this->inputPrepend('IPv4');
-        $this->textInput('ipv4', '', 'form-control', true, 4, 124);
+        $this->textInput('ipv4', '', 'form-control', false, 4, 124);
         $this->tagClose('div', 2);
         $this->colOpen('col-12 col-md-6');
         $this->tagOpen('div', 'input-group');
@@ -2807,11 +2807,12 @@ class itemInsert extends idlers
         (isset($data['dedi_cpu'])) ? $dedi_cpu = 1 : $dedi_cpu = 0;
         ($data['virt'] == 'DEDI') ? $dedi = 1 : $dedi = 0;
         (isset($data['was_offer'])) ? $offer = 1 : $offer = 0;
+        (empty($data['ipv4'])) ? $ipv4 = null : $ipv4 = $data['ipv4'];
         (empty($data['ipv6'])) ? $ipv6 = null : $ipv6 = $data['ipv6'];
         $location_id = $this->handleLocation($data['location']);
         $provider_id = $this->handleProvider($data['provider']);
         $insert = $this->dbConnect()->prepare('INSERT IGNORE INTO `servers` (id, hostname, location, provider, ipv4,ipv6, owned_since, os, is_cpu_dedicated, is_dedicated, was_special, bandwidth, virt, has_yabs, ns1, ns2, ssh_port) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?)');
-        $insert->execute([$item_id, $data['hostname'], $location_id, $provider_id, $data['ipv4'], $ipv6, $data['owned_since'], $data['os'], $dedi_cpu, $dedi, $offer, $data['bandwidth'], $data['virt'], $data['has_yabs'], $data['ns1'], $data['ns2'], $data['ssh_port']]);
+        $insert->execute([$item_id, $data['hostname'], $location_id, $provider_id, $ipv4, $ipv6, $data['owned_since'], $data['os'], $dedi_cpu, $dedi, $offer, $data['bandwidth'], $data['virt'], $data['has_yabs'], $data['ns1'], $data['ns2'], $data['ssh_port']]);
         $this->insertPrice($data['price'], $data['currency'], $data['term'], $data['next_due_date']);
         return $item_id;
     }
@@ -2823,6 +2824,7 @@ class itemInsert extends idlers
         (isset($data['dedi_cpu'])) ? $dedi_cpu = 1 : $dedi_cpu = 0;
         ($data['virt'] == 'DEDI') ? $dedi = 1 : $dedi = 0;
         (isset($data['was_offer'])) ? $offer = 1 : $offer = 0;
+        (empty($data['ipv4'])) ? $ipv4 = null : $ipv4 = $data['ipv4'];
         (empty($data['ipv6'])) ? $ipv6 = null : $ipv6 = $data['ipv6'];
         ($data['ram_type'] == 'GB') ? $ram_mb = $this->GBtoMB($data['ram']) : $ram_mb = $data['ram'];
         ($data['swap_type'] == 'GB') ? $swap_mb = $this->GBtoMB($data['swap']) : $swap_mb = $data['swap'];
@@ -2830,7 +2832,7 @@ class itemInsert extends idlers
         $location_id = $this->handleLocation($data['location']);
         $provider_id = $this->handleProvider($data['provider']);
         $insert = $this->dbConnect()->prepare('INSERT IGNORE INTO `servers` (id, hostname, location, provider, ipv4,ipv6, owned_since, os, is_cpu_dedicated, is_dedicated, was_special, bandwidth, virt, cpu, cpu_freq, ram, ram_type, swap, swap_type, disk, disk_type, ram_mb, swap_mb, disk_gb, ns1, ns2, ssh_port) VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
-        $insert->execute([$item_id, $data['hostname'], $location_id, $provider_id, $data['ipv4'], $ipv6, $data['owned_since'], $data['os'], $dedi_cpu, $dedi, $offer, $data['bandwidth'], $data['virt'], $data['cpu_amount'], $data['cpu_speed'], $data['ram'], $data['ram_type'], $data['swap'], $data['swap_type'], $data['disk'], $data['disk_type'], $ram_mb, $swap_mb, $disk_gb, $data['ns1'], $data['ns2'], $data['ssh_port']]);
+        $insert->execute([$item_id, $data['hostname'], $location_id, $provider_id, $ipv4, $ipv6, $data['owned_since'], $data['os'], $dedi_cpu, $dedi, $offer, $data['bandwidth'], $data['virt'], $data['cpu_amount'], $data['cpu_speed'], $data['ram'], $data['ram_type'], $data['swap'], $data['swap_type'], $data['disk'], $data['disk_type'], $ram_mb, $swap_mb, $disk_gb, $data['ns1'], $data['ns2'], $data['ssh_port']]);
         $this->insertPrice($data['price'], $data['currency'], $data['term'], $data['next_due_date']);
         return $item_id;
     }

From e5c836629b193ff8eab532b5e55ac6eca3ff41f4 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 10:27:46 +1100
Subject: [PATCH 06/19] Added fetch IPv4 & IPv6 from domain dns api

Added fetch IPv4 & IPv6 from domain dns api
---
 assets/js/scripts.min.js | 29 +++++++++++++++++++++++++++++
 calls.php                |  2 ++
 class.php                | 12 ++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/assets/js/scripts.min.js b/assets/js/scripts.min.js
index 774a714..1938021 100644
--- a/assets/js/scripts.min.js
+++ b/assets/js/scripts.min.js
@@ -265,6 +265,35 @@ $(document).on("click", "#addDomainBTN", function () {
     $("#addSharedHosting").removeClass("show");
 });
 
+$(document).on("click", "#fillIpv4", function () {
+    var host_name = $('#hostname').val();
+    if (host_name) {
+        $.ajax({
+            type: "GET",
+            url: "get_ip.php",
+            data: {"type" : "dns_search", "hostname": host_name, "type": "A"},
+            success: function (result) {
+                $('#ipv4').val(result);
+            }
+        });
+        //Now wait 3 seconds before checking AAAA
+        setTimeout(function(){
+            $.ajax({
+                type: "GET",
+                url: "get_ip.php",
+                data: {"type" : "dns_search", "hostname": host_name, "type": "AAAA"},
+                success: function (result) {
+                    if (result != ''){
+                        $('#ipv6').val(result);
+                    } else {
+                        $('#ipv6').val('');
+                    }
+                }
+            });
+        }, 3000);
+    }
+});
+
 function modalServerEdit(id) {
     $.ajax({
         type: "GET",
diff --git a/calls.php b/calls.php
index 0b71e8d..d6b5490 100644
--- a/calls.php
+++ b/calls.php
@@ -36,6 +36,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             } elseif ($_GET['value'] == 'domain') {
                 $idle->viewMoreDomainModal($_GET['id']);//View more details modal
             }
+        } elseif ($_GET['type'] == 'dns_search') {
+            $idle->getIpForDomain($_GET['hostname'], $_GET['type']);
         }
     }
 } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
diff --git a/class.php b/class.php
index 7fe5198..5cdabd3 100644
--- a/class.php
+++ b/class.php
@@ -1666,6 +1666,7 @@ class idlers extends helperFunctions
         $this->tagOpen('div', 'input-group');
         $this->inputPrepend('Hostname');
         $this->textInput('hostname', '', 'form-control', true, 1, 124);
+        $this->outputString('<div class="input-group-append"><span class="input-group-text"><a id="fillIpv4" href="#"><i class="fas fa-search"></i></a></span></div>');
         $this->tagClose('div', 2);
         $this->colOpen('col-12 col-md-4');
         $this->tagOpen('div', 'input-group');
@@ -2787,6 +2788,17 @@ class idlers extends helperFunctions
         $this->tagClose('div', 2);
     }
 
+    public function getIpForDomain(string $domain, string $type = 'A'): string
+    {//Gets IP from A record for a domain
+        $data = json_decode(file_get_contents("https://whatsmydns.net/api/details?server=428&type=$type&query=$domain"), true);
+        if (isset($data['data'][0]['response'][0])) {
+            if (strlen($data['data'][0]['response'][0]) > 6) {
+                return $data['data'][0]['response'][0];
+            }
+        }
+        return "";//Doesnt exist/null/empty/invalid
+    }
+
 }
 
 class itemInsert extends idlers

From 92eb034c89da13c44aba534ade0b03739d53e901 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 10:28:41 +1100
Subject: [PATCH 07/19] Fetch icon color CSS

Fetch icon color CSS
---
 assets/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/css/style.css b/assets/css/style.css
index fef00f6..0e4af55 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1285,6 +1285,10 @@ button.close {
     color: #00000096
 }
 
+.fa-search {
+    color: #537cf7;
+}
+
 .tab-pane {
     margin-top: .8rem
 }

From 1de086ebe0e571785099f8c31e56a7e3af1d24ed Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 10:30:06 +1100
Subject: [PATCH 08/19] On select type DEDI check "is dedi cpu"

When selecting DEDI as the server type, "dedi cpu" will become checked.
---
 assets/js/scripts.min.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/assets/js/scripts.min.js b/assets/js/scripts.min.js
index 1938021..0a48a5a 100644
--- a/assets/js/scripts.min.js
+++ b/assets/js/scripts.min.js
@@ -294,6 +294,12 @@ $(document).on("click", "#fillIpv4", function () {
     }
 });
 
+$('#virt').change(function(){
+    if($(this).val() == 'DEDI'){
+        $('#dedi_cpu').prop("checked", true);
+    }
+});
+
 function modalServerEdit(id) {
     $.ajax({
         type: "GET",

From 66201e4305260c06d72666daee4b72b98292d331 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 10:57:07 +1100
Subject: [PATCH 09/19] Added search icon

Added search icon
---
 assets/css/all.min.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/all.min.css b/assets/css/all.min.css
index 18e53d6..b201d57 100644
--- a/assets/css/all.min.css
+++ b/assets/css/all.min.css
@@ -2,4 +2,4 @@
  * Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-.fa,.fas,.far,.fal,.fad,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid .08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fas.fa-pull-left,.far.fa-pull-left,.fal.fa-pull-left,.fab.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fas.fa-pull-right,.far.fa-pull-right,.fal.fa-pull-right,.fab.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);transform:scale(1,-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(-1,-1);transform:scale(-1,-1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-flip-both{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-centos:before{content:"\f789"}.fa-box:before{content:"\f466"}.fa-compact-disc:before{content:"\f51f"}.fa-fedora:before{content:"\f798"}.fa-hdd:before{content:"\f0a0"}.fa-linux:before{content:"\f17c"}.fa-memory:before{content:"\f538"}.fa-microchip:before{content:"\f2db"}.fa-ubuntu:before{content:"\f7df"}.fa-windows:before{content:"\f17a"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:'Font Awesome 5 Brands';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url("../webfonts/fa-brands-400.svg#fontawesome") format("svg")}.fab{font-family:'Font Awesome 5 Brands';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url("../webfonts/fa-regular-400.svg#fontawesome") format("svg")}.far{font-family:'Font Awesome 5 Free';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url("../webfonts/fa-solid-900.svg#fontawesome") format("svg")}.fa,.fas{font-family:'Font Awesome 5 Free';font-weight:900;margin-right: 0.15rem;}
\ No newline at end of file
+.fa,.fas,.far,.fal,.fad,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid .08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fas.fa-pull-left,.far.fa-pull-left,.fal.fa-pull-left,.fab.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fas.fa-pull-right,.far.fa-pull-right,.fal.fa-pull-right,.fab.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);transform:scale(1,-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(-1,-1);transform:scale(-1,-1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-flip-both{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-centos:before{content:"\f789"}.fa-box:before{content:"\f466"}.fa-compact-disc:before{content:"\f51f"}.fa-fedora:before{content:"\f798"}.fa-hdd:before{content:"\f0a0"}.fa-linux:before{content:"\f17c"}.fa-memory:before{content:"\f538"}.fa-microchip:before{content:"\f2db"}.fa-search:before{content:"\f002"}.fa-ubuntu:before{content:"\f7df"}.fa-windows:before{content:"\f17a"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:'Font Awesome 5 Brands';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url("../webfonts/fa-brands-400.svg#fontawesome") format("svg")}.fab{font-family:'Font Awesome 5 Brands';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url("../webfonts/fa-regular-400.svg#fontawesome") format("svg")}.far{font-family:'Font Awesome 5 Free';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url("../webfonts/fa-solid-900.svg#fontawesome") format("svg")}.fa,.fas{font-family:'Font Awesome 5 Free';font-weight:900;margin-right: 0.15rem;}
\ No newline at end of file

From 07ea6ac27dc860db1ca04e676a34eb58e48a6e2d Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 10:58:41 +1100
Subject: [PATCH 10/19] Changed value font size

This will help with uneven cards
---
 assets/css/style.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 0e4af55..b998a9d 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1124,7 +1124,8 @@ button.close {
 
 .value {
     display: inline;
-    margin-bottom: .4rem
+    margin-bottom: .4rem;
+    font-size: 0.91rem;
 }
 
 .price {

From ec9a931ff62afad129e277c42ec9ce1ff8207ee0 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 13:49:32 +1100
Subject: [PATCH 11/19] Added check if server is "up"

Clicking the OS icon on the card will ping either the ipv4 or hostname if ipv4 empy/null. If reached then the icon will return green else it will turn red.
---
 assets/css/style.css     | 12 ++++++++++++
 assets/js/scripts.min.js | 19 +++++++++++++++++++
 calls.php                |  4 +++-
 class.php                | 16 ++++++++++++++--
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index b998a9d..f38fd27 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1290,6 +1290,18 @@ button.close {
     color: #537cf7;
 }
 
+.os-icon {
+    color: #6f6b6b;
+}
+
+.green-fa {
+    color: #51bf51;
+}
+
+.red-fa {
+    color: #bf5151;
+}
+
 .tab-pane {
     margin-top: .8rem
 }
diff --git a/assets/js/scripts.min.js b/assets/js/scripts.min.js
index 0a48a5a..dfd7019 100644
--- a/assets/js/scripts.min.js
+++ b/assets/js/scripts.min.js
@@ -294,6 +294,25 @@ $(document).on("click", "#fillIpv4", function () {
     }
 });
 
+$(document).on("click", "#checkUpStatus", function () {
+    var host_name = $(this).attr('value');
+    var icon = $(this).children().first();
+    if (host_name) {
+        $.ajax({
+            type: "GET",
+            url: "check_up.php",
+            data: {"type": "check_up", "host": host_name},
+            success: function (result) {
+                if (result == 1) {
+                    icon.addClass("green-fa");
+                } else {
+                    icon.addClass("red-fa");
+                }
+            }
+        });
+    }
+});
+
 $('#virt').change(function(){
     if($(this).val() == 'DEDI'){
         $('#dedi_cpu').prop("checked", true);
diff --git a/calls.php b/calls.php
index d6b5490..8e7bf9f 100644
--- a/calls.php
+++ b/calls.php
@@ -38,6 +38,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             }
         } elseif ($_GET['type'] == 'dns_search') {
             $idle->getIpForDomain($_GET['hostname'], $_GET['type']);
+        } elseif ($_GET['type'] == 'check_up') {
+            echo $idle->checkIsUp($_GET['host']);
         }
     }
 } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
@@ -64,7 +66,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             } elseif ($_POST['type'] == 'server_modal_edit') {//Update the server info
                 $update->updateServerFromModal();
                 $update->updateServerPricingFromModal();
-                if (!is_null($_POST['me_yabs']) && !empty($_POST['me_yabs'])){
+                if (!is_null($_POST['me_yabs']) && !empty($_POST['me_yabs'])) {
                     $update->updateYabsData();
                 }
             } elseif ($_POST['type'] == 'shared_hosting_modal_edit') {//Update the shared hosting info
diff --git a/class.php b/class.php
index 5cdabd3..5e95f23 100644
--- a/class.php
+++ b/class.php
@@ -859,7 +859,7 @@ class idlers extends helperFunctions
     protected function vpsCard(string $id)
     {
         $select = $this->dbConnect()->prepare("
-           SELECT servers.id,servers.hostname,servers.`cpu`,servers.cpu_freq,servers.ram,servers.ram_type,servers.`disk`,
+           SELECT servers.id,servers.hostname,servers.ipv4,servers.`cpu`,servers.cpu_freq,servers.ram,servers.ram_type,servers.`disk`,
            servers.disk_type,servers.os,servers.virt,servers.was_special,locations.name as location,providers.name as provider,pricing.price,pricing.currency,pricing.term,pricing.next_dd
            FROM servers INNER JOIN locations on servers.location = locations.id INNER JOIN providers on servers.provider = providers.id
            INNER JOIN pricing on servers.id = pricing.server_id WHERE servers.id = ? LIMIT 1;");
@@ -874,7 +874,8 @@ class idlers extends helperFunctions
         $this->HTMLphrase('h4', 'hostname-header', $data['hostname']);
         $this->tagClose('div');
         $this->colOpen('col-12 col-xl-2 os-col');
-        $this->outputString($this->osIntToIcon($data['os']));
+        (empty($data['ipv4']) || is_null($data['ipv4'])) ? $host = $data['hostname'] : $host = $data['ipv4'];
+        $this->outputString('<a id="checkUpStatus" href="#" value="' . $host . '">' . $this->osIntToIcon($data['os']) . '</a>');
         $this->tagClose('div', 3);
         $this->tagOpen('div', 'card-body');
         $this->HTMLphrase('h6', 'price', '$' . $data['price'] . ' ' . $data['currency'] . ' ' . $this->paymentTerm($data['term']));
@@ -2799,6 +2800,17 @@ class idlers extends helperFunctions
         return "";//Doesnt exist/null/empty/invalid
     }
 
+    public function checkIsUp(string $host, int $port = 80, int $wait_time = 1): int
+    {//Check if host/ip is "up"
+        if ($fp = @fsockopen($host, $port, $errCode, $errStr, $wait_time)) {
+            $result = 1;
+        } else {
+            $result = 0;
+        }
+        @fclose($fp);
+        return $result;
+    }
+
 }
 
 class itemInsert extends idlers

From c5af0d72e452f7565f19cfe2f95d7df02898111e Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 13:54:33 +1100
Subject: [PATCH 12/19] Fixed on no domains errors thrown in info card

Fixed on no domains errors thrown in info card
---
 class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/class.php b/class.php
index 5e95f23..b3f5de4 100644
--- a/class.php
+++ b/class.php
@@ -2632,7 +2632,12 @@ class idlers extends helperFunctions
 
         $oldest_d = $this->dbConnect()->prepare("SELECT `domain`, `owned_since`  FROM `domains` ORDER BY `owned_since`;");
         $oldest_d->execute();
-        $oldest_d_row = $oldest_d->fetchAll(PDO::FETCH_ASSOC)[0];
+        if (isset($oldest_d->fetchAll(PDO::FETCH_ASSOC)[0])){
+            $oldest_d_row = $oldest_d->fetchAll(PDO::FETCH_ASSOC)[0];
+        } else {
+            $oldest_d_row = array('domain' => null, 'owned_since' => null);
+        }
+
 
         $sel_price = $this->dbConnect()->prepare("SELECT `as_usd`, `term`, `usd_per_month` FROM `pricing`;");
         $sel_price->execute();

From 703e9134bd8beb9e873105f1d1e3af4c92fb7728 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 14:32:04 +1100
Subject: [PATCH 13/19] Updated button styling

Border radius, Border color and btn-third hover color
---
 assets/css/style.css | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index f38fd27..1efba07 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -492,7 +492,7 @@ textarea.form-control {
     padding: .375rem .75rem;
     font-size: 1rem;
     line-height: 1.5;
-    border-radius: .25rem;
+    border-radius: 0.2rem;
     transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out
 }
 
@@ -1326,7 +1326,7 @@ button.close {
 .btn-main {
     color: #f7f7f7;
     background-color: #5a95f5;
-    border-color: #3a73cf
+    border-color: #3a73cf6b
 }
 
 .btn-main:hover, .btn-main:focus, .btn-main:active {
@@ -1342,25 +1342,25 @@ button.close {
 .btn-second {
     color: #f7f7f7;
     background-color: #30cfc0;
-    border-color: #2ea69a
+    border-color: #2ea69a75
 }
 
 .btn-second:hover, .btn-second:focus, .btn-second:active {
     color: #f7f7f7;
     background-color: #26bdae;
-    border-color: #2ea69a
+    border-color: #2ea69a;
 }
 
 .btn-third {
     color: #f7f7f7;
     background-color: #f06f6f;
-    border-color: #df4b4b;
+    border-color: #df4b4b66;
 }
 
 .btn-third:hover, .btn-third:focus, .btn-third:active {
     color: #f7f7f7;
-    background-color: #d05555;
-    border-color: #a62e2e;
+    background-color: #e95656;
+    border-color: #a62e2e8f;
 }
 
 .view-yabs-btn {

From c3ec60727b47696d41d3dda8d9e620489fd7d924 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Wed, 27 Jan 2021 14:34:41 +1100
Subject: [PATCH 14/19] Removed unused buttons

I didnt realize these were here still. Not used therefore they are gone.
---
 assets/css/style.css | 160 -------------------------------------------
 1 file changed, 160 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 1efba07..c6bcd40 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -519,166 +519,6 @@ textarea.form-control {
     cursor: pointer
 }
 
-.btn-primary:not(:disabled):not(.disabled).active, .btn-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #0062cc;
-    border-color: #005cbf
-}
-
-.btn-primary:not(:disabled):not(.disabled).active:focus, .btn-primary:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(0, 123, 255, .5)
-}
-
-.btn-secondary:not(:disabled):not(.disabled).active, .btn-secondary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #545b62;
-    border-color: #4e555b
-}
-
-.btn-secondary:not(:disabled):not(.disabled).active:focus, .btn-secondary:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(108, 117, 125, .5)
-}
-
-.btn-success:not(:disabled):not(.disabled).active, .btn-success:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #1e7e34;
-    border-color: #1c7430
-}
-
-.btn-success:not(:disabled):not(.disabled).active:focus, .btn-success:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(40, 167, 69, .5)
-}
-
-.btn-info:not(:disabled):not(.disabled).active, .btn-info:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #117a8b;
-    border-color: #10707f
-}
-
-.btn-info:not(:disabled):not(.disabled).active:focus, .btn-info:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(23, 162, 184, .5)
-}
-
-.btn-warning:not(:disabled):not(.disabled).active, .btn-warning:not(:disabled):not(.disabled):active {
-    color: #212529;
-    background-color: #d39e00;
-    border-color: #c69500
-}
-
-.btn-warning:not(:disabled):not(.disabled).active:focus, .btn-warning:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(255, 193, 7, .5)
-}
-
-.btn-danger:not(:disabled):not(.disabled).active, .btn-danger:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #bd2130;
-    border-color: #b21f2d
-}
-
-.btn-danger:not(:disabled):not(.disabled).active:focus, .btn-danger:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(220, 53, 69, .5)
-}
-
-.btn-light:not(:disabled):not(.disabled).active, .btn-light:not(:disabled):not(.disabled):active {
-    color: #212529;
-    background-color: #dae0e5;
-    border-color: #d3d9df
-}
-
-.btn-light:not(:disabled):not(.disabled).active:focus, .btn-light:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(248, 249, 250, .5)
-}
-
-.btn-dark:not(:disabled):not(.disabled).active, .btn-dark:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #1d2124;
-    border-color: #171a1d
-}
-
-.btn-dark:not(:disabled):not(.disabled).active:focus, .btn-dark:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(52, 58, 64, .5)
-}
-
-.btn-outline-primary:not(:disabled):not(.disabled).active, .btn-outline-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #007bff;
-    border-color: #007bff
-}
-
-.btn-outline-primary:not(:disabled):not(.disabled).active:focus, .btn-outline-primary:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(0, 123, 255, .5)
-}
-
-.btn-outline-secondary:not(:disabled):not(.disabled).active, .btn-outline-secondary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #6c757d;
-    border-color: #6c757d
-}
-
-.btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .btn-outline-secondary:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(108, 117, 125, .5)
-}
-
-.btn-outline-success:not(:disabled):not(.disabled).active, .btn-outline-success:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #28a745;
-    border-color: #28a745
-}
-
-.btn-outline-success:not(:disabled):not(.disabled).active:focus, .btn-outline-success:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(40, 167, 69, .5)
-}
-
-.btn-outline-info:not(:disabled):not(.disabled).active, .btn-outline-info:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #17a2b8;
-    border-color: #17a2b8
-}
-
-.btn-outline-info:not(:disabled):not(.disabled).active:focus, .btn-outline-info:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(23, 162, 184, .5)
-}
-
-.btn-outline-warning:not(:disabled):not(.disabled).active, .btn-outline-warning:not(:disabled):not(.disabled):active {
-    color: #212529;
-    background-color: #ffc107;
-    border-color: #ffc107
-}
-
-.btn-outline-warning:not(:disabled):not(.disabled).active:focus, .btn-outline-warning:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(255, 193, 7, .5)
-}
-
-.btn-outline-danger:not(:disabled):not(.disabled).active, .btn-outline-danger:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #dc3545;
-    border-color: #dc3545
-}
-
-.btn-outline-danger:not(:disabled):not(.disabled).active:focus, .btn-outline-danger:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(220, 53, 69, .5)
-}
-
-.btn-outline-light:not(:disabled):not(.disabled).active, .btn-outline-light:not(:disabled):not(.disabled):active {
-    color: #212529;
-    background-color: #f8f9fa;
-    border-color: #f8f9fa
-}
-
-.btn-outline-light:not(:disabled):not(.disabled).active:focus, .btn-outline-light:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(248, 249, 250, .5)
-}
-
-.btn-outline-dark:not(:disabled):not(.disabled).active, .btn-outline-dark:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: #343a40;
-    border-color: #343a40
-}
-
-.btn-outline-dark:not(:disabled):not(.disabled).active:focus, .btn-outline-dark:not(:disabled):not(.disabled):active:focus {
-    box-shadow: 0 0 0 .2rem rgba(52, 58, 64, .5)
-}
-
 .btn-block {
     display: block;
     width: 100%

From c5656bb681cd429468529aaf71ceb8f201b1b197 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Thu, 28 Jan 2021 11:10:31 +1100
Subject: [PATCH 15/19] Updated order by table. Bandwidth to be 0.5 step

Update formating for order by table

Bandwidth can now be as low as 0.5 when adding a server
---
 class.php | 81 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/class.php b/class.php
index b3f5de4..e0126e1 100644
--- a/class.php
+++ b/class.php
@@ -1752,7 +1752,8 @@ class idlers extends helperFunctions
         $this->rowColOpen('form-row', 'col-12 col-md-6');
         $this->tagOpen('div', 'input-group');
         $this->inputPrepend('Bandwidth');
-        $this->numberInput('bandwidth', '', 'form-control', false, 1, 99999, 'any');
+        $this->numberInput('bandwidth', '4', 'form-control', false, '0.5', 99999, '0.5');
+        $this->outputString('<div class="input-group-append"><span class="input-group-text">TB</span></div>');
         $this->tagClose('div', 2);
         $this->colOpen('col-12 col-md-6');
         $this->tagOpen('div', 'input-group');
@@ -2401,8 +2402,8 @@ class idlers extends helperFunctions
     public function orderTable(int $order_type)
     {
         if (in_array($order_type, array(1, 2, 3, 4, 5, 6, 7, 8))) {
-            $this->tableHeader(array('Hostname', 'CPU', 'Freq', 'Ram', 'Swap', 'Disk'));
-            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram_mb`, `swap_mb`, `disk_gb` FROM `servers`";
+            $this->tableHeader(array('Hostname', 'CPU', 'Freq', 'Ram', 'Swap', 'Disk', 'BWidth'));
+            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `swap`, `swap_type`, `swap_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type` FROM `servers`";
             if ($order_type == 1) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `cpu` DESC;");
             } elseif ($order_type == 2) {
@@ -2425,15 +2426,16 @@ class idlers extends helperFunctions
                 $this->tagOpen('tr');
                 $this->outputString("<td>{$row['hostname']}</td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>{$row['cpu_freq']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['swap_mb'], 0) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['swap'], 0) . "<span class='table-val-type'>" . $row['swap_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         } elseif (in_array($order_type, array(9, 10))) {
-            $this->tableHeader(array('Hostname', 'Owned since', 'CPU', 'Freq', 'Ram', 'Disk'));
-            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram_mb`, `disk_gb`, DATE_FORMAT(`owned_since`, '%D %b %Y') as dt FROM `servers`";
+            $this->tableHeader(array('Hostname', 'Owned since', 'CPU', 'Freq', 'Ram', 'Disk', 'BWidth'));
+            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type`, DATE_FORMAT(`owned_since`, '%D %b %Y') as dt FROM `servers`";
             if ($order_type == 9) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `owned_since` DESC;");
             } elseif ($order_type == 10) {
@@ -2445,14 +2447,15 @@ class idlers extends helperFunctions
                 $this->outputString("<td>{$row['hostname']}</td>");
                 $this->outputString("<td>{$row['dt']}</td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>{$row['cpu_freq']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         } elseif (in_array($order_type, array(11, 12, 13, 14))) {
-            $this->tableHeader(array('Hostname', 'GB5 single', 'GB5 multi', 'CPU', 'Freq', 'Ram', 'Disk'));
-            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram_mb`, `disk_gb`, `gb5_single`, `gb5_multi` FROM `servers` WHERE has_yabs = 1";
+            $this->tableHeader(array('Hostname', 'GB5 single', 'GB5 multi', 'CPU', 'Freq', 'Ram', 'Disk', 'BWidth'));
+            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type`, `gb5_single`, `gb5_multi` FROM `servers` WHERE has_yabs = 1";
             if ($order_type == 11) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `gb5_single` DESC;");
             } elseif ($order_type == 12) {
@@ -2469,14 +2472,15 @@ class idlers extends helperFunctions
                 $this->outputString("<td>{$row['gb5_single']}</td>");
                 $this->outputString("<td>{$row['gb5_multi']}</td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>{$row['cpu_freq']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         } elseif (in_array($order_type, array(15, 16, 17, 18))) {
-            $this->tableHeader(array('Hostname', 'Price', 'Term', 'P/M', 'CPU', 'Ram', 'Disk'));
-            $base_query = "SELECT `id`, `hostname`, `cpu`, `ram_mb`, `disk_gb`, `price`, `currency`, `term`, `per_month` FROM `servers` INNER JOIN `pricing`p on servers.id = p.server_id";
+            $this->tableHeader(array('Hostname', 'Price', 'Term', 'P/M', 'USD', 'CPU', 'Freq', 'Ram', 'Disk', 'BWidth'));
+            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type`, `price`, `currency`, `term`, `per_month`, `as_usd` FROM `servers` INNER JOIN `pricing`p on servers.id = p.server_id";
             if ($order_type == 15) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `as_usd` DESC;");
             } elseif ($order_type == 16) {
@@ -2493,14 +2497,17 @@ class idlers extends helperFunctions
                 $this->outputString("<td>{$row['price']} {$row['currency']}</td>");
                 $this->outputString("<td>" . $this->paymentTerm($row['term']) . "</td>");
                 $this->outputString("<td>{$row['per_month']}</td>");
+                $this->outputString("<td>{$row['as_usd']}</td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         } elseif (in_array($order_type, array(19, 20, 21, 22, 23, 24, 25, 26))) {
-            $this->tableHeader(array('Hostname', '4k', '64k', '512k', '1m', 'CPU', 'Ram', 'Disk'));
-            $base_query = "SELECT `id`, `hostname`, `cpu`, `ram_mb`, `disk_gb`, `4k`, `4k_type`, `64k`, `64k_type`, `512k`, `512k_type`, `1m`, `1m_type` FROM `servers` INNER JOIN `disk_speed`p on servers.id = p.server_id WHERE has_yabs = 1";
+            $this->tableHeader(array('Hostname', '4k', '64k', '512k', '1m', 'CPU', 'Freq', 'Ram', 'Disk', 'BWidth'));
+            $base_query = "SELECT  `id`, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type`, `4k`, `4k_type`, `64k`, `64k_type`, `512k`, `512k_type`, `1m`, `1m_type` FROM `servers` INNER JOIN `disk_speed`p on servers.id = p.server_id WHERE has_yabs = 1";
             if ($order_type == 19) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `4k_as_mbps` DESC;");
             } elseif ($order_type == 20) {
@@ -2527,13 +2534,15 @@ class idlers extends helperFunctions
                 $this->outputString("<td>{$row['512k']}<span class='table-val-type'>{$row['512k_type']}</span></td>");
                 $this->outputString("<td>{$row['1m']}<span class='table-val-type'>{$row['1m_type']}</span></td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         } elseif (in_array($order_type, array(27, 28, 29, 30))) {
-            $this->tableHeader(array('Hostname', 'Send', 'Receive', 'Location', 'CPU', 'Ram', 'Disk'));
-            $base_query = "SELECT servers.id, `hostname`, `cpu`, `ram_mb`, `disk_gb`, `send`, `send_type`, p.location, `recieve`, `recieve_type` FROM `servers` INNER JOIN `speed_tests`p on servers.id = p.server_id WHERE has_yabs = 1";
+            $this->tableHeader(array('Hostname', 'Send', 'Receive', 'Location', 'CPU', 'Freq', 'Ram', 'Disk', 'BWidth'));
+            $base_query = "SELECT servers.id, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type`, `send`, `send_type`, p.location, `recieve`, `recieve_type` FROM `servers` INNER JOIN `speed_tests`p on servers.id = p.server_id WHERE has_yabs = 1";
             if ($order_type == 27) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `send_as_mbps` DESC LIMIT 80;");
             } elseif ($order_type == 28) {
@@ -2551,13 +2560,15 @@ class idlers extends helperFunctions
                 $this->outputString("<td>{$row['recieve']}<span class='table-val-type'>{$row['recieve_type']}</span></td>");
                 $this->outputString("<td>{$row['location']}</td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         } elseif (in_array($order_type, array(31, 32))) {
             $this->tableHeader(array('Hostname', 'Bandwidth', 'CPU', 'Freq', 'Ram', 'Disk'));
-            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram_mb`, `disk_gb`, `bandwidth` FROM `servers`";
+            $base_query = "SELECT `id`, `hostname`, `cpu`, `cpu_freq`, `ram`, `ram_type`, `ram_mb`, `disk`, `disk_type`, `disk_gb`, `bandwidth`, `bandwidth_type` FROM `servers`";
             if ($order_type == 31) {
                 $select = $this->dbConnect()->prepare("$base_query ORDER BY `bandwidth` DESC;");
             } elseif ($order_type == 32) {
@@ -2567,11 +2578,11 @@ class idlers extends helperFunctions
             while ($row = $select->fetch(PDO::FETCH_ASSOC)) {
                 $this->tagOpen('tr');
                 $this->outputString("<td>{$row['hostname']}</td>");
-                $this->outputString("<td>{$row['bandwidth']}</td>");
+                $this->outputString("<td>" . number_format($row['bandwidth'], 0) . "<span class='table-val-type'>" . $row['bandwidth_type'] . "</span></td>");
                 $this->outputString("<td>{$row['cpu']}</td>");
-                $this->outputString("<td>{$row['cpu_freq']}</td>");
-                $this->outputString("<td>" . number_format($row['ram_mb'], 2) . "<span class='table-val-type'>MB</span></td>");
-                $this->outputString("<td>" . number_format($row['disk_gb'], 0) . "<span class='table-val-type'>GB</span></td>");
+                $this->outputString("<td>" . $this->mhzToGhz($row['cpu_freq']) . "<span class='table-val-type'>Ghz</span></td>");
+                $this->outputString("<td>" . number_format($row['ram'], 0) . "<span class='table-val-type'>" . $row['ram_type'] . "</span></td>");
+                $this->outputString("<td>" . number_format($row['disk'], 0) . "<span class='table-val-type'>" . $row['disk_type'] . "</span></td>");
                 $this->tagClose('tr');
             }
         }
@@ -2632,7 +2643,7 @@ class idlers extends helperFunctions
 
         $oldest_d = $this->dbConnect()->prepare("SELECT `domain`, `owned_since`  FROM `domains` ORDER BY `owned_since`;");
         $oldest_d->execute();
-        if (isset($oldest_d->fetchAll(PDO::FETCH_ASSOC)[0])){
+        if (isset($oldest_d->fetchAll(PDO::FETCH_ASSOC)[0])) {
             $oldest_d_row = $oldest_d->fetchAll(PDO::FETCH_ASSOC)[0];
         } else {
             $oldest_d_row = array('domain' => null, 'owned_since' => null);

From c74609c406f44f5ba5a751d1b73973538bdde402 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Fri, 29 Jan 2021 11:20:24 +1100
Subject: [PATCH 16/19] Added objects table view format

Can now view servers, shared hosting and domains as a table with the icon switcher.
---
 assets/css/all.min.css   |   2 +-
 assets/css/style.css     |  65 +++++++++-
 assets/js/scripts.min.js |  33 +++++
 calls.php                |   3 +
 class.php                | 261 ++++++++++++++++++++++++++++++++++++++-
 5 files changed, 359 insertions(+), 5 deletions(-)

diff --git a/assets/css/all.min.css b/assets/css/all.min.css
index b201d57..084eda0 100644
--- a/assets/css/all.min.css
+++ b/assets/css/all.min.css
@@ -2,4 +2,4 @@
  * Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-.fa,.fas,.far,.fal,.fad,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid .08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fas.fa-pull-left,.far.fa-pull-left,.fal.fa-pull-left,.fab.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fas.fa-pull-right,.far.fa-pull-right,.fal.fa-pull-right,.fab.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);transform:scale(1,-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(-1,-1);transform:scale(-1,-1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-flip-both{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-centos:before{content:"\f789"}.fa-box:before{content:"\f466"}.fa-compact-disc:before{content:"\f51f"}.fa-fedora:before{content:"\f798"}.fa-hdd:before{content:"\f0a0"}.fa-linux:before{content:"\f17c"}.fa-memory:before{content:"\f538"}.fa-microchip:before{content:"\f2db"}.fa-search:before{content:"\f002"}.fa-ubuntu:before{content:"\f7df"}.fa-windows:before{content:"\f17a"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:'Font Awesome 5 Brands';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url("../webfonts/fa-brands-400.svg#fontawesome") format("svg")}.fab{font-family:'Font Awesome 5 Brands';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url("../webfonts/fa-regular-400.svg#fontawesome") format("svg")}.far{font-family:'Font Awesome 5 Free';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url("../webfonts/fa-solid-900.svg#fontawesome") format("svg")}.fa,.fas{font-family:'Font Awesome 5 Free';font-weight:900;margin-right: 0.15rem;}
\ No newline at end of file
+.fa,.fas,.far,.fal,.fad,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid .08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fas.fa-pull-left,.far.fa-pull-left,.fal.fa-pull-left,.fab.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fas.fa-pull-right,.far.fa-pull-right,.fal.fa-pull-right,.fab.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);transform:scale(1,-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(-1,-1);transform:scale(-1,-1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-flip-both{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-centos:before{content:"\f789"}.fa-box:before{content:"\f466"}.fa-compact-disc:before{content:"\f51f"}.fa-fedora:before{content:"\f798"}.fa-hdd:before{content:"\f0a0"}.fa-linux:before{content:"\f17c"}.fa-memory:before{content:"\f538"}.fa-microchip:before{content:"\f2db"}.fa-search:before{content:"\f002"}.fa-table:before{content:"\f0ce"}.fa-th:before{content:"\f00a"}.fa-ubuntu:before{content:"\f7df"}.fa-windows:before{content:"\f17a"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:'Font Awesome 5 Brands';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url("../webfonts/fa-brands-400.svg#fontawesome") format("svg")}.fab{font-family:'Font Awesome 5 Brands';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url("../webfonts/fa-regular-400.svg#fontawesome") format("svg")}.far{font-family:'Font Awesome 5 Free';font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url("../webfonts/fa-solid-900.svg#fontawesome") format("svg")}.fa,.fas{font-family:'Font Awesome 5 Free';font-weight:900;margin-right: 0.15rem;}
\ No newline at end of file
diff --git a/assets/css/style.css b/assets/css/style.css
index c6bcd40..5e657ee 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -331,13 +331,13 @@ textarea {
 
 .table td, .table th {
     padding: .75rem;
-    vertical-align: top;
     border-top: 1px solid #dee2e6
 }
 
 .table thead th {
     vertical-align: bottom;
-    border-bottom: 2px solid #dee2e6
+    border-bottom: 2px solid #dee2e6;
+    font-weight: 600;
 }
 
 .table-sm td, .table-sm th {
@@ -1142,10 +1142,71 @@ button.close {
     color: #bf5151;
 }
 
+.fa-th, .fa-table {
+    color: #8787ff;
+    font-size: 1.2rem;
+}
+
+.os-td {
+    text-align: center;
+    vertical-align: middle;
+}
+
+.objects-table td, .objects-table th {
+    padding: 0.6rem 0.4rem;
+}
+
+.objects-table tr {
+    transition: ease-in-out 0.4s;
+}
+
+.objects-table tr:hover {
+    background: #f2f7fb;
+}
+
+.td-text-sml {
+    font-size: 86%;
+}
+
+.td-text-med {
+    font-size: 90%;
+}
+
+.td-special-price {
+    background: #ffd70014;
+}
+
+.td-due-soon {
+    background: #ff00000f;
+}
+
+.td-not-due-soon {
+    background: #00ff340f;
+}
+
+.objects-table th:first-child, .objects-table td:first-child {
+    position: sticky;
+    left: 0;
+    background-color: #f6f6f6;
+}
+
+.table-btn {
+    font-size: 0.8rem;
+    padding: .01rem 0.6rem;
+}
+
+.td-nowrap {
+    white-space: nowrap;
+}
+
 .tab-pane {
     margin-top: .8rem
 }
 
+.mt-1 {
+    margin-top: 1rem;
+}
+
 .input-group-text {
     color: #2d3032;
     background-color: #dbe4ee;
diff --git a/assets/js/scripts.min.js b/assets/js/scripts.min.js
index dfd7019..9d5d267 100644
--- a/assets/js/scripts.min.js
+++ b/assets/js/scripts.min.js
@@ -313,6 +313,39 @@ $(document).on("click", "#checkUpStatus", function () {
     }
 });
 
+$(document).on("click", "#viewSwitcherIcon", function () {
+    var icon = $(this).children().first();
+    if ($("#serversTable").children().length == 0){
+        $.ajax({
+            type: "GET",
+            url: "calls.php",
+            data: {"type": "object_tables"},
+            success: function (result) {
+                $("#tableViewDiv").append(result);
+            }
+        });
+        icon.removeClass("fa-table");
+        icon.addClass("fa-th");
+        $("#cardsViewDiv" ).hide();
+        $("#tableViewDiv" ).show();
+        $('#viewSwitchIcon').prop('title', 'Switch to cards');
+    } else {
+        if (icon.hasClass("fa-table")) {
+            icon.removeClass("fa-table");
+            icon.addClass("fa-th");
+            $( "#cardsViewDiv" ).hide();
+            $( "#tableViewDiv" ).show();
+            $('#viewSwitchIcon').prop('title', 'Switch to cards');
+        } else if (icon.hasClass("fa-th")) {
+            icon.removeClass("fa-th");
+            icon.addClass("fa-table");
+            $( "#tableViewDiv" ).hide();
+            $( "#cardsViewDiv" ).show();
+            $('#viewSwitchIcon').prop('title', 'Switch to table');
+        }
+    }
+});
+
 $('#virt').change(function(){
     if($(this).val() == 'DEDI'){
         $('#dedi_cpu').prop("checked", true);
diff --git a/calls.php b/calls.php
index 8e7bf9f..e3f0dbf 100644
--- a/calls.php
+++ b/calls.php
@@ -40,6 +40,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             $idle->getIpForDomain($_GET['hostname'], $_GET['type']);
         } elseif ($_GET['type'] == 'check_up') {
             echo $idle->checkIsUp($_GET['host']);
+        } elseif ($_GET['type'] == 'object_tables') {
+            header('Content-Type: text/html; charset=utf-8');
+            echo $idle->objectTables();
         }
     }
 } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
diff --git a/class.php b/class.php
index e0126e1..302fb62 100644
--- a/class.php
+++ b/class.php
@@ -14,6 +14,9 @@ class idlersConfig
     const DB_NAME = 'idlers';
     const DB_USERNAME = 'root';
     const DB_PASSWORD = '';
+
+    //Have slight background color for server table values: was special price and due soon
+    const COLOR_TABLE = true;
 }
 
 class elementHelpers extends idlersConfig
@@ -153,10 +156,10 @@ class elementHelpers extends idlersConfig
         $this->tagClose("ul");
     }
 
-    protected function tableHeader(array $headers)
+    protected function tableHeader(array $headers, string $class = 'table table-striped table-bordered table-sm', string $id = 'orderTable')
     {
         $this->tagOpen('div', 'table-responsive');
-        $this->outputString("<table class='table table-striped table-bordered table-sm' id='orderTable'>");
+        $this->outputString("<table class='$class' id='$id'>");
         $this->tagOpen('thead');
         $this->tagOpen('tr');
         foreach ($headers as $th) {
@@ -165,6 +168,13 @@ class elementHelpers extends idlersConfig
         $this->outputString('</tr></thead><tbody>');
     }
 
+    protected function tableTd(string $class, $content)
+    {
+        $this->tagOpen('td', $class);
+        $this->outputString($content);
+        $this->tagClose('td');
+    }
+
     protected function virtSelectOptions()
     {
         $this->selectOption('KVM', 'KVM', true);
@@ -585,10 +595,15 @@ class idlers extends helperFunctions
         $this->navTabs(array('Services', 'Add', 'Order', 'Info', 'Search'), array('#services', '#add_server', '#order', '#info', '#search'));
         $this->outputString('<div id="myTabContent" class="tab-content">');
         $this->outputString('<div class="tab-pane server-cards fade active show" id="services">');
+        $this->viewSwitcherIcon();
+        $this->tagOpen('div', '', 'cardsViewDiv');
         $this->serverCards();
         $this->sharedHostingCards();
         $this->domainCards();
         $this->tagClose('div');
+        $this->tagOpen('div', '', 'tableViewDiv');
+        //Objects tables
+        $this->tagClose('div', 2);
         $this->outputString('<div class="tab-pane fade" id="add_server">');
         //BTN Bar
         $this->rowColOpen('row text-center', 'col-12 btn-bar-col');
@@ -856,6 +871,41 @@ class idlers extends helperFunctions
         $this->tagClose('div');
     }
 
+    protected function serverTable()
+    {
+        if (self::SRV_SORT_TYPE == 'HOSTNAME_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` ORDER BY `hostname` DESC;");
+        } elseif (self::SRV_SORT_TYPE == 'HOSTNAME_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` ORDER BY `hostname`;");
+        } elseif (self::SRV_SORT_TYPE == 'OWNED_SINCE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` ORDER BY `owned_since` DESC;");
+        } elseif (self::SRV_SORT_TYPE == 'OWNED_SINCE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` ORDER BY `owned_since`;");
+        } elseif (self::SRV_SORT_TYPE == 'PRICE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` INNER JOIN `pricing` ON servers.id = pricing.server_id ORDER BY `as_usd` DESC;");
+        } elseif (self::SRV_SORT_TYPE == 'PRICE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` INNER JOIN `pricing` ON servers.id = pricing.server_id ORDER BY `as_usd`;");
+        } elseif (self::SRV_SORT_TYPE == 'DUE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` INNER JOIN `pricing` ON servers.id = pricing.server_id ORDER BY `next_dd` DESC;");
+        } elseif (self::SRV_SORT_TYPE == 'DUE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers` INNER JOIN `pricing` ON servers.id = pricing.server_id ORDER BY `next_dd`;");
+        } else {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `servers`;");
+        }
+        $select->execute();
+        $count = $select->rowCount();
+        if ($count > 0) {
+            $this->HTMLPhrase('h4', 'card-section-header', 'Servers <span class="object-count">' . $count . '</span>');
+            $this->tagOpen('div', 'row');
+            $this->tableHeader(array('Hostname', '', '', 'Type', 'CPU', 'RAM', 'Disk', 'Price', 'OS', 'Location', 'Provider', 'Due', 'Owned', 'IPv4', 'IPv6', 'Tags'), 'table objects-table', 'serversTable');
+            while ($row = $select->fetch(PDO::FETCH_ASSOC)) {
+                $this->vpsTableRow($row['id']);
+            }
+            $this->outputString('</tbody></table></div>');
+            $this->tagClose('div');
+        }
+    }
+
     protected function vpsCard(string $id)
     {
         $select = $this->dbConnect()->prepare("
@@ -920,6 +970,206 @@ class idlers extends helperFunctions
         $this->tagClose('div', 5);
     }
 
+    protected function locationForTable(string $location)
+    {
+        if (strpos($location, ',') !== false) {
+            return explode(',', $location)[0];
+        } else {
+            return $location;
+        }
+    }
+
+    public function objectTables()
+    {
+        $this->serverTable();
+        $this->sharedHostingTable();
+        $this->domainTable();
+    }
+
+    protected function vpsTableRow(string $id)
+    {
+        $select = $this->dbConnect()->prepare("
+           SELECT servers.id,servers.hostname,servers.ipv4,servers.ipv6,servers.`cpu`,servers.cpu_freq,servers.ram,servers.ram_type,servers.`disk`,
+           servers.disk_type,servers.os,servers.virt,servers.tags, DATE_FORMAT(`owned_since`, '%d %b %Y') as dt, servers.was_special,locations.name as location,providers.name as provider,pricing.price,pricing.currency,pricing.term,pricing.next_dd
+           FROM servers INNER JOIN locations on servers.location = locations.id INNER JOIN providers on servers.provider = providers.id
+           INNER JOIN pricing on servers.id = pricing.server_id WHERE servers.id = ? LIMIT 1;");
+        $select->execute([$id]);
+        $data = $select->fetchAll(PDO::FETCH_ASSOC)[0];
+        if (self::COLOR_TABLE) {
+            ($data['was_special'] == 1) ? $special_class = 'td-special-price' : $special_class = '';
+            if ($this->processDueDate($data['id'], $data['term'], $data['next_dd']) < 7) {
+                $ds_class = 'td-due-soon';
+            } elseif ($this->processDueDate($data['id'], $data['term'], $data['next_dd']) > 300) {
+                $ds_class = 'td-not-due-soon';
+            } else {
+                $ds_class = '';
+            }
+        } else {
+            $special_class = $ds_class = '';
+        }
+        (empty($data['ipv4']) || is_null($data['ipv4'])) ? $host = $data['hostname'] : $host = $data['ipv4'];
+        $this->tagOpen('tr');
+        $this->tableTd('', $data['hostname']);
+        $this->tableTd('', '<a class="btn btn-main table-btn" id="viewMoreServer" value="' . $data['id'] . '" data-target="#viewMoreServerModal" data-toggle="modal" href="#" role="button">More</a>');
+        $this->tableTd('', '<a class="btn btn-second table-btn" id="editServer" value="' . $data['id'] . '" data-target="#editServerModal" data-toggle="modal" href="#" role="button">Edit</a>');
+        $this->tableTd('td-text-sml', $data['virt']);
+        $this->tableTd('td-nowrap', $data['cpu'] . '<span class="data-type">@' . $this->mhzToGhz($data['cpu_freq']) . 'Ghz</span>');
+        $this->tableTd('td-nowrap', $data['ram'] . '<span class="data-type">' . $data['ram_type'] . '</span>');
+        $this->tableTd('td-nowrap', $data['disk'] . '<span class="data-type">' . $data['disk_type'] . '</span>');
+        $this->tableTd('td-nowrap ' . $special_class . '', $data['price'] . ' <span class="data-type">' . $data['currency'] . ' ' . $this->paymentTerm($data['term']) . '</span>');
+        $this->tableTd('', '<a id="checkUpStatus" href="#" value="' . $host . '">' . $this->osIntToIcon($data['os']) . '</a>');
+        $this->tableTd('td-nowrap td-text-med', '<div class="td-nowrap">' . $this->locationForTable($data['location']) . '</div>');
+        $this->tableTd('td-nowrap td-text-med', '<div class="td-nowrap">' . $data['provider'] . '</div>');
+        $this->tableTd('td-nowrap td-text-sml ' . $ds_class . '', '<div class="td-nowrap">' . $this->processDueDate($data['id'], $data['term'], $data['next_dd']) . ' days</div>');
+        $this->tableTd('td-nowrap td-text-sml', '<div class="td-nowrap">' . $data['dt'] . '</div>');
+        $this->tableTd('td-nowrap td-text-sml', '<div class="td-nowrap">' . $data['ipv4'] . '</div>');
+        $this->tableTd('td-nowrap td-text-sml', '<div class="td-nowrap">' . $data['ipv6'] . '</div>');
+        $this->tableTd('td-nowrap td-text-sml', '<div class="td-nowrap">' . $data['tags'] . '</div>');
+        $this->tagClose('tr');
+    }
+
+    protected function sharedHostingTable()
+    {
+        if (self::SH_SORT_TYPE == 'DOMAIN_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` ORDER BY `domain` DESC;");
+        } elseif (self::SH_SORT_TYPE == 'DOMAIN_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` ORDER BY `domain`;");
+        } elseif (self::SH_SORT_TYPE == 'OWNED_SINCE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` ORDER BY `owned_since` DESC;");
+        } elseif (self::SH_SORT_TYPE == 'OWNED_SINCE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` ORDER BY `owned_since`;");
+        } elseif (self::SH_SORT_TYPE == 'PRICE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` INNER JOIN `pricing` ON shared_hosting.id = pricing.server_id ORDER BY `as_usd` DESC;");
+        } elseif (self::SH_SORT_TYPE == 'PRICE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` INNER JOIN `pricing` ON shared_hosting.id = pricing.server_id ORDER BY `as_usd`;");
+        } elseif (self::SH_SORT_TYPE == 'DUE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` INNER JOIN `pricing` ON shared_hosting.id = pricing.server_id ORDER BY `next_dd` DESC;");
+        } elseif (self::SH_SORT_TYPE == 'DUE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting` INNER JOIN `pricing` ON shared_hosting.id = pricing.server_id ORDER BY `next_dd`;");
+        } else {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `shared_hosting`;");
+        }
+        $select->execute();
+        $count = $select->rowCount();
+        if ($count > 0) {
+            $this->HTMLPhrase('h4', 'card-section-header mt-1', 'Shared hosting <span class="object-count">' . $count . '</span>');
+            $this->tagOpen('div', 'row');
+            $this->tableHeader(array('Domain', '', '', 'Type', 'Disk', 'Price', 'Location', 'Provider', 'Due', 'BWidth', 'Domains', 'Emails', 'FTPs', 'DBs', 'Since'), 'table objects-table', 'sharedHostingTable');
+            while ($row = $select->fetch(PDO::FETCH_ASSOC)) {
+                $this->sharedHostingTableRow($row['id']);
+            }
+            $this->outputString('</tbody></table></div>');
+            $this->tagClose('div');
+        }
+    }
+
+    protected function domainTable()
+    {
+        if (self::DC_SORT_TYPE == 'DOMAIN_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` ORDER BY `domain` DESC;");
+        } elseif (self::DC_SORT_TYPE == 'DOMAIN_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` ORDER BY `domain`;");
+        } elseif (self::DC_SORT_TYPE == 'OWNED_SINCE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` ORDER BY `owned_since` DESC;");
+        } elseif (self::DC_SORT_TYPE == 'OWNED_SINCE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` ORDER BY `owned_since`;");
+        } elseif (self::DC_SORT_TYPE == 'PRICE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` INNER JOIN `pricing` ON domains.id = pricing.server_id ORDER BY `as_usd` DESC;");
+        } elseif (self::DC_SORT_TYPE == 'PRICE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` INNER JOIN `pricing` ON domains.id = pricing.server_id ORDER BY `as_usd`;");
+        } elseif (self::DC_SORT_TYPE == 'DUE_DESC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` INNER JOIN `pricing` ON domains.id = pricing.server_id ORDER BY `next_dd` DESC;");
+        } elseif (self::DC_SORT_TYPE == 'DUE_ASC') {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains` INNER JOIN `pricing` ON domains.id = pricing.server_id ORDER BY `next_dd`;");
+        } else {
+            $select = $this->dbConnect()->prepare("SELECT `id` FROM `domains`;");
+        }
+        $select->execute();
+        $count = $select->rowCount();
+        if ($count > 0) {
+            $this->HTMLPhrase('h4', 'card-section-header mt-1', 'Domains <span class="object-count">' . $count . '</span>');
+            $this->tagOpen('div', 'row');
+            $this->tableHeader(array('Domain', '', '', 'NS1', 'NS2', 'Price', 'Provider', 'Due', 'Since'), 'table objects-table', 'domainsTable');
+            while ($row = $select->fetch(PDO::FETCH_ASSOC)) {
+                $this->domainTableRow($row['id']);
+            }
+            $this->outputString('</tbody></table></div>');
+            $this->tagClose('div');
+        }
+    }
+
+    protected function domainTableRow(string $id)
+    {
+        $select = $this->dbConnect()->prepare("
+           SELECT domains.id,domains.domain,domains.attached_to,domains.ns1,domains.ns2,DATE_FORMAT(`owned_since`, '%d %b %Y') as dt,providers.name as provider, pricing.price,pricing.currency,pricing.term,pricing.next_dd
+           FROM domains INNER JOIN providers on domains.provider = providers.id
+           INNER JOIN pricing on domains.id = pricing.server_id WHERE domains.id = ? LIMIT 1;");
+        $select->execute([$id]);
+        $data = $select->fetchAll(PDO::FETCH_ASSOC)[0];
+        if (self::COLOR_TABLE) {
+            if ($this->processDueDate($data['id'], $data['term'], $data['next_dd']) < 7) {
+                $ds_class = 'td-due-soon';
+            } elseif ($this->processDueDate($data['id'], $data['term'], $data['next_dd']) > 300) {
+                $ds_class = 'td-not-due-soon';
+            } else {
+                $ds_class = '';
+            }
+        } else {
+            $ds_class = '';
+        }
+        $this->tagOpen('tr');
+        $this->tableTd('td-nowrap', $data['domain']);
+        $this->tableTd('', '<a class="btn btn-main table-btn" id="viewMoreDomain" value="' . $data['id'] . '" data-target="#viewMoreModalDomain" data-toggle="modal" href="#" role="button">More</a>');
+        $this->tableTd('', '<a class="btn btn-second table-btn" id="editDomain" value="' . $data['id'] . '" data-target="#editModalDomain" data-toggle="modal" href="#" role="button">Edit</a>');
+        $this->tableTd('td-nowrap', '<code>' . $data['ns1'] . '<code>');
+        $this->tableTd('td-nowrap', '<code>' . $data['ns2'] . '<code>');
+        $this->tableTd('td-nowrap', $data['price'] . ' <span class="data-type">' . $data['currency'] . ' ' . $this->paymentTerm($data['term']) . '</span>');
+        $this->tableTd('td-nowrap td-text-med', '<div class="td-nowrap">' . $data['provider'] . '</div>');
+        $this->tableTd('td-nowrap td-text-sml ' . $ds_class . '', '<div class="td-nowrap">' . $this->processDueDate($data['id'], $data['term'], $data['next_dd']) . ' days</div>');
+        $this->tableTd('td-nowrap', $data['dt']);
+        $this->tagClose('tr');
+    }
+
+    protected function sharedHostingTableRow(string $id)
+    {
+        $select = $this->dbConnect()->prepare("
+           SELECT shared_hosting.id,shared_hosting.domain,shared_hosting.type,shared_hosting.was_special,shared_hosting.disk,shared_hosting.disk_type,shared_hosting.bandwidth,shared_hosting.domains_limit,shared_hosting.emails,
+                  shared_hosting.ftp,shared_hosting.db,DATE_FORMAT(`owned_since`, '%d %b %Y') as dt,locations.name as location,providers.name as provider,pricing.price,pricing.currency,pricing.term,pricing.next_dd
+           FROM shared_hosting INNER JOIN locations on shared_hosting.location = locations.id INNER JOIN providers on shared_hosting.provider = providers.id
+           INNER JOIN pricing on shared_hosting.id = pricing.server_id WHERE shared_hosting.id = ? LIMIT 1;");
+        $select->execute([$id]);
+        $data = $select->fetchAll(PDO::FETCH_ASSOC)[0];
+        if (self::COLOR_TABLE) {
+            ($data['was_special'] == 1) ? $special_class = 'td-special-price' : $special_class = '';
+            if ($this->processDueDate($data['id'], $data['term'], $data['next_dd']) < 7) {
+                $ds_class = 'td-due-soon';
+            } elseif ($this->processDueDate($data['id'], $data['term'], $data['next_dd']) > 300) {
+                $ds_class = 'td-not-due-soon';
+            } else {
+                $ds_class = '';
+            }
+        } else {
+            $special_class = $ds_class = '';
+        }
+        $this->tagOpen('tr');
+        $this->tableTd('td-nowrap', $data['domain']);
+        $this->tableTd('', '<a class="btn btn-main table-btn" id="viewMoreSharedHosting" value="' . $data['id'] . '" data-target="#viewMoreModalSharedHosting" data-toggle="modal" href="#" role="button">More</a>');
+        $this->tableTd('', '<a class="btn btn-second table-btn" id="editSharedHosting" value="' . $data['id'] . '" data-target="#editModalSharedHosting" data-toggle="modal" href="#" role="button">Edit</a>');
+        $this->tableTd('td-nowrap td-text-sml', $data['type']);
+        $this->tableTd('td-nowrap', $data['disk'] . '<span class="data-type">' . $data['disk_type'] . '</span>');
+        $this->tableTd('td-nowrap ' . $special_class . '', $data['price'] . ' <span class="data-type">' . $data['currency'] . ' ' . $this->paymentTerm($data['term']) . '</span>');
+        $this->tableTd('td-nowrap td-text-med', '<div class="td-nowrap">' . $this->locationForTable($data['location']) . '</div>');
+        $this->tableTd('td-nowrap td-text-med', '<div class="td-nowrap">' . $data['provider'] . '</div>');
+        $this->tableTd('td-nowrap td-text-sml ' . $ds_class . '', '<div class="td-nowrap">' . $this->processDueDate($data['id'], $data['term'], $data['next_dd']) . ' days</div>');
+        $this->tableTd('td-nowrap', $data['bandwidth'] . '<span class="data-type">TB</span>');
+        $this->tableTd('td-nowrap', $data['domains_limit']);
+        $this->tableTd('td-nowrap', $data['emails']);
+        $this->tableTd('td-nowrap', $data['ftp']);
+        $this->tableTd('td-nowrap', $data['db']);
+        $this->tableTd('td-nowrap', $data['dt']);
+        $this->tagClose('tr');
+    }
+
     protected function SharedHostingCard(string $id)
     {
         $select = $this->dbConnect()->prepare("
@@ -2827,6 +3077,13 @@ class idlers extends helperFunctions
         return $result;
     }
 
+    protected function viewSwitcherIcon()
+    {
+        $this->rowColOpen('row text-center', 'col-12');
+        $this->outputString('<a id="viewSwitcherIcon"><i class="fas fa-table" id="viewSwitchIcon" title="Switch to table"></i></a>');
+        $this->tagClose('div', 2);
+    }
+
 }
 
 class itemInsert extends idlers

From 910ff94b149beda42b01278aa584e9f643b45597 Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Fri, 29 Jan 2021 11:20:47 +1100
Subject: [PATCH 17/19] Updated server bandwidth column to float type

Updated server bandwidth column to float type
---
 update.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/update.sql b/update.sql
index 2764157..ad8b414 100644
--- a/update.sql
+++ b/update.sql
@@ -25,4 +25,7 @@ UPDATE servers t1
         HAVING COUNT(*) > 0
     ) t2
     ON t1.id = t2.server_id
-SET t1.has_st = 1;
\ No newline at end of file
+SET t1.has_st = 1;
+
+ALTER TABLE `servers`
+    CHANGE COLUMN `bandwidth` `bandwidth` FLOAT NULL DEFAULT NULL AFTER `disk_type`;
\ No newline at end of file

From c67ae671e41fed4ccef1e43330c349870e33d8ef Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Fri, 29 Jan 2021 11:38:52 +1100
Subject: [PATCH 18/19] Updated database to reflect changes made

my_ilders.sql reflects updater.sql
---
 my_idlers.sql | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/my_idlers.sql b/my_idlers.sql
index d95249c..c02df60 100644
--- a/my_idlers.sql
+++ b/my_idlers.sql
@@ -299,7 +299,7 @@ CREATE TABLE IF NOT EXISTS `servers`
     `ns1`              varchar(124) DEFAULT NULL,
     `ns2`              varchar(124) DEFAULT NULL,
     `virt`             varchar(4)   DEFAULT NULL,
-    `cpu`              int(11)      DEFAULT '1',
+    `cpu`              int(11)      DEFAULT 1,
     `cpu_type`         varchar(124) DEFAULT NULL,
     `cpu_freq`         float        DEFAULT NULL,
     `ram`              float        DEFAULT NULL,
@@ -311,23 +311,24 @@ CREATE TABLE IF NOT EXISTS `servers`
     `disk`             int(11)      DEFAULT NULL,
     `disk_gb`          int(11)      DEFAULT NULL,
     `disk_type`        char(2)      DEFAULT 'GB',
-    `bandwidth`        int(11)      DEFAULT NULL,
+    `bandwidth`        float        DEFAULT NULL,
     `bandwidth_type`   char(2)      DEFAULT 'TB',
     `gb5_single`       int(11)      DEFAULT NULL,
     `gb5_multi`        int(11)      DEFAULT NULL,
     `gb5_id`           varchar(12)  DEFAULT NULL,
-    `aes_ni`           tinyint(1)   DEFAULT '0',
-    `amd_v`            tinyint(1)   DEFAULT '0',
-    `is_dedicated`     tinyint(1)   DEFAULT '0',
-    `is_cpu_dedicated` tinyint(1)   DEFAULT '0',
-    `was_special`      tinyint(1)   DEFAULT '0',
+    `aes_ni`           tinyint(1)   DEFAULT 0,
+    `amd_v`            tinyint(1)   DEFAULT 0,
+    `is_dedicated`     tinyint(1)   DEFAULT 0,
+    `is_cpu_dedicated` tinyint(1)   DEFAULT 0,
+    `was_special`      tinyint(1)   DEFAULT 0,
     `os`               int(11)      DEFAULT NULL,
-    `ssh_port`         int(11)      DEFAULT '22',
-    `still_have`       tinyint(1)   DEFAULT '1',
+    `ssh_port`         int(11)      DEFAULT 22,
+    `still_have`       tinyint(1)   DEFAULT 1,
     `owned_since`      date         DEFAULT NULL,
     `tags`             varchar(255) DEFAULT NULL,
     `notes`            varchar(255) DEFAULT NULL,
-    `has_yabs`         tinyint(1)   DEFAULT '0',
+    `has_yabs`         tinyint(1)   DEFAULT 0,
+    `has_st`           tinyint(1)   DEFAULT 0,
     PRIMARY KEY (`id`),
     UNIQUE KEY `Index 2` (`ipv4`, `hostname`, `ipv6`)
 ) ENGINE = InnoDB

From 0496f4e8a87b24e90a22aae0d60ba9c20231996b Mon Sep 17 00:00:00 2001
From: cp6 <corbin@corbpie.com>
Date: Fri, 29 Jan 2021 11:42:44 +1100
Subject: [PATCH 19/19] Updated readme for version 1.2

Updated readme for version 1.2
---
 README.md | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index f8441f9..b8847d2 100644
--- a/README.md
+++ b/README.md
@@ -5,21 +5,24 @@ A web app for displaying, organizing and storing information about servers (VPS)
 Despite what the name infers this self hosted web app isn't just for storing idling server information. 
 By using a [YABs](https://github.com/masonr/yet-another-bench-script) output you can get disk & network speed values along with GeekBench 5 scores to do easier comparing and sorting.
 
-[![Generic badge](https://img.shields.io/badge/version-1.1-blue.svg)](https://shields.io/)
+[![Generic badge](https://img.shields.io/badge/version-1.2-blue.svg)](https://shields.io/)
 
-## 1.1 changes:
-**If you have version 1.0 please run ```update.sql```**
-* Added notes input for servers
-* Added SSH port input for servers
-* Added YABs update disk & network speed values (Keeps history)
-* Added red button for closing modals
-* Added `update.sql` for pre-existing installations only.
-* Fixed page jumping horizontally when opening modals
-* Fixed search showing duplicates when typing fast
-* Fixed adding provider and locations return id
+## 1.2 changes:
+**If you have version 1.1 or less already installed please run ```update.sql```**
+* Added table view type (use switcher icon to change to this view)
+* Added auto get IPv4/IPv6 based on hostname (Click icon at hostname input)
+* Added up/down status (Click OS icon)
+* Updated the order by table for better formatting
+* Removed unused buttons from the CSS
+* Updated Minor style changes
+* Updated `update.sql` for pre-existing installations only.
+* Updated when type DEDI selected "is_dedi" will be toggled
+* Updated IPv4 no longer required field
+* Fixed no location and/or provider causing uneven cards
+* Updated delete labels
+* Updated domain terms to be annual and longer only
+* Fixed error when all speedtests are "busy"
 * Updated `my_idlers.sql` for changes
-* Updated view YABs modal to be wider
-* Updated config constants to new class at top of ```class.php```
 
 ## Requires
 
@@ -32,8 +35,11 @@ By using a [YABs](https://github.com/masonr/yet-another-bench-script) output you
 * Add domains
 * [Auto suggest locations](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-auto-location.gif)
 * [Auto suggest providers](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-auto-provider.gif)
+* [Auto get IP's from hostname](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ips-from-hostname.gif)
+* [Check up/down status](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ping-up-feature.gif)
 * Get YABs data from output
 * Save & view YABs output
+* Update YABs disk & network results
 * Next due date system
 * Multi currency compatibility
 * Multi payment-term compatibility
@@ -51,7 +57,7 @@ By using a [YABs](https://github.com/masonr/yet-another-bench-script) output you
 * Download [the zip](https://github.com/cp6/my-idlers/archive/main.zip) and unpack the files from ```my-idlers-main/``` into your directory of choice.
 * Run `my_idlers.sql` in MySQL.
   
-* **Only run ```update.sql``` if you have version 1.0 installed.**
+* **Only run ```update.sql``` if you have version 1.1 or less already installed.**
   
 * Edit ```class.php``` lines ```13-16``` for your MySQL details.
 * Edit ```class.php``` lines ```8-10``` for card order type.
@@ -97,9 +103,20 @@ or
 
 [![screenshot5](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-tally-card.png)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-tally-card.png)
 
+[![screenshot6](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-data-table-view.png)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-data-table-view.png)
+
 
 [![Auto complete location](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-auto-location.gif)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-auto-location.gif)
 
 
 [![Auto complete provider](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-auto-provider.gif)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-auto-provider.gif)
 
+
+[![Auto complete IP's](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ips-from-hostname.gif)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ips-from-hostname.gif)
+
+
+[![Get up/down status](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ping-up-feature.gif)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ping-up-feature.gif)
+
+
+[![Table scrolling x](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-table-view.gif)](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-table-view.gif)
+