CVE-2024-34460

@@ -34,5 +34,5 @@
 		"wow.js": "^1.2.2",
 		"zxcvbn": "^4.4.2"
 	},
-	"version": "9.5.60437"
+	"version": "9.5.60602"
 }
\ No newline at end of file

@@ -39,6 +39,6 @@
 define('ZENARIO_MINOR_VERSION', '5');
 define('ZENARIO_CHANGELOG_URL', 'https://zenar.io/zenario-95');
 define('ZENARIO_IS_BUILD', true);
-define('ZENARIO_REVISION', '60437');
+define('ZENARIO_REVISION', '60602');
 
 define('TINYMCE_DIR', 'zenario/libs/manually_maintained/lgpl/tinymce_4_7_3.1/');

@@ -1,52 +0,0 @@
-<?php
-
-require '../../../adminheader.inc.php';
-require 'tree_explorer.fun.php';
-
-$cachingRestrictions = 0;
-$allowCaching = true;
-
-if ($_GET["section_id"] ?? false) {
-	if ($_GET["menu_id"] ?? false) {
-		if ($menuArray = ze\menu::getStructure($cachingRestrictions, ($_GET["section_id"] ?? false),false,($_GET["menu_id"] ?? false),0,100,false,false,false,true)) {
-			$levelNodesCount = [];
-		
-			generateMenuForJSON($menuArray, $levelNodesCount,ze::get('sk'), ze::get('language'));
-		}
-		
-		$menuNode = ze\menu::details($_GET["menu_id"] ?? false,"en-gb");
-
-		if (!ze\ray::issetArrayKey($menuNode,'name')) {
-			$menuNode = ze\menu::details($_GET["menu_id"] ?? false,"en");
-		}
-
-		$menuNodeAttributes = ze\row::get("menu_nodes",["redundancy","invisible"],["id" => ($_GET["menu_id"] ?? false)]);
-	
-		$redundancy = $menuNodeAttributes['redundancy'];
-		$visibility = $menuNodeAttributes['invisible'] ? "invisible" : "visible";
-		
-		$top = $menuNode['name'];
-
-		$subMenuArray = false;
-
-		if (!empty($menuArray)) {
-			$subMenuArray = $menuArray;
-		}
-
-		$menuArray = ['name' => $top, 'redundancy' => $redundancy, 'visibility' => $visibility,'children' => $subMenuArray];
-	} else {
-		if ($menuArray = ze\menu::getStructure($cachingRestrictions,($_GET["section_id"] ?? false),false,0,0,100,false,false,false,true)) {
-			$levelNodesCount = [];
-			
-			generateMenuForJSON($menuArray, $levelNodesCount, ze::get('sk'), ze::get('language'));
-		}
-		
-		$top = ze\menu::sectionName($_GET["section_id"] ?? false);
-		$menuArray = ['name' => $top, 'children' => $menuArray, "section" => true];
-	}
-}
-
-
-echo json_encode($menuArray);
-
-?>
\ No newline at end of file

