Correctif insertion public

Gvx- · Apr 7, 2020 · 748b044 · 748b044
1 parent 587b536
commit 748b044
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Version 2.1.2 (2020-04-07)
+--------------------------
+
+* Correctif insertion cote public
+* Sauvegarde settings
+
 Version 2.1.1 (2020-04-04)
 --------------------------
 

diff --git a/dcScript/CHANGELOG.md b/dcScript/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Version 2.1.2 (2020-04-07)
+--------------------------
+
+* Correctif insertion cote public
+* Sauvegarde settings
+
 Version 2.1.1 (2020-04-04)
 --------------------------
 

diff --git a/dcScript/_config.php b/dcScript/_config.php
@@ -12,9 +12,9 @@
 if (isset($_POST['save'])) {
 	try {
 		$core->dcScript->settings('enabled', !empty($_POST['enabled']), true);
-		$core->dcScript->settings('header_code_enabled', !empty($_POST['header_code_enabled']), true);
-		$core->dcScript->settings('footer_code_enabled', !empty($_POST['footer_code_enabled']), true);
-		$core->dcScript->settings('backup_ext', html::escapeHTML($_POST['backup']), true);
+		$core->dcScript->settings('header_code_enabled', !empty($_POST['header_code_enabled']), false);
+		$core->dcScript->settings('footer_code_enabled', !empty($_POST['footer_code_enabled']), false);
+		$core->dcScript->settings('backup_ext', html::escapeHTML($_POST['backup']), false);
 		$core->blog->triggerBlog();
 		dcPage::addSuccessNotice(__('Configuration successfully updated.'));
 	} catch(exception $e) {

diff --git a/dcScript/_define.php b/dcScript/_define.php
@@ -11,7 +11,7 @@
 	/* Name */			'dcScript',
 	/* Description*/	'Add script for DC 2.8+',
 	/* Author */		'Gvx',
-	/* Version */		'2.1.1',
+	/* Version */		'2.1.2',
 	array(
 		/* standard plugin options dotclear */
 		'permissions' 				=>	'dcScript.edit'

diff --git a/dcScript/inc/class.dcScript.php b/dcScript/inc/class.dcScript.php
@@ -19,15 +19,15 @@ class dcScript extends dcPluginHelper024b {
 
 	public static function publicHeadContent($core, $_ctx) {
 		if(version_compare(PHP_VERSION, '7.2', '>=') && ($core->dcScript->settings('crypt_lib') != self::OPENSSL)) { return; }
-		$html = self::decrypt($core->dcScript->settings('header_code'), $core->dcScript->getCryptKey());
+		$html = self::decrypt($core->dcScript->settings('header_code'), $core->dcScript->getCryptKey(), $core->dcScript->settings('crypt_lib'));
 		if($core->dcScript->settings('enabled') && $core->dcScript->settings('header_code_enabled') && !empty($html)) {
 			echo "<!-- dcScript header begin -->\n".$html."\n<!-- dcScript header end -->\n";
 		}
 	}
 
 	public static function publicFooterContent($core, $_ctx) {
 		if(version_compare(PHP_VERSION, '7.2', '>=') && ($core->dcScript->settings('crypt_lib') != self::OPENSSL)) { return; }
-		$html = self::decrypt($core->dcScript->settings('footer_code'), $core->dcScript->getCryptKey());
+		$html = self::decrypt($core->dcScript->settings('footer_code'), $core->dcScript->getCryptKey(), $core->dcScript->settings('crypt_lib'));
 		if($core->dcScript->settings('enabled') && $core->dcScript->settings('footer_code_enabled') && !empty($html)) {
 			echo "<!-- dcScript footer begin -->\n".$html."\n<!-- dcScript footer end -->\n";
 		}

diff --git a/dcScript/inc/index_warning.js b/dcScript/inc/index_warning.js
@@ -5,40 +5,40 @@
  * (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
  * -- END LICENSE BLOCK -----------------------------------------------------*/
 
-(function (undefined) {
-	'use strict';
-	// -- INFORMATIONS BLOCK BEGIN ----------------------------------------------------
-	var informations = {
-		name:			'dcScriptIndexWarning',
-		description:	'dcScript for dotclear version 2.7+',
-		version:		'0.1.0',
-		author:			'Gvx',
-		copyright:		'© 2020 Gvx',
-		support:		'',
-		license:		'http://www.gnu.org/licenses/old-licenses/gpl-2.0.html'
-	};
-	// -- INFORMATIONS BLOCK END ------------------------------------------------------
+(function(undefined) {
+    'use strict';
+    // -- INFORMATIONS BLOCK BEGIN ----------------------------------------------------
+    var informations = {
+        name: 'dcScriptIndexWarning',
+        description: 'dcScript for dotclear version 2.7+',
+        version: '0.1.0',
+        author: 'Gvx',
+        copyright: '© 2020 Gvx',
+        support: '',
+        license: 'http://www.gnu.org/licenses/old-licenses/gpl-2.0.html'
+    };
+    // -- INFORMATIONS BLOCK END ------------------------------------------------------
 
-	function copy(element, button) {
-		if (element) {
-			var range = document.createRange();
-			var selection = window.getSelection();
-			range.selectNode(element);
-			selection.removeAllRanges();
-			selection.addRange(range);
-			if (button) { button.classList.remove('copy_done'); }
-			if (document.execCommand('copy')) {
-				if (button) { button.classList.add('copy_done'); }
-			} else {
-				console.log('Erreur de copie de "' + element.id + '"');
-			}
-		}
-	}
+    function copy(element, button) {
+        if (element) {
+            var range = document.createRange();
+            var selection = window.getSelection();
+            range.selectNode(element);
+            selection.removeAllRanges();
+            selection.addRange(range);
+            if (button) { button.classList.remove('copy_done'); }
+            if (document.execCommand('copy')) {
+                if (button) { button.classList.add('copy_done'); }
+            } else {
+                console.log('Erreur de copie de "' + element.id + '"');
+            }
+        }
+    }
 
-	document.addEventListener('DOMContentLoaded', function() {
-		document.getElementById('copy_key_crypt').addEventListener('click', function() { copy(document.getElementById('key_crypt'), this); });
-		document.getElementById('copy_header_code').addEventListener('click', function() { copy(document.getElementById('header_code'), this); });
-		document.getElementById('copy_footer_code').addEventListener('click', function() { copy(document.getElementById('footer_code'), this); });
-	});
+    document.addEventListener('DOMContentLoaded', function() {
+        document.getElementById('copy_key_crypt').addEventListener('click', function() { copy(document.getElementById('key_crypt'), this); });
+        document.getElementById('copy_header_code').addEventListener('click', function() { copy(document.getElementById('header_code'), this); });
+        document.getElementById('copy_footer_code').addEventListener('click', function() { copy(document.getElementById('footer_code'), this); });
+    });
 
-}());
+}());