Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Makefile

@@ -1,4 +1,4 @@
-VERSION=5.1.2
+VERSION=5.1.3
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -363,7 +363,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.2';
+			$this->version = '5.1.3';
 	} /* }}} */
 
 	/**

SeedDMS_Core/package.xml

@@ -1182,7 +1182,7 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
    </notes>
   </release>
   <release>
-   <date>2017-03-23</date>
+   <date>2017-07-11</date>
    <time>06:38:12</time>
    <version>
     <release>4.3.35</release>
@@ -1197,6 +1197,21 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
 do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set
    </notes>
   </release>
+  <release>
+   <date>2017-03-22</date>
+   <time>06:38:12</time>
+   <version>
+    <release>4.3.36</release>
+    <api>4.3.36</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+   </notes>
+  </release>
   <release>
    <date>2016-01-22</date>
    <time>14:34:58</time>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.2";
+	public $_number = "5.1.3";
 	private $_string = "SeedDMS";
 
 	function __construct() {

install/install.php

@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.1.2");
+define("SEEDDMS_VERSION", "5.1.3");
 
 require_once('../inc/inc.ClassSettings.php');
 

op/op.EditUserData.php

@@ -127,6 +127,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");

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);
+		},
 <?php
 		if($enablelargefileupload) {
 ?>

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("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		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: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>"

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("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-	?>
-	if ($("#comment").val() == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if ($("#keywords").val() == "") msg.push("<?php printMLText("js_no_keywords");?>");
-<?php
-	}
-?>
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		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({

views/bootstrap/class.EditFolder.php

@@ -35,37 +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("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-  	});
-		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: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>"

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("<?php printMLText("js_pwd_not_conf");?>");
-	if ($("#fullname").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if ($("#email").val() == "") msg.push("<?php printMLText("js_no_email");?>");
-//	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		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: "<?php printMLText("js_no_currentpwd");?>",
 			fullname: "<?php printMLText("js_no_name");?>",
 			email: {
 				required: "<?php printMLText("js_no_email");?>",