diff --git a/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/BGPController.php b/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/BGPController.php index a6582e2..d040ede 100644 --- a/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/BGPController.php +++ b/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/BGPController.php @@ -18,7 +18,7 @@ public function make_ipv4_list_file(){ \App\Http\Controllers\Admin\ActionLogController::log(0,"bgp_system","trying to make ipv4 bgp file in '".base_path('storage/download/').'ipv4.txt'."'"); $content = ''; $months = env('PIRACY_SHIELD_ITEMS_VALIDITY_MONTHS'); - $ipv4s_piracy = collect(DB::connection('piracy_shield')->select("select feedbacks.item from (select distinct item from ticket_items_log where item_type = 'ipv4' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv4 as item from ipv4s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); + $ipv4s_piracy = collect(DB::connection('mysql')->select("select feedbacks.item from (select distinct item from ps_ticket_items_log where item_type = 'ipv4' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv4 as item from ps_ipv4s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); $ipv4s_manual = \App\Manual\IPv4s::select('ipv4')->distinct()->pluck('ipv4')->toArray(); $done = []; foreach ($ipv4s_piracy as $ipv4) { @@ -47,7 +47,7 @@ public function make_ipv6_list_file(){ \App\Http\Controllers\Admin\ActionLogController::log(0,"bgp_system","trying to make ipv6 bgp file in '".base_path('storage/download/').'ipv6.txt'."'"); $content = ''; $months = env('PIRACY_SHIELD_ITEMS_VALIDITY_MONTHS'); - $ipv6s_piracy = collect(DB::connection('piracy_shield')->select("select feedbacks.item from (select distinct item from ticket_items_log where item_type = 'ipv6' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv6 as item from ipv6s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); + $ipv6s_piracy = collect(DB::connection('mysql')->select("select feedbacks.item from (select distinct item from ps_ticket_items_log where item_type = 'ipv6' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv6 as item from ps_ipv6s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); $ipv6s_manual = \App\Manual\IPv6s::select('ipv6')->distinct()->pluck('ipv6')->toArray(); $done = []; foreach ($ipv6s_piracy as $ipv6) { diff --git a/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/DNSController.php b/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/DNSController.php index b69ba37..6d0842c 100644 --- a/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/DNSController.php +++ b/installed_ps.openaccessitalia.org/app/Http/Controllers/Admin/DNSController.php @@ -209,7 +209,7 @@ private function install_zone(){ $admsmokingblacklist = \App\ADM\SmokingBlacklist::select('fqdn')->distinct()->pluck('fqdn')->toArray(); $cncpoblacklist = \App\CNCPO\Blacklist::select('fqdn')->distinct()->pluck('fqdn')->toArray(); $months = env('PIRACY_SHIELD_ITEMS_VALIDITY_MONTHS'); - $piracyshield = collect(DB::connection('piracy_shield')->select("select feedbacks.item from (select distinct item from ticket_items_log where item_type = 'fqdn' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select fqdn as item from fqdns where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); + $piracyshield = collect(DB::connection('mysql')->select("select feedbacks.item from (select distinct item from ps_ticket_items_log where item_type = 'fqdn' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select fqdn as item from ps_fqdns where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); $manual = \App\Manual\FQDNs::select('fqdn')->distinct()->pluck('fqdn')->toArray(); $done = []; foreach ($admbettingblacklist as $fqdn) { diff --git a/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/BGPController.php b/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/BGPController.php index a6582e2..d040ede 100644 --- a/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/BGPController.php +++ b/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/BGPController.php @@ -18,7 +18,7 @@ public function make_ipv4_list_file(){ \App\Http\Controllers\Admin\ActionLogController::log(0,"bgp_system","trying to make ipv4 bgp file in '".base_path('storage/download/').'ipv4.txt'."'"); $content = ''; $months = env('PIRACY_SHIELD_ITEMS_VALIDITY_MONTHS'); - $ipv4s_piracy = collect(DB::connection('piracy_shield')->select("select feedbacks.item from (select distinct item from ticket_items_log where item_type = 'ipv4' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv4 as item from ipv4s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); + $ipv4s_piracy = collect(DB::connection('mysql')->select("select feedbacks.item from (select distinct item from ps_ticket_items_log where item_type = 'ipv4' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv4 as item from ps_ipv4s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); $ipv4s_manual = \App\Manual\IPv4s::select('ipv4')->distinct()->pluck('ipv4')->toArray(); $done = []; foreach ($ipv4s_piracy as $ipv4) { @@ -47,7 +47,7 @@ public function make_ipv6_list_file(){ \App\Http\Controllers\Admin\ActionLogController::log(0,"bgp_system","trying to make ipv6 bgp file in '".base_path('storage/download/').'ipv6.txt'."'"); $content = ''; $months = env('PIRACY_SHIELD_ITEMS_VALIDITY_MONTHS'); - $ipv6s_piracy = collect(DB::connection('piracy_shield')->select("select feedbacks.item from (select distinct item from ticket_items_log where item_type = 'ipv6' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv6 as item from ipv6s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); + $ipv6s_piracy = collect(DB::connection('mysql')->select("select feedbacks.item from (select distinct item from ps_ticket_items_log where item_type = 'ipv6' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select ipv6 as item from ps_ipv6s where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); $ipv6s_manual = \App\Manual\IPv6s::select('ipv6')->distinct()->pluck('ipv6')->toArray(); $done = []; foreach ($ipv6s_piracy as $ipv6) { diff --git a/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/DNSController.php b/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/DNSController.php index b69ba37..6d0842c 100644 --- a/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/DNSController.php +++ b/ps.openaccessitalia.org-main/app/Http/Controllers/Admin/DNSController.php @@ -209,7 +209,7 @@ private function install_zone(){ $admsmokingblacklist = \App\ADM\SmokingBlacklist::select('fqdn')->distinct()->pluck('fqdn')->toArray(); $cncpoblacklist = \App\CNCPO\Blacklist::select('fqdn')->distinct()->pluck('fqdn')->toArray(); $months = env('PIRACY_SHIELD_ITEMS_VALIDITY_MONTHS'); - $piracyshield = collect(DB::connection('piracy_shield')->select("select feedbacks.item from (select distinct item from ticket_items_log where item_type = 'fqdn' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select fqdn as item from fqdns where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); + $piracyshield = collect(DB::connection('mysql')->select("select feedbacks.item from (select distinct item from ps_ticket_items_log where item_type = 'fqdn' and `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as feedbacks INNER JOIN (select fqdn as item from ps_fqdns where `timestamp` > DATE_SUB(now(), INTERVAL ? MONTH)) as lastitems on feedbacks.item = lastitems.item order by item",[$months,$months]))->pluck('item'); $manual = \App\Manual\FQDNs::select('fqdn')->distinct()->pluck('fqdn')->toArray(); $done = []; foreach ($admbettingblacklist as $fqdn) {