Ticket #995

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -243,7 +243,7 @@ class BxBaseModGeneralModule extends BxDolModule
      * Display featured entries
      * @return HTML string
      */
-    public function serviceBrowseFeatured ($sUnitView = false, $bEmptyMessage = true, $bAjaxPaginate = true)
+    public function serviceBrowseFeatured ($sUnitView = false, $bEmptyMessage = false, $bAjaxPaginate = true)
     {
         return $this->_serviceBrowse ('featured', $sUnitView ? array('unit_view' => $sUnitView) : false, BX_DB_PADDING_DEF, $bEmptyMessage, $bAjaxPaginate);
     }
@@ -264,7 +264,13 @@ class BxBaseModGeneralModule extends BxDolModule
         if(!$oProfile)
             return '';
 
-        return $this->_serviceBrowse ('favorite', array_merge(array('user' => $oProfile->id()), $aParams), BX_DB_PADDING_DEF, true);
+        $bEmptyMessage = false;
+        if(isset($aParams['empty_message'])) {
+            $bEmptyMessage = (bool)$aParams['empty_message'];
+            unset($aParams['empty_message']);
+        }
+
+        return $this->_serviceBrowse ('favorite', array_merge(array('user' => $oProfile->id()), $aParams), BX_DB_PADDING_DEF, $bEmptyMessage);
     }
 
     public function serviceFormsHelper ()

modules/base/text/classes/BxBaseModTextModule.php

@@ -95,13 +95,13 @@ class BxBaseModTextModule extends BxBaseModGeneralModule implements iBxDolConten
         if (!$iProfileId)
             return '';
 
-        $bDisplayEmptyMsg = true;
+        $bEmptyMessage = true;
         if(isset($aParams['empty_message'])) {
-            $bDisplayEmptyMsg = (bool)$aParams['empty_message'];
+            $bEmptyMessage = (bool)$aParams['empty_message'];
             unset($aParams['empty_message']);
         }
 
-        return $this->_serviceBrowse ('author', array_merge(array('author' => $iProfileId), $aParams), BX_DB_PADDING_DEF, $bDisplayEmptyMsg);
+        return $this->_serviceBrowse ('author', array_merge(array('author' => $iProfileId), $aParams), BX_DB_PADDING_DEF, $bEmptyMessage);
     }
 
     /**

modules/boonex/albums/classes/BxAlbumsModule.php

@@ -182,7 +182,7 @@ class BxAlbumsModule extends BxBaseModTextModule
      * Display featured media. 
      * For the list of params @see BxAlbumsModule::serviceBrowseRecentMedia
      */ 
-    public function serviceBrowseFeaturedMedia ($sUnitView = false, $bDisplayEmptyMsg = true, $bAjaxPaginate = true)
+    public function serviceBrowseFeaturedMedia ($sUnitView = false, $bDisplayEmptyMsg = false, $bAjaxPaginate = true)
     {
         return $this->_serviceBrowse ('featured', array('unit_view' => $sUnitView), BX_DB_PADDING_DEF, $bDisplayEmptyMsg, $bAjaxPaginate, 'SearchResultMedia');
     }
@@ -213,7 +213,13 @@ class BxAlbumsModule extends BxBaseModTextModule
         if(!$oProfile)
             return '';
 
-        return $this->_serviceBrowse ('favorite', array_merge(array('user' => $oProfile->id()), $aParams), BX_DB_PADDING_DEF, true, true, 'SearchResultMedia');
+        $bEmptyMessage = false;
+        if(isset($aParams['empty_message'])) {
+            $bEmptyMessage = (bool)$aParams['empty_message'];
+            unset($aParams['empty_message']);
+        }
+
+        return $this->_serviceBrowse ('favorite', array_merge(array('user' => $oProfile->id()), $aParams), BX_DB_PADDING_DEF, $bEmptyMessage, true, 'SearchResultMedia');
     }
 
     public function serviceGetNotificationsData()

modules/boonex/files/classes/BxFilesFormsEntryHelper.php

@@ -24,7 +24,7 @@ class BxFilesFormsEntryHelper extends BxBaseModTextFormsEntryHelper
         return BxDolForm::getObjectInstance('bx_files_upload', 'bx_files_entry_upload', $this->_oModule->_oTemplate);
     }
     
