Ticket #3149 - Search Extended: Encode/decode conditions with base64.

unacms · Dec 29, 2021 · 6553b04 · 6553b04
1 parent 99e64a0
commit 6553b04
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/inc/classes/BxDolSearchExtended.php b/inc/classes/BxDolSearchExtended.php
@@ -136,6 +136,16 @@ static public function actionGetMention()
             self::actionGetHashtags();
     }
 
+    static public function encodeConditions($aConditions) 
+    {
+        return urlencode(base64_encode(serialize($aConditions)));
+    }
+
+    static public function decodeConditions($sConditions) 
+    {
+        return unserialize(base64_decode(urldecode($sConditions)));
+    }
+
     public function isEnabled()
     {
         return isset($this->_aObject['active']) && (int)$this->_aObject['active'] != 0;

diff --git a/template/scripts/BxBaseSearchExtended.php b/template/scripts/BxBaseSearchExtended.php
@@ -160,7 +160,7 @@ public function getResults($aParams = array())
     	    return '';
 
         if(!empty($aParams['cond']) && is_array($aParams['cond']))
-            $aParams['cond'] = urlencode(serialize($aParams['cond']));
+            $aParams['cond'] = self::encodeConditions($aParams['cond']);
 
         $aPaginate = array('start' => $iStart, 'per_page' => $iPerPage);
         if(!$bJsMode) {

diff --git a/template/scripts/BxBaseSearchExtendedServices.php b/template/scripts/BxBaseSearchExtendedServices.php
@@ -61,7 +61,7 @@ public function prepareParams(&$aParams)
             $aParams['template'] = bx_process_input(bx_get('template'), BX_DATA_TEXT);
 
         if(empty($aParams['cond']) && bx_get('cond') !== false)
-            $aParams['cond'] = unserialize(urldecode(bx_process_input(bx_get('cond'), BX_DATA_TEXT)));
+            $aParams['cond'] = BxDolSearchExtended::decodeConditions(bx_process_input(bx_get('cond'), BX_DATA_TEXT));
 
         if(!isset($aParams['start']) && bx_get('start') !== false)
             $aParams['start'] = (int)bx_get('start');