mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-10-04 23:22:24 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
4d43097961
|
@ -134,6 +134,7 @@
|
||||||
longer work.
|
longer work.
|
||||||
- clean up code for managing extensions
|
- clean up code for managing extensions
|
||||||
- fix renaming of folders via webdav
|
- fix renaming of folders via webdav
|
||||||
|
- fix list of expired documents on MyDocuments page
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
Changes in version 5.1.13
|
Changes in version 5.1.13
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
# Make sure settings.xml can not be opened from outside!
|
# Make sure settings.xml can not be opened from outside!
|
||||||
#Redirect /conf/settings.xml /index.php
|
# Deny all requests from Apache 2.4+.
|
||||||
<Files ~ "^settings\.xml">
|
<IfModule mod_authz_core.c>
|
||||||
Order allow,deny
|
Require all denied
|
||||||
Deny from all
|
</IfModule>
|
||||||
</Files>
|
|
||||||
|
# Deny all requests from Apache 2.0-2.2.
|
||||||
|
<IfModule !mod_authz_core.c>
|
||||||
|
Deny from all
|
||||||
|
</IfModule>
|
||||||
|
|
|
@ -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;
|
if ($reqversion<1) $reqversion=1;
|
||||||
|
|
||||||
$sequence = $_POST["sequence"];
|
$sequence = $_POST["sequence"];
|
||||||
|
|
|
@ -67,8 +67,7 @@ if(isset($_POST['categoryidform1'])) {
|
||||||
} else {
|
} else {
|
||||||
$categories = array();
|
$categories = array();
|
||||||
}
|
}
|
||||||
$sequence = isset($_POST["sequence"]) ? $_POST["sequence"] : "keep";
|
$sequence = isset($_POST["sequence"]) ? str_replace(',', '.', $_POST["sequence"]) : "keep";
|
||||||
$sequence = str_replace(',', '.', $_POST["sequence"]);
|
|
||||||
if (!is_numeric($sequence)) {
|
if (!is_numeric($sequence)) {
|
||||||
$sequence="keep";
|
$sequence="keep";
|
||||||
}
|
}
|
||||||
|
@ -77,6 +76,7 @@ if(isset($_POST["attributes"]))
|
||||||
else
|
else
|
||||||
$attributes = array();
|
$attributes = array();
|
||||||
|
|
||||||
|
if(isset($_POST['presetexpdate'])) {
|
||||||
switch($_POST["presetexpdate"]) {
|
switch($_POST["presetexpdate"]) {
|
||||||
case "date":
|
case "date":
|
||||||
$tmp = explode('-', $_POST["expdate"]);
|
$tmp = explode('-', $_POST["expdate"]);
|
||||||
|
@ -103,6 +103,9 @@ default:
|
||||||
$expires = null;
|
$expires = null;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
$expires = null;
|
||||||
|
}
|
||||||
|
|
||||||
$oldname = $document->getName();
|
$oldname = $document->getName();
|
||||||
$oldcomment = $document->getComment();
|
$oldcomment = $document->getComment();
|
||||||
|
|
|
@ -335,6 +335,7 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->contentSubHeading(getMLText("version_info"));
|
$this->contentSubHeading(getMLText("version_info"));
|
||||||
|
if(!$nodocumentformfields || !in_array('version', $nodocumentformfields)) {
|
||||||
$this->formField(
|
$this->formField(
|
||||||
getMLText("version"),
|
getMLText("version"),
|
||||||
array(
|
array(
|
||||||
|
@ -345,6 +346,7 @@ $(document).ready(function() {
|
||||||
'value'=>1
|
'value'=>1
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
$this->formField(
|
$this->formField(
|
||||||
getMLText("local_file"),
|
getMLText("local_file"),
|
||||||
$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '')
|
$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"));
|
$this->contentSubHeading(getMLText("add_document_notify"));
|
||||||
|
|
||||||
$options = array();
|
$options = array();
|
||||||
|
@ -781,6 +785,7 @@ $(document).ready(function() {
|
||||||
'options'=>$options
|
'options'=>$options
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_document'));
|
$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_document'));
|
||||||
?>
|
?>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -290,7 +290,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
|
||||||
-->
|
-->
|
||||||
<?php $this->showConfigHeadline('settings_Edition'); ?>
|
<?php $this->showConfigHeadline('settings_Edition'); ?>
|
||||||
<?php $this->showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?>
|
<?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_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?>
|
||||||
<?php $this->showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?>
|
<?php $this->showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?>
|
||||||
<?php $this->showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?>
|
<?php $this->showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?>
|
||||||
|
|
|
@ -358,7 +358,7 @@ console.log(element);
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$this->warningMsg(getMLText("add_doc_workflow_warning"));
|
$this->warningMsg(getMLText("add_doc_workflow_warning"));
|
||||||
} else {
|
} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
|
||||||
$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
|
$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
|
||||||
if($workflowmode == 'traditional') {
|
if($workflowmode == 'traditional') {
|
||||||
$this->contentSubHeading(getMLText("assign_reviewers"));
|
$this->contentSubHeading(getMLText("assign_reviewers"));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user