improve flag display

antedebaas · Oct 26, 2024 · 65fa920 · 65fa920
1 parent 744355f
commit 65fa920
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/Twig/GeoIp_Country.php b/src/Twig/GeoIp_Country.php
@@ -18,7 +18,7 @@ public function __construct(Reader $reader)
     public function getFilters(): array
     {
         return [
-            new TwigFilter('geoip_country', [$this, 'geoipCountryFilter']),
+            new TwigFilter('geoip_country', [$this, 'geoipCountryFilter'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -30,7 +30,18 @@ public function getFilters(): array
      */
     public function geoipCountryFilter($ip)
     {
-        $country = $this->reader->country($ip);
-        return strtolower($country->country->isoCode);
+        if (empty($ip)) {
+            return '';
+        }
+        try {
+
+            $country = $this->reader->country($ip);
+            $response = $ip.' <span class="flag flag-xs flag-country-'.$country->country->isoCode.'"></span>';
+            return $response;
+        }
+        catch (\Exception $e) {
+            return $ip;
+        }
+
     }
 }
diff --git a/templates/dmarc_reports/report.html.twig b/templates/dmarc_reports/report.html.twig
@@ -188,7 +188,7 @@
                                   <li class="list-group-item">
                                     <div class="clearfix">
                                       <span class="float-start"><b>IP Address: </b> </span>
-                                      <span class="float-end"> {{ record.sourceip }} <span class="flag flag-xs flag-country-{{ record.sourceip|geoip_country }}"></span></span>
+                                      <span class="float-end">{{ record.sourceip|geoip_country }}</span>
                                     </div>
                                   </li>
                                 </ul> 

diff --git a/templates/smtptls_reports/report.html.twig b/templates/smtptls_reports/report.html.twig
@@ -223,13 +223,13 @@
                                             <li class="list-group-item">
                                               <div class="clearfix">
                                                 <span class="float-start"><b>Sending MTA IP: </b> </span>
-                                                <span class="float-end"> {{ failuredetail.sendingmtaip }} <span class="flag flag-xs flag-country-{{ failuredetail.sendingmtaip|geoip_country }}"></span></span>
+                                                <span class="float-end">{{ failuredetail.sendingmtaip|geoip_country }}</span>
                                               </div>
                                             </li>
                                             <li class="list-group-item">
                                               <div class="clearfix">
                                                 <span class="float-start"><b>Receiving IP: </b> </span>
-                                                <span class="float-end"> {{ failuredetail.receivingip }} <span class="flag flag-xs flag-country-{{ failuredetail.sendingmtaip|geoip_country }}"></span></span>
+                                                <span class="float-end">{{ failuredetail.receivingip|geoip_country }}</span>
                                               </div>
                                             </li>
                                           </ul>