| ".getMLText('name')." | ".getMLText('file_size')." | ".getMLText('date')." | |
|---|---|---|---|
| ".getMLText('name')." | ".getMLText('filesize')." | ".getMLText('date')." | \n"; print " | ".getMLText("name")." | \n"; print "".getMLText("creation_date")." | \n"; - print "".getMLText("file_size")." | \n"; + print "".getMLText("filesize")." | \n"; print "\n"; print "\n\n\n"; $print_header=false; diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php index fa77b8083..ce6349bea 100644 --- a/views/bootstrap/class.ManageNotify.php +++ b/views/bootstrap/class.ManageNotify.php @@ -74,7 +74,9 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style { if(is_string($txt)) echo $txt; else { - echo $this->folderListRow($fld, true); + $extracontent = array(); + $extracontent['below_title'] = $this->getListRowPath($fld); + echo $this->folderListRow($fld, true, $extracontent); } print " | "; if ($deleteaction) print " ".getMLText("delete").""; @@ -113,7 +115,9 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style { if(is_string($txt)) echo $txt; else { - echo $this->documentListRow($doc, $previewer, true); + $extracontent = array(); + $extracontent['below_title'] = $this->getListRowPath($doc); + echo $this->documentListRow($doc, $previewer, true, 0, $extracontent); } print " | ";
if ($deleteaction) print " ".getMLText("delete")."";
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 6ebf8b171..d8f9f63ab 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -480,6 +480,7 @@ $(document).ready(function() {
$modifystartdate = $this->params['modifystartdate'];
$modifyenddate = $this->params['modifyenddate'];
$modified = $this->params['modified'];
+ $filesize = $this->params['filesize'];
$expstartdate = $this->params['expstartdate'];
$expenddate = $this->params['expenddate'];
$statusstartdate = $this->params['statusstartdate'];
@@ -907,6 +908,24 @@ $(document).ready(function() {
getMLText("modification_date")." (".getMLText('to').")",
$this->getDateChooser(!empty($modified['to']) ? getReadableDate($modified['to']) : null, "modified[to]", $this->params['session']->getLanguage())
);
+ $this->formField(
+ getMLText("filesize")." (".getMLText('from').")",
+ array(
+ 'element'=>'input',
+ 'type'=>'number',
+ 'name'=>'filesize[from]',
+ 'value'=>$filesize['from']
+ )
+ );
+ $this->formField(
+ getMLText("filesize")." (".getMLText('to').")",
+ array(
+ 'element'=>'input',
+ 'type'=>'number',
+ 'name'=>'filesize[to]',
+ 'value'=>$filesize['to']
+ )
+ );
if(!isset($facets['owner'])) {
$options = array();
foreach ($allUsers as $currUser) {
@@ -1028,7 +1047,7 @@ $(document).ready(function() {
$option[] = array(array('data-subtitle', $c.' ×'));
$options[] = $option;
}
- } elseif(substr($facetname, 0, 5) == 'attr_' || $facetname == 'created' || $facetname == 'modified') {
+ } elseif(substr($facetname, 0, 5) == 'attr_' || $facetname == 'created' || $facetname == 'modified' || $facetname == 'filesize') {
/* Do not even create a list of options, because it isn't used */
} else {
foreach($values as $v=>$c) {
@@ -1041,7 +1060,7 @@ $(document).ready(function() {
$options[] = $option;
}
}
- if(substr($facetname, 0, 5) != 'attr_' && $facetname != 'created' && $facetname != 'modified') {
+ if(substr($facetname, 0, 5) != 'attr_' && $facetname != 'created' && $facetname != 'modified' && $facetname != 'filesize') {
$this->formField(
getMLText($facetname),
array(
@@ -1258,6 +1277,14 @@ $(document).ready(function() {
$oldvalue = null;
}
break;
+ case 'filesize':
+ if(!empty($allparams[$facetname]['from']) || !empty($allparams[$facetname]['to'])) {
+ $oldvalue = $allparams[$facetname];
+ $oldtransval = $oldvalue; //$oldvalue['from'].' TO '.$oldvalue['to'];
+ } else {
+ $oldvalue = null;
+ }
+ break;
default:
$oldvalue = is_array($allparams[$facetname]) ? $allparams[$facetname] : [$allparams[$facetname]];
$oldtransval = $oldvalue;
@@ -1390,6 +1417,18 @@ $(document).ready(function() {
$this->printAccordion(getMLText('modification_date'), $content);
}
}
+ } elseif($facetname == 'filesize') {
+ if(empty($allparams[$facetname]['from']) && empty($allparams[$facetname]['to'])) {
+ $tt = array_keys($values);
+ $content = ' ';
+ $content .= ' from ';
+ $content .= '';
+ $content .= ' to ';
+ $content .= '';
+ $content .= '';
+ $content .= ' ';
+ $this->printAccordion(getMLText('filesize'), $content);
+ }
} else {
/* Further filter makes only sense if the facet has more than 1 value
* or in case of 1 value, if that value has a count < $total. That second
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 93e93b747..9481b9bd2 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1564,6 +1564,7 @@ function getOverallStatusIcon($status) { /* {{{ */
} /* }}} */
function printFileChooserJs() { /* {{{ */
+ $maxfilesize = $this->getParam('maxfilesize');
?>
$(document).ready(function() {
/* do not use bootstrap4 custom form element because it is difficult to localize
@@ -1579,6 +1580,19 @@ $(document).ready(function() {
var input = $(this),
numFiles = input.get(0).files ? input.get(0).files.length : 1,
label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
+
+ if(input.get(0).files[0].size > ) {
+ noty({
+ text: "",
+ type: 'error',
+ dismissQueue: true,
+ layout: 'topRight',
+ theme: 'defaultTheme',
+ timeout: 1500,
+ });
+ return;
+ }
+
input.trigger('fileselect', [numFiles, label]);
});
diff --git a/webdav/webdav.php b/webdav/webdav.php
index f6f950755..122c25482 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -207,6 +207,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
$this->logger->log('check_auth: type='.$type.', user='.$user.' authenticated', PEAR_LOG_INFO);
$this->user = $controller->getUser();
+ /* Get diskspace and quota for later PROPFIND calls */
$this->diskspace = $this->user->getUsedDiskSpace();
$this->quota = $this->user->getQuota();
if(!$this->user) {
|