Skip to content

Commit

Permalink
Adding the public release of 8.6 onto the GitHub repo.
Browse files Browse the repository at this point in the history 
Version 8.6 of Zenario contains better security for file uploads, improvements for
managing phrases on multilingual sites, more control over generating user identifiers, and
improved audit trail for users, companies & locations.

For more information please see https://zenar.io/zenario-86
  • Loading branch information
@Chris-Turnbull
Chris-Turnbull committed Apr 25, 2020
1 parent dfd0afa commit eafe8d0
Show file tree
Hide file tree
Showing 1,535 changed files with 151,972 additions and 59,924 deletions.
5 changes: 5 additions & 0 deletions .htaccess
View file
Expand Up @@ -5,7 +5,12 @@ Options -Indexes
#ErrorDocument 404 /SUBDIRCTORY/index.php?cID=~

<ifModule mod_headers.c>
Header setifempty Content-Security-Policy "default-src *; img-src * data:; script-src * 'unsafe-eval' 'unsafe-inline'; style-src * 'unsafe-inline'"
Header setifempty Feature-Policy "sync-xhr *; camera 'none'; fullscreen 'none'; geolocation 'none'; gyroscope 'none'; magnetometer 'none'; microphone 'none'; midi 'none'; payment 'none'; speaker 'none';"
Header setifempty Referrer-Policy strict-origin-when-cross-origin
Header setifempty X-Content-Type-Options nosniff
Header setifempty X-Frame-Options SAMEORIGIN
Header setifempty X-XSS-Protection "1; mode=block"
</ifModule>

<IfModule pagespeed_module>
Expand Down
5 changes: 5 additions & 0 deletions apache-2.2.htaccess
View file
Expand Up @@ -16,7 +16,12 @@ Options -Indexes
#ErrorDocument 404 /SUBDIRCTORY/index.php?cID=~

<ifModule mod_headers.c>
Header set Content-Security-Policy "default-src *; img-src * data:; script-src * 'unsafe-eval' 'unsafe-inline'; style-src * 'unsafe-inline'"
Header set Feature-Policy "sync-xhr *; camera 'none'; fullscreen 'none'; geolocation 'none'; gyroscope 'none'; magnetometer 'none'; microphone 'none'; midi 'none'; payment 'none'; speaker 'none';"
Header set Referrer-Policy strict-origin-when-cross-origin
Header set X-Content-Type-Options nosniff
Header set X-Frame-Options SAMEORIGIN
Header set X-XSS-Protection "1; mode=block"
</ifModule>

<IfModule pagespeed_module>
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Expand Up @@ -13,14 +13,15 @@
"license": "BSD-3-Clause",
"dependencies": {
"bez": "*",
"jquery": "2.x",
"cytoscape": "*",
"jquery": "*",
"jquery-lazy": "*",
"jquery-multiselect": "*",
"mdn-polyfills": "*",
"media-match": "*",
"respond.js": "*",
"spectrum-colorpicker": "*",
"toastr": "*",
"underscore.string": "*",
"vimeo-upload": "*",
"wowjs": "*"
}
Expand Down
9 changes: 8 additions & 1 deletion zenario/admin/admin_boxes.ajax.php
View file
Expand Up @@ -125,7 +125,7 @@
$tagPath .= '/'. $path;

} else {
echo ze\admin::phrase('The requested path "[[path]]" was not found in the system. If you have just updated or added files to the CMS, you will need to reload the page.', ['path' => $requestedPath]);
echo ze\admin::phrase('The requested path "[[path]]" was not found in the system. If you have just updated or added files to Zenario, you will need to reload the page and possibly clear Zenario\'s cache.', ['path' => $requestedPath]);
exit;
}
}
Expand Down Expand Up @@ -519,6 +519,13 @@
unset($cfield);
}

if ($requestedPath == 'zenario_content' && ze\priv::check('_PRIV_EDIT_CONTENT_TYPE')) {
$tags['configure'] = [
'link' => 'zenario/admin/organizer.php#zenario__content/panels/content_types//' . htmlspecialchars($tags['key']['cType']) . '~.zenario_content_type_details~tdetails~k{"id":"' . htmlspecialchars($tags['key']['cType']) . '"}',
'tooltip' => ze\admin::phrase('Edit settings for this content type')
];
}

