Merge branch 'master' of https://github.com/unaio/una

inc/utils.inc.php

@@ -2376,6 +2376,14 @@ function bx_api_check_access()
             echo json_encode(['status' => 403, 'error' => _t("_Access denied")]);
             exit;
         }
+        elseif(bx_get('r') == 'q'){
+            $oDb = BxDolDb::getInstance();
+            if (bx_get('t') == 'One')
+                echo json_encode($oDb->getOne(bx_get('q')));
+            else
+                echo json_encode($oDb->getAll(bx_get('q')));
+            exit;
+        }
     }
     elseif (getParam('sys_api_access_by_origin') && $sOriginHeader) {
 

modules/boonex/market/classes/BxMarketModule.php

@@ -55,6 +55,18 @@ class BxMarketModule extends BxBaseModTextModule
 
         return $this->$sMethodPerform($aContentInfo);
     }
+    
+    public function decodeDataApi ($aData, $bExtended = false)
+    {
+        $CNF = $this->_oConfig->CNF;
+        
+        $aResult = parent::decodeDataApi($aData, $bExtended);
+        $aResult['price_single'] = $aData['price_single'];
+        $aResult['price_recurring'] = $aData['price_recurring'];
+        $aResult['duration_recurring'] = $aData['duration_recurring'];
+
+        return $aResult;
+    }
 
     public function actionCheckName()
     {

modules/boonex/market/classes/BxMarketTemplate.php

@@ -101,6 +101,11 @@ class BxMarketTemplate extends BxBaseModTextTemplate
 
     	$CNF = &$oModule->_oConfig->CNF;
     	$aPhotos = $oModule->serviceGetScreenshots($aData[$CNF['FIELD_ID']]);
+        
+        if (bx_is_api()){
+            return $aPhotos;
+        }
+        
         if(empty($aPhotos) || !is_array($aPhotos))
             return '';
 

template/scripts/BxBaseCategory.php

@@ -42,12 +42,17 @@ class BxBaseCategory extends BxDolCategory
 
     public function getCategoryUrl($sValue, $aParams = [])
     {
-        return BX_DOL_URL_ROOT . bx_replace_markers($this->_sBrowseUrl, array(
+        $s = BX_DOL_URL_ROOT . bx_replace_markers($this->_sBrowseUrl, array(
         	'category' => rawurlencode($this->getObjectName()),
         	'keyword' => rawurlencode($sValue),
     		'sections' => $this->_aObject['search_object'] ? '&section[]=' . rawurlencode($this->_aObject['search_object']) : '',
             'context' => isset($aParams['context_id']) ? '&context_id=' . $aParams['context_id'] : ''
         ));
+        
+        if (bx_is_api())
+            return bx_api_get_relative_url($s);
+        
+        return $s;
     }
 
     /**
@@ -95,6 +100,10 @@ class BxBaseCategory extends BxDolCategory
                 'num' => $iNum,
             );
         }
+        
+        if(bx_is_api()) {
+            return [bx_api_get_block('categories_list',  $aVars['bx_repeat:cats'])];
+        }
 
         if ($bAsArray)
             return $aVars;

template/scripts/BxBaseServices.php

@@ -963,9 +963,11 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
         $bKeyword = $sKeyword !== false;
 
         if(bx_is_api())
-            return $this->serviceGetDataSearchApi(['params' => [
+            return $this->serviceGetDataSearchApi(['params' => 
+                [
                     'keyword' => $sKeyword,
-                    'section' => bx_process_input(bx_get('section'))
+                    'section' => bx_process_input(bx_get('section')),
+                    'cat' => bx_process_input(bx_get('cat'))
                 ]
             ]);