From 3ea6a468b01cb0e70604360ffa3070a3ac6db494 Mon Sep 17 00:00:00 2001
From: Tomasz Wolniewicz <twoln@cat-ams-test.eduroam.org>
Date: Mon, 8 Jul 2024 12:28:24 +0200
Subject: [PATCH] Removing the Registered rademark character form eduroam
 profiles name in Windows

---
 Changes.md                        | 2 ++
 config/ConfAssistant-template.php | 2 +-
 devices/ms/DeviceW8W10.php        | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 5ea5e371d..52c2368a2 100644
--- a/Changes.md
+++ b/Changes.md
@@ -26,6 +26,8 @@ Changes in 2.1.2
                 your instance following the Diagnostics-template.php
 - [FEATURE #14] Improvemens to the linux python installed, in particular add support
                 for Tkinker and yad provided by https://github.com/sdasda7777
+- [FEATURE #15] Removing the Registered Trademark character form the eduroam profile
+                name in Windows
 - [BUGFIX #1]   multiple improvements to the code, in particular eliminating
                 the deprecated FILTER_SANITIZE_STRING usage
 - [BUGFIX #2]   replaced slow SQL queries in Managed IdP area with much faster ones
diff --git a/config/ConfAssistant-template.php b/config/ConfAssistant-template.php
index e2e45740c..ac5a8f5f1 100644
--- a/config/ConfAssistant-template.php
+++ b/config/ConfAssistant-template.php
@@ -83,7 +83,7 @@ class ConfAssistant
         'interworking-consortium-oi' => ['001bc50460'],
         'interworking-domainname-fallback' => 'eduroam.org',
         'networks' => [
-            'eduroam®'     => [
+            'eduroam'     => [
                 'ssid' => ['eduroam'], 
                 'oi' => [
                     '001bc50460' /* eduroam RCOI */ 
diff --git a/devices/ms/DeviceW8W10.php b/devices/ms/DeviceW8W10.php
index f2e10ac42..4e65705ce 100644
--- a/devices/ms/DeviceW8W10.php
+++ b/devices/ms/DeviceW8W10.php
@@ -95,6 +95,9 @@ public function writeInstaller()
                 $delProfiles[] = $ssid.' (TKIP)';
             }
         }
+        // the two lines below remove the eduroam® profiles we used to install, this is a temporary hack untill a better solution is implemented
+        $delProfiles[] = 'eduroam®';
+        $delProfiles[] = 'eduroam® via partner';
         // this removes the profile container that we used in CAT 2.1 and removed in 2.1.1
         $delProfiles[] = sprintf('%s Custom Network', \core\CAT::$nomenclature_participant);
         $this->writeAdditionalDeletes($delProfiles);