fix #18 und Bug bei EncNotesHistroy

KIMB-technologies · Feb 2, 2020 · c5d0434 · c5d0434
1 parent 7f954ab
commit c5d0434
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 latest
 1
 1.1
-1.1.5
+1.1.6
diff --git a/build/package-lock.json b/build/package-lock.json
diff --git a/build/package.json b/build/package.json
@@ -10,7 +10,7 @@
   "author": "kimbtech",
   "license": "GPL-3.0",
   "dependencies": {
-    "clean-css": "^4.1.9",
+    "clean-css": "^4.2.3",
     "uglify-es": "^3.3.1"
   }
 }
diff --git a/system/load/devjs/fun_maker.js b/system/load/devjs/fun_maker.js
@@ -9,9 +9,7 @@ function maker(noteid, notename, sharecont, savecallback, encrypted) {
 	if( typeof encrypted === "undefined" || encrypted !== true ){
 		encrypted = false;
 	}
-	if(encrypted){
-		$("button#publishnote").prop('disabled', true);
-	}
+	$("button#publishnote").prop('disabled', encrypted);
 
 	//	Erstelle zwei Variablen, die Zustand darstellen
 	if (typeof sharecont === "undefined") {
@@ -732,9 +730,16 @@ function maker(noteid, notename, sharecont, savecallback, encrypted) {
 						var key = $(this).attr('key');
 						var newtext = data.data[key]["text"];
 
+						if( encrypted ){
+							try {
+								newtext = systemEncrypter.decryptNote( newtext );
+							} catch (error) {
+								setTimeout( () => { errorMessage('Kann Verlauf nicht entschlüsseln!', 10); }, 200 );
+								return;
+							}
+						}
 						cm_editor.setValue(newtext);
 						$("div#historyManagerDialog").dialog("close");
-
 					});
 				}
 				else {

diff --git a/system/load/notes.min.js b/system/load/notes.min.js
diff --git a/system/php/systemInit.php b/system/php/systemInit.php
@@ -66,7 +66,7 @@ abstract class SystemInit{
 
 	//Sytemversion
 	//	[ Hauptversionsnummer, Unternummer, Patch, Zusatz (Alpha, Beta, Final) ] => [1, 23, 5, 'B'] -> 1.23.5 Beta
-	const SYSTEMVERSION = [ 1, 1, 4, 'Final' ];
+	const SYSTEMVERSION = [ 1, 1, 6, 'Final' ];
 
 	/*
 		Auslesen der Konfiguration
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
     latest
 .1
-.1.5
+.1.6