From 739b6fb9a9a60c215906e55fbfe0cbb46533b8e6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 17:16:04 +0200 Subject: [PATCH] use documentListRow() in all lists --- views/bootstrap/class.MyDocuments.php | 588 ++++++-------------------- 1 file changed, 137 insertions(+), 451 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index b68601e50..5fae130d4 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -57,6 +57,8 @@ $(document).ready( function() { function listReviews() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -68,7 +70,7 @@ $(document).ready( function() { // Get document list for the current user. $reviewStatus = $user->getReviewStatus(); - $resArr = $dms->getDocumentList('AppRevByMe', $user); + $resArr = $dms->getDocumentList('AppRevByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -84,20 +86,11 @@ $(document).ready( function() { */ $docIdx = array(); foreach ($resArr as $res) { - - /* verify expiry */ - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - $docIdx[$res["id"]][$res["version"]] = $res; } // List the documents for which a review has been requested. $this->contentHeading(getMLText("documents_to_review")); - // $this->contentContainerStart(); $printheader=true; $iRev = array(); $dList = array(); @@ -113,30 +106,17 @@ $(document).ready( function() { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"]).""; - print "".$st["version"].""; - print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) .""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -152,30 +132,17 @@ $(document).ready( function() { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"]).""; - print "".$st["version"].""; - print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]).""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -184,7 +151,6 @@ $(document).ready( function() { }else{ printMLText("no_docs_to_review"); } -// $this->contentContainerEnd(); } else { $this->contentHeading(getMLText("documents_to_review")); $this->contentContainerStart(); @@ -197,6 +163,8 @@ $(document).ready( function() { function listApprovals() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -207,7 +175,7 @@ $(document).ready( function() { $approvalStatus = $user->getApprovalStatus(); - $resArr = $dms->getDocumentList('AppRevByMe', $user); + $resArr = $dms->getDocumentList('AppRevByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -223,20 +191,11 @@ $(document).ready( function() { */ $docIdx = array(); foreach ($resArr as $res) { - - /* verify expiry */ - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - $docIdx[$res["id"]][$res["version"]] = $res; } // List the documents for which an approval has been requested. $this->contentHeading(getMLText("documents_to_approve")); - $this->contentContainerStart(); $printheader=true; foreach ($approvalStatus["indstatus"] as $st) { @@ -250,30 +209,17 @@ $(document).ready( function() { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"]).""; - print "".$st["version"].""; - print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]).""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -287,30 +233,17 @@ $(document).ready( function() { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"]).""; - print "".$st["version"].""; - print "".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]).""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -319,7 +252,6 @@ $(document).ready( function() { }else{ printMLText("no_docs_to_approve"); } - $this->contentContainerEnd(); } else { $this->contentHeading(getMLText("documents_to_approve")); @@ -333,6 +265,8 @@ $(document).ready( function() { function listDocsToLookAt() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $workflowmode = $this->params['workflowmode']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; @@ -346,7 +280,7 @@ $(document).ready( function() { /* Get list of documents owned by current user that are * pending review or pending approval. */ - $resArr = $dms->getDocumentList('AppRevOwner', $user); + $resArr = $dms->getDocumentList('AppRevOwner', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -355,56 +289,33 @@ $(document).ready( function() { } $this->contentHeading(getMLText("documents_user_requiring_attention")); -// $this->contentContainerStart(); if (count($resArr)>0) { print ""; print "\n\n"; print ""; - print "\n"; + print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); $document->verifyLastestContentExpriry(); - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - - if($content = $document->getContentByVersion($res['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print "\n"; - print ""; - print ""; - print ""; - print ""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $res['version']); } } print "
".getMLText("name")."".getMLText("name")." ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '' : '') : '')." / ".getMLText("last_update")." ".($orderby == 'u' ? ($orderdir == 'desc' ? '' : '') : '')." / ".getMLText("expires")." ".($orderby == 'e' ? ($orderdir == 'desc' ? '' : '') : '')."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "" . htmlspecialchars($res["name"]) . "".getOverallStatusText($res["status"])."".$res["version"]."".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("no_docs_to_look_at"); - -// $this->contentContainerEnd(); } else { - $resArr = $dms->getDocumentList('WorkflowOwner', $user); + $resArr = $dms->getDocumentList('WorkflowOwner', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer("Internal error. Unable to complete request. Exiting."); @@ -413,7 +324,6 @@ $(document).ready( function() { } $this->contentHeading(getMLText("documents_user_requiring_attention")); -// $this->contentContainerStart(); if (count($resArr)>0) { print ""; @@ -421,46 +331,24 @@ $(document).ready( function() { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); $document->verifyLastestContentExpriry(); - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - - if($content = $document->getContentByVersion($res['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print "\n"; - print ""; - print ""; - print ""; - print ""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $res['version']); } } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "" . htmlspecialchars($res["name"]) . "".getOverallStatusText($res["status"])."".$res["version"]."".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("no_docs_to_look_at"); - -// $this->contentContainerEnd(); } } /* }}} */ @@ -479,7 +367,7 @@ $(document).ready( function() { $previewer->setConverters($previewconverters); /* Get list of documents owned by current user */ - $resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir == 'desc' ? 'desc' : ''); + $resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -488,14 +376,13 @@ $(document).ready( function() { } $this->contentHeading(getMLText("all_documents")); -// $this->contentContainerStart(); if (count($resArr)>0) { print ""; print "\n\n"; print ""; - print "\n"; + print "\n"; print "\n"; print "\n"; print "\n\n\n"; @@ -510,45 +397,17 @@ $(document).ready( function() { else { echo $this->documentListRow($document, $previewer, false, $res['version']); } - -if(0) { - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - - if($content = $document->getContentByVersion($res['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print "\n"; - print ""; - print ""; - print ""; - //print ""; - print ""; - print "\n"; - } -} } print "
".getMLText("name")." / ".getMLText("last_update")." / ".getMLText("expires")."".getMLText("name")." ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '' : '') : '')." / ".getMLText("last_update")." ".($orderby == 'u' ? ($orderdir == 'desc' ? '' : '') : '')." / ".getMLText("expires")." ".($orderby == 'e' ? ($orderdir == 'desc' ? '' : '') : '')."".getMLText("status")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "" . htmlspecialchars($res["name"]) . "".getOverallStatusText($res["status"])."".$res["version"]."".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; } else printMLText("empty_notify_list"); - -// $this->contentContainerEnd(); } /* }}} */ function listWorkflow() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -560,7 +419,7 @@ if(0) { // Get document list for the current user. $workflowStatus = $user->getWorkflowStatus(); - $resArr = $dms->getDocumentList('WorkflowByMe', $user); + $resArr = $dms->getDocumentList('WorkflowByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -575,20 +434,11 @@ if(0) { // new document information is required. $docIdx = array(); foreach ($resArr as $res) { - - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_IN_WORKFLOW ){ - $res["status"]=S_EXPIRED; - } - } - $docIdx[$res["id"]][$res["version"]] = $res; } // List the documents where a review has been requested. $this->contentHeading(getMLText("documents_to_process")); -// $this->contentContainerStart(); $printheader=true; $iRev = array(); @@ -605,30 +455,17 @@ if(0) { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"]).""; - print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"]).""; - print "".$st["version"].""; - print "".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) .""; - print "".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -644,30 +481,17 @@ if(0) { print "\n\n"; print "\n"; print "".getMLText("name")."\n"; - print "".getMLText("owner")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("status")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"]).""; - print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"]).""; - print "".$st["version"].""; - print "".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]).""; - print "".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -676,7 +500,6 @@ if(0) { }else{ printMLText("no_docs_to_check"); } -// $this->contentContainerEnd(); } } /* }}} */ @@ -684,6 +507,8 @@ if(0) { function listRevisions() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -695,7 +520,7 @@ if(0) { // Get document list for the current user. $revisionStatus = $user->getRevisionStatus(); - $resArr = $dms->getDocumentList('ReviseByMe', $user); + $resArr = $dms->getDocumentList('ReviseByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -710,15 +535,10 @@ if(0) { */ $docIdx = array(); foreach ($resArr as $res) { - /* verify expiry */ - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - $res["status"]=S_EXPIRED; - } $docIdx[$res["id"]][$res["version"]] = $res; } $this->contentHeading(getMLText("documents_to_revise")); -// $this->contentContainerStart(); $printheader=true; $iRev = array(); $dList = array(); @@ -727,36 +547,24 @@ if(0) { if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print ""; print "\n\n"; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print ""; - print ""; - print ""; - print ""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -765,36 +573,24 @@ if(0) { if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
".getMLText("name")."".getMLText("owner")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("status")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."".$st["version"]."".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."
"; print "\n\n"; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print ""; - print ""; - print ""; - print ""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -803,7 +599,6 @@ if(0) { }else{ printMLText("no_docs_to_revise"); } -// $this->contentContainerEnd(); } else { $this->contentHeading(getMLText("documents_to_revise")); @@ -816,6 +611,8 @@ if(0) { function listReceipts() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -825,7 +622,7 @@ if(0) { $previewer->setConverters($previewconverters); $receiptStatus = $user->getReceiptStatus(); - $resArr = $dms->getDocumentList('ReceiptByMe', $user); + $resArr = $dms->getDocumentList('ReceiptByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -841,14 +638,9 @@ if(0) { */ $docIdx = array(); foreach ($resArr as $res) { - /* verify expiry */ - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - $res["status"]=S_EXPIRED; - } $docIdx[$res["id"]][$res["version"]] = $res; } $this->contentHeading(getMLText("documents_to_receipt")); -// $this->contentContainerStart(); $printheader=true; $iRev = array(); $dList = array(); @@ -857,36 +649,24 @@ if(0) { if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
".getMLText("name")."".getMLText("owner")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("status")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."".$st["version"]."".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."
"; print "\n\n"; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print ""; - print ""; - print ""; - print ""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -895,36 +675,24 @@ if(0) { if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
".getMLText("name")."".getMLText("owner")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("status")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."".$st["version"]."".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."
"; print "\n\n"; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; print "\n\n\n"; $printheader=false; } - if($content = $document->getContentByVersion($st['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print ""; - print ""; - print ""; - print ""; - print "".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $st['version']); } } } @@ -933,7 +701,6 @@ if(0) { }else{ printMLText("no_docs_to_receipt"); } -// $this->contentContainerEnd(); } else { $this->contentHeading(getMLText("documents_to_receipt")); @@ -947,6 +714,8 @@ if(0) { function listRejects() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -958,7 +727,7 @@ if(0) { /* Get list of documents owned by current user that has * been rejected. */ - $resArr = $dms->getDocumentList('RejectOwner', $user); + $resArr = $dms->getDocumentList('RejectOwner', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -968,50 +737,27 @@ if(0) { if (count($resArr)>0) { $this->contentHeading(getMLText("documents_user_rejected")); -// $this->contentContainerStart(); print "
".getMLText("name")."".getMLText("owner")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("status")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."".$st["version"]."".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."
"; print "\n\n"; print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); $document->verifyLastestContentExpriry(); - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - - if($content = $document->getContentByVersion($res['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print "\n"; - print ""; - print ""; - print ""; - print ""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $res['version']); } } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "" . htmlspecialchars($res["name"]) . "".getOverallStatusText($res["status"])."".$res["version"]."".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; - -// $this->contentContainerEnd(); } } /* }}} */ @@ -1019,6 +765,8 @@ if(0) { function listLockedDocs() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -1028,7 +776,7 @@ if(0) { $previewer->setConverters($previewconverters); /* Get list of documents locked by current user */ - $resArr = $dms->getDocumentList('LockedByMe', $user); + $resArr = $dms->getDocumentList('LockedByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -1037,7 +785,6 @@ if(0) { } $this->contentHeading(getMLText("documents_locked_by_you")); -// $this->contentContainerStart(); if (count($resArr)>0) { print ""; @@ -1045,37 +792,18 @@ if(0) { print ""; print "\n"; print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n\n\n"; foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); + $document->verifyLastestContentExpriry(); - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - - if($content = $document->getContentByVersion($res['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - print "\n"; - print ""; - print ""; - print ""; - print ""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $res['version']); } } print "
".getMLText("name")."".getMLText("status")."".getMLText("version")."".getMLText("last_update")."".getMLText("expires")."".getMLText("action")."
"; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print "" . htmlspecialchars($res["name"]) . "".getOverallStatusText($res["status"])."".$res["version"]."".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."
"; @@ -1083,13 +811,13 @@ if(0) { } else printMLText("no_docs_locked"); -// $this->contentContainerEnd(); - } /* }}} */ function listCheckedoutDocs() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $orderby = $this->params['orderby']; + $orderdir = $this->params['orderdir']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; @@ -1099,7 +827,7 @@ if(0) { $previewer->setConverters($previewconverters); /* Get list of documents checked out by current user */ - $resArr = $dms->getDocumentList('CheckedOutByMe', $user); + $resArr = $dms->getDocumentList('CheckedOutByMe', $user, $orderby, $orderdir); if (is_bool($resArr) && !$resArr) { $this->contentHeading(getMLText("warning")); $this->contentContainer(getMLText("internal_error_exit")); @@ -1116,37 +844,18 @@ if(0) { print ""; print "".getMLText("name")."\n"; print "".getMLText("status")."\n"; - print "".getMLText("version")."\n"; - print "".getMLText("last_update")."\n"; - print "".getMLText("expires")."\n"; + print "".getMLText("action")."\n"; print "\n\n\n"; foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); + $document->verifyLastestContentExpriry(); - // verify expiry - if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ - $res["status"]=S_EXPIRED; - } - } - - if($content = $document->getContentByVersion($res['version'])) { - print "\n"; - $previewer->createPreview($content); - print ""; - if($previewer->hasPreview($content)) { - print "getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } else { - print "getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">"; - } - print ""; - print "" . htmlspecialchars($res["name"]) . "\n"; - print "".getOverallStatusText($res["status"]).""; - print "".$res["version"].""; - print "".$res["statusDate"]." ".htmlspecialchars($res["statusName"]).""; - print "".(!$res["expires"] ? "-":getReadableDate($res["expires"])).""; - print "\n"; + $txt = $this->callHook('documentListItem', $document, $previewer); + if(is_string($txt)) + echo $txt; + else { + echo $this->documentListRow($document, $previewer, false, $res['version']); } } print ""; @@ -1213,29 +922,6 @@ if(0) { echo '
'; - /* - if($workflowmode == 'traditional') { - echo '
'; - } - - if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { - echo '
'; - } elseif($workflowmode == 'advanced') { - echo '
'; - } - echo '
'; - - echo '
'; - - echo '
'; - - echo '
'; - - echo '
'; - - echo '
'; - - */ echo ''; echo ''; } else {