URL Encoding didn't solve it, so I'm replacing "/" with "$" and back …

…since "$" is not a character in base64 encoding.
jdavidbakr · May 7, 2016 · 7ac1708 · 7ac1708
1 parent 28a1ab0
commit 7ac1708
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/MailTracker.php b/src/MailTracker.php
@@ -100,7 +100,7 @@ protected function inject_link_callback($matches)
 
     	return $matches[1].action('\jdavidbakr\MailTracker\MailTrackerController@getL',
     		[
-    			urlencode(base64_encode($url)),
+    			str_replace("/","$",base64_encode($url)), // Replace slash with dollar sign
     			$this->hash
     		]);
     }

diff --git a/src/MailTrackerController.php b/src/MailTrackerController.php
@@ -39,7 +39,7 @@ public function getT($hash)
 
     public function getL($url, $hash)
     {
-    	$url = base64_decode($url);
+    	$url = base64_decode(str_replace("$","/",$url));
     	$tracker = Model\SentEmail::where('hash',$hash)
     		->first();
     	if($tracker) {

diff --git a/tests/MailTrackerTest.php b/tests/MailTrackerTest.php
@@ -43,13 +43,12 @@ public function testLink()
 		$clicks = $track->clicks;
 		$clicks++;
 
-		$redirect = 'http://www.google.com';
+		$redirect = 'http://mfn1.myfootballnow.com/community/thread/2/1636?page=4&amp;x=tRnYCfp9mT#10111';
 
 		$url = action('\jdavidbakr\MailTracker\MailTrackerController@getL',[
-				base64_encode($redirect),
+    			str_replace("/","$",base64_encode($redirect)), // Replace slash with dollar sign
 				$track->hash
 			]);
-
 		$this->call('GET',$url);
 		$this->assertRedirectedTo($redirect);