gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 21:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2022-05-03 08:13:36 +02:00
commit bef41ad838
8 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
inc/inc.Utils.php
View File

@ -66,11 +66,22 @@ function getReadableDate($timestamp=0) { /* {{{ */
return date("Y-m-d", $timestamp); return date("Y-m-d", $timestamp);
} /* }}} */ } /* }}} */
function getLongReadableDate($timestamp) { /* {{{ */ /**
* Return a human readable date and time string
*
* See note for getReadableDate()
*/
function getLongReadableDate($timestamp=0) { /* {{{ */
global $settings; global $settings;
if(!is_numeric($timestamp)) if($timestamp === 0)
$timestamp = time();
elseif($timestamp && is_numeric($timestamp))
;
elseif($timestamp && is_string($timestamp))
$timestamp = strtotime($timestamp); $timestamp = strtotime($timestamp);
if($settings->_datetimeformat) elseif(!is_numeric($timestamp))
return '';
if($settings->_dateformat)
return date($settings->_datetimeformat, $timestamp); return date($settings->_datetimeformat, $timestamp);
else else
return date("Y-m-d H:i:s", $timestamp); return date("Y-m-d H:i:s", $timestamp);

14
views/bootstrap/class.ClearCache.php
View File

@ -41,15 +41,13 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("clear_cache")); $this->contentHeading(getMLText("clear_cache"));
$this->contentContainerStart('warning'); $this->warningMsg(getMLText("confirm_clear_cache", array('cache_dir'=>$cachedir)));
?> ?>
<form action="../op/op.ClearCache.php" name="form1" method="post"> <form action="../op/op.ClearCache.php" name="form1" method="post">
<?php echo createHiddenFieldWithKey('clearcache'); ?> <?php echo createHiddenFieldWithKey('clearcache'); ?>
<p> <?php
<?php printMLText("confirm_clear_cache", array('cache_dir'=>$cachedir));?> $this->contentContainerStart('warning');
</p> ?>
<p>
<input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images'); ?> <input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images'); ?>
</p> </p>
<p> <p>
@ -60,11 +58,11 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
foreach($addcache as $c) foreach($addcache as $c)
echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>"; echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
} }
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('clear_cache'), '', '', 'danger');
?> ?>
<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
</form> </form>
<?php <?php
$this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

4
views/bootstrap/class.ImportFS.php
View File

@ -52,8 +52,8 @@ class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {
if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) { if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
$this->warningMsg(getMLText("import_fs_warning")); $this->warningMsg(getMLText("import_fs_warning"));
$this->contentContainerStart();
print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">"; print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
$this->contentContainerStart();
$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE)); $this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE));
$this->formField( $this->formField(
getMLText("dropfolder_folder"), getMLText("dropfolder_folder"),
@ -90,9 +90,9 @@ class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {
'value'=>'1' 'value'=>'1'
) )
); );
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import')); $this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
print "</form>\n"; print "</form>\n";
$this->contentContainerEnd();
} else { } else {
$this->warningMsg(getMLText("dropfolderdir_missing")); $this->warningMsg(getMLText("dropfolderdir_missing"));
} }

4
views/bootstrap/class.ImportUsers.php
View File

@ -53,8 +53,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
$this->rowStart(); $this->rowStart();
$this->columnStart(4); $this->columnStart(4);
$this->contentContainerStart();
print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">"; print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">";
$this->contentContainerStart();
$this->formField( $this->formField(
getMLText("userdata_file"), getMLText("userdata_file"),
$this->getFileChooserHtml('userdata', false) $this->getFileChooserHtml('userdata', false)
@ -77,9 +77,9 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
'value'=>'1' 'value'=>'1'
) )
); );
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import')); $this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
print "</form>\n"; print "</form>\n";
$this->contentContainerEnd();
$this->columnEnd(); $this->columnEnd();
$this->columnStart(8); $this->columnStart(8);

2
views/bootstrap/class.UsrMgr.php
View File

@ -232,6 +232,8 @@ $(document).ready( function() {
if($accessobject->check_controller_access('UsrMgr', ['action'=>'sendlogindata'])) if($accessobject->check_controller_access('UsrMgr', ['action'=>'sendlogindata']))
if($enableemail) if($enableemail)
$button['menuitems'][] = array('label'=>'<i class="fa fa-envelope-o"></i> '.getMLText("send_login_data"), 'link'=>'../out/out.SendLoginData.php?userid='.$seluser->getID()); $button['menuitems'][] = array('label'=>'<i class="fa fa-envelope-o"></i> '.getMLText("send_login_data"), 'link'=>'../out/out.SendLoginData.php?userid='.$seluser->getID());
if($this->hasHook('actionMenu'))
$button['menuitems'] = $this->callHook('actionMenu', $seluser, $button['menuitems']);
self::showButtonwithMenu($button); self::showButtonwithMenu($button);
} }
} /* }}} */ } /* }}} */

10
views/bootstrap/class.ViewDocument.php
View File

@ -584,7 +584,9 @@ $(document).ready( function() {
case 'application/pdf': case 'application/pdf':
$this->contentHeading(getMLText("preview")); $this->contentHeading(getMLText("preview"));
?> ?>
<iframe src="<?= $settings->_httpRoot ?>pdfviewer/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe> <div style="width:100%; height: 0; position:relative; padding-top: 141%;">
<iframe src="<?= $settings->_httpRoot ?>pdfviewer/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="100%" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width: 100%; height: 100%"></iframe>
</div>
<?php <?php
break; break;
case 'image/svg+xml': case 'image/svg+xml':
@ -619,7 +621,9 @@ $(document).ready( function() {
if($pdfpreviewer->hasConverter($latestContent->getMimeType())) { if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
$this->contentHeading(getMLText("preview_pdf")); $this->contentHeading(getMLText("preview_pdf"));
?> ?>
<iframe src="<?= $settings->_httpRoot ?>pdfviewer/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.PdfPreview.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe> <div style="width:100%; height: 0; position:relative; padding-top: 141%;">
<iframe src="<?= $settings->_httpRoot ?>pdfviewer/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.PdfPreview.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="700px" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width: 100%; height: 100%"></iframe>
</div>
<?php <?php
} }
} }
@ -1939,7 +1943,7 @@ $(document).ready( function() {
print getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName()); print getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL )) { if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL )) {
print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no")); print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
print "<form action=\"".$this->params['settings']->_httpRoot."op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-danger btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>"; print "<form action=\"".$this->params['settings']->_httpRoot."op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
} }
print "</span></td>"; print "</span></td>";
echo $this->documentListRowEnd($sourceDoc); echo $this->documentListRowEnd($sourceDoc);

3
views/bootstrap/styles/application.css
View File

@ -20,6 +20,9 @@
#login_wrapper { #login_wrapper {
width: 100%; width: 100%;
} }
legend { /* to prevent overlong filenames from cause horiz. scroll */
overflow: hidden;
}
} }
img.mimeicon { img.mimeicon {
-moz-border-bottom-colors: none; -moz-border-bottom-colors: none;

3
views/bootstrap4/styles/application.css
View File

@ -9,6 +9,9 @@ body { /* Add top padding for full-width layout */
#login_wrapper { #login_wrapper {
width: 100%; width: 100%;
} }
legend { /* to prevent overlong filenames from cause horiz. scroll */
overflow: hidden;
}
} }
a.navbar-brand img { a.navbar-brand img {