CVE-2021-26830

@@ -1,4 +1,4 @@
-Copyright (c) 2020, Tribal Limited

+Copyright (c) 2021, Tribal Limited

 All rights reserved.

 

 Redistribution and use in source and binary forms, with or without

@@ -25,5 +25,5 @@
 		"vimeo-upload": "*",
 		"wowjs": "*"
 	},
-	"version": "8.8.52729"
+	"version": "8.8.53370"
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -41,6 +41,7 @@ DROP TABLE IF EXISTS `[[DB_PREFIX]]languages`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]last_sent_warning_emails`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]layouts`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]local_revision_numbers`;
+DROP TABLE IF EXISTS `[[DB_PREFIX]]lock__clean_dirs`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]lov_salutations`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]menu_hierarchy`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]menu_nodes`;

@@ -160,7 +160,7 @@ INSERT INTO `[[DB_PREFIX]]plugin_settings` VALUES
 <p>Content items will be visible to administrators only until published. Click on the "Publish" button to make them visible to regular site visitors.</p>
 <p>You will also need to make your site visible to visitors by enabling it in Organizer, in the <a href="zenario/admin/organizer.php#zenario__administration/panels/site_settings//site_disabled">Configuration -&gt; Site settings</a> section.</p>
 <p>You can get support and downloads at <a href="http://zenar.io" target="_blank" rel="noopener">http://zenar.io</a>.</p>
-<p>We hope you enjoy using Zenario.</p>','synchronized_setting','translatable_html',NULL,0,'','remove',NULL),
+<p>We hope you enjoy using Zenario.</p>','version_controlled_content','translatable_html',NULL,0,'','remove',NULL),
  (7,'image',0,12,'synchronized_setting','text','file',12,'','remove',NULL),
  (7,'image_source',0,'_CUSTOM_IMAGE','synchronized_setting','text',NULL,0,'','remove',NULL),
  (7,'title',0,'Just a nice image','synchronized_setting','translatable_text',NULL,0,'','remove',NULL),
