Merge pull request #184 from CESNET/fix-listofSps

fix: bugfixes in list of SPs

Author: Dominik František Bučík

lib/ListOfSps.php

@@ -8,7 +8,10 @@ class ListOfSps
 {
     public static function sortByName($a, $b)
     {
-        return strcmp(strtolower($a['name']['value']), strtolower($b['name']['value']));
+        return strnatcasecmp(
+            transliterator_transliterate('Any-Latin; Latin-ASCII', $a['name']['value']),
+            transliterator_transliterate('Any-Latin; Latin-ASCII', $b['name']['value'])
+        );
     }
 
     public static function getClass($type)

templates/listOfSps-tpl.php

@@ -24,7 +24,25 @@
 $samlServices = $this->data['samlServices'];
 $oidcServices = $this->data['oidcServices'];
 $allServices = $this->data['allServices'];
-
+if ($this->data['isNameMultilingual']) {
+    // translate service name for sorting
+    $allServices = array_map(function ($service) {
+        if (empty($service['name']) || empty($service['name']['value']) || ! is_array($service['name']['value'])) {
+            $service['name'] = [
+                'type' => 'java.lang.String',
+                'value' => '-',
+            ];
+        } else {
+            $service['name']['type'] = 'java.lang.String';
+            $service['name']['value'] = ListOfSps::getPreferredTranslation(
+                $service['name']['value'],
+                $this->getLanguage()
+            );
+        }
+        return $service;
+    }, $allServices);
+}
+usort($allServices, ['\\SimpleSAML\\Module\\perun\\ListOfSps', 'sortByName']);
 
 $productionServicesCount = $statistics['samlServicesCount'] - $statistics['samlTestServicesCount'] +
     $statistics['oidcServicesCount'] - $statistics['oidcTestServicesCount'];

www/listOfSps.php

@@ -164,7 +164,6 @@
 }
 
 $allServices = array_merge($samlServices, $oidcServices);
-usort($allServices, 'ListOfSps::sortByName');
 
 if (isset($_GET['output']) && $_GET['output'] === 'json') {
     $json = [];
@@ -201,6 +200,7 @@
     $t->data['statistics'] = $statistics;
     $t->data['attributesToShow'] = $attributesToShow;
     $t->data['multilingualAttributes'] = $multilingualAttributes;
+    $t->data['isNameMultilingual'] = in_array($perunServiceNameAttr, $multilingualAttributes, true);
     $t->data['samlServices'] = $samlServices;
     $t->data['oidcServices'] = $oidcServices;
     $t->data['allServices'] = $allServices;