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

modules/boonex/charts/classes/BxChartsCron.php

@@ -58,6 +58,7 @@ class BxChartsCron extends BxDolCron
             if ($oContentModule && isset($oContentModule->_oConfig->CNF['TABLE_ENTRIES']) && isset($oContentModule->_oConfig->CNF['FIELD_AUTHOR'])){
                 $sContentTable = $oContentModule->_oConfig->CNF['TABLE_ENTRIES'];
                 $sColumnAuthor = $oContentModule->_oConfig->CNF['FIELD_AUTHOR'];
+				$sColumnAdded = $oContentModule->_oConfig->CNF['FIELD_ADDED'];
                 if (!empty($sContentTable) && !empty($sColumnAuthor)){
                     $aSystems = BxDolView::getSystems();
                     $aModules = array_keys($this->_oModule->serviceGetProfileModules());
@@ -69,7 +70,7 @@ class BxChartsCron extends BxDolCron
                             $sSystem = $oModule->_oConfig->CNF['OBJECT_VIEWS'];
                             if(empty($sSystem))
                                 continue;
-                            $this->_oModule->_oDb->saveMostActiveProfiles_Create($sProfileModule, $sContentModule, $sContentTable, $sColumnAuthor);
+                            $this->_oModule->_oDb->saveMostActiveProfiles_Create($sProfileModule, $sContentModule, $sContentTable, $sColumnAuthor, $sColumnAdded);
                         }
                     }
                 }

modules/boonex/charts/classes/BxChartsDb.php

@@ -52,11 +52,11 @@ class BxChartsDb extends BxBaseModGeneralDb
         $this->query($sQuery);
     }
     
-    public function saveMostActiveProfiles_Create($sProfileModuleName, $sContentModuleName, $sTableName, $sColumnAuthor)
+    public function saveMostActiveProfiles_Create($sProfileModuleName, $sContentModuleName, $sTableName, $sColumnAuthor, $sColumnAdded)
     {
         $iInterval = intval(getParam('bx_charts_chart_most_active_profiles_interval_day'));
         $sQuery = "INSERT INTO `" . $this->_sTableMostActiveProfiles . "` (`object_id`, `profile_module`, `content_module`, `create_count`)  SELECT `sys_profiles`.`content_id`, `sys_profiles`.`type`, '" . $sContentModuleName . "' , COUNT(`" . $sTableName . "`.`id`) FROM `" . $sTableName . "`
-  INNER JOIN `sys_profiles`  ON `sys_profiles`.`id` = `" . $sTableName . "`.`" . $sColumnAuthor . "` WHERE sys_profiles.type='" . $sProfileModuleName . "' AND  `" . $sTableName . "`.`added` > " . ($iInterval > 0 ? $this->getTimeFromDaysBefore($iInterval) : 0) . " GROUP BY `sys_profiles`.`content_id`, `sys_profiles`.`type` ORDER BY COUNT(`" . $sTableName . "`.`id`) DESC LIMIT 0," . intval(getParam('bx_charts_chart_most_active_profiles_count'));
+  INNER JOIN `sys_profiles`  ON `sys_profiles`.`id` = `" . $sTableName . "`.`" . $sColumnAuthor . "` WHERE sys_profiles.type='" . $sProfileModuleName . "' AND  `" . $sTableName . "`.`" . $sColumnAdded . "` > " . ($iInterval > 0 ? $this->getTimeFromDaysBefore($iInterval) : 0) . " GROUP BY `sys_profiles`.`content_id`, `sys_profiles`.`type` ORDER BY COUNT(`" . $sTableName . "`.`id`) DESC LIMIT 0," . intval(getParam('bx_charts_chart_most_active_profiles_count'));
         $this->query($sQuery);
     }
     

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -4026,9 +4026,12 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
         if($iUserId == 0)
             return false;
 
+        $aPrivacy = [BX_DOL_PG_ALL, BX_DOL_PG_MEMBERS];
+		bx_alert($this->_oConfig->getObject('alert'), 'is_allow_repost', $aEvent['id'], $iUserId, array('result' => &$aPrivacy));
         $iPrivacy = (int)$aEvent['object_privacy_view'];
-        if($iPrivacy >= 0 && !in_array($iPrivacy, array(BX_DOL_PG_ALL, BX_DOL_PG_MEMBERS)))
-            return false;      
+		
+        if($iPrivacy >= 0 && !in_array($iPrivacy, $aPrivacy))
+            return false;         
 
         if(isAdmin())
             return true;