-    public function addDataForm ()
+    public function addDataForm ($sCheckFunction = false)
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 

modules/boonex/forum/classes/BxForumModule.php

@@ -184,7 +184,7 @@ class BxForumModule extends BxBaseModTextModule
     /** 
      * @ref bx_forum-browse_featured "browse_featured"
      */
-    public function serviceBrowseFeatured($sUnitView = false, $bEmptyMessage = true, $bAjaxPaginate = true, $bShowHeader = true)
+    public function serviceBrowseFeatured($sUnitView = false, $bEmptyMessage = false, $bAjaxPaginate = true, $bShowHeader = true)
     {
         $CNF = &$this->_oConfig->CNF;
 
@@ -196,7 +196,8 @@ class BxForumModule extends BxBaseModTextModule
 		return $this->_serviceBrowseTable(array(
 			'grid' => $CNF['OBJECT_GRID_FEATURE'],
 			'type' => $sType, 
-			'where' => array('fld' => 'featured', 'val' => 0, 'opr' => '<>')
+			'where' => array('fld' => 'featured', 'val' => 0, 'opr' => '<>'),
+		    'empty_message' => $bEmptyMessage
 		), $bShowHeader);
     }
 
@@ -405,6 +406,12 @@ class BxForumModule extends BxBaseModTextModule
         if(!$oFavorite->isPublic() && $iProfileAuthor != bx_get_logged_profile_id())
             return '';
 
+        $bEmptyMessage = false;
+        if(isset($aParams['empty_message'])) {
+            $bEmptyMessage = (bool)$aParams['empty_message'];
+            unset($aParams['empty_message']);
+        }
+
         $aConditions = $oFavorite->getConditionsTrack($CNF['TABLE_ENTRIES'], 'id', $iProfileAuthor);
         if(empty($aConditions) || !is_array($aConditions)) 
             return '';
@@ -436,7 +443,8 @@ class BxForumModule extends BxBaseModTextModule
         	'author' => $iProfileId, 
             'join' => $aJoinGroup,
         	'where' => $aWhereGroup, 
-        	'per_page' => (int)$this->_oDb->getParam('bx_forum_per_page_profile')
+        	'per_page' => (int)$this->_oDb->getParam('bx_forum_per_page_profile'),
+        	'empty_message' => $bEmptyMessage
         ), false);
     }
 

modules/boonex/forum/install/sql/enable.sql

@@ -120,7 +120,7 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_forum_home', 'discussions-home', '_bx_forum_page_title_sys_home', '_bx_forum_page_title_home', @sName, 2, 2147483647, 1, 'page.php?i=discussions-home', '', '', '', 0, 1, 0, 'BxForumPageBrowse', 'modules/boonex/forum/classes/BxForumPageBrowse.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES
-('bx_forum_home', 1, @sName, '', '_bx_forum_page_block_title_featured_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_forum";s:6:"method";s:15:"browse_featured";s:6:"params";a:4:{i:0;s:5:"table";i:1;b:1;i:2;b:1;i:3;b:0;}}', 0, 1, 1, 0),
+('bx_forum_home', 1, @sName, '', '_bx_forum_page_block_title_featured_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_forum";s:6:"method";s:15:"browse_featured";s:6:"params";a:4:{i:0;s:5:"table";i:1;b:0;i:2;b:1;i:3;b:0;}}', 0, 1, 1, 0),
 ('bx_forum_home', 1, @sName, '', '_bx_forum_page_block_title_latest_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_forum";s:6:"method";s:13:"browse_latest";s:6:"params";a:1:{i:0;s:5:"table";}}', 0, 1, 1, 1),
 ('bx_forum_home', 2, @sName, '', '_bx_forum_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"categories_list";s:6:"params";a:2:{i:0;s:13:"bx_forum_cats";i:1;a:1:{s:10:"show_empty";b:1;}}s:5:"class";s:20:"TemplServiceCategory";}', 0, 1, 1, 0),
 ('bx_forum_home', 2, @sName, '', '_bx_forum_page_block_title_popular_keywords', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:14:"keywords_cloud";s:6:"params";a:2:{i:0;s:8:"bx_forum";i:1;s:8:"bx_forum";}s:5:"class";s:20:"TemplServiceMetatags";}', 0, 1, 1, 1);