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

CHANGELOG

@@ -225,6 +225,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.26
 --------------------------------------------------------------------------------
+- add hook additionalDocumentContentInfo
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.25

SeedDMS_Core/Core/inc.ClassUser.php

@@ -950,12 +950,31 @@ class SeedDMS_Core_User { /* {{{ */
 	 * happen if the new user has at least read access on the document. If not,
 	 * the document will be skipped and remained unchanged.
 	 *
+	 * This removal from processes will also take place for older versions of a document.
+	 *
+	 * This methode was initialy added to remove a user (which is going to be deleted
+	 * afterwards) from all processes he or she is still involved in.
+	 *
+	 * If a new user is passed, then this user will be added as a new reviewer, approver, etc.
+	 * Hence, this method does not replace the old user but actually deletes the old user and
+	 * adds a new one. Adding the new reviewer, approver, etc. will also be done for old versions
+	 * of a document. The same operation could be archieved by first calling
+	 * SeedDMS_Core_DocumentVersion::delIndReviewer() followed by SeedDMS_Core_DocumentVersion::addIndReviewer()
+	 * but this would require to do for each version of a document and the operation would not
+	 * be in a single transaction.
+	 *
+	 * A new user is only added if the process (review, approval, etc.) is still in its initial
+	 * state (have not been reviewed/approved or rejected). Unlike the removal of the user (see above).
+	 *
+	 * If a new user is given but has no read access on the document the transfer for that
+	 * particular document will be skipped. Not even the removal of the user will take place.
+	 * 
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
 	 * @param array $states remove user only from reviews/approvals in one of the states
 	 *        e.g. if passing array('review'=>array(0)), the method will operate on
 	 *        reviews which has not been touched yet.
-	 * @param object user who is take over the processes
+	 * @param object user who takes over the processes
 	 * @return boolean true on success or false in case of an error
 	 */
 	private function __removeFromProcesses($user, $states = array(), $newuser=null) { /* {{{ */
@@ -1104,6 +1123,7 @@ class SeedDMS_Core_User { /* {{{ */
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
 	 * @param array $states remove user only from reviews/approvals in one of the states
+	 * @param object user who takes over the processes
 	 * @return boolean true on success or false in case of an error
 	 */
 	public function removeFromProcesses($user, $states=array(), $newuser=null) { /* {{{ */

views/bootstrap/class.RemoveUserFromProcesses.php

@@ -278,9 +278,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("rm_user_from_processes"));
 
-		$this->warningMsg(getMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName()))));
 		$this->rowStart();
 		$this->columnStart(4);
+		$this->warningMsg(getMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName()))));
 
 		$reviewStatus = $rmuser->getReviewStatus();
 		$tmpr = array();

views/bootstrap/class.ViewDocument.php

@@ -113,6 +113,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					}
 				}
 			}
+			$arrarr = $this->callHook('additionalDocumentContentInfo', $version);
+			if(is_array($arrarr)) {
+				foreach($arrarr as $arr) {
+					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+				}
+			} elseif(is_string($arrarr)) {
+				echo $arrarr;
+			}
 	} /* }}} */
 
 	function documentListItem() { /* {{{ */
@@ -1691,7 +1699,7 @@ $(document).ready( function() {
 ?>
 				<div class="alert alert-warning">
 <?php
-				print getMLText('revise_document_on', array('date' => substr($latestContent->getRevisionDate(), 0, 10)));
+				print getMLText('revise_document_on', array('date' => getReadableDate($latestContent->getRevisionDate())));
 ?>
 				</div>
 <?php