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

2024-10-04 15:12:30 +00:00 · 2022-05-03 08:13:36 +02:00 · 2022-05-03 08:13:36 +02:00 · bef41ad838
commit bef41ad838
parent 939a7dbce2 da17e00422
8 changed files with 39 additions and 18 deletions
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@ -66,11 +66,22 @@ function getReadableDate($timestamp=0) { /* {{{ */
 		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;
-	if(!is_numeric($timestamp))
+	if($timestamp === 0)
+		$timestamp = time();
+	elseif($timestamp && is_numeric($timestamp))
+		;
+	elseif($timestamp && is_string($timestamp))
 		$timestamp = strtotime($timestamp);
-	if($settings->_datetimeformat)
+	elseif(!is_numeric($timestamp))
+		return '';
+	if($settings->_dateformat)
 		return date($settings->_datetimeformat, $timestamp);
 	else
 		return date("Y-m-d H:i:s", $timestamp);
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@ -41,15 +41,13 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$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">
 <?php echo createHiddenFieldWithKey('clearcache'); ?>
-<p>
-<?php printMLText("confirm_clear_cache", array('cache_dir'=>$cachedir));?>
-</p>
-<p>
+<?php
+		$this->contentContainerStart('warning');
+?>
 <input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images'); ?>
 </p>
 <p>
@ -60,11 +58,11 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 			foreach($addcache as $c)
 				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>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@ -52,8 +52,8 @@ class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {

 		if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
 			$this->warningMsg(getMLText("import_fs_warning"));
-			$this->contentContainerStart();
 			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("dropfolder_folder"),
@ -90,9 +90,9 @@ class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {
 					'value'=>'1'
 				)
 			);
+			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 			print "</form>\n";
-			$this->contentContainerEnd();
 		} else {
 			$this->warningMsg(getMLText("dropfolderdir_missing"));
 		}
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@ -53,8 +53,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {

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

 		$this->columnEnd();
 		$this->columnStart(8);
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@ -232,6 +232,8 @@ $(document).ready( function() {
 			if($accessobject->check_controller_access('UsrMgr', ['action'=>'sendlogindata']))
 				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());
+			if($this->hasHook('actionMenu'))
+				$button['menuitems'] = $this->callHook('actionMenu', $seluser, $button['menuitems']);
 			self::showButtonwithMenu($button);
 		}
 	} /* }}} */
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@ -584,7 +584,9 @@ $(document).ready( function() {
 				case 'application/pdf':
 					$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
 					break;
 				case 'image/svg+xml':
@ -619,7 +621,9 @@ $(document).ready( function() {
 				if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
 					$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
 				}
 			}
@ -1939,7 +1943,7 @@ $(document).ready( function() {
 				print getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL )) {
 					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>";
 				echo $this->documentListRowEnd($sourceDoc);
--- a/views/bootstrap/styles/application.css
+++ b/views/bootstrap/styles/application.css
@ -20,6 +20,9 @@
 	#login_wrapper {
 		width: 100%;
 	}
+	legend { /* to prevent overlong filenames from cause horiz. scroll */
+		overflow: hidden;
+	}
 }
 img.mimeicon {
  -moz-border-bottom-colors: none;
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@ -9,6 +9,9 @@ body { /* Add top padding for full-width layout */
 	#login_wrapper {
 		width: 100%;
 	}
+	legend { /* to prevent overlong filenames from cause horiz. scroll */
+		overflow: hidden;
+	}
 }

 a.navbar-brand img {