Merge pull request #115 from iosley/master

#109 Fix spaces on Outlook
spatie · Mar 5, 2021 · 0586c13 · dravenk · Feb 13, 2022 · 0586c13
2 parents 659a682 + cb9707f
commit 0586c13
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/src/Generators/WebOutlook.php b/src/Generators/WebOutlook.php
@@ -34,16 +34,36 @@ public function generate(Link $link): string
             $url .= '&allday=true';
         }
 
-        $url .= '&subject='.urlencode($link->title);
+        $url .= '&subject='.urlencode($this->sanitizeText($link->title));
 
         if ($link->description) {
-            $url .= '&body='.urlencode($link->description);
+            $url .= '&body='.urlencode($this->sanitizeText($link->description));
         }
 
         if ($link->address) {
-            $url .= '&location='.urlencode($link->address);
+            $url .= '&location='.urlencode($this->sanitizeText($link->address));
         }
 
         return $url;
     }
+
+    /**
+     * Generate an text without html entity code and hexadecimal code instead spaces.
+     * @param string $text
+     * @return string
+     */
+    private function sanitizeText(string $text): string
+    {
+        $replaceList = [
+            '/\s/' => '&#32;',
+        ];
+
+        $resultText = html_entity_decode($text);
+
+        foreach ($replaceList as $pattern => $newValue) {
+            $resultText = preg_replace($pattern, $newValue, $resultText);
+        }
+
+        return $resultText;
+    }
 }
diff --git a/.../__snapshots__/WebOutlookGeneratorTest__it_can_generate_a_multiple_days_event_link__1.php b/.../__snapshots__/WebOutlookGeneratorTest__it_can_generate_a_multiple_days_event_link__1.php
@@ -1 +1 @@
-<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2019-12-31T23:00:00Z&enddt=2020-01-01T01:00:00Z&subject=New+Year&body=With+balloons%2C+clowns+and+stuff%0ABring+a+dog%2C+bring+a+frog&location=Party+Lane+1A%2C+1337+Funtown';
+<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2019-12-31T23:00:00Z&enddt=2020-01-01T01:00:00Z&subject=New%26%2332%3BYear&body=With%26%2332%3Bballoons%2C%26%2332%3Bclowns%26%2332%3Band%26%2332%3Bstuff%26%2332%3BBring%26%2332%3Ba%26%2332%3Bdog%2C%26%2332%3Bbring%26%2332%3Ba%26%2332%3Bfrog&location=Party%26%2332%3BLane%26%2332%3B1A%2C%26%2332%3B1337%26%2332%3BFuntown';
diff --git a/...bOutlookGeneratorTest__it_can_generate_a_multiple_days_event_link_with_allday_flag__1.php b/...bOutlookGeneratorTest__it_can_generate_a_multiple_days_event_link_with_allday_flag__1.php
@@ -1 +1 @@
-<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2018-02-01&enddt=2018-02-06&allday=true&subject=Birthday&body=With+balloons%2C+clowns+and+stuff%0ABring+a+dog%2C+bring+a+frog&location=Party+Lane+1A%2C+1337+Funtown';
+<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2018-02-01&enddt=2018-02-06&allday=true&subject=Birthday&body=With%26%2332%3Bballoons%2C%26%2332%3Bclowns%26%2332%3Band%26%2332%3Bstuff%26%2332%3BBring%26%2332%3Ba%26%2332%3Bdog%2C%26%2332%3Bbring%26%2332%3Ba%26%2332%3Bfrog&location=Party%26%2332%3BLane%26%2332%3B1A%2C%26%2332%3B1337%26%2332%3BFuntown';
diff --git a/...nerators/__snapshots__/WebOutlookGeneratorTest__it_can_generate_a_short_event_link__1.php b/...nerators/__snapshots__/WebOutlookGeneratorTest__it_can_generate_a_short_event_link__1.php
@@ -1 +1 @@
-<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2018-02-01T09:00:00Z&enddt=2018-02-01T18:00:00Z&subject=Birthday&body=With+balloons%2C+clowns+and+stuff%0ABring+a+dog%2C+bring+a+frog&location=Party+Lane+1A%2C+1337+Funtown';
+<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2018-02-01T09:00:00Z&enddt=2018-02-01T18:00:00Z&subject=Birthday&body=With%26%2332%3Bballoons%2C%26%2332%3Bclowns%26%2332%3Band%26%2332%3Bstuff%26%2332%3BBring%26%2332%3Ba%26%2332%3Bdog%2C%26%2332%3Bbring%26%2332%3Ba%26%2332%3Bfrog&location=Party%26%2332%3BLane%26%2332%3B1A%2C%26%2332%3B1337%26%2332%3BFuntown';
diff --git a/...napshots__/WebOutlookGeneratorTest__it_can_generate_a_single_day_allday_event_link__1.php b/...napshots__/WebOutlookGeneratorTest__it_can_generate_a_single_day_allday_event_link__1.php
@@ -1 +1 @@
-<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2018-02-01&enddt=2018-02-02&allday=true&subject=Birthday&body=With+balloons%2C+clowns+and+stuff%0ABring+a+dog%2C+bring+a+frog&location=Party+Lane+1A%2C+1337+Funtown';
+<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2018-02-01&enddt=2018-02-02&allday=true&subject=Birthday&body=With%26%2332%3Bballoons%2C%26%2332%3Bclowns%26%2332%3Band%26%2332%3Bstuff%26%2332%3BBring%26%2332%3Ba%26%2332%3Bdog%2C%26%2332%3Bbring%26%2332%3Ba%26%2332%3Bfrog&location=Party%26%2332%3BLane%26%2332%3B1A%2C%26%2332%3B1337%26%2332%3BFuntown';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2019-12-31T23:00:00Z&enddt=2020-01-01T01:00:00Z&subject=New+Year&body=With+balloons%2C+clowns+and+stuff%0ABring+a+dog%2C+bring+a+frog&location=Party+Lane+1A%2C+1337+Funtown';
		<?php return 'https://outlook.live.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent&startdt=2019-12-31T23:00:00Z&enddt=2020-01-01T01:00:00Z&subject=New%26%2332%3BYear&body=With%26%2332%3Bballoons%2C%26%2332%3Bclowns%26%2332%3Band%26%2332%3Bstuff%26%2332%3BBring%26%2332%3Ba%26%2332%3Bdog%2C%26%2332%3Bbring%26%2332%3Ba%26%2332%3Bfrog&location=Party%26%2332%3BLane%26%2332%3B1A%2C%26%2332%3B1337%26%2332%3BFuntown';