@@ -240,7 +240,7 @@ INSERT INTO `[[DB_PREFIX]]plugin_settings` VALUES
  (12,'more_link_text',0,'Discover more','synchronized_setting','translatable_text',NULL,0,'','remove',NULL),
  (13,'html',0,'<p>CONTACT</p>
  <h2>Nam liber tempor</h2>
- <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse<br>molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero<br>eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>','synchronized_setting','translatable_html',NULL,0,'','remove',NULL),
+ <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse<br>molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero<br>eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>','version_controlled_content','translatable_html',NULL,0,'','remove',NULL),
  (14,'user_form',0,1,'synchronized_setting','text','user_form',1,'','remove',NULL),
  (15,'image',0,13,'synchronized_setting','text','file',13,'','remove',NULL),
  (15,'image_source',0,'_CUSTOM_IMAGE','synchronized_setting','text',NULL,0,'','remove',NULL),

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,6 @@
 define('ZENARIO_MAJOR_VERSION', '8');
 define('ZENARIO_MINOR_VERSION', '8');
 define('ZENARIO_IS_BUILD', true);
-define('ZENARIO_REVISION', '52729');
+define('ZENARIO_REVISION', '53370');
 
 define('TINYMCE_DIR', 'zenario/libs/manually_maintained/lgpl/tinymce_4_7_3/');
\ No newline at end of file

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -73,7 +73,7 @@ diagnostics:
                     full_width: true
                     row_class: sub_field
                     snippet:
-                        html: PHP version 7.0 or later
+                        html: PHP version 7.2 or later
                     visible_if: zenarioAW.togglePressed(field)
                 opcache_misconfigured:
                     grouping: sub_table

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -26,12 +26,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-if (version_compare(phpversion(), '7.0.0', '<')) {
+if (version_compare(phpversion(), '7.2.0', '<')) {
 	echo '
 		<h1>System Requirements</h1>
 		<p>It looks like your server doesn\'t meet the requirements for Zenario.</p>
 		<p>
-			Zenario needs PHP version 7.0 or later to run (<em>you have version ', htmlspecialchars(phpversion()), '</em>).
+			Zenario needs PHP version 7.2 or later to run (<em>you have version ', htmlspecialchars(phpversion()), '</em>).
 		</p>';
 	exit;
 }

@@ -49,7 +49,7 @@ system_requirements:
                     grouping: sub_table
                     full_width: true
                     snippet:
-                        html: PHP version 7.0 or later
+                        html: PHP version 7.2 or later
                     visible_if: zenarioAW.togglePressed(field)
                 opcache_misconfigured:
                     grouping: sub_table

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -554,7 +554,8 @@ public static function isInactive($adminId) {
 			FROM ' . DB_PREFIX . 'admins
 			WHERE id = ' . (int)$adminId . '
 			AND authtype = "local" 
-			AND COALESCE(last_login, created_date) < DATE_SUB(NOW(), INTERVAL ' . (int)$days . ' DAY)';
+			AND COALESCE(last_login, created_date) < DATE_SUB(NOW(), INTERVAL ' . (int)$days . ' DAY)
+			LIMIT 1';
 		$result = \ze\sql::select($sql);
 		return \ze\sql::numRows($result) > 0;
 	}

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -599,7 +599,7 @@ public static function updateDataRevisionNumber2() {
 
 
 	//Formerly "connectToDatabase()"
-	public static function connect($dbhost = 'localhost', $dbname, $dbuser, $dbpass, $dbport = '', $reportErrors = true) {
+	public static function connect($dbhost, $dbname, $dbuser, $dbpass, $dbport = '', $reportErrors = true) {
 		try {
 			\ze::ignoreErrors();
 				if ($dbport) {

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -1054,17 +1054,23 @@ public static function imageLink(
 				//We'll try to create a subdirectory inside public/images/ using the short checksum as the name
 				$path = \ze\cache::createDir($image['short_checksum'], 'public/images', false);
 			
-				//If this is a resize, we'll put the resize in another subdirectory using the code above as the name
-				if ($path && $imageNeedsToBeResized) {
+				//If this is a resize, we'll put the resize in another subdirectory using the code above as the name.
+				//(Note: Except for SVGs which are vector images and don't need resizing.)
+				if ($path && $imageNeedsToBeResized && !$isSVG) {
 					$path = \ze\cache::createDir($image['short_checksum']. '/'. $settingCode, 'public/images', false);
 				}
 		
 			//If the image should be in the private directory, don't worry about a friendly URL and
 			//just use the full hash.
 			} else {
-				//Workout a hash for the image at this size
-				$hash = \ze::hash64($settingCode. '_'. $image['checksum']);
-			
+				//Workout a hash for the image at this size.
+				//Except for SVGs, the hash should also include the resize parameters
+				if ($isSVG) {
+					$hash = $image['checksum'];
+				} else {
+					$hash = \ze::hash64($settingCode. '_'. $image['checksum']);
+				}			
+				
 				//Try to get a directory in the cache dir
 				$path = \ze\cache::createDir($hash, 'images', false);
 			}

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -129,26 +129,22 @@
 }
 
 
-$checkPrefixes = $prefix != 'zenario/';
-
 foreach (\ze::$jsLibs as $lib => $stylesheet) {
 	
 	if ($stylesheet) {
-		if ($checkPrefixes) {
-			if ($stylesheet[0] != '/'
-			 && strpos($stylesheet, '://') === false) {
-				$stylesheet = $prefix. '../'. $stylesheet;
-			}
+		$thisPrefix = '';
+		if ($stylesheet[0] != '/'
+		 && strpos($stylesheet, '://') === false) {
+			$thisPrefix = $absURL;
 		}
-		echo "\n", '<link rel="stylesheet" type="text/css" media="screen" href="', $prefix, htmlspecialchars($stylesheet). '?', $v, '"/>';
+		
+		echo "\n", '<link rel="stylesheet" type="text/css" media="screen" href="', $thisPrefix, htmlspecialchars($stylesheet). '?', $v, '"/>';
 	}
 	
+	$thisPrefix = '';
 	if ($lib[0] != '/'
 	 && strpos($lib, '://') === false) {
-		
-		if ($checkPrefixes) {
-			$lib = $prefix. '../'. $lib;
-		}
+		$thisPrefix = $absURL;
 		
 		if (strpos($lib, '?v=') === false
 		 && strpos($lib, '&v=') === false) {
@@ -159,7 +155,7 @@
 			}
 		}
 	}
-	echo "\n", $scriptTag, ' src="', htmlspecialchars($lib), '"></script>';
+	echo "\n", $scriptTag, ' src="', $thisPrefix, htmlspecialchars($lib), '"></script>';
 }
 	
 
@@ -330,7 +326,7 @@
 
 //Check to see if there is anything we need to output from the head/foot slots.
 //We need to pay attention to the logic for showing to admins, cookie consent, and overriding
-if (\ze::$cID) {
+if (\ze::$cID && \ze::$cID !== -1) {
 	$itemHTML = $templateHTML = $familyHTML = false;
 	
 	$sql = "

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -298,7 +298,7 @@
 }
 
 
-if (\ze::$cID) {
+if (\ze::$cID && \ze::$cID !== -1) {
 	$itemHTML = $templateHTML = $familyHTML =
 	$bgWidth = $bgHeight = $bgURL = false;
 	

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php

 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -1252,7 +1252,10 @@ public static function saveSystemFieldsFromTUIX($datasetId) {
 										[
 											'dataset_id' => $datasetId, 
 											'tab_name' => $tabName, 
-											'field_name' => $fieldName]);
+											'field_name' => $fieldName
+										],
+										$ignore = false, $ignoreMissingColumns = true
+									);
 								}
 							}
 						}

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -671,11 +671,13 @@ protected final function registerPluginPage($mode = null, $moduleClassName = nul
 			}
 			
 			\ze\row::set('plugin_pages_by_mode',
-				['equiv_id' => \ze::$equivId, 'content_type' => \ze::$cType],
 				[
-					'module_class_name' => $moduleClassName ?? $this->moduleClassName,
-					'mode' => $mode ?? ($this->setting('mode') ?: ''),
+					'equiv_id' => \ze::$equivId,
+					'content_type' => \ze::$cType,
 					'state' => substr(\ze\escape::ascii($state), 0, 2)
+				], [
+					'module_class_name' => $moduleClassName ?? $this->moduleClassName,
+					'mode' => $mode ?? ($this->setting('mode') ?: '')
 				]
 			);
 		}
@@ -1340,7 +1342,7 @@ public final function start($awClass = 'zenario_slotOuter') {
 	}
 	
 	//Display the admin controls for a slot
-	private final function startIncludeAdminControls() {
+	private function startIncludeAdminControls() {
 		require \ze::funIncPath(__FILE__, __FUNCTION__);
 	}
 	
@@ -1564,11 +1566,11 @@ public final function frameworkField($attributes) {
 		return $this->zAPIFrameworkField($attributes);
 	}
 	
-	private final function zAPIFrameworkField($attributes, $i = false, $lov = false, $readonly = false, $saveVal = null, $dispVal = null) {
+	private function zAPIFrameworkField($attributes, $i = false, $lov = false, $readonly = false, $saveVal = null, $dispVal = null) {
 		return require \ze::funIncPath(__FILE__, __FUNCTION__);
 	}
 	
-	private final function zAPIFrameworkLOV($type, &$attributes, &$lov) {
+	private function zAPIFrameworkLOV($type, &$attributes, &$lov) {
 		//Load the List of Values for a field
 		if ($type == 'checkbox' || $type == 'radio' || $type == 'select' || $type == 'toggle' || $type == 'text') {
 			if (!empty($attributes['source_module']) && !empty($attributes['source_method']) && \ze\module::inc($attributes['source_module'])) {

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -890,7 +890,7 @@ public static function getUsage($instanceId) {
 
 	//Replace one instance with another
 	//Formerly "replacePluginInstance()"
-	public static function replace($oldmoduleId = false, $oldInstanceId, $newmoduleId = false, $newInstanceId, $cID = false, $cType = false, $cVersion = false, $slotName = false) {
+	public static function replace($oldmoduleId, $oldInstanceId, $newmoduleId, $newInstanceId, $cID = false, $cType = false, $cVersion = false, $slotName = false) {
 	
 		if ((!$oldmoduleId && !($oldmoduleId = \ze\row::get('plugin_instances', 'module_id', $oldInstanceId)))
 		 || (!$newmoduleId && !($newmoduleId = \ze\row::get('plugin_instances', 'module_id', $newInstanceId)))) {
@@ -1000,7 +1000,7 @@ public static function delete($instanceId) {
 			   ON gsl.link_from = 'slide'
 			  AND gsl.link_from_id = np.id
 			  AND np.is_slide = 1
-			WHERE np.instance_id = ". $instanceId);
+			WHERE np.instance_id = ". (int) $instanceId);
 	
 		foreach ([
 			'nested_paths', 'plugin_instance_store',
@@ -1061,7 +1061,7 @@ public static function updateItemSlot($instanceId, $slotName, $cID, $cType = fal
 	
 
 	//Formerly "updatePluginInstanceInTemplateSlot()"
-	public static function updateLayoutSlot($instanceId, $slotName, $templateFamily = false, $layoutId, $moduleId = false, $cID = false, $cType = false, $cVersion = false, $copySwatchUp = false, $copySwatchDown = false) {
+	public static function updateLayoutSlot($instanceId, $slotName, $templateFamily, $layoutId, $moduleId = false, $cID = false, $cType = false, $cVersion = false, $copySwatchUp = false, $copySwatchDown = false) {
 	
 		if ($cID && $cType && !$cVersion) {
 			$cVersion = \ze\content::latestVersion($cID, $cType);

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -103,7 +103,7 @@ public static function quickValidateWelcomePage(&$values, &$rowClasses, &$snippe
 	//This file includes common functionality for running SQL scripts
 
 	//Formerly "runSQL()"
-	public static function runSQL($prefix = false, $file, &$error, $patterns = false, $replacements = false) {
+	public static function runSQL($prefix, $file, &$error, $patterns = false, $replacements = false) {
 		
 		\ze\dbAdm::getTableEngine();
 		$error = false;
@@ -440,7 +440,7 @@ public static function systemRequirementsAJAX(&$source, &$tags, &$fields, &$valu
 		$fields['0/php_1']['post_field_html'] =
 			\ze\admin::phrase('&nbsp;(<em>you have version [[version]]</em>)', ['version' => htmlspecialchars($phpVersion)]);
 	
-		if (!\ze\welcome::compareVersionNumber($phpVersion, '7.0.0')) {
+		if (!\ze\welcome::compareVersionNumber($phpVersion, '7.2.0')) {
 			$fields['0/php_1']['row_class'] = $invalid;
 	
 		} else {
@@ -450,7 +450,7 @@ public static function systemRequirementsAJAX(&$source, &$tags, &$fields, &$valu
 	
 		$phpWarning = false;
 		if (!$fields['0/opcache_misconfigured']['hidden'] =
-			\ze\welcome::compareVersionNumber(phpversion(), '7.0.0')
+			\ze\welcome::compareVersionNumber(phpversion(), '7.2.0')
 		 || !\ze\server::checkFunctionEnabled('ini_get')
 		 || !\ze\ring::engToBoolean(ini_get('opcache.enable'))
 		 || \ze\ring::engToBoolean(ini_get('opcache.dups_fix'))
@@ -957,45 +957,21 @@ public static function installerAJAX(&$source, &$tags, &$fields, &$values, $chan
 			}
 		
 			if (empty($tags['tabs'][3]['errors'])) {
-				
-				if($values['3/multi_db'] == 'zenario_multisite')
-				{
-					
-				\ze::$dbG = new \ze\db($merge['DB_PREFIX_GLOBAL'], $merge['DBHOST_GLOBAL'], $merge['DBNAME_GLOBAL'], $merge['DBUSER_GLOBAL'], $merge['DBPASS_GLOBAL'], $merge['DBPORT_GLOBAL'],$reportErrors = false);
-				}
 			
 				\ze::$dbL = new \ze\db($merge['DB_PREFIX'], $merge['DBHOST'], $merge['DBNAME'], $merge['DBUSER'], $merge['DBPASS'], $merge['DBPORT'], $reportErrors = false);
 				
-				if (!\ze::$dbL->con || !\ze::$dbG->con) {
-					if (!\ze::$dbL->con )
-					{
-						\ze::$dbL = null;
-						$tags['tabs'][3]['errors'][] = 
-							\ze\admin::phrase('The database name, username and/or password are invalid.');
-					}
-					elseif (!\ze::$dbG->con && $values['3/multi_db'] == 'zenario_multisite')
-					{
-						\ze::$dbG = null;
-						$tags['tabs'][3]['errors'][] = 
-							\ze\admin::phrase('The database name, username and/or password are invalid for the global database.');
-					}
-				} 
-				if (\ze::$dbL->con ) {	
-				
-				// Check for MySQL max_packet_size being too small
+				if (\ze::$dbL && \ze::$dbL->con) {
+					// Check for MySQL max_packet_size being too small
 					if (($result = @\ze\sql::select("SHOW VARIABLES LIKE 'max_allowed_packet'"))
 					 && ($row = \ze\sql::fetchRow($result))
 					 && !empty($row[1])) {
+						
 						$max_allowed_packet = $row[1];
-						if($max_allowed_packet < 4000000 )
-						{
-							
+						if ($max_allowed_packet < 4000000) {
 							$tags['tabs'][3]['errors'][] =
-								\ze\admin::phrase('Your MySQL server\'s max_packet_size variable is set to '.$max_allowed_packet.', we recommend you increase this to 16MB (must be at least 4MB). Without this, you may experience problems when uploading large images or other files.');
-							
+								\ze\admin::phrase('Your MySQL server\'s max_packet_size variable is set to [[max_allowed_packet]], we recommend you increase this to 16MB (must be at least 4MB). Without this, you may experience problems when uploading large images or other files.',
+									['max_allowed_packet' => $max_allowed_packet]);
 						}
-					
-						
 					}
 				
 					if (!($result = @\ze\sql::select("SELECT VERSION()"))
@@ -1025,23 +1001,25 @@ public static function installerAJAX(&$source, &$tags, &$fields, &$values, $chan
 						}
 					}
 					
-				}
-				//Check admins table for global database
-				if (\ze::$dbG
-				 && \ze::$dbG->con
-				 && $values['3/multi_db'] == 'zenario_multisite') {
-						
-						$tablename = $merge['DB_PREFIX_GLOBAL'].'admins';
-
-						$tables = \ze::$dbG->checkTableDef($tablename, true);
-
-						if(!$tables)
-						{
-							$tags['tabs'][3]['errors'][] = \ze\admin::phrase('Connection to the global database succeeded, but the "admins" table (prefixed with your given prefix) does not appear to exist.');
+					if ($values['3/multi_db'] == 'zenario_multisite') {
+						\ze::$dbG = new \ze\db($merge['DB_PREFIX_GLOBAL'], $merge['DBHOST_GLOBAL'], $merge['DBNAME_GLOBAL'], $merge['DBUSER_GLOBAL'], $merge['DBPASS_GLOBAL'], $merge['DBPORT_GLOBAL'],$reportErrors = false);
+					
+						if (\ze::$dbG && \ze::$dbG->con) {
+							if (!\ze::$dbG->checkTableDef($merge['DB_PREFIX_GLOBAL']. 'admins', true)) {
+								$tags['tabs'][3]['errors'][] =
+									\ze\admin::phrase('Connection to the global database succeeded, but the "admins" table (prefixed with your given prefix) does not appear to exist.');
+							}
+						} else {
+							\ze::$dbG = null;
+							$tags['tabs'][3]['errors'][] = 
+								\ze\admin::phrase('The database name, username and/or password are invalid for the global database.');
 						}
-						
-				}
-				
+					}
+				} else {
+					\ze::$dbL = null;
+					$tags['tabs'][3]['errors'][] = 
+						\ze\admin::phrase('The database name, username and/or password are invalid.');
+				} 
 			}
 			
 		}
@@ -2398,7 +2376,7 @@ public static function diagnosticsAJAX(&$source, &$tags, &$fields, &$values, $ch
 				$sql = '
 					SELECT id, username, last_login, last_login_ip, created_date
 					FROM ' . DB_PREFIX . 'admins
-					WHERE id = '.$admiId.'
+					WHERE id = '. (int) $admiId. '
 					  AND `status` = \'active\'
 					ORDER BY last_login';
 				$result = \ze\sql::select($sql);		

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -27,16 +27,27 @@
  */
 
 //Get the checksum and intended usage of this file from the request
-$usage = isset($_GET['usage'])? $_GET['usage'] : 'image';
-$checksum = isset($_GET['checksum'])? $_GET['checksum'] : (isset($_GET['c'])? $_GET['c'] : false);
 $requestedWidth = isset($_GET['width'])? (int) $_GET['width'] : '';
 $requestedHeight = isset($_GET['height'])? (int) $_GET['height'] : '';
 $retina = !empty($_GET['retina']);
-$key = isset($_GET['k'])? $_GET['k'] : '';
 $adminBackend = false;
 
-if ($checksum !== false) {
-	$checksum = preg_replace('/[^\\w-]/', '', $checksum);
+if (isset($_GET['checksum'])) {
+	$checksum = preg_replace('@[^\w\-\=]@', '', $_GET['checksum']);
+} elseif (isset($_GET['c'])) {
+	$checksum = preg_replace('@[^\w\-\=]@', '', $_GET['c']);
+} else {
+	$checksum = '';
+}
+if (isset($_GET['usage'])) {
+	$usage = preg_replace('@[^\w\-\=]@', '', $_GET['usage']);
+} else {
+	$usage = 'image';
+}
+if (isset($_GET['k'])) {
+	$key = preg_replace('@[^\w\-\=]@', '', $_GET['k']);
+} else {
+	$key = '';
 }
 
 //Add some logic to handle any old links to email/inline/menu images (these are now just classed as "image"s).

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -169,7 +169,11 @@ function slot($slotName, $mode = false) {
 		$_SESSION['destCID'] = $content['id'];
 		$_SESSION['destCType'] = $content['type'];
 		$_SESSION['destURL'] = ze\link::protocol(). ze\link::host(). $_SERVER['REQUEST_URI'];
-		$_SESSION['destTitle'] = $version['title'];
+		
+		if (!empty($version)
+		 && !empty($version['title'])) {
+			$_SESSION['destTitle'] = $version['title'];
+		}
 	}
 	ze::$canCache = false;
 	

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -483,6 +483,28 @@ zenarioGM.drawAddToolbar = function() {
 			helper: "clone",
 			revert: "invalid"
 		});
+	
+	var $addToolbar = $( "#"+ zenarioGM.addToolbarId ),
+		position = $addToolbar.position();
+	
+	//Fix a bug that caused the yellow box to stay attached to the right of the screen,
+	//and keep stretching if someone tries to pull it away.
+	//This is caused by the "right: 30px;" rule, however this rule does need to be there
+	//to get the positioning of the box correct.
+	//If the position is well defined, get whatever the current value is based off of the
+	//CSS calculation, and then manually set it to its own current value.
+	//Then it's safe to remove the "right: 30px;" rule to fix the bug, without affecting
+	//the positioning.
+	if (position
+	 && defined(position.top)
+	 && defined(position.left)) {
+		$addToolbar.css({
+			right: 'auto',
+			top: position.top,
+			left: position.left
+		});
+	}
+	
 	 $( "#"+ zenarioGM.addToolbarId ).draggable({ cursor: "move"});
 };
 

@@ -1,4 +1,4 @@
-zenario.lib(function(z,u,v,s,A,g,h,n,B,C,D,E,w,x,F,l,q,G,r,H,y,t,a){a.initVars();a.gridId="grid";a.mtPrefix="zenario_grid_maker_";a.addToolbarId="grid_add_toolbar";a.init=function(c,b,e,d){a.data="object"==typeof c?c:JSON.parse(c);e&&(a.layoutName=e);b&&(a.layoutId=b);a.checkData(e,d);a.checkDataR(a.data.cells);a.rememberNames(a.data.cells);a.editing=!0;a.data.cells.length||(a.editing=!0);g&&!g.zenarioGM&&g.$&&g.$.colorbox?$("#close_button").click(function(){if(a.savedAtPos==a.pos||confirm(r.gridConfirmClose))h.stopPoking(a),
+zenario.lib(function(z,v,w,t,A,g,h,n,B,C,D,E,x,q,F,l,r,G,s,H,y,u,a){a.initVars();a.gridId="grid";a.mtPrefix="zenario_grid_maker_";a.addToolbarId="grid_add_toolbar";a.init=function(c,b,e,d){a.data="object"==typeof c?c:JSON.parse(c);e&&(a.layoutName=e);b&&(a.layoutId=b);a.checkData(e,d);a.checkDataR(a.data.cells);a.rememberNames(a.data.cells);a.editing=!0;a.data.cells.length||(a.editing=!0);g&&!g.zenarioGM&&g.$&&g.$.colorbox?$("#close_button").click(function(){if(a.savedAtPos==a.pos||confirm(s.gridConfirmClose))h.stopPoking(a),
 g.zenario&&g.zenario.cID?g.location.reload(!0):g.$.colorbox.close()}):l("close_button").style.display="none";h.startPoking(a)};a.draw=function(c){c||a.drawOptions();a.editing?a.drawEditor():a.drawPreview()};a.drawOptions=function(){var c=a.microTemplate(a.mtPrefix+"top",{formId:"settings"});$(".ui-tooltip").remove();l("settings").innerHTML=c;n._to("#settings");a.data.fluid||a.recalcColumnAndGutterOptions(a.data);$("#settings input.zenario_grid_setting_break_1").change(a.update).spinner({stop:a.update,
 min:10,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_break_2").change(a.update).spinner({stop:a.update,min:300,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_min_width").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,min:100,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_max_width").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,
 min:320,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_gutter_flu").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,min:0,step:0.1}).after('<span class="zenario_grid_unit">%</span>');$("#settings input.zenario_grid_setting_gutter_left_flu").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,min:0,step:0.1}).after('<span class="zenario_grid_unit">%</span>');$("#settings input.zenario_grid_setting_gutter_right_flu").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,
@@ -7,23 +7,23 @@ min:0,step:1}).after('<span class="zenario_grid_unit">px</span>');$("#settings i
 $("#settings input.zenario_grid_setting_mirror").change(a.updateAndChange);a.canUndo()&&$("#settings .zenario_grid_setting_undo").click(function(){a.undo()});a.canRedo()&&$("#settings .zenario_grid_setting_redo").click(function(){a.redo()});$("#settings .zenario_grid_setting_preview_grid").click(function(){a.editing=!1;a.drawPreview()});$("#settings .zenario_grid_setting_edit_slots").click(function(){a.editing=!0;a.drawEditor()})};a.recalcColumnAndGutterOptions=function(a,b,e){var d=!1,p=(e?e:1*$("#settings--setting_full_width").val())-
 a.gutterLeftEdge-a.gutterRightEdge;e=Math.floor(p/a.cols);var f=0,h=!1,k=0;b||(d=l("settings--setting_col_width"));if(!a.cols)return!1;if(d)for(k=d.length-1;0<=k;--k)d.remove(k);if(1==a.cols)d&&d.add(new Option(e+" px / "+f+" px",e+"/"+f),++k),h={colWidth:e,gutter:f};else{f=a.cols-1;b=p/f;for(var p=a.cols/f,g,m=999999,k=-1;0<e;--e)f=b-p*e,f=Math.round(1E4*f)/1E4,f==Math.floor(f)&&(d&&d.add(new Option(e+" px / "+f+" px",e+"/"+f),++k),g=Math.abs(a.gutter/a.colWidth-f/e),m>g&&(d&&(d.selectedIndex=k),
 m=g,h={colWidth:e,gutter:f}))}return h};a.editProperties=function(c){var b=$(c),e=["zenario_grid_box","zenario_grid_rename_slot_box"],b={type:b.data("type"),name:b.data("name"),small:b.data("small"),height:b.data("height"),is_full:b.data("is_full"),is_last:b.data("is_last"),css_class:b.data("css_class"),html:b.data("html"),grid_css_class:b.data("grid_css_class")};$.colorbox({transition:"none",html:a.microTemplate(a.mtPrefix+"object_properties",b),onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},
-onComplete:function(){$("#zenario_grid_slotname_button").click(function(){var b,e={},f=$("#colorbox .zenario_grid_properties_form").serializeArray();for(b in f)t(f,b)&&(e[f[b].name]=f[b].value);a.saveProperties(c,e)});$(".zenario_grid_properties_form input,textarea")[1].focus()}})};a.ajaxURL=function(){return u+"zenario/admin/grid_maker/ajax.php"};a.ajaxSrc=function(){var c=a.ajaxData(),b=a.ajaxURL()+"?data="+w(c);400<b.length&&(b=a.ajaxURL()+"?cdata="+h._nAA(a.ajaxURL(),{compress:1,data:c}));return b};
-a.drawPreview=function(){a.clearAddToolbar();a.checkData();var c=Math.max(a.desktopSmallestSize,100*Math.round(($(s).width()-a.previewPaddingLeftRight)/100)),b=Math.min(c-20,a.data.maxWidth),e=a.microTemplate(a.mtPrefix+"preview",{gridId:a.gridId,topHack:5,leftHack:10,min:100,max:c,startingValue:b});$("#"+a.gridId).css("margin","auto");$(".ui-tooltip").remove();l(a.gridId).innerHTML=e;n._to("#"+a.gridId);$('<form action="'+q(a.ajaxURL())+'" method="post" target="'+a.gridId+'-iframe"><input name="data" value="'+
-q(a.ajaxData())+'"/></form>').appendTo("body").hide().submit().remove();$("#"+a.gridId+"-slider").slider({min:100,max:c,step:10,animate:!0,value:b,start:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","block")},stop:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","none")},slide:function(b,c){$("#"+a.gridId+"-slider_val").val(c.value);$("#"+a.gridId+"-iframe").clearQueue();$("#"+a.gridId+"-size").clearQueue();!b.originalEvent||"mousedown"!=b.originalEvent.type&&"touchstart"!=
+onComplete:function(){$("#zenario_grid_slotname_button").click(function(){var b,e={},f=$("#colorbox .zenario_grid_properties_form").serializeArray();for(b in f)u(f,b)&&(e[f[b].name]=f[b].value);a.saveProperties(c,e)});$(".zenario_grid_properties_form input,textarea")[1].focus()}})};a.ajaxURL=function(){return v+"zenario/admin/grid_maker/ajax.php"};a.ajaxSrc=function(){var c=a.ajaxData(),b=a.ajaxURL()+"?data="+x(c);400<b.length&&(b=a.ajaxURL()+"?cdata="+h._nAA(a.ajaxURL(),{compress:1,data:c}));return b};
+a.drawPreview=function(){a.clearAddToolbar();a.checkData();var c=Math.max(a.desktopSmallestSize,100*Math.round(($(t).width()-a.previewPaddingLeftRight)/100)),b=Math.min(c-20,a.data.maxWidth),e=a.microTemplate(a.mtPrefix+"preview",{gridId:a.gridId,topHack:5,leftHack:10,min:100,max:c,startingValue:b});$("#"+a.gridId).css("margin","auto");$(".ui-tooltip").remove();l(a.gridId).innerHTML=e;n._to("#"+a.gridId);$('<form action="'+r(a.ajaxURL())+'" method="post" target="'+a.gridId+'-iframe"><input name="data" value="'+
+r(a.ajaxData())+'"/></form>').appendTo("body").hide().submit().remove();$("#"+a.gridId+"-slider").slider({min:100,max:c,step:10,animate:!0,value:b,start:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","block")},stop:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","none")},slide:function(b,c){$("#"+a.gridId+"-slider_val").val(c.value);$("#"+a.gridId+"-iframe").clearQueue();$("#"+a.gridId+"-size").clearQueue();!b.originalEvent||"mousedown"!=b.originalEvent.type&&"touchstart"!=
 b.originalEvent.type?($("#"+a.gridId+"-iframe").width(c.value),$("#"+a.gridId+"-size").css("marginLeft",c.value+"px")):($("#"+a.gridId+"-iframe").animate({width:c.value}),$("#"+a.gridId+"-size").animate({marginLeft:c.value}));a.resizePreview()}});$("#"+a.gridId+"-slider_val").change(function(){var b=1*this.value;b&&100<=b&&b<=c&&($("#"+a.gridId+"-slider").slider("value",b),$("#"+a.gridId+"-iframe").clearQueue().animate({width:b}),$("#"+a.gridId+"-size").clearQueue().animate({marginLeft:b}))});a.resizePreview();
-var d=function(b){$("#"+a.gridId+"-slider_val").val(b);$("#"+a.gridId+"-slider").slider("value",b);$("#"+a.gridId+"-size").clearQueue().animate({marginLeft:b});$("#"+a.gridId+"-iframe").clearQueue().animate({width:b},{complete:a.resizePreview});a.lastToast&&a.lastToast.remove();a.lastToast=toastr.info(r.gridDisplayingAt.r("[[pixels]]",b))};$("#"+a.gridId+"-slider_mobile").click(function(){d(a.mobileWidth)});$("#"+a.gridId+"-slider_tablet").click(function(){d(a.tabletWidth)});$("#"+a.gridId+"-slider_desktop").click(function(){d(c)});
+var d=function(b){$("#"+a.gridId+"-slider_val").val(b);$("#"+a.gridId+"-slider").slider("value",b);$("#"+a.gridId+"-size").clearQueue().animate({marginLeft:b});$("#"+a.gridId+"-iframe").clearQueue().animate({width:b},{complete:a.resizePreview});a.lastToast&&a.lastToast.remove();a.lastToast=toastr.info(s.gridDisplayingAt.r("[[pixels]]",b))};$("#"+a.gridId+"-slider_mobile").click(function(){d(a.mobileWidth)});$("#"+a.gridId+"-slider_tablet").click(function(){d(a.tabletWidth)});$("#"+a.gridId+"-slider_desktop").click(function(){d(c)});
 $("#settings--tabs").removeClass("zenario_grid_tabs_slots_selected").addClass("zenario_grid_tabs_grid_selected");a.drawLinks()};a.drawEditor=function(a,b,e,d,h,f,g,k,l,m,n){e||$("#settings--tabs").removeClass("zenario_grid_tabs_grid_selected").addClass("zenario_grid_tabs_slots_selected");return y(zenarioG).drawEditor.call(this,a,b,e,d,h,f,g,k,l,m,n)};a.clearAddToolbar=function(){$("#"+a.addToolbarId).hide().html("")};a.drawAddToolbar=function(){$("#"+a.addToolbarId).show().html(a.microTemplate(a.mtPrefix+
-"add_toolbar",{}));$("#"+a.addToolbarId+" a").draggable({connectToSortable:".zenario_grids",helper:"clone",revert:"invalid"});$("#"+a.addToolbarId).draggable({cursor:"move"})};$(v).ready(function(){$("#"+a.addToolbarId).hover(function(){$(this).css("cursor","move")},function(){$(this).css("cursor","pointer")})});a.resizePreview=function(){var c,b=0;(c=l(a.gridId+"-iframe"))&&c.contentWindow&&c.contentWindow.document&&c.contentWindow.document.body&&(b=$(c.contentWindow.document.body).height()||360,
-360>b&&(b=360),$("#"+a.gridId+"-iframe").height(b),$("#"+a.gridId+"-slider_overlay").height(b),$("#"+a.gridId+"-slider a").css("position","absolute").css("z-index",20).css("top","-"+(b+5)+"px").height(b+5).html('<span style="margin-top: '+Math.ceil((b+5)/2)+'px;"></span>'));a.lastIframeHeight=b};a.drawLinks=function(){a.checkData();var c={src:a.ajaxSrc()};a.microTemplate(a.mtPrefix+"bottom_links",c);$(".ui-tooltip").remove();n._to("#download_links");c=$("#"+a.gridId);a.editing?c.addClass("zenario_grid_slot_view").removeClass("zenario_grid_grid_view"):
-(c.addClass("zenario_grid_grid_view").removeClass("zenario_grid_slot_view"),c.css({height:"auto"}),c=$("#"+a.gridId+" .zenario_grid_preview_frame"));c.height(0);c.height(Math.max(a.gridAreaSmallestHeight,$(s).height()-$("body").height()-a.bodyPadding));var b=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_css_box"];$("#download_links a.zenario_grid_copy_css").colorbox({onOpen:function(){h._aCTC(b)},onClosed:function(){h._rCTC(b)},onComplete:function(){$("#colorbox textarea").focus()}});
-var e=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_html_box"];$("#download_links a.zenario_grid_copy_html").colorbox({onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#colorbox textarea").focus()}})};a.save=function(c){a.layoutId||(c=!0);var b;if(c){var e=["zenario_grid_box","zenario_grid_new_layout_box"];(b=h._nAA(a.ajaxURL(),{saveas:1,data:a.ajaxData(),layoutId:a.layoutId},!0))&&$.colorbox({transition:"none",html:a.microTemplate(a.mtPrefix+
-"save_prompt",{name:a.newLayoutName||b.oldLayoutName||""}),onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#zenario_grid_new_layout_save").click(function(){$("#zenario_grid_error").hide();(b=h._nAA(a.ajaxURL(),{saveas:1,confirm:1,data:a.ajaxData(),layoutId:a.layoutId,layoutName:a.newLayoutName=l("zenario_grid_layout_name").value},!0))?b.error?$("#zenario_grid_error").html(q(b.error)).slideDown():($.colorbox.close(),a.layoutName=a.newLayoutName,a.markAsSaved(b)):
-$.colorbox.close()});l("zenario_grid_layout_name").focus()}})}else if(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId},!0))b.success?a.markAsSaved(b,!0):(n._flBo(b.message,r.gridSave,"warning",!0,!0),$("#zenario_fbMessageButtons .submit_selected").click(function(){setTimeout(function(){var b;(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId,confirm:1},!0))&&a.markAsSaved(b)},50)}))};a.markAsSaved=function(c,b){a.savedAtPos=a.pos;x(c.layoutId)&&(a.layoutId=c.layoutId);
-a.rememberNames(a.data.cells);c.success&&(b?n._flBo(c.success,!0,"success"):toastr.success(c.success));if(g&&g.zenarioO.init)switch(g.zenarioO.path){case "zenario__layouts/panels/layouts":c.layoutId&&g.zenarioO._rTSI(c.layoutId)}};a.readSettings=function(a){a.fluid=$("#settings input.zenario_grid_setting_flu").prop("checked");a.responsive=$("#settings input.zenario_grid_setting_responsive").prop("checked");a.mirror=$("#settings input.zenario_grid_setting_mirror").prop("checked");a.cols=1*$("#settings input.zenario_grid_setting_cols").val();
-var b;(b=$("#settings input.zenario_grid_setting_full_width")).length?a.maxWidth=1*b.val():(b=$("#settings input.zenario_grid_setting_max_width")).length&&(a.maxWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_min_width")).length&&(a.minWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_break_1")).length&&(a.bp1=1*b.val());(b=$("#settings input.zenario_grid_setting_break_2")).length&&(a.bp2=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_left")).length&&(a.gutterLeftEdge=
-1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right")).length&&(a.gutterRightEdge=1*b.val());(b=$("#settings select.zenario_grid_setting_col_and_gutter")).length&&(b=b.val())&&(b=b.s("/"))&&(a.colWidth=1*b[0],a.gutter=1*b[1]);(b=$("#settings input.zenario_grid_setting_gutter_left_flu")).length&&(a.gutterLeftEdgeFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_flu")).length&&(a.gutterFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right_flu")).length&&
+"add_toolbar",{}));$("#"+a.addToolbarId+" a").draggable({connectToSortable:".zenario_grids",helper:"clone",revert:"invalid"});var c=$("#"+a.addToolbarId),b=c.position();b&&q(b.top)&&q(b.left)&&c.css({right:"auto",top:b.top,left:b.left});$("#"+a.addToolbarId).draggable({cursor:"move"})};$(w).ready(function(){$("#"+a.addToolbarId).hover(function(){$(this).css("cursor","move")},function(){$(this).css("cursor","pointer")})});a.resizePreview=function(){var c,b=0;(c=l(a.gridId+"-iframe"))&&c.contentWindow&&
+c.contentWindow.document&&c.contentWindow.document.body&&(b=$(c.contentWindow.document.body).height()||360,360>b&&(b=360),$("#"+a.gridId+"-iframe").height(b),$("#"+a.gridId+"-slider_overlay").height(b),$("#"+a.gridId+"-slider a").css("position","absolute").css("z-index",20).css("top","-"+(b+5)+"px").height(b+5).html('<span style="margin-top: '+Math.ceil((b+5)/2)+'px;"></span>'));a.lastIframeHeight=b};a.drawLinks=function(){a.checkData();var c={src:a.ajaxSrc()};a.microTemplate(a.mtPrefix+"bottom_links",
+c);$(".ui-tooltip").remove();n._to("#download_links");c=$("#"+a.gridId);a.editing?c.addClass("zenario_grid_slot_view").removeClass("zenario_grid_grid_view"):(c.addClass("zenario_grid_grid_view").removeClass("zenario_grid_slot_view"),c.css({height:"auto"}),c=$("#"+a.gridId+" .zenario_grid_preview_frame"));c.height(0);c.height(Math.max(a.gridAreaSmallestHeight,$(t).height()-$("body").height()-a.bodyPadding));var b=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_css_box"];$("#download_links a.zenario_grid_copy_css").colorbox({onOpen:function(){h._aCTC(b)},
+onClosed:function(){h._rCTC(b)},onComplete:function(){$("#colorbox textarea").focus()}});var e=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_html_box"];$("#download_links a.zenario_grid_copy_html").colorbox({onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#colorbox textarea").focus()}})};a.save=function(c){a.layoutId||(c=!0);var b;if(c){var e=["zenario_grid_box","zenario_grid_new_layout_box"];(b=h._nAA(a.ajaxURL(),{saveas:1,data:a.ajaxData(),
+layoutId:a.layoutId},!0))&&$.colorbox({transition:"none",html:a.microTemplate(a.mtPrefix+"save_prompt",{name:a.newLayoutName||b.oldLayoutName||""}),onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#zenario_grid_new_layout_save").click(function(){$("#zenario_grid_error").hide();(b=h._nAA(a.ajaxURL(),{saveas:1,confirm:1,data:a.ajaxData(),layoutId:a.layoutId,layoutName:a.newLayoutName=l("zenario_grid_layout_name").value},!0))?b.error?$("#zenario_grid_error").html(r(b.error)).slideDown():
+($.colorbox.close(),a.layoutName=a.newLayoutName,a.markAsSaved(b)):$.colorbox.close()});l("zenario_grid_layout_name").focus()}})}else if(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId},!0))b.success?a.markAsSaved(b,!0):(n._flBo(b.message,s.gridSave,"warning",!0,!0),$("#zenario_fbMessageButtons .submit_selected").click(function(){setTimeout(function(){var b;(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId,confirm:1},!0))&&a.markAsSaved(b)},50)}))};a.markAsSaved=
+function(c,b){a.savedAtPos=a.pos;q(c.layoutId)&&(a.layoutId=c.layoutId);a.rememberNames(a.data.cells);c.success&&(b?n._flBo(c.success,!0,"success"):toastr.success(c.success));if(g&&g.zenarioO.init)switch(g.zenarioO.path){case "zenario__layouts/panels/layouts":c.layoutId&&g.zenarioO._rTSI(c.layoutId)}};a.readSettings=function(a){a.fluid=$("#settings input.zenario_grid_setting_flu").prop("checked");a.responsive=$("#settings input.zenario_grid_setting_responsive").prop("checked");a.mirror=$("#settings input.zenario_grid_setting_mirror").prop("checked");
+a.cols=1*$("#settings input.zenario_grid_setting_cols").val();var b;(b=$("#settings input.zenario_grid_setting_full_width")).length?a.maxWidth=1*b.val():(b=$("#settings input.zenario_grid_setting_max_width")).length&&(a.maxWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_min_width")).length&&(a.minWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_break_1")).length&&(a.bp1=1*b.val());(b=$("#settings input.zenario_grid_setting_break_2")).length&&(a.bp2=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_left")).length&&
+(a.gutterLeftEdge=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right")).length&&(a.gutterRightEdge=1*b.val());(b=$("#settings select.zenario_grid_setting_col_and_gutter")).length&&(b=b.val())&&(b=b.s("/"))&&(a.colWidth=1*b[0],a.gutter=1*b[1]);(b=$("#settings input.zenario_grid_setting_gutter_left_flu")).length&&(a.gutterLeftEdgeFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_flu")).length&&(a.gutterFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right_flu")).length&&
 (a.gutterRightEdgeFlu=1*b.val())};a.updateAndChange=function(){a.update();a.change()};a.update=function(){a.readSettings(a.data);a.checkData()};a.recalcOnKeyUp=function(){a.recalc(this)};a.recalcOnChange=function(){a.recalc(this,!0,!0)};a.recalcOnInc=function(c,b){if(c.originalEvent&&"mouseup"==c.originalEvent.type)return a.recalc(this,!0)};a.recalc=function(c,b,e){var d=$.extend(!1,{},a.data),h=!1,f=!1,g=0,k=c.className,l;d.fluid?(delete d.gutter,delete d.gutterLeftEdge,delete d.gutterRightEdge):
 (delete d.gutterFlu,delete d.gutterLeftEdgeFlu,delete d.gutterRightEdgeFlu);e||(h=JSON.stringify(d));a.readSettings(d);f=a.checkDataNonZeroAndNumeric(d,f);if(d.fluid)delete d.gutter,delete d.gutterLeftEdge,delete d.gutterRightEdge;else{switch(k.s(" ")[0]){case "zenario_grid_setting_full_width":g=1;break;case "zenario_grid_setting_cols":g=2;break;case "zenario_grid_setting_gutter_left":g=3;break;case "zenario_grid_setting_gutter_right":g=4;break;case "zenario_grid_setting_col_and_gutter":g=5}if(g){if(e||
 $(c).val()!=$(c).attr("data-initial-value"))$(c).attr("data-initial-value",$(c).val());else return;do if(!d.maxWidth||1>d.cols)f=!0;else{if(d.gutterLeftEdge+d.cols+d.gutterRightEdge>d.maxWidth)if(3>g)d.gutterLeftEdge=d.gutterRightEdge=0;else{f=!0;break}5>g&&(l=a.recalcColumnAndGutterOptions(d))&&(d.colWidth=l.colWidth,d.gutter=l.gutter);var f=a.checkDataNonZeroAndNumeric(d,f),k=0,m=[{l:3,c:"zenario_grid_setting_gutter_left",v:d.gutterLeftEdge},{l:4,c:"zenario_grid_setting_gutter_right",v:d.gutterRightEdge},
-{l:5,c:"zenario_grid_setting_col_and_gutter",v:d.colWidth+"/"+d.gutter}];for(k in m)if(t(m,k)&&g<m[k].l){var n=$("#settings ."+m[k].c);n.val()!=m[k].v&&n.animate({opacity:0.3},"fast").val(m[k].v).animate({opacity:1},"fast")}}while(0)}delete d.gutterFlu;delete d.gutterLeftEdgeFlu;delete d.gutterRightEdgeFlu}if(e||h!=JSON.stringify(d))$("#settings .zenario_grid_setting_warning").removeClass("zenario_grid_setting_warning"),b?f?a.revert():(a.readSettings(a.data),a.checkDataNonZeroAndNumeric(a.data),a.change(!1,
+{l:5,c:"zenario_grid_setting_col_and_gutter",v:d.colWidth+"/"+d.gutter}];for(k in m)if(u(m,k)&&g<m[k].l){var n=$("#settings ."+m[k].c);n.val()!=m[k].v&&n.animate({opacity:0.3},"fast").val(m[k].v).animate({opacity:1},"fast")}}while(0)}delete d.gutterFlu;delete d.gutterLeftEdgeFlu;delete d.gutterRightEdgeFlu}if(e||h!=JSON.stringify(d))$("#settings .zenario_grid_setting_warning").removeClass("zenario_grid_setting_warning"),b?f?a.revert():(a.readSettings(a.data),a.checkDataNonZeroAndNumeric(a.data),a.change(!1,
 !0)):f&&$(c).parent().addClass("zenario_grid_setting_warning");return!f}},window.zenarioGM=new zenarioG);

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -75,24 +75,36 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 			}
 		}
 		
-		//Set up the primary key from the requests given
-		if ($box['key']['id'] && !$box['key']['cID']) {
-			ze\content::getCIDAndCTypeFromTagId($box['key']['cID'], $box['key']['cType'], $box['key']['id']);
-		}
 		
-		$content =
-			ze\row::get(
-				'content_items',
-				['id', 'type', 'tag_id', 'language_id', 'equiv_id', 'alias', 'visitor_version', 'admin_version', 'status'],
-				['id' => $box['key']['cID'], 'type' => $box['key']['cType']]);
+		if ($total == 1) {
+			//Set up the primary key from the requests given
+			if ($box['key']['id'] && !$box['key']['cID']) {
+				ze\content::getCIDAndCTypeFromTagId($box['key']['cID'], $box['key']['cType'], $box['key']['id']);
+			}
+		
+			$content =
+				ze\row::get(
+					'content_items',
+					['id', 'type', 'tag_id', 'language_id', 'equiv_id', 'alias', 'visitor_version', 'admin_version', 'status'],
+					['id' => $box['key']['cID'], 'type' => $box['key']['cType']]);
+		
+			$box['identifier']['css_class'] = ze\contentAdm::getItemIconClass($content['id'], $content['type'], true, $content['status']);
+		
+		} else {
+			unset($box['identifier']);
+			
+			$fields['layout/desc']['snippet']['html'] =
+				$fields['layout/desc']['snippet']['html_multi'];
+		}
+		unset($fields['layout/desc']['snippet']['html_multi']);
 		
-		$box['identifier']['css_class'] = ze\contentAdm::getItemIconClass($content['id'], $content['type'], true, $content['status']);
 		
 		if (!$canEdit) {
 			$box['tabs']['cant_edit']['hidden'] = false;
 		
 		} elseif (!$box['key']['cType']) {
 			$box['tabs']['mix_of_types']['hidden'] = false;
+			$box['tab'] = 'mix_of_types';
 		
 		} else {
 			$box['tabs']['layout']['hidden'] = false;

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -726,7 +726,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 			}
 			//To show warning message for sheduled datetime content item in FAB
 			$checkIfPublishsql = "SELECT id,scheduled_publish_datetime from ". DB_PREFIX. "content_item_versions 
-					WHERE id IN (". $box['key']['cID']. ")
+					WHERE id IN (". (int) $box['key']['cID']. ")
 			  AND scheduled_publish_datetime IS NOT NULL
 			  AND published_datetime IS NULL AND publisher_id=0" ;
 				$checkIfPublish = ze\sql::select($checkIfPublishsql);

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -90,7 +90,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 						ON civ.id = ci.id
 						AND ci.admin_version = civ.version
 						AND ci.type = civ.type
-					WHERE civ.layout_id = ' . $details['layout_id'];
+					WHERE civ.layout_id = '. (int) $details['layout_id'];
 				
 				$result = ze\sql::select($sql);
 				$contentItem = (ze\sql::fetchAssoc($result));

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -97,7 +97,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 			$pIdArr = $pId[1];
 		}
 		$checkIfPublishsql = "SELECT id,scheduled_publish_datetime from ". DB_PREFIX. "content_item_versions 
-					WHERE id IN (". ze\escape::in($pIdArr, 'checkIfPublishsql'). ")
+					WHERE id IN (". ze\escape::in($pIdArr, true). ")
 			  AND scheduled_publish_datetime IS NOT NULL
 			  AND published_datetime IS NULL AND publisher_id=0" ;
 		$checkIfPublish = ze\sql::select($checkIfPublishsql);

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php

 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php

 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php

 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@ public function fillOrganizerPanel($path, &$panel, $refinerName, $refinerId, $mo
 							$sqlCode = "
 								Select value FROM ". DB_PREFIX. "admin_settings
 								WHERE name LIKE 'COOKIE_ADMIN_SECURITY_CODE_%'
-								  AND admin_id ='". $id. "'";
+								  AND admin_id = ". (int) $id;
 								  $sqlCodeResult = ze\sql::select($sqlCode);
 								  $sqlCodeRow = ze\sql::fetchAssoc($sqlCodeResult);
 								  if($sqlCodeRow['value'])

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -107,8 +107,8 @@ public function handleOrganizerPanelAJAX($path, $ids, $ids2, $refinerName, $refi
 			
 			$filename = $_FILES['Filedata']['name'];
 			$ext = pathinfo($filename, PATHINFO_EXTENSION);
-			if (!in_array($ext, ['sql', 'gz'])) {
-				echo '<!--Message_Type:Error-->Only .sql or .gz files can be uploaded as database backups';
+			if (!in_array($ext, ['sql', 'gz', 'encrypted'])) {
+				echo '<!--Message_Type:Error-->Only .sql, .gz, or .encrypted files can be uploaded as database backups';
 			} elseif (file_exists(ze::setting('backup_dir') . '/'. $_FILES['Filedata']['name'])) {
 				echo '<!--Message_Type:Error-->A database backup with the same name already exists';
 			} elseif (\ze\fileAdm::moveUploadedFile($_FILES['Filedata']['tmp_name'], ze::setting('backup_dir') . '/'. $_FILES['Filedata']['name'])) {

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without