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

CHANGELOG

@@ -134,6 +134,7 @@
   longer work.
 - clean up code for managing extensions
 - fix renaming of folders via webdav
+- fix list of expired documents on MyDocuments page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.13

conf/.htaccess

@@ -1,6 +1,10 @@
 # Make sure settings.xml can not be opened from outside!
-#Redirect /conf/settings.xml /index.php
-<Files ~ "^settings\.xml">
-Order allow,deny
-Deny from all
-</Files>
+# Deny all requests from Apache 2.4+.
+<IfModule mod_authz_core.c>
+      Require all denied
+</IfModule>
+
+# Deny all requests from Apache 2.0-2.2.
+<IfModule !mod_authz_core.c>
+    Deny from all
+</IfModule>

op/op.AddDocument.php

@@ -125,7 +125,7 @@ foreach($attributes_version as $attrdefid=>$attribute) {
 }
  */
 
-$reqversion = (int)$_POST["reqversion"];
+$reqversion = !empty($_POST['reqversion']) ? (int)$_POST["reqversion"] : 0;
 if ($reqversion<1) $reqversion=1;
 
 $sequence = $_POST["sequence"];

op/op.EditDocument.php

@@ -67,8 +67,7 @@ if(isset($_POST['categoryidform1'])) {
 } else {
 	$categories = array();
 }
-$sequence = isset($_POST["sequence"]) ? $_POST["sequence"] : "keep";
-$sequence = str_replace(',', '.', $_POST["sequence"]);
+$sequence = isset($_POST["sequence"]) ? str_replace(',', '.', $_POST["sequence"]) : "keep";
 if (!is_numeric($sequence)) {
 	$sequence="keep";
 }
@@ -77,6 +76,7 @@ if(isset($_POST["attributes"]))
 else
 	$attributes = array();
 
+if(isset($_POST['presetexpdate'])) {
 switch($_POST["presetexpdate"]) {
 case "date":
 	$tmp = explode('-', $_POST["expdate"]);
@@ -103,6 +103,9 @@ default:
 	$expires = null;
 	break;
 }
+} else {
+	$expires = null;
+}
 
 $oldname = $document->getName();
 $oldcomment = $document->getComment();

views/bootstrap/class.AddDocument.php

@@ -335,6 +335,7 @@ $(document).ready(function() {
 		}
 
 		$this->contentSubHeading(getMLText("version_info"));
+		if(!$nodocumentformfields || !in_array('version', $nodocumentformfields)) {
 		$this->formField(
 			getMLText("version"),
 			array(
@@ -345,6 +346,7 @@ $(document).ready(function() {
 				'value'=>1
 			)
 		);
+		}
 		$this->formField(
 			getMLText("local_file"),
 			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '')
@@ -745,6 +747,8 @@ $(document).ready(function() {
 			);
 
 		}
+
+		if(!$nodocumentformfields || !in_array('notification', $nodocumentformfields)) {
 		$this->contentSubHeading(getMLText("add_document_notify"));
 
 		$options = array();
@@ -781,6 +785,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
+		}
 		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_document'));
 ?>
 		</form>

views/bootstrap/class.Settings.php

@@ -290,7 +290,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
       -->
 <?php $this->showConfigHeadline('settings_Edition'); ?>
 <?php $this->showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?>
-<?php $this->showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment'), true, true); ?>
+<?php $this->showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version', 'version_comment', 'notification'), true, true); ?>
 <?php $this->showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?>
 <?php $this->showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?>
 <?php $this->showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?>

views/bootstrap/class.UpdateDocument.php

@@ -358,7 +358,7 @@ console.log(element);
 				);
 			}
 			$this->warningMsg(getMLText("add_doc_workflow_warning"));
-		} else {
+		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 			if($workflowmode == 'traditional') {
 				$this->contentSubHeading(getMLText("assign_reviewers"));