CIL-540 Don't escape backslashes in JSON to save some characters.

cilogon · Mar 30, 2020 · 7014117 · 7014117
1 parent 3b7317d
commit 7014117
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Service/DBService.php b/src/Service/DBService.php
@@ -500,8 +500,11 @@ public function getUser(...$args)
             // If any elements in $attr_arr, append converted JSON object
             if (count($attr_arr) > 0) {
                 if (
-                    ($attr_json = json_encode($attr_arr, JSON_FORCE_OBJECT))
-                    !== false
+                    ($attr_json = json_encode(
+                        $attr_arr,
+                        JSON_FORCE_OBJECT | JSON_UNESCAPED_SLASHES
+                    )
+                    ) !== false
                 ) {
                     $cmd .= '&attr_json=' . urlencode($attr_json);
                 }

diff --git a/src/Service/IdpList.php b/src/Service/IdpList.php
@@ -269,7 +269,10 @@ public function writeJSON()
         if (!is_null($this->idparray)) {
             $filename = $this->getFilename();
             $tmpfname = tempnam('/tmp', 'JSON');
-            $json = json_encode($this->idparray, JSON_FORCE_OBJECT);
+            $json = json_encode(
+                $this->idparray,
+                JSON_FORCE_OBJECT | JSON_UNESCAPED_SLASHES
+            );
             if (
                 ((file_put_contents($tmpfname, $json)) !== false) &&
                 (@rename($tmpfname, $filename))