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

inc/classes/BxDolSearch.php

@@ -504,16 +504,16 @@ class BxDolSearchResult implements iBxDolReplaceable
         $sUnit =  'list';
         if ($this->sUnitViewDefault == 'showcase' || $this->sUnitViewDefault == 'gallery')
             $sUnit = 'card';
+        
         return [
             'module' => $this->oModule->getName(),
             'unit' => 'general-' . $sUnitType . '-' . $sUnit,
-            'mode' => $this->_sMode,
             'data' => $this->decodeData($this->getSearchData()),
-            'paginate' => [
-                'num' => $this->aCurrent['paginate']['num'],
+            'params' => [
                 'per_page' => $this->aCurrent['paginate']['perPage'],
                 'start' => $this->aCurrent['paginate']['start'],
-            ]
+                'type' => $this->_sMode,
+            ],
         ];
     }
 
@@ -1031,7 +1031,7 @@ class BxDolSearchResult implements iBxDolReplaceable
             $iPerPage = $this->iPaginatePerPage;
 
         $this->aCurrent['paginate']['perPage'] = $iPerPage;
-            
+
         $this->aCurrent['paginate']['start'] = isset($this->aCurrent['paginate']['forceStart'])
             ? (int)$this->aCurrent['paginate']['forceStart']
             : (empty($_GET['start']) ? 0 : (int)$_GET['start']);

manifest.json.php

@@ -16,7 +16,7 @@ require_once('./inc/header.inc.php');
 $aContent = [
     'name' => '',
     'short_name' => '',
-    'start_url' => '/',
+    'start_url' => parse_url(BX_DOL_URL_ROOT, PHP_URL_PATH),
     'display' => 'standalone',
 ];
 
@@ -72,4 +72,4 @@ if(!empty($aAdi) && is_array($aAdi))
 header("Content-Type: application/json");
 header("X-Robots-Tag: none");
 echo json_encode($aContent);
-?>
+?>

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -758,10 +758,10 @@ class BxBaseModGeneralModule extends BxDolModule
     {
         if(is_string($aParams)){
             $aParams = json_decode($aParams, true);
-            if (isset($aParams['params']['paginate'])){
+            if (isset($aParams['params'])){
                 //TODO: improve
-                $_GET['start'] = $aParams['params']['paginate']['start'];
-                $_GET['per_page'] = $aParams['params']['paginate']['per_page'];
+                $_GET['start'] = $aParams['params']['start'];
+                $_GET['per_page'] = $aParams['params']['per_page'];
             }
         }
         

modules/base/general/classes/BxBaseModGeneralTemplate.php

@@ -116,7 +116,7 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
     {
         $CNF = &$this->getModule()->_oConfig->CNF;
         
-        if(!isset($aData[$CNF['FIELD_TEXT']]))
+        if(!isset($CNF['FIELD_TEXT']) || !isset($aData[$CNF['FIELD_TEXT']]))
             return '';
 
         $sResult = $aData[$CNF['FIELD_TEXT']];

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -574,6 +574,15 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
             'eval' => $this->_oConfig->getJsObjectView($aParams) . "._onGetPosts(oData)"
         ));
     }
+    
+    function serviceGetPosts($aParams)
+    {
+        if(is_string($aParams)){
+            $aParams = json_decode($aParams, true);
+        }
+
+        return $this->_serviceGetBlockViewByType($aParams['params']);
+    }
 
     public function actionGetPostForm()
     {
@@ -4917,10 +4926,12 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
     protected function _serviceGetBlockViewByType($aBrowseParams = array())
     {
         $aParams = $this->_prepareParams($aBrowseParams);
-
         $this->_iOwnerId = $aParams['owner_id'];
-
-        return bx_is_api() ? [['id' => 1, 'type' => 'browse', 'data' => ['unit' => 'feed', 'data' => $this->_oTemplate->getViewBlock($aParams)]]] : ['content' => $this->_oTemplate->getViewBlock($aParams)];
+        return bx_is_api() ? [['id' => 1, 'type' => 'browse', 'data' => [
+            'unit' => 'feed',  
+            'params' => $aParams,
+            'data' => $this->_oTemplate->getViewBlock($aParams)]],
+        ] : ['content' => $this->_oTemplate->getViewBlock($aParams)];
     }
 
     protected function _getBlockPost($iProfileId, $aParams = array())