Merge branch 'develop' into experimental/session-start

.travis.yml

@@ -10,6 +10,7 @@ matrix:
   allow_failures:
   - php: 7
   - php: hhvm
+sudo: false
 before_script:
 - travis_retry composer self-update
 - npm install -g grunt-cli

Gruntfile.js

@@ -299,7 +299,17 @@ module.exports = function(grunt) {
 						grunt.file.delete('build/xe');
 						grunt.file.delete('build/temp.full.tar');
 
-						grunt.log.ok('Done!');
+						grunt.util.spawn({
+							cmd: "git",
+							args: ['diff', '--name-status', target]
+						}, function (error, result, code) {
+							var fs = require('fs');
+							result = 'Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R).' + grunt.util.linefeed + result;
+							grunt.file.write(build_dir + '/CHANGED.' + version + '.txt', result);
+
+							grunt.log.ok('Done!');
+						});
+
 					});
 				});
 			}

classes/extravar/Extravar.class.php

@@ -289,6 +289,16 @@ class ExtraItem
 		}
 	}
 
+	/**
+	 * Returns a value for HTML
+	 *
+	 * @return string Returns a value expressed in HTML.
+	 */
+	function getValue()
+	{	
+		return $this->_getTypeValue($this->type, $this->value);
+	}
+
 	/**
 	 * Returns a value for HTML
 	 *

common/js/plugins/jquery.fileupload/js/app.js

@@ -37,7 +37,7 @@
                         // send Blob objects via XHR requests:
                         disableImageResize: /Android(?!.*Chrome)|Opera/
                             .test(window.navigator.userAgent),
-                        maxFileSize: 5000000,
+                        maxFileSize: 999000,
                         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
                     });
                 }

common/js/plugins/jquery.fileupload/js/jquery.fileupload-image.js

@@ -242,7 +242,7 @@
                                     blob.name = file.name;
                                 } else if (file.name) {
                                     blob.name = file.name.replace(
-                                        /\..+$/,
+                                        /\.\w+$/,
                                         '.' + blob.type.substr(6)
                                     );
                                 }

common/js/plugins/jquery.fileupload/js/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.42.2
+ * jQuery File Upload Plugin 5.42.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -277,7 +277,8 @@
             // The following are jQuery ajax settings required for the file uploads:
             processData: false,
             contentType: false,
-            cache: false
+            cache: false,
+            timeout: 0
         },
 
         // A list of options that require reinitializing event listeners and/or
@@ -983,7 +984,10 @@
                 fileSet,
                 i,
                 j = 0;
-            if (limitSize && (!filesLength || files[0].size === undefined)) {
+            if (!filesLength) {
+                return false;
+            }
+            if (limitSize && files[0].size === undefined) {
                 limitSize = undefined;
             }
             if (!(options.singleFileUploads || limit || limitSize) ||
@@ -1344,18 +1348,19 @@
         _initDataAttributes: function () {
             var that = this,
                 options = this.options,
-                clone = $(this.element[0].cloneNode(false)),
+                data = this.element.data();
-                data = clone.data();
-            // Avoid memory leaks:
-            clone.remove();
             // Initialize options set via HTML5 data-attributes:
             $.each(
-                data,
+                this.element[0].attributes,
-                function (key, value) {
+                function (index, attr) {
-                    var dataAttributeName = 'data-' +
+                    var key = attr.name.toLowerCase(),
-                        // Convert camelCase to hyphen-ated key:
+                        value;
-                        key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+                    if (/^data-/.test(key)) {
-                    if (clone.attr(dataAttributeName)) {
+                        // Convert hyphen-ated key to camelCase:
+                        key = key.slice(5).replace(/-[a-z]/g, function (str) {
+                            return str.charAt(1).toUpperCase();
+                        });
+                        value = data[key];
                         if (that._isRegExpOption(key, value)) {
                             value = that._getRegExp(value);
                         }

common/js/plugins/jquery.fileupload/js/main.js

@@ -60,6 +60,8 @@
 				last_selected_file: null,
 			});
 
+			var currentEnforce_ssl = window.enforce_ssl;
+			if(location.protocol == 'https:') { window.enforce_ssl = true; }
 
 			var settings = {
 				url: request_uri
@@ -122,6 +124,8 @@
 					}
 				}
 			};
+			window.enforce_ssl = currentEnforce_ssl;
+
 
 			data.settings = $.extend({} , default_settings, settings, opt || {});
 			$container.data(data);
@@ -287,7 +291,6 @@
 			obj.editor_sequence = data.editorSequence;
 
 			$.exec_json('file.getFileList', obj, function(res){
-				console.log(res);
 				data.uploadTargetSrl = res.upload_target_srl;
 				editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl;
 				data.uploadTargetSrl = res.uploadTargetSrl;
@@ -366,8 +369,6 @@
 
 		return u;
 	};
-
-	xe.unregisterApp();
 })(jQuery);
 
 

config/config.inc.php

@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.5');
+define('__XE_VERSION__', '1.8.7');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

layouts/xedition/layout.html

@@ -307,35 +307,35 @@
 		<!--@if($_sample_slide)-->
 			<include target="./demo/slide.html" />
 		<!--@else-->
-			<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');">
+			<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text1">
 					<div>
 						{$layout_info->slide_text1}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');">
+			<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text2">
 					<div>
 						{$layout_info->slide_text2}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');">
+			<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text3">
 					<div>
 						{$layout_info->slide_text3}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');">
+			<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text4">
 					<div>
 						{$layout_info->slide_text4}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');">
+			<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text5">
 					<div>
 						{$layout_info->slide_text5}

modules/document/document.item.php

@@ -657,7 +657,14 @@ class documentItem extends Object
 	function getExtraValue($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		return $extra_vars[$idx]->value;
+		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
+		{
+			return $extra_vars[$idx]->getValue();
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	function getExtraValueHTML($idx)
@@ -685,7 +692,15 @@ class documentItem extends Object
 				$extra_eid[$key->eid] = $key;
 			}
 		}
-		return $extra_eid[$eid]->value;
+		
+		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		{
+			return $extra_eid[$eid]->getValue();
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	function getExtraEidValueHTML($eid)
@@ -696,7 +711,15 @@ class documentItem extends Object
 		{
 			$extra_eid[$key->eid] = $key;
 		}
-		return $extra_eid[$eid]->getValueHTML();
+		
+		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		{
+			return $extra_eid[$eid]->getValueHTML();
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	function getExtraVarsValue($key)

modules/editor/skins/ckeditor/editor.html

@@ -32,9 +32,9 @@
 <script>
 (function($){
 	"use strict";
-
 	// editor
 	$(function(){
+		<!--@if(!FileHandler::exists('common/js/plugins/ckeditor/ckeditor/config.js'))-->CKEDITOR.config.customConfig = '';<!--@endif-->
 		var settings = {
 			ckeconfig: {
 				height: '{$editor_height}',