@@ -1,58 +0,0 @@
-<?php
-
-function generateMenuForJSON (&$array, &$nodesCount, $og = false, $languageId = false, $recurseCount = 20) {
-	if (--$recurseCount && is_array($array)) {
-		$array = array_values($array);
-		
-		foreach($array as &$menu) {
-			
-			if (!isset($nodesCount[(20-$recurseCount)])) {
-				$nodesCount[(20-$recurseCount)] = 0;
-			}
-			
-			$nodesCount[(20-$recurseCount)]++;			
-			
-			foreach($menu as $k => $v) {
-				switch ($k) {
-					case 'mID':
-						$menuNodeAttributes = ze\row::get("menu_nodes",["redundancy","invisible","target_loc"],["id" => $v]);
-					
-						$menu['redundancy'] = $menuNodeAttributes['redundancy'];
-						$menu['visibility'] = $menuNodeAttributes['invisible'] ? "invisible" : "visible";
-						$menu['target_loc'] = $menuNodeAttributes['target_loc'];
-						
-						if ($og) {
-							$menu['organizer_href'] = ze\menuAdm::organizerLink($v, $languageId);
-						
-						} elseif ($menu['cID']) {
-							$menu['content_href'] = ze\link::toItem($menu['cID'],$menu['cType'],true);
-						}
-					
-						break;
-					case 'children':
-						if (is_array($menu[$k])) {
-							generateMenuForJSON($menu[$k], $nodesCount, $og, $languageId, $recurseCount);
-						} else {
-							unset($menu[$k]);
-						}
-						
-						break;
-					
-					case 'name':
-					case 'hide_private_item':
-					case 'content_href':
-					case 'organizer_href':
-					case 'redundancy':
-					case 'visibility':
-					case 'target_loc':
-						break;
-					
-					default:
-						unset($menu[$k]);
-				}
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file

@@ -1,60 +0,0 @@
-<?php
-
-require CMS_ROOT . 'zenario/adminheader.inc.php';
-require 'tree_explorer.fun.php';
-
-$v = ze\db::codeVersion();
-
-$levelNodesCount = [];
-
-if (($_GET["type"] ?? false)=="section") {
-	$parameters = "?section_id=" . ($_GET["id"] ?? false) . "&language=" . ($_GET["language"] ?? false);
-	$top = "Showing menu tree in menu section \"" . ze\menu::sectionName($_GET["id"] ?? false) . "\"";
-
-	if ($menuArray = ze\menu::getStructure($cachingRestrictions,($_GET["id"] ?? false),false,0,0,100,false,false,true)) {
-		generateMenuForJSON($menuArray, $levelNodesCount, ze::get('og'), ze::get('language'));
-	}
-
-} elseif (($_GET["type"] ?? false)=="menu_node") {
-	$sectionId = ze\row::get("menu_nodes","section_id",["id" => ($_GET["id"] ?? false)]);
-
-	$parameters = "?section_id=" . $sectionId . "&menu_id=" . ($_GET["id"] ?? false) . "&language=" . ($_GET["language"] ?? false);
-
-	$menuNode = ze\menu::details($_GET["id"] ?? false,"en-gb");
-	
-	if (!ze\ray::issetArrayKey($menuNode,'name')) {
-		$menuNode = ze\menu::details($_GET["id"] ?? false,"en");
-	}
-	
-	$top = "Showing menu tree beneath menu node \"" . $menuNode['name'] . "\"";
-
-	if ($menuArray = ze\menu::getStructure($cachingRestrictions,$sectionId,false,($_GET["id"] ?? false),0,100,false,false,true)) {
-		generateMenuForJSON($menuArray, $levelNodesCount, ze::get('og'), ze::get('language'));
-	}
-
-} else {
-	exit;
-}
-
-if (ze::get('og')) {
-	$parameters .= '&og=1';
-}
-
-$levelNodeCount = 0;
-
-foreach ($levelNodesCount as $count) {
-	if ($count>$levelNodeCount) {
-		$levelNodeCount = $count;
-	}
-}
-
-$nodeHeightFactor = 30;
-$defaultSVGHeight = 640;
-
-/*
-$svgHeight = (($levelNodeCount * $nodeHeightFactor) > $defaultSVGHeight) ? ($levelNodeCount * $nodeHeightFactor) : $defaultSVGHeight;
-*/
-
-$svgHeight = $defaultSVGHeight;
-
-?>
\ No newline at end of file

@@ -1,57 +0,0 @@
-<?php
-
-require '../../adminheader.inc.php';
-require 'includes/tree_explorer.php';
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-	<title>Tree Explorer</title>
-    <link rel="stylesheet" href="../../styles/admin_tree_explorer_styles.min.css?v=<?php echo $v;?>" />
-    <script type="text/javascript">
-    	var svgHeight = <?php echo $svgHeight;?>;
-    	var JSONURL = 'includes/json.php<?php echo $parameters;?>';
-	</script>
-</head>
-<body>
-    <h1><?php echo $top;?></h1>
-	<div id="controls">
-		<div id="mode_container">
-			<label for="mode">Show:</label>
-			<select id="mode">
-				<option value="redundancy" selected="selected">Redundancy</option>
-				<option value="visibility">Visibility</option>
-				<option value="privacy">Privacy</option>
-			</select>
-		</div>
-		<div id="redundancy_key" class="mode_key">
-			<div class="key_block key_primary"></div>
-			<div class="key_block_label">Primary</div>
-			<div class="key_block key_secondary"></div>
-			<div class="key_block_label">Secondary</div>
-		</div>
-		<div id="visibility_key" class="mode_key">
-			<div class="key_block key_visible"></div>
-			<div class="key_block_label">Visible</div>
-			<div class="key_block key_invisible"></div>
-			<div class="key_block_label">Invisible</div>
-		</div>
-		<div id="privacy_key" class="mode_key">
-			<div class="key_block key_privacy_0"></div>
-			<div class="key_block_label">Show to visitors and extranet users, even if the target content item is private</div>
-			<div class="key_block key_privacy_1"></div>
-			<div class="key_block_label">Obey the privacy setting of the content item</div>
-			<div class="key_block key_privacy_2"></div>
-			<div class="key_block_label">Show to visitors, hide from extranet users</div>
-			<div class="key_block key_privacy_3"></div>
-			<div class="key_block_label">Only show to extranet users</div>
-		</div>
-	</div>
-	<div style="clear: both;"></div>
-    <div id="body"></div>
-	<script type="text/javascript" src="../../libs/yarn/jquery/dist/jquery.min.js?v=<?php echo $v;?>"></script>
-	<script type="text/javascript" src="../../libs/manually_maintained/bsd/d3/d3.min.js?v=<?php echo $v;?>"></script>
-	<script type="text/javascript" src="../../js/admin_tree_explorer.min.js?v=<?php echo $v;?>"></script>
-</body>
-</html>
\ No newline at end of file

@@ -950,6 +950,12 @@ public static function postSlot($slotName, $showPlaceholderMethod, $useOb = true
 						$setFiles = [];
 						foreach ($eggsToCache as $slotNameNestId => &$cacheVars) {
 							$slot = \ze::$slotContents[$slotNameNestId];
+							$eggInstance = $slot->class();
+							
+							//Don't try and check the cache for a nested plugin that refused to load.
+							if (is_null($eggInstance)) {
+								continue;
+							}
 						
 							//Loop through this slot and any child slots, coming up with the rules as to when we should clear the cache
 							//For nests with child slots, we should combine the rules
@@ -964,7 +970,7 @@ public static function postSlot($slotName, $showPlaceholderMethod, $useOb = true
 								}
 							}
 							
-							$cacheVars['c'] = $slot->class()->zAPIGetCachableVars();
+							$cacheVars['c'] = $eggInstance->zAPIGetCachableVars();
 							
 							$temps[$slotNameNestId] = $slot->trimVarsBeforeCaching();
 							$cacheVars['s'] = $slot;

@@ -4615,8 +4615,10 @@ public static function congratulationsAJAX(&$source, &$tags, &$fields, &$values,
 	//Formerly "redirectAdmin()"
 	public static function redirectAdmin($getRequest, $forceAliasInAdminMode = false, $continueTo = 'default') {
 		
+		//If the visitor's original request was from a content item, try to use that as the destination.
 		$cID = $cType = $redirectNeeded = $aliasInURL = $langIdInURL = false;
-		if (!empty($getRequest)) {
+		if (!empty($getRequest)
+		 && !(empty($getRequest['cID']) && empty($getRequest['cType']) && empty($getRequest['langId']))) {
 			\ze\content::resolveFromRequest($cID, $cType, $redirectNeeded, $aliasInURL, $langIdInURL, $getRequest, $getRequest, []);
 		}
 		

@@ -517,7 +517,7 @@ public static function cacheFriendlyCookieVar($var) {
 			|| substr($var, 0, 4) == '_ga_'
 			|| substr($var, 0, 9) == 'PHPSESSID'
 			|| substr($var, 0, 11) == 'can_cache__'
-			|| in_array($var, ['cookies_accepted', '_ga', '_gat', 'is_returning']);
+			|| in_array($var, ['cookies_accepted', '_ga', '_gat', '_fbp', '_clck', '_uetvid', 'is_returning', 'COOKIE_LAST_ADMIN_USER', 'COOKIE_LAST_ADMIN_CAPTCHA_COMPLETED', 'ZENARIO_ADMIN_LOGIN_LINK']);
 	}
 	
 	//Returns true if a $_SESSION variable does not affect caching (or is already covered by another existing category)

@@ -206,6 +206,18 @@ function zenarioPageCacheLogStats($stats) {
 													
 													zenarioPageCacheLogStats(['hits', 'total']);
 													touch($chPath. 'accessed');
+													
+													
+													//Try and record the destCID and destCType as we would a normal page view
+													if ($tagId = file_get_contents($chPath. 'tag_id')) {
+														$tag = explode('_', $tagId, 2);
+														if (isset($tag[1])) {
+															if ($cID = (int) $tag[1]) {
+																$_SESSION['destCID'] = $cID;
+																$_SESSION['destCType'] = $tag[0];
+															}
+														}
+													}
 												
 												
 													//If there are cached images on this page, mark that they've been accessed

@@ -1214,7 +1214,7 @@ methods.showConfirm = function(saveAndContinue, createAnother, saveAndNext) {
 		}
 		
 		var buttons =
-			'<input type="button" class="submit_selected" value="' + thus.tuix.confirm.button_message + '" onclick="' + thus.globalName + '.save(true, ' + engToBoolean(saveAndContinue) + ', ' + engToBoolean(createAnother) + ');"/>' +
+			'<input type="button" class="submit_selected" value="' + thus.tuix.confirm.button_message + '" onclick="' + thus.globalName + '.save(true, ' + engToBoolean(saveAndContinue) + ', ' + engToBoolean(createAnother) + ', ' + engToBoolean(saveAndNext) + ');"/>' +
 			'<input type="button" class="submit" value="' + (thus.tuix.confirm.cancel_button_message || zenarioA.phrase.cancel) + '"/>';
 		
 		zenarioA.floatingBox(message, buttons, thus.tuix.confirm.message_type || 'none');

@@ -5,31 +5,31 @@ $jscomp.polyfill=function(g,m,d,p){m&&($jscomp.ISOLATE_POLYFILLS?$jscomp.polyfil
 $jscomp.polyfillIsolated=function(g,m,d,p){var t=g.split(".");g=1===t.length;p=t[0];p=!g&&p in $jscomp.polyfills?$jscomp.polyfills:$jscomp.global;for(var z=0;z<t.length-1;z++){var k=t[z];if(!(k in p))return;p=p[k]}t=t[t.length-1];d=$jscomp.IS_SYMBOL_NATIVE&&"es6"===d?p[t]:null;m=m(d);null!=m&&(g?$jscomp.defineProperty($jscomp.polyfills,t,{configurable:!0,writable:!0,value:m}):m!==d&&(void 0===$jscomp.propertyToPolyfillSymbol[t]&&(d=1E9*Math.random()>>>0,$jscomp.propertyToPolyfillSymbol[t]=$jscomp.IS_SYMBOL_NATIVE?
 $jscomp.global.Symbol(t):$jscomp.POLYFILL_PREFIX+d+"$"+t),$jscomp.defineProperty(p,$jscomp.propertyToPolyfillSymbol[t],{configurable:!0,writable:!0,value:m})))};$jscomp.initSymbol=function(){};$jscomp.iteratorPrototype=function(g){g={next:g};g[Symbol.iterator]=function(){return this};return g};
 $jscomp.iteratorFromArray=function(g,m){g instanceof String&&(g+="");var d=0,p=!1,t={next:function(){if(!p&&d<g.length){var z=d++;return{value:m(z,g[z]),done:!1}}p=!0;return{done:!0,value:void 0}}};t[Symbol.iterator]=function(){return t};return t};$jscomp.polyfill("Array.prototype.values",function(g){return g?g:function(){return $jscomp.iteratorFromArray(this,function(m,d){return d})}},"es8","es3");
-zenario.lib(function(g,m,d,p,t,z,k,q,u,G,H,v,y,A,w,L,I,M,F,N,C,B,D,J){var x=p.zenarioABG=new D;x.init("zenarioABG","zenario_admin_box");d=C(J);d.open=function(a,b,c,f,e,h,l,n){if(q._l3w("AdminOrganizer"))return!1;k._xva(this.globalName);k._m52()&&(this.ffScrollTop=k._7xu(),k._7xu(0));b||(b={});a=(""+a).s("//",2);a[1]&&!b.id&&(b.id=a[1]);a=a[0];this.isOpen=!0;this.callBack=e;this.passMatchedIds=n;this.createAnotherObject=h;this.getRequestKey=b;this.changed={};this.isSlidUp=this.heightBeforeSlideUp=
+zenario.lib(function(g,m,d,p,t,z,k,q,u,G,H,w,y,A,v,L,I,M,F,N,C,B,D,J){var x=p.zenarioABG=new D;x.init("zenarioABG","zenario_admin_box");d=C(J);d.open=function(a,b,c,f,e,h,l,n){if(q._l3w("AdminOrganizer"))return!1;k._xva(this.globalName);k._m52()&&(this.ffScrollTop=k._7xu(),k._7xu(0));b||(b={});a=(""+a).s("//",2);a[1]&&!b.id&&(b.id=a[1]);a=a[0];this.isOpen=!0;this.callBack=e;this.passMatchedIds=n;this.createAnotherObject=h;this.getRequestKey=b;this.changed={};this.isSlidUp=this.heightBeforeSlideUp=
 this.hasPreviewWindow=this.previewChecksum=this.previewPost=this.previewSlotWidth=!1;this.previewSlotWidthInfo="";this.previewHidden=!0;this.baseCSSClass="zenario_fbAdmin zenario_admin_box zenario_fab_"+a;l||(e=this.microTemplate(this.mtPrefix,{}),this.openBox(e));p.onbeforeunload=u.onbeforeunload;this.start(a,b,c,f);return this.cb=new k.callback};d.openBox=function(a){};d.closeBox=function(){};d.updateHash=function(){};d.initFields=function(){this.hasPreviewWindow=!!this.pluginPreviewDetails();C(D).initFields.call(this)};
-d.openNext=function(a){if(a||this.confirmClose(!0)){a=this.tuix.key;var b=a.nextIds;a.openNextMode&&A(b)?($("#zenario_abtab").clearQueue(),delete this.tuix,a.id=b,delete a.nextIds,this.open(this.path,a,g,g,g,g,!0,g)):this.refreshParentAndClose()}};d.refreshParentAndClose=function(a,b,c,f){q._8nu(!1);if(f&&A(this.tuix.key.nextIds))this.openNext(f);else{var e;b||(this.isOpen=!1,this.updateHash());if(this.callBack&&!b){var h;(h=this.getValueArrayofArrays())&&this.callBack(this.tuix.key,h)}else if(v.init&&
-(q.isFullOrganizerWindow||q._l3w("og"))){a=!1;if(A(this.tuix.key.id))a=this.tuix.key.id;else for(var l in this.tuix.key)if(B(this.tuix.key,l)){a=this.tuix.key[l];break}v._6bl(a,c&&F.createdAnother,!b&&F.savedButNotShown,this.path)}else k.cID&&(e=this.tuix.key.slotName)?(k._xja(e,q.importantGetRequests),q.adminToolbarOnPage&&H.init()):!k.cID||"zenario_menu"!=this.path&&"zenario_menu_text"!=this.path?a||b||(this.tuix.key.cID?this.tuix.key.cID==k.cID&&this.tuix.key.cType==k.cType?q._3ag():k._6h1(k._rqd(this.tuix.key.cID,
+d.openNext=function(a){if(a||this.confirmClose(!0)){a=this.tuix.key;var b=a.nextIds;a.openNextMode&&A(b)?($("#zenario_abtab").clearQueue(),delete this.tuix,a.id=b,delete a.nextIds,this.open(this.path,a,g,g,g,g,!0,g)):this.refreshParentAndClose()}};d.refreshParentAndClose=function(a,b,c,f){q._8nu(!1);if(f&&A(this.tuix.key.nextIds))this.openNext(f);else{var e;b||(this.isOpen=!1,this.updateHash());if(this.callBack&&!b){var h;(h=this.getValueArrayofArrays())&&this.callBack(this.tuix.key,h)}else if(w.init&&
+(q.isFullOrganizerWindow||q._l3w("og"))){a=!1;if(A(this.tuix.key.id))a=this.tuix.key.id;else for(var l in this.tuix.key)if(B(this.tuix.key,l)){a=this.tuix.key[l];break}w._6bl(a,c&&F.createdAnother,!b&&F.savedButNotShown,this.path)}else k.cID&&(e=this.tuix.key.slotName)?(k._xja(e,q.importantGetRequests),q.adminToolbarOnPage&&H.init()):!k.cID||"zenario_menu"!=this.path&&"zenario_menu_text"!=this.path?a||b||(this.tuix.key.cID?this.tuix.key.cID==k.cID&&this.tuix.key.cType==k.cType?q._3ag():k._6h1(k._rqd(this.tuix.key.cID,
 this.tuix.key.cType)):q.adminToolbarOnPage&&q._3ag(!0)):(q._i1x(),q.adminToolbarOnPage&&H.init());a=this.tuix.popout_message;c=c&&this.createAnotherObject;b||c||(this.cb&&this.cb.done(),this.close());a&&q._s34(a,!0,!1);if(b){this.changed={};if(this.tuix.tabs)for(l in this.tuix.tabs)B(this.tuix.tabs,l)&&this.tuix.tabs[l]&&this.editModeOn(l)&&(this.tuix.tabs[l]._saved_and_continued=!0);this.sortTabs();this.draw()}else c&&($("#zenario_abtab").clearQueue(),delete this.tuix,this.open(this.createAnotherObject.path,
 this.getRequestKey,this.createAnotherObject.tab,this.createAnotherObject.values,g,this.createAnotherObject,!0,this.passMatchedIds))}};d.close=function(a){this.callFunctionOnEditors("remove");q._8nu(!1);this.sizing&&clearTimeout(this.sizing);k._3pc(this);k._w4g();a||q._7xa();this.isOpen=!1;this.closeBox();k._wdd(this.globalName);k._m52()&&A(this.ffScrollTop)&&(k._7xu(this.ffScrollTop),delete this.ffScrollTop);delete this.cb;delete this.tuix;delete this.previewChecksum;delete this.previewPost;delete this.previewSlotWidth;
 delete this.previewSlotWidthInfo;return!1};d.closeButton=function(){this.confirmClose()&&(this.tuix&&this.tuix.key&&this.tuix.key.openNextMode?this.refreshParentAndClose():this.close());return!1};d.confirmClose=function(){var a=u._dg4();return(!A(a)||confirm(a))&&this.isOpen};d.draw=function(){this.isOpen&&this.loaded&&this.tabHidden&&this.draw2()};d.draw2=function(){var a=this;if(a.tuix.tabs){a.get("zenario_fbAdminFloatingBox").className=a.baseCSSClass+" "+(a.tuix.css_class||"zenario_fab_default_style")+
-" "+(w(a.tuix.hide_tab_bar)?"zenario_admin_box_with_tabs_hidden":"zenario_admin_box_with_tabs_shown");var b=a.tuix;!b.tab||b.tabs[b.tab]&&!u._58(g,a,g,b.tab,g,g,g,g,b.tabs[b.tab])||(b.tab=!1);a.get("zenario_fabTabs").innerHTML=a.drawTabs();var c=!a.editModeOnBox(),f="";f={isReadOnly:c};a.setTitle(c);a.get("zenario_fbButtons").innerHTML=a.microTemplate(a.mtPrefix+"_buttons",f);k._4oz("#zenario_fbButtons ",!0);a.get("zenario_fbAdminFloatingBox").style.display="block";a.tallAsPossibleField=g;a.size(!0);
+" "+(v(a.tuix.hide_tab_bar)?"zenario_admin_box_with_tabs_hidden":"zenario_admin_box_with_tabs_shown");var b=a.tuix;!b.tab||b.tabs[b.tab]&&!u._58(g,a,g,b.tab,g,g,g,g,b.tabs[b.tab])||(b.tab=!1);a.get("zenario_fabTabs").innerHTML=a.drawTabs();var c=!a.editModeOnBox(),f="";f={isReadOnly:c};a.setTitle(c);a.get("zenario_fbButtons").innerHTML=a.microTemplate(a.mtPrefix+"_buttons",f);k._4oz("#zenario_fbButtons ",!0);a.get("zenario_fbAdminFloatingBox").style.display="block";a.tallAsPossibleField=g;a.size(!0);
 q._8nu(!1);c=new k.callback;f=a.drawFields(c);var e;c.after(a.makeFieldAsTallAsPossible);a.animateInTab(f,c,$("#zenario_abtab"));a.shownTab=b.tab;delete a.lastScrollTop;k._3fp(a);(e=b.tabs.global_area)&&!_._ruc(e.fields)?(x.tuix={tab:"global_area",tabs:{global_area:JSON.parse(JSON.stringify(e))}},x.sortTabs(),x.validate=function(){a.validate()},x.format=function(){a.format()},x.redrawTab=function(){a.redrawTab()},x.readTab=function(){C(D).readTab.call(x);var h,l=a.tuix.tabs.global_area;for(h in l.fields)if(B(l.fields,
 h)){var n=l.fields[h];var r=x.tuix.tabs.global_area.fields[h];n.value=r.value;n.current_value=r.current_value;n.pressed=r.pressed;n.selected_option=r.selected_option;n._display_value=r._display_value;n.hidden=r.hidden;n._was_hidden_before=r._was_hidden_before}},c=new k.callback,f=x.drawFields(c),$("#zenario_fabGlobalArea").show().html(f),a.addJQueryElements("#zenario_fabGlobalArea"),c.done()):$("#zenario_fabGlobalArea").hide()}};d.readTab=function(){C(D).readTab.call(this);this.tuix.tabs.global_area&&
-x.readTab()};d.sortTabs=function(){C(D).sortTabs.call(this);this.sortedTabs=_._40o(this.sortedTabs,function(a){return"global_area"!=a})};d.setTitle=function(a){};d.returnAJAXURL=function(a){return"start"==a&&this.passMatchedIds&&v.lastRequests?m+"zenario/admin/organizer.ajax.php?_get_matched_ids=1&_fab_path="+y(this.path)+"&path="+y(v.path)+k._488(v.lastRequests)+k._488(this.getRequestKey):m+"zenario/admin/admin_boxes.ajax.php?path="+y(this.path)+k._488(this.getRequestKey)};d.typeaheadSearchEnabled=
-function(a,b,c){return(a=a.pick_items)&&(a.path||a.target_path)&&!1!==a.enable_type_ahead_search};d.typeaheadSearchAJAXURL=function(a,b,c){var f,e;a=a.pick_items;b=a.path&&v._q5q(a.path);c=a.target_path&&v._q5q(a.target_path);if(b=b&&c&&b.path==c.path?b:c||b){if(a.add_conductor_vars_to_type_ahead_search&&(f=this.getConductorVars()))for(e in f)B(f,e)&&(a=f[e],b.request[e]=a);return m+"zenario/admin/organizer.ajax.php?_typeahead_search=1&path="+y(b.path)+k._488(b.request)}};d.parseTypeaheadSearch=function(a,
+x.readTab()};d.sortTabs=function(){C(D).sortTabs.call(this);this.sortedTabs=_._40o(this.sortedTabs,function(a){return"global_area"!=a})};d.setTitle=function(a){};d.returnAJAXURL=function(a){return"start"==a&&this.passMatchedIds&&w.lastRequests?m+"zenario/admin/organizer.ajax.php?_get_matched_ids=1&_fab_path="+y(this.path)+"&path="+y(w.path)+k._488(w.lastRequests)+k._488(this.getRequestKey):m+"zenario/admin/admin_boxes.ajax.php?path="+y(this.path)+k._488(this.getRequestKey)};d.typeaheadSearchEnabled=
+function(a,b,c){return(a=a.pick_items)&&(a.path||a.target_path)&&!1!==a.enable_type_ahead_search};d.typeaheadSearchAJAXURL=function(a,b,c){var f,e;a=a.pick_items;b=a.path&&w._q5q(a.path);c=a.target_path&&w._q5q(a.target_path);if(b=b&&c&&b.path==c.path?b:c||b){if(a.add_conductor_vars_to_type_ahead_search&&(f=this.getConductorVars()))for(e in f)B(f,e)&&(a=f[e],b.request[e]=a);return m+"zenario/admin/organizer.ajax.php?_typeahead_search=1&path="+y(b.path)+k._488(b.request)}};d.parseTypeaheadSearch=function(a,
 b,c,f,e){var h,l=[];if(e.items)for(h in e.items)if(B(e.items,h)){c=e.items[h];var n=q._ac1(e,h);a.values=a.values||{};a.values[h]={image:c.image,css_class:c.css_class||e.item&&e.item.css_class,label:n};l.push({value:h,text:n,html:this.drawPickedItem(h,b,a,f,!0)})}return l};d.drawPickedItem=function(a,b,c,f,e){A(c)||(c=this.field(b));var h=c.values&&c.values[a],l=c.pick_items||{},n=a==1*a,r,E;f={id:b,item:a,label:h,readOnly:f};_._16j(h)?(f.missing=h.missing,f.css_class=h.css_class,f.image=h.image,
-h=f.label=h.label,f.fileSize=c.values[a].size):h?f.label=h:(h=f.label=a,f.missing=!0);c.tag_colors&&(f.tag_color=c.tag_colors[a]||"blue");w(l.hide_info_button)||c.upload&&!n||!(r=l.info_button_path)&&(!(r=l.path)||r!=l.target_path&&l.min_path!=l.target_path)||(r="//"==k._yot(r,2)?r+a:"/"==k._yot(r,1)?r+("/"+a):r+("//"+a),f.organizerPath=r,f.organizerId=a);c.upload&&(f.isUpload=!0,r=(r=(""+h).m(/(.*?)\.(\w+)$/)||(""+h).m(/(.*?)\.(\w+) \[.*\]$/))&&r[2]?r[2].toLowerCase():"unknown",f.extension=r,n?(E=
+h=f.label=h.label,f.fileSize=c.values[a].size):h?f.label=h:(h=f.label=a,f.missing=!0);c.tag_colors&&(f.tag_color=c.tag_colors[a]||"blue");v(l.hide_info_button)||c.upload&&!n||!(r=l.info_button_path)&&(!(r=l.path)||r!=l.target_path&&l.min_path!=l.target_path)||(r="//"==k._yot(r,2)?r+a:"/"==k._yot(r,1)?r+("/"+a):r+("//"+a),f.organizerPath=r,f.organizerId=a);c.upload&&(f.isUpload=!0,r=(r=(""+h).m(/(.*?)\.(\w+)$/)||(""+h).m(/(.*?)\.(\w+) \[.*\]$/))&&r[2]?r[2].toLowerCase():"unknown",f.extension=r,n?(E=
 c.values&&c.values[a])&&E.checksum?(n=m+"zenario/file.php?c="+y(E.checksum),E.usage&&(n+="&usage="+y(E.usage))):n=m+"zenario/file.php?id="+a:n=m+"zenario/file.php?getUploadedFileInCacheDir="+y(a),r.m(/gif|jpg|jpeg|png|svg/)?(f.thumbnail={onclick:this.globalName+".showPickedItemInPopout('"+n+"&popout=1&dummy_filename="+y("image."+r)+"', '"+h+"');",src:n+"&og=1"},(a=(""+h).m(/.*\[\s*(\d+)p?x?\s*[\u00d7x]\s*(\d+)p?x?\s*\]$/))&&a[1]&&a[2]&&u._esd(a[1],a[2],180,120,f.thumbnail)):c.values[a].location&&
 "s3"==c.values[a].location?c.values[a].s3Link&&(f.adminDownload=c.values[a].s3Link):f.adminDownload=n+"&adminDownload=1");return this.drawPickedItem2(b,l,e,f)};d.pluginPreviewDetails=function(a,b,c,f,e){if(this.tuix&&this.tuix.key&&(this.tuix.key.nest||this.tuix.key.eggId))return!1;var h={post:{}},l=_.clone(q.importantGetRequests);b=!b;switch(this.path){case "zenario_skin_editor":b=!1;a&&(h.checksum=crc32(h.post.overrideFrameworkAndCSS=JSON.stringify(this.getVisibleValues(!0))));break;case "plugin_settings":a&&
 (h.checksum=crc32((h.post.overrideSettings=JSON.stringify(this.getPluginSettingValues()))+(h.post.overrideFrameworkAndCSS=JSON.stringify(this.getVisibleValues(!0,["this_css_tab","all_css_tab","framework_tab"])))));break;default:return!1}f=f||this.tuix&&this.tuix.key&&this.tuix.key.slotName;e=e||this.tuix&&this.tuix.key&&this.tuix.key.instanceId||k.slots&&k.slots[f]&&k.slots[f].instanceId;f&&zenario_conductor._tn(f)&&(l=zenario_conductor._153(f,"refresh",l));l.cVersion=k.cVersion;if(b){if(!f||!e)return!1;
 b=q._9b6(f);var n;a=b&&b.cssClass&&b.cssClass.s(" ")||[];l.method_call="showSingleSlot";l.fakeLayout=1;l.grid_columns=b.columns;l.grid_container=b.container;this.previewSlotWidth=b.pxWidth;this.previewSlotWidthInfo=b.widthInfo;l.grid_pxWidth=this.previewWidth&&!c?this.previewWidth:this.previewSlotWidth;l.grid_cssClass="";for(n in a)B(a,n)&&(c=a[n],"alpha"==c||"omega"==c||c.m(/^span[\d_]*$/)||(l.grid_cssClass+=c+" "))}else l._show_page_preview=1;f&&(l.slotName=f);e&&(l.instanceId=e);h.url=k._rqd(k.cID,
 k.cType,l);return h};d.addExtraAttsForTextFields=function(a,b){this.hasPreviewWindow&&(b.onkeyup=(b.onkeyup||"")+" "+this.globalName+".updatePreview();")};d.fieldChange=function(a,b){this.updatePreview(750);C(D).fieldChange.call(this,a,b)};d.updatePreview=function(a){var b=this;b.hasPreviewWindow&&!b.previewHidden&&k._9fm("fabUpdatePreview",function(){var c=b.pluginPreviewDetails(!0);c&&b.previewChecksum!=c.checksum&&(b.previewChecksum=c.checksum,b.previewPost=c.post,b.submitPreview(c))},a||1E3)};
 var K=0;d.submitPreview=function(a,b,c){b=b||$("#zenario_fabPreview");c=c||"zenario_fabPreviewFrame";var f="zenario_previewFrame"+ ++K,e=b.find("."+c).not(".beingRemoved");c=$(u.html("iframe","id",f,"name",f,"class",c));var h=e[0]&&e[0].contentDocument;if(h=1*(h&&$(h).scrollTop()))a.url+="&_scroll_to="+h;e[0]&&(e.width(e.width()).height(e.height()).attr("id","").attr("name","").addClass("beingRemoved"),setTimeout(function(){e.fadeOut(600,function(){e.remove()})},400));b.append(c);this.showPreviewViaPost(a,
 f)};d.showPreviewViaPost=function(a,b){$(u.form("action",a.url,"method","post","target",b,u.input("name","overrideSettings","value",a.post.overrideSettings)+u.input("name","overrideFrameworkAndCSS","value",a.post.overrideFrameworkAndCSS))).appendTo("body").hide().submit().remove()};d.showPreviewInPopoutBox=function(a,b){var c=this,f=c.pluginPreviewDetails(!0,a,b);if(f){c.previewChecksum=f.checksum;c.previewPost=f.post;a=f.url+k._488(f.post);if(a.length>=(k._etm()?2E3:4E3)){a="";var e=function(){c.showPreviewViaPost(f,
-$("#cboxLoadedContent iframe")[0].name)}}$.colorbox({width:"95%",height:"90%",iframe:!0,preloading:!1,open:!0,title:c.previewSlotWidthInfo||F.preview,className:"zenario_admin_cb zenario_plugin_preview_popout_box",href:a,onComplete:e});$("#colorbox,#cboxOverlay,#cboxWrapper").css("z-index","333000")}};d.editModeAlwaysOn=function(a){return!this.tuix.tabs[a].edit_mode.use_view_and_edit_mode||this.savedAndContinued(a)};d.editCancelEnabled=function(a){return this.tuix.tabs[a].edit_mode&&w(this.tuix.tabs[a].edit_mode.enabled)&&
-!this.editModeAlwaysOn(a)};d.revertEnabled=function(a){return this.tuix.tabs[a].edit_mode&&w(this.tuix.tabs[a].edit_mode.enabled)&&this.editModeAlwaysOn(a)&&!this.savedAndContinued(a)&&(!A(this.tuix.tabs[a].edit_mode.enable_revert)&&this.tuix.key&&this.tuix.key.id||w(this.tuix.tabs[a].edit_mode.enable_revert))};d.savedAndContinued=function(a){return!1};d.editModeOnBox=function(){if(this.tuix&&this.tuix.tabs&&this.sortedTabs)for(var a in this.sortedTabs)if(B(this.sortedTabs,a)&&this.editModeOn(this.sortedTabs[a]))return!0;
-return!1};d.setData=function(a){this.setDataDiff(a)};d.sendStateToServer=function(){return this.sendStateToServerDiff()};d.save=function(a,b,c,f){var e=this,h;e.loaded&&(h=e.getURL("save"))&&(e.saving||setTimeout(function(){e.saving=!0;e.differentTab=!0;e.loaded=!1;e.hideTab(!0);e.checkValues();var l={_save:!0,_confirm:a?1:"",_save_and_continue:b,_box:e.sendStateToServer()};w(e.tuix.download)||e.tuix.confirm&&w(e.tuix.confirm.download)?e.save2(k._w3i(e.getURL("save"),k._488(l),!0),b,c,f):e.retryAJAX(h,
-l,!0,function(n){e.save2(n,b,c,f)},"saving")},100))};d.save2=function(a,b,c,f){delete this.saving;var e=a&&a._sync&&a._sync.flags||{},h=v.init&&!p.zenarioOQuickMode&&!p.zenarioOSelectMode;e.close_with_message?(this.close(),h&&v._131(),q._s34(e.close_with_message)):e.reload_organizer&&h?(this.close(),q._e45(e),u.uploading=!1,v._f5r("uploading",u.uploading),v._3ag(e.organizer_path)):e.open_admin_box&&G.init?(this.close(),G.open(e.open_admin_box)):e.go_to_url?(this.close(),q._e45(e),k._6h1(k._ozg(e.go_to_url),
-!0)):e.valid?e.confirm?(this.load(a),this.sortTabs(),this.draw(),this.showConfirm(b,c,f)):e.download?(q._ok1(this.getURL("download"),{_download:1,_box:this.sendStateToServer()}),b&&(a=a.substr(15),this.load(a)),this.refreshParentAndClose(!0,b,c,f)):e.saved?(this.load(a),this.refreshParentAndClose(!1,b,c,f)):(this.close(),q._s34(a,!0,"error")):(this.load(a),this.sortTabs(),this.switchToATabWithErrors(),this.draw())};d.showConfirm=function(a,b,c){this.tuix&&this.tuix.confirm&&w(this.tuix.confirm.show)&&
-(c=this.tuix.confirm.message,w(this.tuix.confirm.html)||(c=I(c,!0)),a='<input type="button" class="submit_selected" value="'+this.tuix.confirm.button_message+'" onclick="'+this.globalName+".save(true, "+w(a)+", "+w(b)+');"/><input type="button" class="submit" value="'+(this.tuix.confirm.cancel_button_message||q.phrase.cancel)+'"/>',q._g82(c,a,this.tuix.confirm.message_type||"none"))};d.dragDropTarget=function(){return this.get("zenario_fbAdminInner")};d.enableDragDropUpload=function(){var a=this.dragDropTarget();
-u._u4i(this.ajaxURL(),{fileUpload:1},!1,this.uploadCallback,a);$(a).addClass("upload_enabled").removeClass("dragover")};d.disableDragDropUpload=function(){$(this.dragDropTarget()).removeClass("upload_enabled").removeClass("dragover").off("drop")};d.dragListeners=function(){return u._3gj()?"ondragover=\"$(this).addClass('dragover');\" ondragleave=\"$(this).removeClass('dragover');\"":""}},zenarioAF,zenarioABToolkit);
+$("#cboxLoadedContent iframe")[0].name)}}$.colorbox({width:"95%",height:"90%",iframe:!0,preloading:!1,open:!0,title:c.previewSlotWidthInfo||F.preview,className:"zenario_admin_cb zenario_plugin_preview_popout_box",href:a,onComplete:e});$("#colorbox,#cboxOverlay,#cboxWrapper").css("z-index","333000")}};d.editModeAlwaysOn=function(a){return!this.tuix.tabs[a].edit_mode.use_view_and_edit_mode||this.savedAndContinued(a)};d.editCancelEnabled=function(a){return this.tuix.tabs[a].edit_mode&&v(this.tuix.tabs[a].edit_mode.enabled)&&
+!this.editModeAlwaysOn(a)};d.revertEnabled=function(a){return this.tuix.tabs[a].edit_mode&&v(this.tuix.tabs[a].edit_mode.enabled)&&this.editModeAlwaysOn(a)&&!this.savedAndContinued(a)&&(!A(this.tuix.tabs[a].edit_mode.enable_revert)&&this.tuix.key&&this.tuix.key.id||v(this.tuix.tabs[a].edit_mode.enable_revert))};d.savedAndContinued=function(a){return!1};d.editModeOnBox=function(){if(this.tuix&&this.tuix.tabs&&this.sortedTabs)for(var a in this.sortedTabs)if(B(this.sortedTabs,a)&&this.editModeOn(this.sortedTabs[a]))return!0;
+return!1};d.setData=function(a){this.setDataDiff(a)};d.sendStateToServer=function(){return this.sendStateToServerDiff()};d.save=function(a,b,c,f){var e=this,h;e.loaded&&(h=e.getURL("save"))&&(e.saving||setTimeout(function(){e.saving=!0;e.differentTab=!0;e.loaded=!1;e.hideTab(!0);e.checkValues();var l={_save:!0,_confirm:a?1:"",_save_and_continue:b,_box:e.sendStateToServer()};v(e.tuix.download)||e.tuix.confirm&&v(e.tuix.confirm.download)?e.save2(k._w3i(e.getURL("save"),k._488(l),!0),b,c,f):e.retryAJAX(h,
+l,!0,function(n){e.save2(n,b,c,f)},"saving")},100))};d.save2=function(a,b,c,f){delete this.saving;var e=a&&a._sync&&a._sync.flags||{},h=w.init&&!p.zenarioOQuickMode&&!p.zenarioOSelectMode;e.close_with_message?(this.close(),h&&w._131(),q._s34(e.close_with_message)):e.reload_organizer&&h?(this.close(),q._e45(e),u.uploading=!1,w._f5r("uploading",u.uploading),w._3ag(e.organizer_path)):e.open_admin_box&&G.init?(this.close(),G.open(e.open_admin_box)):e.go_to_url?(this.close(),q._e45(e),k._6h1(k._ozg(e.go_to_url),
+!0)):e.valid?e.confirm?(this.load(a),this.sortTabs(),this.draw(),this.showConfirm(b,c,f)):e.download?(q._ok1(this.getURL("download"),{_download:1,_box:this.sendStateToServer()}),b&&(a=a.substr(15),this.load(a)),this.refreshParentAndClose(!0,b,c,f)):e.saved?(this.load(a),this.refreshParentAndClose(!1,b,c,f)):(this.close(),q._s34(a,!0,"error")):(this.load(a),this.sortTabs(),this.switchToATabWithErrors(),this.draw())};d.showConfirm=function(a,b,c){if(this.tuix&&this.tuix.confirm&&v(this.tuix.confirm.show)){var f=
+this.tuix.confirm.message;v(this.tuix.confirm.html)||(f=I(f,!0));a='<input type="button" class="submit_selected" value="'+this.tuix.confirm.button_message+'" onclick="'+this.globalName+".save(true, "+v(a)+", "+v(b)+", "+v(c)+');"/><input type="button" class="submit" value="'+(this.tuix.confirm.cancel_button_message||q.phrase.cancel)+'"/>';q._g82(f,a,this.tuix.confirm.message_type||"none")}};d.dragDropTarget=function(){return this.get("zenario_fbAdminInner")};d.enableDragDropUpload=function(){var a=
+this.dragDropTarget();u._u4i(this.ajaxURL(),{fileUpload:1},!1,this.uploadCallback,a);$(a).addClass("upload_enabled").removeClass("dragover")};d.disableDragDropUpload=function(){$(this.dragDropTarget()).removeClass("upload_enabled").removeClass("dragover").off("drop")};d.dragListeners=function(){return u._3gj()?"ondragover=\"$(this).addClass('dragover');\" ondragleave=\"$(this).removeClass('dragover');\"":""}},zenarioAF,zenarioABToolkit);

@@ -1,337 +0,0 @@
-var m = [20, 120, 20, 120],
-	canvas_w = 1160 - m[1] - m[3],
-	canvas_h = svgHeight - m[0] - m[2],
-	i = 0,
-	mode = "redundancy",
-	root;
-
-$(document).ready(function () {
-	$("#mode").change(function () {
-		mode = $(this).val();
-		
-		$(".mode_key").hide();
-		
-		if (mode=="redundancy") {
-			$("#redundancy_key").show();
-		} else if (mode=="visibility") {
-			$("#visibility_key").show();
-		} else if (mode=="privacy") {
-			$("#privacy_key").show();
-		}
-		update(root);
-	});
-});
-
-var tree, diagonal, vis, tree_svg;
-
-function resizeTreeSVG(pcanvas_w, pcanvas_h){
-	canvas_h = pcanvas_h;
-	canvas_w = pcanvas_w;
-
-	tree.size([canvas_h, canvas_w]);
-	
-	tree_svg.attr("width", canvas_w + m[1] + m[3])
-	.attr("height", canvas_h + m[0] + m[2]);
-}
-
-function createTreeSVG(pcanvas_w, pcanvas_h){
-	canvas_h = pcanvas_h;
-	canvas_w = pcanvas_w;
-	var el = document.getElementById("body");
-	var new_body = document.createElement("div");
-	el.parentNode.replaceChild(new_body, el);
-	new_body.id = "body";
-
-	tree = d3.layout.tree();
-
-	diagonal = d3.svg.diagonal()
-	.projection(function(d) { return [d.y, d.x]; });
-
-	tree_svg = d3.select("#body").append("svg:svg");
-	vis = tree_svg.append("svg:g")
-	.attr("transform", "translate(" + m[3] + "," + m[0] + ")");
-
-	resizeTreeSVG(pcanvas_w, pcanvas_h);
-}
-
-createTreeSVG(canvas_w, canvas_h);
-
-var tooltip = d3.select("body")
-	.append("div")
-	.style("position", "absolute")
-	.style("z-index", "10")
-	.style("visibility", "hidden")
-	.style("background-color","white")
-	.style("font-size","11px")
-	.style("font-family","verdana");	
-
-d3.json(JSONURL, function(json) {
-	root = json;
-	root.x0 = 0; //canvas_h / 2;
-	root.y0 = 0;
-	
-	// Initialize the display to show a 2 levels beneath the parent node.
-  
-	toggleAll(root,2,0);
-	  	
-	update(root);
-});
-
-function update(source) {
-	var duration = d3.event && d3.event.altKey ? 5000 : 500;
-
-	var nodes, nodes_hor_dist_ary;
-	//two pass, first to calculate
-	for(var j=0; j < 2; ++j){
-		// Compute the new tree layout.
-		nodes = tree.nodes(root).reverse();
-
-		// Normalize for fixed-depth.
-		var nodes_hor_dist = 40;
-		nodes_hor_dist_ary = [0];
-		var nodes_ver_dist_ary = [0];
-
-		var one_char_width = 8;
-		nodes.forEach(function(d, i) { 
-			if(d.depth >= nodes_hor_dist_ary.length){
-				for(var ni=nodes_hor_dist_ary.length; ni<= d.depth; ++ni){
-					nodes_hor_dist_ary.push(nodes_hor_dist);
-					nodes_ver_dist_ary.push(0);
-				}
-			}
-			++nodes_ver_dist_ary[d.depth];
-			if(d.name){
-				var name_len = (d.name.length+2) * (d.name.length > 40 ? one_char_width-3 : one_char_width);
-				if(name_len > nodes_hor_dist_ary[d.depth])
-					nodes_hor_dist_ary[d.depth] = name_len;
-			}
-			});
-
-		if(j == 0){
-			var max_ver_dist = 0;
-			var best_width = 0;
-			var best_height = 0;
-			for(var k=0, len=nodes_ver_dist_ary.length; k < len; ++k){
-				if(nodes_ver_dist_ary[k] > max_ver_dist) max_ver_dist = nodes_ver_dist_ary[k];
-				best_width += nodes_hor_dist_ary[k];
-			}
-			best_height = max_ver_dist * 34; //vertical space between nodes			
-			if( 
-					((best_width > canvas_w) || (best_height > canvas_h)) || 
-					((canvas_h - best_height) > (best_height/3)) )
-			{
-				resizeTreeSVG(best_width, best_height);
-			}
-		}		
-	}	
-
-	//compute start x position for each node
-	for (var idx in nodes_hor_dist_ary){
-		if(idx > 0) nodes_hor_dist_ary[idx] += nodes_hor_dist_ary[idx-1];
-	}
-
-	nodes.forEach(function(d) { d.y = d.depth ? nodes_hor_dist_ary[d.depth-1] : -nodes_hor_dist_ary[d.depth]; });
-
-	// Update the nodes…
-	var node = vis.selectAll("g.node")
-	  	.data(nodes, function(d) { return d.id || (d.id = ++i); });
-
-	// Enter any new nodes at the parent's previous position.
-	var nodeEnter = node.enter().append("svg:g")
-	  	.attr("class", "node")
-	  	.attr("transform", function(d) { return "translate(" + source.y0 + "," + source.x0 + ")"; })
-	  	.on("click", function(d) { toggle(d); update(d); tooltip.text(""); });
-
-	nodeEnter.append("svg:circle")
-	  	.attr("r", 1e-6)
-	  	.on("mouseover", function(d) {
-	  		var d2 = d;
-
-			tooltip.style("visibility", "visible");
-			tooltip.text(function () { return d2.children ? "Click to hide child menu nodes" : d2._children ? "Click to show child menu nodes" : "There are no child menu nodes"});
-			return true;
-		})
-		.on("mousemove", function(d) {
-			tooltip.style("top", (d3.event.pageY-10)+"px").style("left",(d3.event.pageX+10)+"px");
-			return true;
-		})
-		.on("mouseout", function(d) {
-			tooltip.style("visibility", "hidden");
-			return true;
-		});
-
-	nodeEnter.append("svg:circle")
-	  	.attr("r", 2)
-	  	.attr("class","child_circle")
-	  	.attr("cx",-5);
-
-	nodeEnter.append("svg:circle")
-	  	.attr("r", 2)
-	  	.attr("class","child_circle");
-
-	nodeEnter.append("svg:circle")
-	  	.attr("r", 2)
-	  	.attr("class","child_circle")
-	  	.attr("cx",5);
-
-	var child_text_xpos = 20; //28;
-	
-	nodeEnter.append("svg:rect")
-		.attr("id",function (d) { return "menu_node_" + d.mID})
-		.attr("width",6)
-		.attr("height",9)
-		.attr("x",12)
-		.attr("y",-4)
-		.attr("class", "rect_page")
-		.style("display", function(d) { return (d.target_loc==undefined || d.target_loc=="none") ? "none" : "block"});
-		
-	nodeEnter.append("a")
-		.attr("xlink:href", function (d) { if (d.content_href) return d.content_href; return undefined;})
-		.on("click", function (d) { if (d.organizer_href) window.parent.zenarioO.go(d.organizer_href); return false; })
-		.attr("xlink:show", "new")
-		.attr("xlink:target", "_blank")
-		.style("display", function(d) { return (d.content_href == undefined && d.organizer_href === undefined) ? "none" : "block"})
-		.append("svg:text")
-	  	//.attr("x", function(d) { return d.children || d._children ? -12 : (d.target_loc!=undefined && d.target_loc!="none") ? child_text_xpos : 12; })
-	  	.attr("x", function(d) { return child_text_xpos; })
-	  	.attr("dy", ".35em")
-	  	//.attr("text-anchor", function(d) { return d.children || d._children ? "end" : "start"; })
-	  	//.attr("text-anchor", function(d) { return "start"; })
-	  	.text(function(d) { return d.name; })
-	  	.style("fill-opacity", 1e-6)
-			.on("mousemove", function(){
-				tooltip.style("top", (d3.event.pageY-10)+"px").style("left",(d3.event.pageX+10)+"px");
-				return true;
-			})
-	  	/*
-			.on("mouseover", function(){
-				tooltip.style("visibility", "visible");
-				tooltip.text("Click to view the target content item in a new tab");
-				return true;
-			})
-			.on("mouseout", function(){
-				tooltip.style("visibility", "hidden");
-				return true;
-			})*/;
-
-	// Transition nodes to their new position.
-	var nodeUpdate = node.transition()
-	  	.duration(duration)
-	  	.attr("transform", function(d) { return "translate(" + d.y + "," + d.x + ")"; });
-
-	nodeUpdate.select("circle")
-	  	.attr("r", 9)
-	  	.attr("class",function (d){
-	  		var circleClass = false;
-
-	  		if (!d.section) {
-		  		if (mode=="redundancy") {
-				  	circleClass = (d.redundancy=="primary") ? "node_menu_node_primary" : "node_menu_node_secondary";
-				} else if (mode=="visibility") {
-				  	circleClass = (d.visibility=="visible") ? "node_menu_node_visible" : "node_menu_node_invisible";
-				} else if (mode=="privacy") {
-				  	circleClass = "node_menu_node_privacy_" + d.hide_private_item;
-				}
-				
-				if (d.children || d._children) {
-					circleClass += " children";
-				}
-
-				return circleClass;
-	  		}
-	  	})
-
-	nodeUpdate.select("text")
-	  	.style("fill-opacity", 1);
-
-	// Transition exiting nodes to the parent's new position.
-	var nodeExit = node.exit().transition()
-	  	.duration(duration)
-	  	.attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
-	  	.remove();
-
-	nodeExit.select("circle")
-	  	.attr("r", 1e-6);
-
-	nodeExit.select("text")
-	  	.style("fill-opacity", 1e-6);
-
-	// Update the links…
-	var link = vis.selectAll("path.link")
-	  	.data(tree.links(nodes), function(d) { return d.target.id; });
-
-	// Enter any new links at the parent's previous position.
-	link.enter().insert("svg:path", "g")
-	  	.attr("class", "link")
-	 	.attr("d", function(d) {
-			var o = {x: source.x0, y: source.y0};
-			return diagonal({source: o, target: o});
-	  	})
-	.transition()
-	  	.duration(duration)
-	  	.attr("d", diagonal);
-
-	// Transition links to their new position.
-	link.transition()
-	  	.duration(duration)
-	  	.attr("d", diagonal);
-
-	// Transition exiting nodes to the parent's new position.
-	link.exit().transition()
-	  	.duration(duration)
-	  	.attr("d", function(d) {
-			var o = {x: source.x, y: source.y};
-			return diagonal({source: o, target: o});
-	  	})
-	  	.remove();
-
-	// Stash the old positions for transition.
-	nodes.forEach(function(d) {
-		d.x0 = d.x;
-		d.y0 = d.y;
-	});
-}
-
-// Toggle children.
-function toggle(d) {
- 	if (d.children) {
- 		closeAll(d);
- 	} else {
-		d.children = d._children;
-		d._children = null;
- 	}
-}
-
-function closeAll(d) {
-	if (d.children || d._children) {			
-		if (d.children) {
-			d._children = d.children;
-			d.children = null;
-		}
-
-		for (var childId in d._children) {
-			closeAll(d._children[childId]);
-		}					
-	}		
-}
-
-function toggleAll(d,maxLevelCount,levelCount) {
-	if (d.children || d._children) {
-		levelCount++;
-		
-		if (levelCount>=maxLevelCount) {
-			d._children = d.children;
-			d.children = null;
-		}
-
-		if (d.children) {
-			for (var childId in d.children) {
-				toggleAll(d.children[childId],maxLevelCount,levelCount);
-			}
-		} else if (d._children) {
-			for (var childId in d._children) {
-				toggleAll(d._children[childId],maxLevelCount,levelCount);
-			}					
-		}
-	}
-}
\ No newline at end of file

@@ -1,12 +0,0 @@
-var m=[20,120,20,120],canvas_w=1160-m[1]-m[3],canvas_h=svgHeight-m[0]-m[2],i=0,mode="redundancy",root;$(document).ready(function(){$("#mode").change(function(){mode=$(this).val();$(".mode_key").hide();"redundancy"==mode?$("#redundancy_key").show():"visibility"==mode?$("#visibility_key").show():"privacy"==mode&&$("#privacy_key").show();update(root)})});var tree,diagonal,vis,tree_svg;
-function resizeTreeSVG(b,e){canvas_h=e;canvas_w=b;tree.size([canvas_h,canvas_w]);tree_svg.attr("width",canvas_w+m[1]+m[3]).attr("height",canvas_h+m[0]+m[2])}
-function createTreeSVG(b,e){canvas_h=e;canvas_w=b;var f=document.getElementById("body"),c=document.createElement("div");f.parentNode.replaceChild(c,f);c.id="body";tree=d3.layout.tree();diagonal=d3.svg.diagonal().projection(function(d){return[d.y,d.x]});tree_svg=d3.select("#body").append("svg:svg");vis=tree_svg.append("svg:g").attr("transform","translate("+m[3]+","+m[0]+")");resizeTreeSVG(b,e)}createTreeSVG(canvas_w,canvas_h);
-var tooltip=d3.select("body").append("div").style("position","absolute").style("z-index","10").style("visibility","hidden").style("background-color","white").style("font-size","11px").style("font-family","verdana");d3.json(JSONURL,function(b){root=b;root.x0=0;root.y0=0;toggleAll(root,2,0);update(root)});
-function update(b){for(var e=d3.event&&d3.event.altKey?5E3:500,f,c,d=0;2>d;++d){f=tree.nodes(root).reverse();c=[0];var l=[0];f.forEach(function(a,h){if(a.depth>=c.length)for(h=c.length;h<=a.depth;++h)c.push(40),l.push(0);++l[a.depth];a.name&&(h=(a.name.length+2)*(40<a.name.length?5:8),h>c[a.depth]&&(c[a.depth]=h))});if(0==d){var g=0,p=0,k=0;k=0;for(var q=l.length;k<q;++k)l[k]>g&&(g=l[k]),p+=c[k];k=34*g;(p>canvas_w||k>canvas_h||canvas_h-k>k/3)&&resizeTreeSVG(p,k)}}for(var n in c)0<n&&(c[n]+=c[n-1]);
-f.forEach(function(a){a.y=a.depth?c[a.depth-1]:-c[a.depth]});d=vis.selectAll("g.node").data(f,function(a){return a.id||(a.id=++i)});g=d.enter().append("svg:g").attr("class","node").attr("transform",function(a){return"translate("+b.y0+","+b.x0+")"}).on("click",function(a){toggle(a);update(a);tooltip.text("")});g.append("svg:circle").attr("r",1E-6).on("mouseover",function(a){tooltip.style("visibility","visible");tooltip.text(function(){return a.children?"Click to hide child menu nodes":a._children?
-"Click to show child menu nodes":"There are no child menu nodes"});return!0}).on("mousemove",function(a){tooltip.style("top",d3.event.pageY-10+"px").style("left",d3.event.pageX+10+"px");return!0}).on("mouseout",function(a){tooltip.style("visibility","hidden");return!0});g.append("svg:circle").attr("r",2).attr("class","child_circle").attr("cx",-5);g.append("svg:circle").attr("r",2).attr("class","child_circle");g.append("svg:circle").attr("r",2).attr("class","child_circle").attr("cx",5);g.append("svg:rect").attr("id",
-function(a){return"menu_node_"+a.mID}).attr("width",6).attr("height",9).attr("x",12).attr("y",-4).attr("class","rect_page").style("display",function(a){return void 0==a.target_loc||"none"==a.target_loc?"none":"block"});g.append("a").attr("xlink:href",function(a){if(a.content_href)return a.content_href}).on("click",function(a){a.organizer_href&&window.parent.zenarioO.go(a.organizer_href);return!1}).attr("xlink:show","new").attr("xlink:target","_blank").style("display",function(a){return void 0==a.content_href&&
-void 0===a.organizer_href?"none":"block"}).append("svg:text").attr("x",function(a){return 20}).attr("dy",".35em").text(function(a){return a.name}).style("fill-opacity",1E-6).on("mousemove",function(){tooltip.style("top",d3.event.pageY-10+"px").style("left",d3.event.pageX+10+"px");return!0});g=d.transition().duration(e).attr("transform",function(a){return"translate("+a.y+","+a.x+")"});g.select("circle").attr("r",9).attr("class",function(a){var h=!1;if(!a.section){"redundancy"==mode?h="primary"==a.redundancy?
-"node_menu_node_primary":"node_menu_node_secondary":"visibility"==mode?h="visible"==a.visibility?"node_menu_node_visible":"node_menu_node_invisible":"privacy"==mode&&(h="node_menu_node_privacy_"+a.hide_private_item);if(a.children||a._children)h+=" children";return h}});g.select("text").style("fill-opacity",1);d=d.exit().transition().duration(e).attr("transform",function(a){return"translate("+b.y+","+b.x+")"}).remove();d.select("circle").attr("r",1E-6);d.select("text").style("fill-opacity",1E-6);d=
-vis.selectAll("path.link").data(tree.links(f),function(a){return a.target.id});d.enter().insert("svg:path","g").attr("class","link").attr("d",function(a){a={x:b.x0,y:b.y0};return diagonal({source:a,target:a})}).transition().duration(e).attr("d",diagonal);d.transition().duration(e).attr("d",diagonal);d.exit().transition().duration(e).attr("d",function(a){a={x:b.x,y:b.y};return diagonal({source:a,target:a})}).remove();f.forEach(function(a){a.x0=a.x;a.y0=a.y})}
-function toggle(b){b.children?closeAll(b):(b.children=b._children,b._children=null)}function closeAll(b){if(b.children||b._children){b.children&&(b._children=b.children,b.children=null);for(var e in b._children)closeAll(b._children[e])}}function toggleAll(b,e,f){if(b.children||b._children)if(f++,f>=e&&(b._children=b.children,b.children=null),b.children)for(var c in b.children)toggleAll(b.children[c],e,f);else if(b._children)for(c in b._children)toggleAll(b._children[c],e,f)};

@@ -1,7 +0,0 @@
-{
-  "name": "d3",
-  "description": "A JavaScript visualization library for HTML and SVG.",
-  "main": "d3.js",
-  "license": "BSD-3-Clause",
-  "ignore": []
-}

@@ -1,18 +0,0 @@
-{
-  "name": "d3",
-  "description": "A JavaScript visualization library for HTML and SVG.",
-  "main": "d3.js",
-  "license": "BSD-3-Clause",
-  "ignore": [],
-  "homepage": "https://github.com/mbostock-bower/d3-bower",
-  "version": "3.5.17",
-  "_release": "3.5.17",
-  "_resolution": {
-    "type": "version",
-    "tag": "v3.5.17",
-    "commit": "abe0262a205c9f3755c3a757de4dfd1d49f34b24"
-  },
-  "_source": "https://github.com/mbostock-bower/d3-bower.git",
-  "_target": "3.*",
-  "_originalSource": "d3"
-}
\ No newline at end of file

@@ -1,26 +0,0 @@
-Copyright (c) 2010-2016, Michael Bostock
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* The name Michael Bostock may not be used to endorse or promote products
-  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@@ -1,13 +0,0 @@
-# Data-Driven Documents

-

-<a href="https://d3js.org"><img src="https://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>

-

-**D3.js** is a JavaScript library for manipulating documents based on data. **D3** helps you bring data to life using HTML, SVG, and CSS. **D3** emphasizes web standards and combines powerful visualization components with a data-driven approach to DOM manipulation, giving you the full capabilities of modern browsers without tying yourself to a proprietary framework.

-

-Want to learn more? [See the wiki.](https://github.com/mbostock/d3/wiki)

-

-For examples, [see the gallery](https://github.com/mbostock/d3/wiki/Gallery) and [mbostock’s bl.ocks](http://bl.ocks.org/mbostock).

-

-## Good News, Everyone!

-

-The next major release of D3, 4.0, is coming! See the [4.0 development branch](https://github.com/mbostock/d3/tree/4) and read the [new API reference](https://github.com/mbostock/d3/blob/4/README.md) to get ready.

@@ -2096,7 +2096,9 @@ public function adminBoxSaveCompleted($path, $settingGroup, &$box, &$fields, &$v
 			}
 		}
 		
-		if (!array_key_exists("refinerName", $_GET)){
+		//If we're creating a new content item from the admin toolbar, navigate to that content item
+		//after the FAB closes.
+		if (!empty($box['key']['create_from_toolbar'])) {
 			$contentItemLink = ze\link::toItem($box['key']['cID'], $box['key']['cType']);
 			if ($contentItemLink) {
 				ze\tuix::closeWithFlags(['go_to_url' => $contentItemLink]);

@@ -150,14 +150,6 @@ public function fillOrganizerPanel($path, &$panel, $refinerName, $refinerId, $mo
 			unset($panel['item_buttons']['view_content']);
 		}
 
-		if (isset($panel['collection_buttons']['tree_explorer']['popout']['href'])) {
-			if ($panel['key']['parentId']) {
-				$panel['collection_buttons']['tree_explorer']['popout']['href'] .= '?type=menu_node&id='. (int) $panel['key']['parentId'];
-			} else {
-				$panel['collection_buttons']['tree_explorer']['popout']['href'] .= '?type=section&id='. (int) $panel['key']['sectionId'];
-			}
-		}
-
 
 		//Pass the Storekeeper Mode onto the create and edit buttons
 		if (isset($panel['item_buttons']['edit'])) {

@@ -248,19 +248,6 @@ zenario__menu:
                     ord: 99
                     admin_box:
                         path: zenario_menu
-                tree_explorer:
-                    hide_in_select_mode: true
-                    label: Open Tree Explorer
-                    popout:
-                        href: zenario/admin/tree_explorer/index.php
-                        width: 100%
-                        height: 100%
-                        maxWidth: 100%
-                        maxHeight: 100%
-                        initialWidth: 100%
-                        initialHeight: 100%
-                        iframe: true
-                        transition: none
             inline_buttons:
                 #Icons for displaying the linked content item status
                 linked_content_item_status_inline_button:

@@ -45,16 +45,3 @@ zenario__menu:
                     ord: "20"
                     multiple_select: Yes
                     hide_when_children_are_not_visible: Yes
-                tree_explorer:
-                    hide_in_select_mode: Yes
-                    name: Explore tree
-                    popout:
-                        href: zenario/admin/tree_explorer/index.php?type=section
-                        width: 100%
-                        height: 100%
-                        maxWidth: 100%
-                        maxHeight: 100%
-                        initialWidth: 100%
-                        initialHeight: 100%
-                        iframe: Yes
-                        transition: none

@@ -1,136 +0,0 @@
-.node circle {
-  	cursor: pointer;
-  	fill: #fff;
-  	stroke: black;
-  	stroke-width: 2.5px;
-}
-
-.node circle.child_circle {
-	display: none;
-  	stroke-width: 0px;
-}
-
-.node circle.children ~ circle {
-	display: block;
-}
-
-.node text {
-  	font-size: 10px;
-  	font-family: "verdana";
-}
-
-path.link {
-  	fill: none;
-  	stroke: #ccc;
-  	stroke-width: 2.5px;
-}
-
-.mode_key {
-	float: left;
-	margin-left: 10px;
-}
-
-.key_block {
-	float: left;
-	width: 15px;
-	height: 15px;
-	border: 1px solid black;
-}
-
-.key_block_label {
-	float: left;
-	margin-left: 5px;
-	margin-right: 20px;
-	font-size: 10px;
-	font-family: "verdana";
-}
-
-.key_primary {
-	background-color: #1049A9;
-}
-
-.node .node_menu_node_primary {
-	fill: #1049A9;
-	stroke: #1049A9;
-}
-
-.key_secondary {
-	background-color: #FFA400;
-}
-
-.node .node_menu_node_secondary {
-	fill: #FFA400;
-	stroke: #FFA400;
-}
-
-.key_visible {
-	background-color: #138900;
-}
-
-.node .node_menu_node_visible {
-	fill: #138900;
-	stroke: #138900;
-}
-
-.key_invisible {
-	background-color: #7AE969;
-}
-
-.node .node_menu_node_invisible {
-	fill: #7AE969;
-	stroke: #7AE969;
-}
-
-.key_privacy_0 {
-	background-color: #C10087;
-}
-
-.node .node_menu_node_privacy_0 {
-	fill: #C10087;
-	stroke: #C10087;
-}
-
-.key_privacy_1 {
-	background-color: #F30021;
-}
-
-.node .node_menu_node_privacy_1 {
-	fill: #F30021;
-	stroke: #F30021;
-}
-
-.key_privacy_2 {
-	background-color: #34D800;
-}
-
-.node .node_menu_node_privacy_2 {
-	fill: #34D800;
-	stroke: #34D800;
-}
-
-.key_privacy_3 {
-	background-color: #B1F100;
-}
-
-.node .node_menu_node_privacy_3 {
-	fill: #B1F100;
-	stroke: #B1F100;
-}
-
-.node .rect_page {
-	fill: white;
-	stroke: #BBBBBB;
-	stroke-width: 1;
-}
-
-#mode_container {
-	float:left;
-}
-
-#visibility_key {
-	display: none;
-}
-
-#privacy_key {
-	display: none;
-}
\ No newline at end of file

@@ -1 +0,0 @@
-.node circle{cursor:pointer;fill:#fff;stroke:#000;stroke-width:2.5px}.node circle.child_circle{display:none;stroke-width:0}.node circle.children~circle{display:block}.node text{font-size:10px;font-family:"verdana"}path.link{fill:none;stroke:#ccc;stroke-width:2.5px}.mode_key{float:left;margin-left:10px}.key_block{float:left;width:15px;height:15px;border:1px solid #000}.key_block_label{float:left;margin-left:5px;margin-right:20px;font-size:10px;font-family:"verdana"}.key_primary{background-color:#1049A9}.node .node_menu_node_primary{fill:#1049A9;stroke:#1049A9}.key_secondary{background-color:#FFA400}.node .node_menu_node_secondary{fill:#FFA400;stroke:#FFA400}.key_visible{background-color:#138900}.node .node_menu_node_visible{fill:#138900;stroke:#138900}.key_invisible{background-color:#7AE969}.node .node_menu_node_invisible{fill:#7AE969;stroke:#7AE969}.key_privacy_0{background-color:#C10087}.node .node_menu_node_privacy_0{fill:#C10087;stroke:#C10087}.key_privacy_1{background-color:#F30021}.node .node_menu_node_privacy_1{fill:#F30021;stroke:#F30021}.key_privacy_2{background-color:#34D800}.node .node_menu_node_privacy_2{fill:#34D800;stroke:#34D800}.key_privacy_3{background-color:#B1F100}.node .node_menu_node_privacy_3{fill:#B1F100;stroke:#B1F100}.node .rect_page{fill:#fff;stroke:#BBB;stroke-width:1}#mode_container{float:left}#visibility_key{display:none}#privacy_key{display:none}
\ No newline at end of file