From b43200703bbd5c0911c66650285a457231c3a684 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 11 Jul 2017 18:12:31 +0200 Subject: [PATCH 1/6] start new version 4.3.36 --- Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 21 ++++++++++++++++++--- inc/inc.Version.php | 2 +- install/install.php | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 66711f42a..6e54b8d05 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.3.35 +VERSION=4.3.36 SRC=CHANGELOG inc conf utils index.php languages views op out doc styles LICENSE webdav install restapi pdfviewer # webapp diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 37215e77b..f7fb9cfca 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -307,7 +307,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '4.3.35'; + $this->version = '4.3.36'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 9700a6a6b..9ebf58ec8 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -15,8 +15,8 @@ 2017-03-22 - 4.3.35 - 4.3.35 + 4.3.36 + 4.3.36 stable @@ -24,7 +24,6 @@ GPL License -do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set @@ -1141,5 +1140,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document + + 2017-07-11 + + + 4.3.35 + 4.3.35 + + + stable + stable + + GPL License + +do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 61bf92141..d0a7b4d5d 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "4.3.35"; + public $_number = "4.3.36"; private $_string = "SeedDMS"; function __construct() { diff --git a/install/install.php b/install/install.php index 6a04997dc..aed5f135c 100644 --- a/install/install.php +++ b/install/install.php @@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.3.35"); +define("SEEDDMS_VERSION", "4.3.36"); require_once('../inc/inc.ClassSettings.php'); From f1cfa81c39ee0027cba6787906b5b84f137496a8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jul 2017 08:49:50 +0200 Subject: [PATCH 2/6] set splash messages after succesful saving the data --- op/op.EditUserData.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op/op.EditUserData.php b/op/op.EditUserData.php index 7140598b0..334319d7b 100644 --- a/op/op.EditUserData.php +++ b/op/op.EditUserData.php @@ -125,6 +125,8 @@ if (isset($_FILES["userfile"]) && is_uploaded_file($_FILES["userfile"]["tmp_name $user->setImage($_FILES["userfile"]["tmp_name"], $_FILES["userfile"]["type"]); } +$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_save_user_data'))); + add_log_line("?user=".$user->getLogin()); header("Location:../out/out.MyAccount.php"); From 7bc2b140b991002761e6f9542c83800f1affa5b5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jul 2017 08:50:39 +0200 Subject: [PATCH 3/6] validate current password, set highlight and unhiglight functions remove old js code --- views/bootstrap/class.EditUserData.php | 38 +++++++------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php index af6ccd32a..aea65afa6 100644 --- a/views/bootstrap/class.EditUserData.php +++ b/views/bootstrap/class.EditUserData.php @@ -34,35 +34,7 @@ class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ header('Content-Type: application/javascript'); ?> -function checkForm() -{ - msg = new Array(); - if ($("#pwd").val() != $("#pwdconf").val()) msg.push(""); - if ($("#fullname").val() == "") msg.push(""); - if ($("#email").val() == "") msg.push(""); -// if (document.form1.comment.value == "") msg.push(""); - if (msg != "") { - noty({ - text: msg.join('
'), - type: 'error', - dismissQueue: true, - layout: 'topRight', - theme: 'defaultTheme', - _timeout: 1500, - }); - return false; - } - else - return true; -} - $(document).ready( function() { -/* - $('body').on('submit', '#form', function(ev){ - if(checkForm()) return; - ev.preventDefault(); - }); -*/ $("#form").validate({ invalidHandler: function(e, validator) { noty({ @@ -74,7 +46,16 @@ $(document).ready( function() { timeout: 1500, }); }, + highlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(validClass).addClass(errorClass); + }, + unhighlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(errorClass).addClass(validClass); + }, rules: { + currentpwd: { + required: true + }, fullname: { required: true }, @@ -87,6 +68,7 @@ $(document).ready( function() { } }, messages: { + currentpwd: "", fullname: "", email: { required: "", From a34d2d8855d060f9b856febf813e7ee3860ced49 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jul 2017 08:51:32 +0200 Subject: [PATCH 4/6] set highlight and unhighligth functions in validator --- views/bootstrap/class.AddFile.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php index 063daaf60..a5e9843de 100644 --- a/views/bootstrap/class.AddFile.php +++ b/views/bootstrap/class.AddFile.php @@ -68,6 +68,12 @@ $(document).ready( function() { timeout: 1500, }); }, + highlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(validClass).addClass(errorClass); + }, + unhighlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(errorClass).addClass(validClass); + }, From 24e34184e8f40f6174ac13d062cb104ca9985b95 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jul 2017 08:52:01 +0200 Subject: [PATCH 5/6] set highlight and unhighligth functions in validato, remove old js code --- views/bootstrap/class.AddSubFolder.php | 36 +++++-------------------- views/bootstrap/class.EditDocument.php | 34 ----------------------- views/bootstrap/class.EditFolder.php | 37 +++++--------------------- 3 files changed, 12 insertions(+), 95 deletions(-) diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php index 105a1145c..c7c142ca3 100644 --- a/views/bootstrap/class.AddSubFolder.php +++ b/views/bootstrap/class.AddSubFolder.php @@ -35,37 +35,7 @@ class SeedDMS_View_AddSubFolder extends SeedDMS_Bootstrap_Style { $strictformcheck = $this->params['strictformcheck']; header('Content-Type: application/javascript'); ?> -function checkForm() -{ - msg = new Array(); - if (document.form1.name.value == "") msg.push(""); - - if (document.form1.comment.value == "") msg.push(""); - - if (msg != "") { - noty({ - text: msg.join('
'), - type: 'error', - dismissQueue: true, - layout: 'topRight', - theme: 'defaultTheme', - _timeout: 1500, - }); - return false; - } - else - return true; -} $(document).ready( function() { -/* $('body').on('submit', '#form1', function(ev){ - if(checkForm()) return; - ev.preventDefault(); - }); -*/ $("#form1").validate({ invalidHandler: function(e, validator) { noty({ @@ -77,6 +47,12 @@ $(document).ready( function() { timeout: 1500, }); }, + highlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(validClass).addClass(errorClass); + }, + unhighlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(errorClass).addClass(validClass); + }, messages: { name: "", comment: "" diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index b7832b542..4dbcefbfa 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -36,41 +36,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style { header('Content-Type: application/javascript'); $this->printKeywordChooserJs('form1'); ?> -function checkForm() -{ - msg = new Array(); - if ($("#name").val() == "") msg.push(""); - - if ($("#comment").val() == "") msg.push(""); - if ($("#keywords").val() == "") msg.push(""); - - if (msg != "") - { - noty({ - text: msg.join('
'), - type: 'error', - dismissQueue: true, - layout: 'topRight', - theme: 'defaultTheme', - _timeout: 1500, - }); - return false; - } - else - return true; -} - $(document).ready( function() { -/* - $('body').on('submit', '#form1', function(ev){ - if(checkForm()) return; - ev.preventDefault(); - }); -*/ $("#form1").validate({ invalidHandler: function(e, validator) { noty({ diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index 7c403dbd7..04c5fee63 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -35,38 +35,7 @@ class SeedDMS_View_EditFolder extends SeedDMS_Bootstrap_Style { $strictformcheck = $this->params['strictformcheck']; header('Content-Type: application/javascript; charset=UTF-8'); ?> -function checkForm() -{ - msg = new Array(); - if (document.form1.name.value == "") msg.push(""); - - if (document.form1.comment.value == "") msg.push(""); - - if (msg != "") { - noty({ - text: msg.join('
'), - type: 'error', - dismissQueue: true, - layout: 'topRight', - theme: 'defaultTheme', - _timeout: 1500, - }); - return false; - } - else - return true; -} $(document).ready(function() { -/* - $('body').on('submit', '#form1', function(ev){ - if(checkForm()) return; - ev.preventDefault(); - }); -*/ $("#form1").validate({ invalidHandler: function(e, validator) { noty({ @@ -78,6 +47,12 @@ $(document).ready(function() { timeout: 1500, }); }, + highlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(validClass).addClass(errorClass); + }, + unhighlight: function(e, errorClass, validClass) { + $(e).parent().parent().removeClass(errorClass).addClass(validClass); + }, messages: { name: "", comment: "" From afbb166505bf68070f36de49fd417b25b1a8b2da Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jul 2017 17:52:16 +0200 Subject: [PATCH 6/6] add 4.3.36 to list of releases --- SeedDMS_Core/package.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 49a844d47..dfc1cabb6 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -1196,6 +1196,22 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document GPL License +do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set + + + + 2017-03-22 + + + 4.3.36 + 4.3.36 + + + stable + stable + + GPL License +