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

inc/classes/BxDolConnection.php

@@ -423,6 +423,8 @@ class BxDolConnection extends BxDolFactory implements iBxDolFactoryObject
             $aMessageInitiator = $aMessageContent = [
                 'object' => $this->_sObject, 
                 'action' => 'added',
+                'initiator' => $iInitiator,
+                'content' => $iContent,
             ];
 
             if(bx_is_api()) {

inc/classes/BxDolTemplate.php

@@ -693,6 +693,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
 
         $this->addJsOption('sys_fixed_header');
         $this->addJsOption('sys_confirmation_before_redirect');
+        $this->addJsOption('sys_storage_s3_endpoint');
     }
     
     protected function initImages()

inc/js/functions.js

@@ -1670,12 +1670,18 @@ function bx_redirect_for_external_links (e)
     $(aExclude).each(function () {
         sPattern += ':not([href^="' + this + '"])';
     });
+    if ('undefined' !== typeof(aDolOptions.sys_storage_s3_endpoint) && aDolOptions.sys_storage_s3_endpoint.length)
+        sPattern += ':not([href^="https://' + aDolOptions.sys_storage_s3_endpoint + '"])';
+
     sPattern += ":is([href^='http://'],[href^='https://'])";
 
     if ('undefined' === typeof(e))
         e = $('document');
 
     e.find(sPattern).each(function() {
+        if ($(this).attr('href').match(/s3\.amazonaws\.com/))
+            return;
+            
         $(this).on('contextmenu', function(e) {
             e.preventDefault();
         });

modules/boonex/events/install/sql/enable.sql

@@ -730,7 +730,7 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_events_prices_manage', 'price', '_bx_events_grid_column_title_price', '15%', 0, 16, '', 6),
 ('bx_events_prices_manage', 'period', '_bx_events_grid_column_title_period', '15%', 0, 16, '', 7),
 ('bx_events_prices_manage', 'default_price', '_bx_events_grid_column_title_default_price', '5%', 0, 0, '', 8),
-('bx_events_prices_manage', 'actions', '', '20%', 0, 0, '', 9)
+('bx_events_prices_manage', 'actions', '', '20%', 0, 0, '', 9),
 
 ('bx_events_prices_view', 'role_id', '_bx_events_grid_column_title_role_id', '40%', 0, 32, '', 1),
 ('bx_events_prices_view', 'price', '_bx_events_grid_column_title_price', '20%', 0, 16, '', 2),

modules/boonex/events/install/sql/install.sql

@@ -1,4 +1,4 @@
-bx_events_price_add
+
 SET @sStorageEngine = (SELECT `value` FROM `sys_options` WHERE `name` = 'sys_storage_default');
 
 -- TABLE: EVENTS