EQ-1012 More urlencode() fixes

openequella · Mar 18, 2014 · d4e8d79 · d4e8d79
1 parent 859b3fd
commit d4e8d79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/lib.php b/common/lib.php
@@ -114,7 +114,7 @@ function equella_getssotoken_raw($username, $shareid, $sharedsecret) {
     $time = time() . '000';
     $hash = md5($username . $shareid . $time . $sharedsecret);
     $params = array();
-    $params[] = urlencode($username);
+    $params[] = rawurlencode($username);
     $params[] = $shareid;
     $params[] = $time;
     $params[] = base64_encode(pack('H*', $hash));
@@ -136,7 +136,7 @@ function equella_appendtoken($url, $token = null) {
         $token = equella_getssotoken();
     }
     $url .= (strpos($url, '?') != false) ? '&' : '?';
-    $url .= 'token=' . urlencode($token);
+    $url .= 'token=' . rawurlencode($token);
     return $url;
 }
 

diff --git a/lib.php b/lib.php
@@ -160,7 +160,7 @@ function equella_delete_instance($id) {
     if ($equella->activation)
     {
         $url = str_replace("signon.do", "access/activationwebservice.do", $CFG->equella_url);
-        $url = equella_appendtoken($url)."&activationUuid=".urlencode($equella->activation);
+        $url = equella_appendtoken($url)."&activationUuid=".rawurlencode($equella->activation);
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $res = curl_exec($curl);