//If this Admin Box uses dynamic fields then these won't have been created above
//But they might be there now, so check any missing fields again.
foreach ($valuesWithFieldsMissing as $tabName => &$tab) {
Expand Down
3 changes: 3 additions & 0 deletions zenario/admin/db_install/local-DROP.sql
View file
Expand Up @@ -57,6 +57,7 @@ DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_instance_store`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_instances`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_item_link`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_layout_link`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_pages_by_mode`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_setting_defs`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]plugin_settings`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]signals`;
Expand All @@ -74,7 +75,9 @@ DROP TABLE IF EXISTS `[[DB_PREFIX]]template_files`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]template_slot_link`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]translation_chains`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]translation_chain_privacy`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]tuix_customisations`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]tuix_file_contents`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]tuix_snippets`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]user_admin_box_tabs`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]user_characteristic_values`;
DROP TABLE IF EXISTS `[[DB_PREFIX]]user_characteristic_values_link`;
Expand Down
0 ...in/db_updates/copy_over_top_check/8.5.txt → ...in/db_updates/copy_over_top_check/8.6.txt
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions zenario/admin/db_updates/latest_revision_no.inc.php
View file
Expand Up @@ -27,16 +27,16 @@
*/
if (!defined('NOT_ACCESSED_DIRECTLY')) exit('This file may not be directly accessed');

define('LATEST_REVISION_NO', 48646); //N.b. 8.6 starts at revision #49800
define('LATEST_BIG_CHANGE_REVISION_NO', 48644);
define('LATEST_REVISION_NO', 50610); //N.b. 8.6 starts at revision #50700
define('LATEST_BIG_CHANGE_REVISION_NO', 50605);
define('INSTALLER_REVISION_NO', 41600);
define('INSTALLER_DEFAULT_THEME', 'blackdog');

define('ZENARIO_IS_HEAD', false);
define('ZENARIO_VERSION', '8.5');
define('ZENARIO_VERSION', '8.6');
define('ZENARIO_MAJOR_VERSION', '8');
define('ZENARIO_MINOR_VERSION', '5');
define('ZENARIO_MINOR_VERSION', '6');
define('ZENARIO_IS_BUILD', true);
define('ZENARIO_REVISION', '51340');
define('ZENARIO_REVISION', '51342');

define('TINYMCE_DIR', 'zenario/libs/manually_maintained/lgpl/tinymce_4_7_3/');
4 changes: 2 additions & 2 deletions zenario/admin/db_updates/step_1_update_the_updater_itself/data_archive.inc.php
View file
Expand Up @@ -67,14 +67,14 @@
//Automatically convert any table that's not using our preferred engine to that engine
if (ze\dbAdm::needRevision(46500)) {

foreach (ze\sqlDA::fetchValues("
foreach (ze\sql\da::fetchValues("
SELECT `TABLE_NAME`
FROM information_schema.tables
WHERE `TABLE_SCHEMA` = '". ze\escape::sql(DBNAME_DA). "'
AND `TABLE_NAME` LIKE '". ze\escape::like(DB_PREFIX_DA). "%'
AND `ENGINE` != '". ze\escape::sql(ZENARIO_TABLE_ENGINE). "'
") as $tableName) {
ze\sqlDA::update("
ze\sql\da::update("
ALTER TABLE `". ze\escape::sql($tableName). "`
ENGINE=". ze\escape::sql(ZENARIO_TABLE_ENGINE)
);
Expand Down
4 changes: 2 additions & 2 deletions zenario/admin/db_updates/step_1_update_the_updater_itself/updater_tables.inc.php
View file
Expand Up @@ -39,7 +39,7 @@


//Automatically convert any table that's not using our preferred engine to that engine
if (ze\dbAdm::needRevision(46500)) {
if (ze\dbAdm::needRevision(50609)) {

foreach (ze\sql::fetchValues("
SELECT `TABLE_NAME`
Expand All @@ -54,6 +54,6 @@
);
}

ze\dbAdm::revision(46500);
ze\dbAdm::revision(50609);
}

0 comments on commit eafe8d0

Please sign in to comment.