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

inc/classes/BxDolPrivacy.php

@@ -536,6 +536,7 @@ class BxDolPrivacy extends BxDolFactory implements iBxDolFactoryObject
            'object_id' => $iObjectId,
            'viewer_id' => $iViewerId,
            'object' => $aObject,
+           'object_provacy' => $this->_aObject,
            'result' => &$bRv
         ));
         return $bRv;

modules/boonex/developer/classes/BxDevBuilderPage.php

@@ -405,8 +405,7 @@ class BxDevBuilderPage extends BxTemplStudioBuilderPage
         if($aBlock['type'] == BX_DOL_STUDIO_BP_BLOCK_SERVICE)
             $aBlock['content'] = BxDevFunctions::unserializeString($aBlock['content']);
 
-        if((int)$aBlock['designbox_id'] != 0)
-            $aBlock['designbox_id'] = $this->sSelectKeyPrefix . $aBlock['designbox_id'];
+        $aBlock['designbox_id'] = $this->sSelectKeyPrefix . $aBlock['designbox_id'];
     }
 
     protected function onSaveBlock(&$oForm, &$aBlock)

modules/boonex/notifications/classes/BxNtfsCronClean.php

@@ -0,0 +1,34 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    Notifications Notifications
+ * @ingroup     UnaModules
+ *
+ * @{
+ */
+
+class BxNtfsCronClean extends BxDolCron
+{
+    protected $_sModule;
+    protected $_oModule;
+
+    public function __construct()
+    {
+    	$this->_sModule = 'bx_notifications';
+    	$this->_oModule = BxDolModule::getInstance($this->_sModule);
+
+        parent::__construct();
+    }
+
+    function processing()
+    {
+        $iClearIntervalInDays = (int)getParam('bx_notifications_clear_interval');
+        if($iClearIntervalInDays > 0){
+            $this->_oModule->_oDb->cleanEvents($iClearIntervalInDays);
+        }
+    }
+}
+
+/** @} */