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

composer.json

@@ -63,11 +63,11 @@
             "type": "package",
             "package": {
                 "name": "unaio/amazon-s3-php-class-hmac-v2",
-                "version": "0.5",
+                "version": "0.6",
                 "source": {
                     "url": "https://github.com/unaio/amazon-s3-php-class-hmac-v2",
                     "type": "git",
-                    "reference": "main"
+                    "reference": "3687dec0af7be2cb11f21828aa4b12d20c4c5935"
                 }
             }
         }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "78768e5138ed84dbf0e50d07eff17ef8",
+    "content-hash": "3f2f41ec2487e43be6e0b7617c5959e5",
     "packages": [
         {
             "name": "achingbrain/php5-akismet",
@@ -1736,12 +1736,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/unaio/amazon-s3-php-class.git",
-                "reference": "3f720a0144843c214b9444e626119dbe12ecc180"
+                "reference": "7c62b0e9b7d956a04e377ca236979a78dbac4e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/unaio/amazon-s3-php-class/zipball/3f720a0144843c214b9444e626119dbe12ecc180",
-                "reference": "3f720a0144843c214b9444e626119dbe12ecc180",
+                "url": "https://api.github.com/repos/unaio/amazon-s3-php-class/zipball/7c62b0e9b7d956a04e377ca236979a78dbac4e66",
+                "reference": "7c62b0e9b7d956a04e377ca236979a78dbac4e66",
                 "shasum": ""
             },
             "require": {
@@ -1768,7 +1768,7 @@
             "support": {
                 "source": "https://github.com/unaio/amazon-s3-php-class/tree/master"
             },
-            "time": "2021-09-02T09:17:14+00:00"
+            "time": "2022-06-30T03:20:34+00:00"
         },
         {
             "name": "twilio/sdk",
@@ -1826,11 +1826,11 @@
         },
         {
             "name": "unaio/amazon-s3-php-class-hmac-v2",
-            "version": "0.5",
+            "version": "0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/unaio/amazon-s3-php-class-hmac-v2",
-                "reference": "main"
+                "reference": "3687dec0af7be2cb11f21828aa4b12d20c4c5935"
             },
             "type": "library"
         },

inc/js/editor.quill.js

@@ -68,6 +68,13 @@ function bx_editor_init(oEditor, oParams){
                     node.setAttribute('dchar', value.denotationChar);
                     node.setAttribute('data-profile-id', value.dataProfileId);
                 }
+                if (value.url && value.dchar && value.title && value.dataProfileId){
+                    node.setAttribute('href', value.url);
+                    node.innerHTML = value.text;
+                    node.setAttribute('title', value.title);
+                    node.setAttribute('dchar', value.dchar);
+                    node.setAttribute('data-profile-id', value.dataProfileId);
+                }
                 return node;
             }
             
@@ -91,6 +98,10 @@ function bx_editor_init(oEditor, oParams){
                     super.format(name, value);
                 }
             };
+            
+            static value(node) {
+                return { url: node.getAttribute('href') ,title: node.getAttribute('title'), dchar: node.getAttribute('dchar'), dataProfileId: node.getAttribute('data-profile-id'), text: node.innerText }
+            }
                 
             static formats(node) {
                 let format = {};
@@ -143,6 +154,10 @@ function bx_editor_init(oEditor, oParams){
                     super.format(name, value);
                 }
             };
+            
+            static value(node) {
+                return { source: node.getAttribute('source'), inlinecode: "emded"}
+            }
                 
             static formats(node) {
                 let format = {};

install/sql/system.sql

@@ -323,7 +323,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 
 (@iCategoryId, 'sys_quill_insert_as_plain_text', '_adm_stg_cpt_option_sys_quill_insert_as_plain_text', '', 'checkbox', '', '', '', '', 65),
 
-(@iCategoryId, 'sys_quill_allowed_tags', '_adm_stg_cpt_option_sys_quill_allowed_tags', '[\'link\', \'size\', \'image\', \'menthion-link\', \'embed-link\']', 'digit', '', '', '', '', 67),
+(@iCategoryId, 'sys_quill_allowed_tags', '_adm_stg_cpt_option_sys_quill_allowed_tags', '', 'digit', '', '', '', '', 67),
 
 (@iCategoryId, 'sys_quill_toolbar_mini', '_adm_stg_cpt_option_sys_quill_toolbar_mini', '[\'bold\',\'italic\',\'underline\',\'clean\',{\'list\':\'ordered\'}, {\'list\':\'bullet\'},{ \'align\':\'\'},{\'align\':\'center\'},{\'align\':\'right\'},\'blockquote\',\'link\',\'image\',\'embed\']', 'digit', '', '', '', '', 70),
 (@iCategoryId, 'sys_quill_toolbar_standard', '_adm_stg_cpt_option_sys_quill_toolbar_standard', '[\'bold\',\'italic\',\'underline\',\'clean\',{ \'header\': [1, 2, 3, 4, 5, 6, false] },{\'list\':\'ordered\'}, {\'list\':\'bullet\'},{\'indent\': \'-1\'},{\'indent\': \'+1\'},{ \'align\':\'\'},{\'align\':\'center\'},{\'align\':\'right\'},{\'align\':\'justify\'},\'blockquote\',\'link\',\'image\',\'embed\']', 'digit', '', '', '', '', 73),

modules/boonex/elasticsearch/classes/BxElsResponse.php

@@ -107,7 +107,7 @@ class BxElsResponse extends BxDolAlertsResponse
         $aResults = $this->_oModule->serviceSearchExtended($aCondition, $aSelection, $oContentInfo->getName());
 
         $aIds = array();
-        if((int)$aResults['total'] > 0 && !empty($aResults['hits']))
+        if($aResults && (int)$aResults['total'] > 0 && !empty($aResults['hits']))
             foreach($aResults['hits'] as $aResult)
                 $aIds[] = $aResult['_id'];
 

modules/boonex/timeline/js/main.js

@@ -429,9 +429,15 @@ BxTimelineMain.prototype._getPost = function(oView, iId, aParams) {
             	return;
             
             if (oElement.find('img').length > 0){
-                var iRelImgY = oElement.find('img').first().offset().top - oElement.offset().top;
-                if (iRelImgY < oElement.height() && iRelImgY + oElement.find('img').first().height() > oElement.height()){
-                    oElement.css('max-height', (iRelImgY + oElement.find('img').first().height()) +  50 + 'px');
+                var oImg = oElement.find('img').first();
+                var iRelImgY = oImg.offset().top - oElement.offset().top;
+                
+                const img = new Image();
+                img.src = oImg.prop('src');
+                img.onload = function() {
+                    if (iRelImgY < oElement.height() && iRelImgY + this.height > oElement.height()){
+                        oElement.css('max-height', (iRelImgY + this.height) +  50 + 'px');
+                    }
                 }
             }
 

template/scripts/BxBaseGrid.php

@@ -15,7 +15,7 @@ class BxBaseGrid extends BxDolGrid
 {
     protected $_oTemplate;
     protected $_aPopupOptions = false;
-    protected $_aQueryAppend = false;
+    protected $_aQueryAppend = [];
     protected $_aQueryAppendExclude = false; // an array of keys which shouldn't be pathed in http requests, but can be stored (used) in 'Query Append' array.
     protected $_aQueryReset = false;
     protected $_aConfirmMessages = false;