diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index fcf17a6..5dd703b 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -41,8 +41,10 @@ class ExportController extends Controller if ($type == 'mastodon') { //comman break teh CSV so just take them out $comments = str_replace(",", ";", $location->description); + //remove extra white space $comments = str_replace(["\n\r", "\n", "\r"], " ", $comments); + $comments = str_replace(['"', "'"], "", $comments); //add to the export list array_push($list, [$location->url, $location->rating, $comments, "FALSE", "FALSE", "FALSE"]); } diff --git a/app/Http/Controllers/LocationController.php b/app/Http/Controllers/LocationController.php index 51d8ada..e8ff44a 100644 --- a/app/Http/Controllers/LocationController.php +++ b/app/Http/Controllers/LocationController.php @@ -81,9 +81,9 @@ class LocationController extends Controller $silence = 0; $suspend = 0; if ($item['severity'] == "suspend" || $item['severity'] == "defederate") { - ++$silence; - } else { ++$suspend; + } else { + ++$silence; } array_push($unified, [ 'name' => $item['domain'],