Adding the public release of 8.4 onto the GitHub repo.

The 8.4 release of Zenario contains a new default skin, improvements for banners,
simple slideshows, logging in as an admin, plus many more changes and improvements.

For more information please see https://zenar.io/zenario-84


Hosting providers should be aware that there is a "soft" switch from MyISAM to InnoDB,
for anyone hosting using MySQL 5.7 or later.

.htaccess

@@ -47,17 +47,16 @@ Options -Indexes
 <IfModule mod_rewrite.c>
 	RewriteEngine On
 
-	# Redirect admin/ to zenario/admin/
-	RewriteRule ^admin$ zenario/redirect.php?redirect=admin/ [L]
-	RewriteRule ^admin/(.*)$ zenario/redirect.php?redirect=admin/$1 [L,QSA]
-
 	# Correct any bad relative-URLs
 	RewriteRule ^[\/,A-Za-z0-9~_-]*\/(public|private|zenario|zenario_custom|zenario_extra_modules)/(.*)$ zenario/redirect.php?redirectdir=$1&redirect=$2 [L,QSA]
 
 
 	# Favicons
 	RewriteRule ^favicon.ico$ zenario/file.php?usage=favicon [L]
 
+	# Admin URL:
+	RewriteRule ^admin(|\.\w+)$ zenario/admin/welcome.php [L,QSA]
+
 	# Friendly URLs:
 	RewriteCond %{REQUEST_URI} !/(admin|public|private|zenario|zenario_custom|zenario_extra_modules|purchased_downloads)/
 	RewriteRule ^([\/,A-Za-z0-9~_-]+)(|\.htm|\.html)$ index.php?cID=$1 [L,QSA]

admin.php

@@ -0,0 +1 @@
+<?php require 'zenario/admin/welcome.php'; ?>

admin/index.php

@@ -1,4 +1,4 @@
 <?php
-	header ('Location: ../zenario/admin/welcome.php?'. $_SERVER['QUERY_STRING']);
+	header ('Location: ../admin.php?'. $_SERVER['QUERY_STRING']);
 	exit;
 ?>

apache-2.2.htaccess

@@ -58,17 +58,16 @@ Options -Indexes
 <IfModule mod_rewrite.c>
 	RewriteEngine On
 
-	# Redirect admin/ to zenario/admin/
-	RewriteRule ^admin$ zenario/redirect.php?redirect=admin/ [L]
-	RewriteRule ^admin/(.*)$ zenario/redirect.php?redirect=admin/$1 [L,QSA]
-
 	# Correct any bad relative-URLs
 	RewriteRule ^[\/,A-Za-z0-9~_-]*\/(public|private|zenario|zenario_custom|zenario_extra_modules)/(.*)$ zenario/redirect.php?redirectdir=$1&redirect=$2 [L,QSA]
 
 
 	# Favicons
 	RewriteRule ^favicon.ico$ zenario/file.php?usage=favicon [L]
 
+	# Admin URL:
+	RewriteRule ^admin(|\.\w+)$ zenario/admin/welcome.php [L,QSA]
+
 	# Friendly URLs:
 	RewriteCond %{REQUEST_URI} !/(admin|public|private|zenario|zenario_custom|zenario_extra_modules|purchased_downloads)/
 	RewriteRule ^([\/,A-Za-z0-9~_-]+)(|\.htm|\.html)$ index.php?cID=$1 [L,QSA]

bower.json

@@ -1,30 +1,33 @@
 {
-	"name": "tribalsystems/zenario",
-	"type": "project",
-	"description": "Zenario is a web-based content management system for sites with one or many languages.",
-	"keywords": ["cms", "content management", "wysiwyg", "zenario"],
-	"homepage": "https://github.com/TribalSystems/Zenario",
-	"license": "MIT",
-	"dependencies": {
-		"bgrins/spectrum": "*",
-		"CodeSeven/toastr": "*",
-		"d3": "3.*",
-		"gridster": "*",
-		"fabric": "1.6.*",
-		"jquery": "*",
-		"jquery-lazy": "*",
-		"nobleclem/jQuery-MultiSelect": "*",
-		"rdallasgray/bez": "*",
-		"scottjehl/Respond": "*",
-		"weblinc/media-match": "*",
-		"usablica/intro.js": "*",
-		"vimeo-upload": "*"
-	},
-	"ignore": [
-		"**/.*",
-		"node_modules",
-		"bower_components",
-		"test",
-		"tests"
-	]
+  "name": "tribalsystems/zenario",
+  "type": "project",
+  "description": "Zenario is a web-based content management system for sites with one or many languages.",
+  "keywords": [
+    "cms",
+    "content management",
+    "wysiwyg",
+    "zenario"
+  ],
+  "homepage": "https://github.com/TribalSystems/Zenario",
+  "license": "MIT",
+  "dependencies": {
+    "bgrins/spectrum": "*",
+    "CodeSeven/toastr": "*",
+    "d3": "3.*",
+    "fabric": "1.6.*",
+    "jquery": "*",
+    "jquery-lazy": "*",
+    "nobleclem/jQuery-MultiSelect": "*",
+    "rdallasgray/bez": "*",
+    "scottjehl/Respond": "*",
+    "weblinc/media-match": "*",
+    "vimeo-upload": "*"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
 }

zenario/admin/admin_boxes.ajax.php

@@ -48,7 +48,7 @@
 $loadDefinition = true;
 $settingGroup = '';
 $compatibilityClassNames = [];
-ze::$skType = $type = 'admin_boxes';
+ze::$tuixType = $type = 'admin_boxes';
 
 
 
@@ -85,7 +85,7 @@
 if (!empty($_REQUEST['path'])) {
 	$requestedPath = preg_replace('/[^\w\/]/', '', $_REQUEST['path']);
 }
-ze::$skPath = $requestedPath;
+ze::$tuixPath = $requestedPath;
 
 //The Plugin Settings Admin Boxes are a special case for looking up XML files.
 //They need to include the Settings from the Plugin in question, and any modules it is compatable with

zenario/admin/admin_toolbar.ajax.php

@@ -41,8 +41,8 @@
 $debugMode = (bool) ($_GET['_debug'] ?? false);
 $settingGroup = '';
 $compatibilityClassNames = [];
-ze::$skType = $type = 'admin_toolbar';
-ze::$skPath = $requestedPath = false;
+ze::$tuixType = $type = 'admin_toolbar';
+ze::$tuixPath = $requestedPath = false;