From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 20 Dec 2022 07:04:25 +0000 (+0100)
Subject: wip #5661
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fe85a77fc126f59ae71e4618c30dd593df0efcba;p=fluidbook_tools.git

wip #5661
---

diff --git a/src/Links/Link.php b/src/Links/Link.php
index 81cd964..b7a731b 100644
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -636,12 +636,6 @@ class Link {
      * @throws \SodiumException
      */
     public static function decryptLink($link) {
-        $array = false;
-        if (is_array($link)) {
-            $array = true;
-            $link = ObjectUtil::asObject($link);
-        }
-
         foreach ($link as $attr => $item) {
             if (!str_starts_with($item, '///')) {
                 continue;
@@ -649,15 +643,12 @@ class Link {
             $v = Crypt::safeDecrypt(substr($item, 3), self::_getLinkKey());
             $e = explode('|||', $v);
             if ($e[0] === $link->uid) {
-                $link->$attr = $e[1];
+                $link[$attr] = $e[1];
             } else {
-                $link->$attr = '';
+                $link[$attr] = '';
             }
         }
-        if (!$array) {
-            return $link;
-        }
-        return ArrayUtil::asArray($link);
+        return $link;
     }
 
     public static function decryptLinks($links) {
@@ -683,26 +674,22 @@ class Link {
      */
     public static function encryptLinkAttrs($link)
     {
-        if (is_array($link)) {
-            $link = ObjectUtil::asObject($link);
-        }
-
         $crypted = [13, 14, 35];
 
-        if (!isset($link->type) || !in_array($link->type, $crypted)) {
+        if (!isset($link['type']) || !in_array($link['type'], $crypted)) {
             return $link;
         }
 
         $attrs = ['image_rollover'];
         foreach ($attrs as $attr) {
-            if (!isset($link->$attr)) {
+            if (!isset($link[$attr])) {
                 continue;
             }
-            $link->$attr = trim($link->$attr);
-            if (str_starts_with($link->$attr, '///') || $link->$attr == '') {
+            $link[$attr] = trim($link[$attr]);
+            if (str_starts_with($link[$attr], '///') || $link[$attr] == '') {
                 continue;
             }
-            $link->$attr = '///' . Crypt::safeEncrypt($link->uid . '|||' . $link->$attr, self::_getLinkKey());
+            $link[$attr] = '///' . Crypt::safeEncrypt($link['uid'] . '|||' . $link[$attr], self::_getLinkKey());
         }
         return $link;
     }