diff --git a/composer-dist.json b/composer-dist.json
index 7c0171634..1e4d01ddb 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -1,9 +1,19 @@
{
+ "config": {
+ "platform": {
+ "php": "7.4"
+ }
+ },
+
"require": {
+ "robthree/twofactorauth": "^1.5",
"sabre/dav": "^3.",
+ "sabre/xml": "^1.4.",
"slim/slim": "^3.0",
"erusev/parsedown": "*",
"erusev/parsedown-extra": "*",
+ "mibe/feedwriter": "^1.1",
+ "phpoffice/phpspreadsheet": "*",
"pear/log": "*",
"pear/mail": "*",
"pear/mail_mime": "*",
@@ -11,7 +21,51 @@
"pear/auth_sasl": "*",
"pear/db": "*",
"alecrabbit/php-console-colour": "*",
+ "dragonmantank/cron-expression": "^3",
"zf1/zend-search-lucene": "*",
- "symfony/http-foundation": "^5.4"
- }
+ "symfony/http-foundation": "^5.4",
+ "seeddms/core": "dev-master",
+ "seeddms/lucene": "dev-master",
+ "seeddms/preview": "dev-master",
+ "seeddms/sqlitefts": "dev-master",
+ "seeddms/http_webdav_server": "dev-master"
+ },
+ "repositories": [
+ {
+ "type": "path",
+ "url": "/home/cvs/seeddms-ext/core",
+ "options": {
+ "symlink": false
+ }
+ },
+ {
+ "type": "path",
+ "url": "/home/cvs/seeddms-ext/lucene",
+ "options": {
+ "symlink": false
+ }
+ },
+ {
+ "type": "path",
+ "url": "/home/cvs/seeddms-ext/preview",
+ "options": {
+ "symlink": false
+ }
+ },
+ {
+ "type": "path",
+ "url": "/home/cvs/seeddms-ext/sqlitefts",
+ "options": {
+ "symlink": false
+ }
+ },
+ {
+ "type": "path",
+ "url": "/home/cvs/seeddms-ext/http_webdav_server",
+ "options": {
+ "symlink": false
+ }
+ }
+ ]
+
}
diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index 01704a1ce..180362d15 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -15,7 +15,7 @@
footNote = "SeedDMS free document management system - www.seeddms.org"
printDisclaimer = "true"
language = "en_GB"
- theme = "bootstrap"
+ theme = "bootstrap4"
previewWidthList = "40"
previewWidthDetail = "100"
onePageMode="true"
@@ -60,8 +60,8 @@
enableDropUpload = "false"
enableRecursiveCount = "false"
maxRecursiveCount = "0"
- enableThemeSelector = "false"
- fullSearchEngine = "lucene"
+ enableThemeSelector = "true"
+ fullSearchEngine = "sqlitefts"
sortFoldersDefault = "u"
defaultDocPosition = "end"
defaultFolderPosition = "end"
@@ -290,7 +290,7 @@
updateNotifyTime = "86400"
extraPath = ""
maxExecutionTime = "30"
- cmdTimeout = "1"
+ cmdTimeout = "10"
/>
showConfigHeadline('settings_Server'); ?>
showConfigText('settings_rootDir', 'rootDir'); ?>
+showConfigText('settings_baseUrl', 'baseUrl'); ?>
showConfigText('settings_httpRoot', 'httpRoot'); ?>
showConfigText('settings_contentDir', 'contentDir'); ?>
showConfigText('settings_backupDir', 'backupDir'); ?>
@@ -398,6 +434,8 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
showConfigText('settings_stagingDir', 'stagingDir'); ?>
showConfigText('settings_luceneDir', 'luceneDir'); ?>
showConfigText('settings_dropFolderDir', 'dropFolderDir'); ?>
+showConfigText('settings_checkOutDir', 'checkOutDir'); ?>
+showConfigCheckbox('settings_createCheckOutDir', 'createCheckOutDir'); ?>
showConfigText('settings_repositoryUrl', 'repositoryUrl'); ?>
showConfigText('settings_proxyUrl', 'proxyUrl'); ?>
showConfigText('settings_proxyUser', 'proxyUser'); ?>
@@ -414,6 +452,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
showConfigHeadline('settings_Authentication'); ?>
showConfigCheckbox('settings_enableGuestLogin', 'enableGuestLogin'); ?>
showConfigCheckbox('settings_enableGuestAutoLogin', 'enableGuestAutoLogin'); ?>
+showConfigCheckbox('settings_enable2FactorAuthentication', 'enable2FactorAuthentication'); ?>
showConfigCheckbox('settings_restricted', 'restricted'); ?>
showConfigCheckbox('settings_enableUserImage', 'enableUserImage'); ?>
showConfigCheckbox('settings_disableSelfEdit', 'disableSelfEdit'); ?>
@@ -482,20 +521,34 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
-->
showConfigHeadline('settings_Edition'); ?>
showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced', 'none'=>'settings_workflowMode_valnone'), false, true); ?>
+showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?>
+showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?>
+showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?>
+showConfigCheckbox('settings_enableRevisionOneVoteReject', 'enableRevisionOneVoteReject'); ?>
showConfigText('settings_versioningFileName', 'versioningFileName'); ?>
showConfigText('settings_presetExpirationDate', 'presetExpirationDate'); ?>
+showConfigOption('settings_initialDocumentStatus', 'initialDocumentStatus', array(' '.S_RELEASED=>'settings_initialDocumentStatus_released', ' '.S_DRAFT=>'settings_initialDocumentStatus_draft'), false, true); ?>
showConfigCheckbox('settings_allowReviewerOnly', 'allowReviewerOnly'); ?>
+showConfigCheckbox('settings_allowChangeRevAppInProcess', 'allowChangeRevAppInProcess'); ?>
showConfigCheckbox('settings_enableAdminRevApp', 'enableAdminRevApp'); ?>
showConfigCheckbox('settings_enableOwnerRevApp', 'enableOwnerRevApp'); ?>
showConfigCheckbox('settings_enableSelfRevApp', 'enableSelfRevApp'); ?>
showConfigCheckbox('settings_enableUpdateRevApp', 'enableUpdateRevApp'); ?>
showConfigCheckbox('settings_enableRemoveRevApp', 'enableRemoveRevApp'); ?>
+showConfigCheckbox('settings_enableSelfReceipt', 'enableSelfReceipt'); ?>
+showConfigCheckbox('settings_enableAdminReceipt', 'enableAdminReceipt'); ?>
+showConfigCheckbox('settings_enableOwnerReceipt', 'enableOwnerReceipt'); ?>
+showConfigCheckbox('settings_enableUpdateReceipt', 'enableUpdateReceipt'); ?>
+showConfigCheckbox('settings_enableFilterReceipt', 'enableFilterReceipt'); ?>
showConfigCheckbox('settings_enableVersionDeletion', 'enableVersionDeletion'); ?>
showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?>
showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?>
showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?>
+showConfigCheckbox('settings_enableCancelCheckout', 'enableCancelCheckout'); ?>
showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?>
+showConfigCheckbox('settings_advancedAcl', 'advancedAcl'); ?>
showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?>
+showConfigCheckbox('settings_uploadedAttachmentIsPublic', 'uploadedAttachmentIsPublic'); ?>
getExtensionConfiguration() as $extname=>$extconf) {
+ echo ''.$extconf['title']." ● ";
+ }
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
if($this->hasHook('processConfig'))
$extconf = $this->callHook('processConfig', $extname, $extconf);
if($this->isVisible($extname.'|')) {
if($extconf['config']) {
- $this->showRawConfigHeadline("_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"> '.$extconf['title'].' ');
+ $this->showRawConfigHeadline("_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"> '.$extconf['title'].' ');
foreach($extconf['config'] as $confkey=>$conf) {
ob_start();
if($this->isVisible($extname.'|'.$confkey)) {
@@ -624,7 +680,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
echo "getID()."\"";
if(in_array($rec->getID(), $selections))
echo " selected";
- echo ">".htmlspecialchars($rec->getName())." ";
+ echo " data-subtitle=\"".htmlspecialchars(getAttributeObjectTypeText($rec).", ".getAttributeTypeText($rec))."\">".htmlspecialchars($rec->getName())."";
}
echo "";
} else {
@@ -651,6 +707,9 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
case "folders":
$this->formField(null, $this->getFolderChooserHtml("form".$extname.$confkey, M_READ, -1, $selections ? $dms->getFolder($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
break;
+ case "documents":
+ $this->formField(null, $this->getDocumentChooserHtml("form".$extname.$confkey, M_READ, -1, $selections ? $dms->getDocument($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
+ break;
}
}
break;
@@ -680,9 +739,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
_configFilePath)) {
-?>
- '.$oldsecret.'
';
echo '';
?>
contentContainerEnd();
+ $this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 7ad0d639c..335b27556 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -73,24 +73,16 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Theme_Style {
echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
if($hasemail)
echo "";
- echo "".htmlspecialchars($currUser->getComment())." ";
if($hasemail)
- echo "".htmlspecialchars($currUser->getEmail())." ".htmlspecialchars($currUser->getComment())." ";
+ echo "getEmail())."\">".htmlspecialchars($currUser->getEmail())." ".htmlspecialchars($dms->getFolder($homefolder)->getName())." ";
echo getMLText('role').": ";
- switch($currUser->getRole()) {
- case SeedDMS_Core_User::role_user:
- printMLText("role_user");
- break;
- case SeedDMS_Core_User::role_admin:
- printMLText("role_admin");
- break;
- case SeedDMS_Core_User::role_guest:
- printMLText("role_guest");
- break;
- }
+ echo htmlspecialchars($currUser->getRole()->getName());
echo " ";
echo "";
- echo " ";
echo "";
if($currUser->getID() != $user->getID()) {
echo "getID())."&formtoken=".createFormKey('substituteuser')."\"> ".getMLText('substitute_user')." ";
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index b30b5ad79..846466bd0 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
/**
* Class which outputs the html page for clipboard view
*
@@ -39,8 +34,12 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
private function __myTasks() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
+ $enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+ $enablerevisionworkflow = $this->params['enablerevisionworkflow'];
$workflowmode = $this->params['workflowmode'];
+ $tasksinmenu = $this->params['tasksinmenu'];
$tasks = array();
+/*
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
$tasks['approval'] = array();
if($workflowmode == 'traditional')
@@ -48,25 +47,31 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
} elseif($workflowmode == 'advanced')
$tasks['workflow'] = array();
$tasks['rejected'] = array();
+ $tasks['checkedout'] = array();
+*/
- if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
- $resArr = $dms->getDocumentList('ApproveByMe', $user);
- if($resArr) {
- $docs = array();
- foreach ($resArr as $res) {
- $document = $dms->getDocument($res["id"]);
- if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
- $docs[] = $document;
-// $tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+ if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
+ if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
+ $tasks['approval'] = array();
+ $resArr = $dms->getDocumentList('ApproveByMe', $user, false, '', '', false);
+ if($resArr) {
+ $docs = array();
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $docs[] = $document;
+ }
}
+ if($this->hasHook('filterApprovalTaskList'))
+ $docs = $this->callHook('filterApprovalTaskList', $docs);
+ foreach($docs as $doc)
+ $tasks['approval'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
- if($this->hasHook('filterApprovalTaskList'))
- $docs = $this->callHook('filterApprovalTaskList', $docs);
- foreach($docs as $doc)
- $tasks['approval'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
- if($workflowmode == 'traditional') {
- $resArr = $dms->getDocumentList('ReviewByMe', $user);
+ if($workflowmode == 'traditional')
+ if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
+ $tasks['review'] = array();
+ $resArr = $dms->getDocumentList('ReviewByMe', $user, false, '', '', false);
if($resArr) {
$docs = array();
foreach ($resArr as $res) {
@@ -82,38 +87,111 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
$tasks['review'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
}
- } elseif($workflowmode == 'advanced') {
- $resArr = $dms->getDocumentList('WorkflowByMe', $user);
+ if($enablereceiptworkflow)
+ if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+ $tasks['receipt'] = array();
+ $resArr = $dms->getDocumentList('ReceiptByMe', $user);
+ if($resArr) {
+ $docs = array();
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $docs[] = $document;
+ }
+ }
+ if($this->hasHook('filterReceiptTaskList'))
+ $docs = $this->callHook('filterReceiptTaskList', $docs);
+ foreach($docs as $doc)
+ $tasks['receipt'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+ }
+ }
+ if($enablerevisionworkflow)
+ if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+ $tasks['revision'] = array();
+ $resArr = $dms->getDocumentList('ReviseByMe', $user);
+ if($resArr) {
+ $docs = array();
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $docs[] = $document;
+ }
+ }
+ if($this->hasHook('filterRevisionTaskList'))
+ $docs = $this->callHook('filterRevisionTaskList', $docs);
+ foreach($docs as $doc)
+ $tasks['revision'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+ }
+ }
+ if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
+ $tasks['needscorrection'] = array();
+ $resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
if($resArr) {
$docs = array();
foreach ($resArr as $res) {
$document = $dms->getDocument($res["id"]);
if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
$docs[] = $document;
-// $tasks['workflow'][] = array('id'=>$res['id'], 'name'=>$res['name']);
}
}
- if($this->hasHook('filterWorkflowTaskList'))
- $docs = $this->callHook('filterWorkflowTaskList', $docs);
+ if($this->hasHook('filterNeedsCorrectionTaskList'))
+ $docs = $this->callHook('filterNeedsCorrectionTaskList', $docs);
foreach($docs as $doc)
- $tasks['workflow'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+ $tasks['needscorrection'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
}
- $resArr = $dms->getDocumentList('RejectOwner', $user);
- if($resArr) {
- $docs = array();
- foreach ($resArr as $res) {
- $document = $dms->getDocument($res["id"]);
- if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
- $docs[] = $document;
+ if($workflowmode == 'advanced')
+ if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
+ $tasks['workflow'] = array();
+ $resArr = $dms->getDocumentList('WorkflowByMe', $user);
+ if($resArr) {
+ $docs = array();
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $docs[] = $document;
+ }
+ }
+ if($this->hasHook('filterWorkflowTaskList'))
+ $docs = $this->callHook('filterWorkflowTaskList', $docs);
+ foreach($docs as $doc)
+ $tasks['workflow'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
}
}
- if($this->hasHook('filterRejectedTaskList'))
- $docs = $this->callHook('filterRejectedTaskList', $docs);
- foreach($docs as $doc)
- $tasks['rejected'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+ if(!$tasksinmenu || in_array('rejected', $tasksinmenu)) {
+ $tasks['rejected'] = array();
+ $resArr = $dms->getDocumentList('RejectOwner', $user);
+ if($resArr) {
+ $docs = array();
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $docs[] = $document;
+ }
+ }
+ if($this->hasHook('filterRejectedTaskList'))
+ $docs = $this->callHook('filterRejectedTaskList', $docs);
+ foreach($docs as $doc)
+ $tasks['rejected'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+ }
+ }
+ if(!$tasksinmenu || in_array('checkedout', $tasksinmenu)) {
+ $tasks['checkedout'] = array();
+ $resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+ if($resArr) {
+ $docs = array();
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document && $document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $docs[] = $document;
+ }
+ }
+ if($this->hasHook('filterCheckedOutTaskList'))
+ $docs = $this->callHook('filterCheckedOutTaskList', $docs);
+ foreach($docs as $doc)
+ $tasks['checkedout'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+ }
}
-
return $tasks;
} /* }}} */
@@ -127,6 +205,46 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
* documents and folders.
* @return string html code
*/
+ function countTasks() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+ $enablerevisionworkflow = $this->params['enablerevisionworkflow'];
+ $workflowmode = $this->params['workflowmode'];
+ $tasksinmenu = $this->params['tasksinmenu'];
+
+ $startts = microtime(true);
+ $tasks = array();
+ if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
+ if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
+ $tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
+ }
+ if($workflowmode == 'traditional')
+ if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
+ $tasks['review'] = $dms->countTasks('ReviewByMe', $user);
+ }
+ if($workflowmode == 'advanced')
+ if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
+ $tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
+ }
+ if($enablereceiptworkflow)
+ if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
+ $tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
+ if($enablerevisionworkflow)
+ if(!$tasksinmenu || in_array('revision', $tasksinmenu))
+ $tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+ if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu))
+ $tasks['needscorrection'] = $dms->countTasks('NeedsCorrectionOwner', $user);
+
+ header('Content-Type: application/json');
+ echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));
+ } /* }}} */
+
+ /**
+ * Returns a json array of tasks to be done
+ *
+ * @return string json string
+ */
function myTasks() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
@@ -144,13 +262,12 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
* This function renders the tasks in a way suitable to be
* used as a menu
*
- * @param array $clipboard clipboard containing two arrays for both
- * documents and folders.
* @return string html code
*/
function menuTasks() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
+ $accessobject = $this->params['accessobject'];
if(!$tasks = $this->__myTasks()) {
echo '';
@@ -166,13 +283,21 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
$ct[] = count($tasks['approval']);
if(isset($tasks['workflow']))
$ct[] = count($tasks['workflow']);
+ if(isset($tasks['receipt']))
+ $ct[] = count($tasks['receipt']);
+ if(isset($tasks['revision']))
+ $ct[] = count($tasks['revision']);
+ if(isset($tasks['needscorrection']))
+ $ct[] = count($tasks['needscorrection']);
if(isset($tasks['rejected']))
$ct[] = count($tasks['rejected']);
+ if(isset($tasks['checkedout']))
+ $ct[] = count($tasks['checkedout']);
$menuitems['tasks'] = array('label'=>getMLText('tasks')." (".implode('/', $ct).")");
$menuitems['tasks']['children'] = [];
- if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) {
+ if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected']) || !empty($tasks['checkedout'])) {
if(!empty($tasks['review'])) {
$subitems = [];
foreach($tasks['review'] as $t) {
@@ -198,6 +323,30 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
}
$menuitems['tasks']['children']['workflow'] = array('label'=>getMLText('documents_to_trigger_workflow'), 'children'=>$subitems);
}
+ if(!empty($tasks['receipt'])) {
+ $subitems = [];
+ foreach($tasks['receipt'] as $t) {
+ $doc = $dms->getDocument($t['id']);
+ $subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."¤ttab=recipients", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
+ }
+ $menuitems['tasks']['children']['receipt'] = array('label'=>getMLText('documents_to_receipt'), 'children'=>$subitems);
+ }
+ if(!empty($tasks['revision'])) {
+ $subitems = [];
+ foreach($tasks['revision'] as $t) {
+ $doc = $dms->getDocument($t['id']);
+ $subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."¤ttab=revision", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
+ }
+ $menuitems['tasks']['children']['revision'] = array('label'=>getMLText('documents_to_revise'), 'children'=>$subitems);
+ }
+ if(!empty($tasks['needscorrection'])) {
+ $subitems = [];
+ foreach($tasks['needscorrection'] as $t) {
+ $doc = $dms->getDocument($t['id']);
+ $subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."¤ttab=docinfo", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
+ }
+ $menuitems['tasks']['children']['needscorrection'] = array('label'=>getMLText('documents_to_correct'), 'children'=>$subitems);
+ }
if(!empty($tasks['rejected'])) {
$subitems = [];
foreach($tasks['rejected'] as $t) {
@@ -206,10 +355,20 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
}
$menuitems['tasks']['children']['rejected'] = array('label'=>getMLText('documents_rejected'), 'children'=>$subitems);
}
+ if(!empty($tasks['checkedout'])) {
+ $subitems = [];
+ foreach($tasks['checkedout'] as $t) {
+ $doc = $dms->getDocument($t['id']);
+ $subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."¤ttab=docinfo", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
+ }
+ $menuitems['tasks']['children']['checkedout'] = array('label'=>getMLText('documents_checked_out_by_you'), 'children'=>$subitems);
+ }
+ if ($accessobject->check_view_access('MyDocuments')) {
$menuitems['tasks']['children']['divider'] = array('divider'=>true);
$menuitems['tasks']['children']['mydocuments'] = array('label'=>getMLText('my_documents'), 'link'=>$this->params['settings']->_httpRoot.'out/out.MyDocuments.php');
}
self::showNavigationBar($menuitems, array('right'=>true));
+ }
} /* }}} */
/**
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 93732e9dc..d4529c511 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
/**
* Class which outputs the html page for Timeline view
*
@@ -94,8 +89,11 @@ class SeedDMS_View_Timeline extends SeedDMS_Theme_Style {
case 'status_change':
$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
break;
+ case 'scheduled_revision':
+ $msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
+ break;
default:
- $msg = '???';
+ $msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
}
$data[$i]['msg'] = $msg;
}
@@ -276,6 +274,8 @@ div.timeline-event-selected {
contentContainerEnd();
echo "
";
@@ -296,7 +297,6 @@ div.timeline-event-selected {
$this->columnEnd();
$this->rowEnd();
- $this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */
diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
new file mode 100644
index 000000000..854744f91
--- /dev/null
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -0,0 +1,150 @@
+
+ * @copyright Copyright (C)2016 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+//require_once("class.Bootstrap.php");
+
+require_once("vendor/autoload.php");
+
+use \FeedWriter\RSS2;
+
+/**
+ * Class which outputs the html page for UserList view
+ *
+ * @category DMS
+ * @package SeedDMS
+ * @author Uwe Steinmann
+ * @copyright Copyright (C)2016 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+class SeedDMS_View_TimelineFeed extends SeedDMS_Theme_Style {
+
+ function show() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $settings = $this->params['settings'];
+ $httproot = $this->params['httproot'];
+ $skip = $this->params['skip'];
+ $fromdate = $this->params['fromdate'];
+ $todate = $this->params['todate'];
+ $cachedir = $this->params['cachedir'];
+ $sitename = $this->params['sitename'];
+ $previewwidthlist = $this->params['previewWidthList'];
+ $previewwidthdetail = $this->params['previewWidthDetail'];
+ $timeout = $this->params['timeout'];
+
+ if($fromdate) {
+ $from = makeTsFromLongDate($fromdate.' 00:00:00');
+ } else {
+ $from = time()-7*86400;
+ }
+
+ if($todate) {
+ $to = makeTsFromLongDate($todate.' 23:59:59');
+ } else {
+ $to = time();
+ }
+
+ $baseurl = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$httproot;
+ $feed = new RSS2;
+ $feed->setTitle($sitename.': Recent Changes');
+ $feed->setLink($baseurl);
+ $feed->setDescription('Show recent changes in SeedDMS.');
+ // Image title and link must match with the 'title' and 'link' channel elements for RSS 2.0,
+ // which were set above.
+// $feed->setImage('Testing & Checking the Feed Writer project', 'https://github.com/mibe/FeedWriter', 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Rss-feed.svg/256px-Rss-feed.svg.png');
+ // Use core setChannelElement() function for other optional channel elements.
+ // See http://www.rssboard.org/rss-specification#optionalChannelElements
+ // for other optional channel elements. Here the language code for American English and
+ $feed->setChannelElement('language', str_replace('_', '-', $user->getLanguage()));
+ // The date when this feed was lastly updated. The publication date is also set.
+ $feed->setDate(date(DATE_RSS, time()));
+ $feed->setChannelElement('pubDate', date(\DATE_RSS, time() /*strtotime('2013-04-06')*/));
+ // You can add additional link elements, e.g. to a PubSubHubbub server with custom relations.
+ // It's recommended to provide a backlink to the feed URL.
+ $feed->setSelfLink($baseurl.'out/out.TimelineFeed.php');
+// $feed->setAtomLink('http://pubsubhubbub.appspot.com', 'hub');
+ // You can add more XML namespaces for more custom channel elements which are not defined
+ // in the RSS 2 specification. Here the 'creativeCommons' element is used. There are much more
+ // available. Have a look at this list: http://feedvalidator.org/docs/howto/declare_namespaces.html
+// $feed->addNamespace('creativeCommons', 'http://backend.userland.com/creativeCommonsRssModule');
+// $feed->setChannelElement('creativeCommons:license', 'http://www.creativecommons.org/licenses/by/1.0');
+ // If you want you can also add a line to publicly announce that you used
+ // this fine piece of software to generate the feed. ;-)
+// $feed->addGenerator();
+
+ if($data = $dms->getTimeline($from, $to)) {
+ foreach($data as $i=>$item) {
+ switch($item['type']) {
+ case 'add_version':
+ $msg = getMLText('timeline_'.$item['type'], array(), null, $user->getLanguage());
+ break;
+ case 'add_file':
+ $msg = getMLText('timeline_'.$item['type'], array(), null, $user->getLanguage());
+ break;
+ case 'status_change':
+ $msg = getMLText('timeline_'.$item['type'], array('version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])), null, $user->getLanguage());
+ break;
+ default:
+ $msg = '???';
+ }
+ $data[$i]['msg'] = $msg;
+ }
+
+ $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
+ foreach($data as $item) {
+ if($item['type'] == 'status_change')
+ $classname = $item['type']."_".$item['status'];
+ else
+ $classname = $item['type'];
+ if(!$skip || !in_array($classname, $skip)) {
+ $doc = $item['document'];
+ $owner = $doc->getOwner();
+ $d = makeTsFromLongDate($item['date']);
+ $newItem = $feed->createNewItem();
+ $newItem->setTitle($doc->getName()." (".$item['msg'].")");
+ $newItem->setLink($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID());
+ $newItem->setDescription("".$item['msg']." ".
+ "".getMLText('comment', array(), null, $user->getLanguage()).": ".$doc->getComment()."
".
+ "".getMLText('owner', array(), null, $user->getLanguage()).": getEmail())."\">".htmlspecialchars($owner->getFullName())."
".
+ "".getMLText("creation_date", array(), null, $user->getLanguage()).": ".getLongReadableDate($doc->getDate())."
"
+ );
+ $newItem->setDate(date('c', $d));
+ $newItem->setAuthor($owner->getFullName(), preg_match('/.+@.+/', $owner->getEmail()) == 1 ? $owner->getEmail() : null);
+ $newItem->setId($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID()."&kkk=".$classname, true);
+ if(!empty($item['version'])) {
+ $version = $doc->getContentByVersion($item['version']);
+ $previewer->createPreview($version);
+ if($previewer->hasPreview($version)) {
+ $token = new SeedDMS_JwtToken($settings->_encryptionKey);
+ $data = array('d'=>$doc->getId(), 'v'=>$item['version'], 'u'=>$user->getId(), 'w'=>$previewwidthdetail,);
+ $hash = $token->jwtEncode($data);
+ $newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.TimelineFeedPreview.php?hash='.$hash, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
+ }
+ }
+ $feed->addItem($newItem);
+ }
+ }
+ }
+
+ // OK. Everything is done. Now generate the feed.
+ // If you want to send the feed directly to the browser, use the printFeed() method.
+ $myFeed = $feed->generateFeed();
+ // Do anything you want with the feed in $myFeed. Why not send it to the browser? ;-)
+ // You could also save it to a file if you don't want to invoke your script every time.
+ header('Content-Type: application/rss+xml');
+ echo $myFeed;
+ } /* }}} */
+}
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
new file mode 100644
index 000000000..b89bd7a31
--- /dev/null
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -0,0 +1,246 @@
+
+ * @copyright Copyright (C) 2002-2005 Markus Westphal,
+ * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ * 2010-2012 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+//require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for TransmittalMgr view
+ *
+ * @category DMS
+ * @package SeedDMS
+ * @author Markus Westphal, Malcolm Cowe, Uwe Steinmann
+ * @copyright Copyright (C) 2002-2005 Markus Westphal,
+ * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ * 2010-2012 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+class SeedDMS_View_TransmittalMgr extends SeedDMS_Theme_Style {
+
+ use TransmittalDeleteButton;
+ use TransmittalUpdateButton;
+
+ function js() { /* {{{ */
+ $showtree = $this->params['showtree'];
+ $onepage = $this->params['onepage'];
+
+ header('Content-Type: application/javascript; charset=UTF-8');
+ parent::jsTranslations(array('js_form_error', 'js_form_errors', 'cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+ $this->printDeleteDocumentButtonJs();
+ $this->printDeleteItemButtonJs();
+ $this->printUpdateItemButtonJs();
+ if($onepage)
+ $this->printClickDocumentJs();
+?>
+function runValidation() {
+ $("#form1").validate({
+ rules: {
+ name: {
+ required: true
+ },
+ },
+ messages: {
+ name: "",
+ }
+ });
+}
+$(document).ready( function() {
+ $('body').on('click', '.selecttransmittal', function(ev){
+ ev.preventDefault();
+ $('div.ajax').trigger('update', {transmittalid: $(ev.currentTarget).data('transmittalid')});
+ window.history.pushState({"html":"","pageTitle":""},"", '../out/out.TransmittalMgr.php?transmittalid=' + $(ev.currentTarget).data('transmittalid'));
+ });
+});
+params['dms'];
+ $user = $this->params['user'];
+ $accessop = $this->params['accessobject'];
+?>
+
+params['seltransmittal'];
+
+ $this->showTransmittalForm($seltransmittal);
+ } /* }}} */
+
+ protected function showTransmittalItems($seltransmittal) { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $accessop = $this->params['accessobject'];
+ $cachedir = $this->params['cachedir'];
+ $timeout = $this->params['timeout'];
+ $previewwidth = $this->params['previewWidthList'];
+ $previewconverters = $this->params['previewConverters'];
+
+ $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+ $previewer->setConverters($previewconverters);
+
+ if($seltransmittal) {
+ $items = $seltransmittal->getItems();
+ if($items) {
+ print "";
+ print "\n\n";
+ print "".getMLText("name")." \n";
+ print "".getMLText("status")." \n";
+ print "".getMLText("document")." \n";
+ print "".getMLText("action")." \n";
+ print " \n \n\n";
+ foreach($items as $item) {
+ if($content = $item->getContent()) {
+ $document = $content->getDocument();
+ $latestcontent = $document->getLatestContent();
+ if ($document->getAccessMode($user) >= M_READ) {
+// echo "getID()."\">";
+ echo $this->documentListRowStart($document);
+ echo $this->documentListRow($document, $previewer, true, $content->getVersion());
+ echo "";
+ $this->printDeleteItemButton($item, getMLText('transmittalitem_removed'));
+ if($latestcontent->getVersion() != $content->getVersion())
+ $this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
+ echo "
getID()."\">";
+ echo "content ist weg ";
+ echo " ";
+ }
+ }
+ print " \n
\n";
+ print "getID()."\">".getMLText('download')." ";
+ }
+ }
+ } /* }}} */
+
+ function items() { /* {{{ */
+ $seltransmittal = $this->params['seltransmittal'];
+
+ $this->showTransmittalItems($seltransmittal);
+ } /* }}} */
+
+ function show() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $accessop = $this->params['accessobject'];
+ $seltransmittal = $this->params['seltransmittal'];
+
+ $this->htmlAddHeader(''."\n", 'js');
+ $this->htmlAddHeader(''."\n", 'js');
+
+ $this->htmlStartPage(getMLText("my_transmittals"));
+ $this->globalNavigation();
+ $this->contentStart();
+ $this->pageNavigation(getMLText("my_transmittals"), "my_documents");
+ $this->contentHeading(getMLText("my_transmittals"));
+ $this->rowStart();
+ $this->columnStart(4);
+
+ $transmittals = $dms->getAllTransmittals($user);
+
+ if ($transmittals){
+ print "";
+ print "\n\n";
+ print "".getMLText("name")." \n";
+ print "".getMLText("comment")." \n";
+ print "".getMLText("transmittal_size")." \n";
+ print " \n \n\n";
+ foreach($transmittals as $transmittal) {
+ print "\n";
+ print "".$transmittal->getName()." ";
+ print "".$transmittal->getComment()." ";
+ $items = $transmittal->getItems();
+ print "".count($items)." (".SeedDMS_Core_File::format_filesize($transmittal->getSize()).") ";
+ print "";
+ print "";
+ print " ";
+ print " \n";
+ }
+ print " \n
\n";
+ }
+
+ $this->columnEnd();
+ $this->columnStart(8);
+ if($accessop->check_view_access($this, array('action'=>'form'))) {
+?>
+ getID()."\"" : "") ?>>
+check_view_access($this, array('action'=>'items'))) {
+?>
+ getID()."\"" : "") ?>>
+columnEnd();
+ $this->rowEnd();
+ $this->contentEnd();
+ $this->htmlEndPage();
+ } /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index 0cc18bd70..f04e1c2e2 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -65,8 +65,17 @@ $(document).ready(function() {
$action = $transition->getAction();
$currentstate = $latestContent->getWorkflowState();
- $wkflog = $latestContent->getWorkflowLog();
- $workflow = $latestContent->getWorkflow();
+ $wkflogs = $latestContent->getWorkflowLog();
+ /* Check if latest content is still in workflow, which should be
+ * always the case, otherwise this code would be executed.
+ * In that case the returned log is just a list of entries for the
+ * current workflow. If the document was not in a workflow, then the
+ * log entries for all workflows of this content will be returned
+ */
+ if($workflow = $latestContent->getWorkflow())
+ $wkflog = $wkflogs;
+ else
+ $wkflog = array_shift($wkflogs);
$msg = "The document is currently in state: ".$currentstate->getName()."">
+ formSubmit('isDisabled() ? " class=\"error\"" : "").">";
echo "";
if ($currUser->hasImage())
- print " ";
echo "";
echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).") ";
echo "";
- switch($currUser->getRole()) {
- case SeedDMS_Core_User::role_user:
- printMLText("role_user");
- break;
- case SeedDMS_Core_User::role_admin:
- printMLText("role_admin");
- break;
- case SeedDMS_Core_User::role_guest:
- printMLText("role_guest");
- break;
- }
+ echo htmlspecialchars($currUser->getRole()->getName());
echo " ";
echo "";
echo SeedDMS_Core_File::format_filesize($currUser->getUsedDiskSpace());
@@ -129,10 +120,12 @@ class SeedDMS_View_UserList extends SeedDMS_Theme_Style {
}
echo " ";
echo "";
- echo "";
+ if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
+ echo "";
+ echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '
";
+ }
echo " ";
echo "";
}
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index a32e29263..1f6b3488c 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -37,6 +37,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Theme_Style {
header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('js_form_error', 'js_form_errors'));
+ $this->printFolderChooserJs("form");
?>
function runValidation() {
$("#form1").validate({
@@ -96,6 +97,7 @@ $(document).ready( function() {
$user = $this->params['user'];
$seluser = $this->params['seluser'];
$quota = $this->params['quota'];
+ $settings = $this->params['settings'];
$workflowmode = $this->params['workflowmode'];
if($seluser) {
@@ -165,6 +167,26 @@ $(document).ready( function() {
echo "".getMLText('mandatory_approvers')." ".count($resArr)." ".getMLText('pending_receipt')." ".count($tasks['receipt'])." ".getMLText('pending_revision')." ".count($tasks['revision'])." ".getMLText('workflows_involded')." ".count($workflows)." ".getMLText('lastaccess')." ".getLongReadableDate($session->getLastAccess())." ".getMLText('network_drive')." _httpRoot.'checkout/'.preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."\">".preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())." getID()."\"" : "") ?>>
+
+check_view_access($this, array('action'=>'info'))) { ?>
getID()."\"" : "") ?>>
columnEnd();
- $this->columnStart(4);
- ?>
+ $this->columnStart(8);
+?>
+check_view_access($this, array('action'=>'form'))) { ?>
getID()."\"" : "") ?>>
+
columnEnd();
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 06614a509..c96d231d7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
/**
* Class which outputs the html page for ViewDocument view
*
@@ -173,6 +168,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
case 'status_change':
$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
break;
+ case 'scheduled_revision':
+ $msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
+ break;
default:
$msg = '???';
}
@@ -242,6 +240,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('js_form_error', 'js_form_errors', 'cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+?>
+ $(document).ready(function(){
+ $("#filterRecipientsInput").on("keyup", function() {
+ var value = $(this).val().toLowerCase();
+ $("#filterRecipientsTable tbody tr").filter(function() {
+ $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+ });
+ });
+ });
+isAdmin()) {
$latestContent = $this->callHook('documentLatestContent', $document);
if($latestContent === null)
@@ -369,11 +377,11 @@ $(document).ready( function() {
print "params['settings']->_httpRoot."op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"> ";
if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
- print $this->html_link('RemoveDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '', ' '));
- print $this->html_link('EditDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '', ' '));
+ print $this->html_link('RemoveDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '', ' '));
+ print $this->html_link('EditDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '', ' '));
}
print " ";
@@ -388,13 +396,35 @@ $(document).ready( function() {
function documentInfos() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
+ $settings = $this->params['settings'];
$document = $this->params['document'];
+ $checkoutdir = $this->params['checkOutDir'];
$txt = $this->callHook('documentInfos', $document);
if(is_string($txt))
echo $txt;
else {
$this->contentHeading(htmlspecialchars($document->getName()));
+ $txt = $this->callHook('checkOutInfo', $document);
+ if(is_string($txt)) {
+ echo $txt;
+ } elseif($infos = $document->getCheckOutInfo()) {
+ $session = $this->params['session'];
+ if($session->getSu()) {
+ $origuser = $dms->getUser($session->getUser());
+ $checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $origuser->getLogin()));
+ } else {
+ $origuser = $user;
+ $checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
+ }
+ foreach($infos as $info) {
+ $checkoutuser = $dms->getUser($info['userID']);
+ $checkoutstatus = $document->checkOutStatus();
+ echo "";
+ }
+ }
$txt = $this->callHook('preDocumentInfos', $document);
if(is_string($txt))
echo $txt;
@@ -423,14 +453,20 @@ $(document).ready( function() {
getComment()) {
+ if($settings->_markdownComments) {
+ $Parsedown = new Parsedown();
+ $comment = $Parsedown->text(htmlspecialchars($document->getComment()));
+ } else {
+ $comment = htmlspecialchars($document->getComment());
+ }
?>
:
- getComment());?>
+
isAdmin() || $document->getAccessMode($user) > M_READ) {
+ if($document->getAccessMode($user) == M_ALL) {
echo "";
echo "".getMLText('default_access').": ";
echo "".$this->getAccessModeText($document->getDefaultAccess())." ";
@@ -690,6 +726,9 @@ $(document).ready( function() {
$accessobject = $this->params['accessobject'];
$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
$enableownerrevapp = $this->params['enableownerrevapp'];
+ $enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+ $enablereceiptreject = $this->params['enablereceiptreject'];
+ $enablerevisionworkflow = $this->params['enablerevisionworkflow'];
$workflowmode = $this->params['workflowmode'];
$previewwidthdetail = $this->params['previewWidthDetail'];
@@ -769,7 +808,14 @@ $(document).ready( function() {
echo $txt;
} else {
if($latestContent->getComment())
- print "".htmlspecialchars($latestContent->getComment())."
";
+ if($this->params['settings']->_markdownComments) {
+ $Parsedown = new Parsedown();
+ $comment = $Parsedown->text(htmlspecialchars($latestContent->getComment()));
+ print "";
+ } else {
+ $comment = htmlspecialchars($latestContent->getComment());
+ print "".$comment."
";
+ }
}
print "\n";
$this->printVersionAttributes($folder, $latestContent);
@@ -796,38 +842,51 @@ $(document).ready( function() {
$items = array();
if ($file_exists){
- if($islatest && $accessobject->mayEditVersion()) {
+ if($islatest && $accessobject->mayEditVersion($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('EditOnline', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion())), 'icon'=>'edit', 'label'=>'edit_version');
}
}
/* Only admin has the right to remove version in any case or a regular
* user if enableVersionDeletion is on
*/
- if($accessobject->mayRemoveVersion()) {
+ if($accessobject->mayRemoveVersion($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('RemoveVersion', array('documentid'=>$latestContent->getDocument()->getId(),'version'=>$latestContent->getVersion())), 'icon'=>'remove', 'label'=>'rm_version');
}
- if($islatest && $accessobject->mayOverwriteStatus()) {
+ if($islatest && $accessobject->mayOverrideStatus($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('OverrideContentStatus', array('documentid'=>$latestContent->getDocument()->getId(),'version'=>$latestContent->getVersion())), 'icon'=>'align-justify', 'label'=>'change_status');
}
+ if($islatest && $enablereceiptworkflow && $accessobject->check_controller_access('SetRecipients'))
+ if($accessobject->maySetRecipients($latestContent->getDocument())) {
+ $items[] = array('link'=>"../out/out.SetRecipients.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'check', 'label'=>'change_recipients');
+ }
+ if($islatest && $enablerevisionworkflow && $accessobject->check_controller_access('SetRevisors'))
+ if($accessobject->maySetRevisors($latestContent->getDocument())) {
+ $items[] = array('link'=>$this->params['settings']->_httpRoot."out/out.SetRevisors.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'refresh', 'label'=>'change_revisors');
+ }
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
// Allow changing reviewers/approvals only if not reviewed
- if($accessobject->maySetReviewersApprovers()) {
+ if($accessobject->maySetReviewersApprovers($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('SetReviewersApprovers', array('documentid'=>$latestContent->getDocument()->getId(),'version'=>$latestContent->getVersion())), 'icon'=>'edit', 'label'=>'change_assignments');
}
} elseif($workflowmode == 'advanced') {
- if($accessobject->maySetWorkflow()) {
+ if($accessobject->maySetWorkflow($latestContent->getDocument())) {
$workflow = $latestContent->getWorkflow();
if(!$workflow) {
$items[] = array('link'=>$this->html_url('SetWorkflow', array('documentid'=>$latestContent->getDocument()->getId(),'version'=>$latestContent->getVersion())), 'icon'=>'random', 'label'=>'set_workflow');
}
}
}
+ if($accessobject->check_controller_access('AddToTransmittal'))
+ if($dms->getAllTransmittals($user)) {
+ if($accessobject->check_view_access('AddToTransmittal'))
+ $items[] = array('link'=>"out.AddToTransmittal.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'list', 'label'=>'add_to_transmittal');
+ }
if($accessobject->check_view_access('EditComment'))
- if($accessobject->mayEditComment()) {
+ if($accessobject->mayEditComment($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('EditComment', array('documentid'=>$latestContent->getDocument()->getId(),'version'=>$latestContent->getVersion())), 'icon'=>'comment', 'label'=>'edit_comment');
}
if($accessobject->check_view_access('EditAttributes'))
- if($accessobject->mayEditAttributes()) {
+ if($accessobject->mayEditAttributes($latestContent->getDocument())) {
$items[] = array('link'=>$this->html_url('EditAttributes', array('documentid'=>$latestContent->getDocument()->getId(),'version'=>$latestContent->getVersion())), 'icon'=>'edit', 'label'=>'edit_attributes');
}
if(!$islatest)
@@ -859,6 +918,10 @@ $(document).ready( function() {
$enableDropUpload = $this->params['enableDropUpload'];
$enableownerrevapp = $this->params['enableownerrevapp'];
$enableremoverevapp = $this->params['enableremoverevapp'];
+ $enableownerreceipt = $this->params['enableownerreceipt'];
+ $enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+ $enablereceiptreject = $this->params['enablereceiptreject'];
+ $enablerevisionworkflow = $this->params['enablerevisionworkflow'];
$workflowmode = $this->params['workflowmode'];
$cachedir = $this->params['cachedir'];
$conversionmgr = $this->params['conversionmgr'];
@@ -933,6 +996,8 @@ $(document).ready( function() {
$reviewStatus = $latestContent->getReviewStatus();
$approvalStatus = $latestContent->getApprovalStatus();
+ $receiptStatus = $latestContent->getReceiptStatus();
+ $revisionStatus = $latestContent->getRevisionStatus();
$this->rowStart();
$this->columnStart(4);
@@ -952,7 +1017,7 @@ $(document).ready( function() {
?>
";
+ echo "".getMLText('workflow')." ".getMLText('date')." ".getMLText('action')." ".getMLText('user')." ".getMLText('comment')." \n";
+ echo " ";
+ foreach($wkflogt as $wkflog) {
+ echo "";
+ echo "".htmlspecialchars($wkflog->getWorkflow()->getName())." ";
+ echo "".getLongReadableDate($wkflog->getDate())." ";
+ echo "".htmlspecialchars(getMLText('action_'.strtolower($wkflog->getTransition()->getAction()->getName()), array(), $wkflog->getTransition()->getAction()->getName()))." ";
+ $loguser = $wkflog->getUser();
+ echo "".htmlspecialchars($loguser->getFullName())." ";
+ echo "".htmlspecialchars($wkflog->getComment())." ";
+ echo " ";
+ }
+ print " \n
\n";
+ }
+ $this->contentContainerEnd();
+ }
+*/
}
?>
@@ -1131,11 +1236,11 @@ $(document).ready( function() {
if($accesserr)
echo "".$accesserr." ', ' '));
- } elseif ($accessobject->mayUpdateReview($updateUser) && (($r["status"]==1)||($r["status"]==-1))){
+ } elseif ($accessobject->mayUpdateReview($latestContent->getDocument(), $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
print $this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('', ' '));
}
}
@@ -1237,11 +1342,11 @@ $(document).ready( function() {
if($accesserr)
echo "".$accesserr." ', ' '));
- } elseif ($accessobject->mayUpdateApproval($updateUser) && (($a["status"]==1)||($a["status"]==-1))){
+ } elseif ($accessobject->mayUpdateApproval($latestContent->getDocument(), $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
print $this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('', ' '));
}
}
@@ -1500,10 +1605,11 @@ $(document).ready( function() {
$this->contentHeading(getMLText("workflow_log"));
$this->contentContainerStart();
echo "";
- echo "".getMLText('date')." ".getMLText('action')." ".getMLText('user')." ".getMLText('comment')." \n";
+ echo "".getMLText('workflow')." ".getMLText('date')." ".getMLText('action')." ".getMLText('user')." ".getMLText('comment')." \n";
echo " ";
foreach($wkflogs as $wkflog) {
echo "";
+ echo "".htmlspecialchars($wkflog->getWorkflow()->getName())." ";
echo "".getLongReadableDate($wkflog->getDate())." ";
echo "".htmlspecialchars(getMLText('action_'.strtolower($wkflog->getTransition()->getAction()->getName()), array(), $wkflog->getTransition()->getAction()->getName()))." ";
$loguser = $wkflog->getUser();
@@ -1521,7 +1627,262 @@ $(document).ready( function() {
1) {
+ if(is_array($receiptStatus) && count($receiptStatus)>0 && $accessobject->check_view_access($this, array('action'=>'recipients'))) {
+?>
+
+getStatus();
+ if($status["status"]!=S_RELEASED)
+ echo "
".getMLText('info_recipients_tab_not_released')."
";
+
+ $txt = $this->callHook('preRecipientsTab', $receiptStatus);
+ if(is_string($txt))
+ echo $txt;
+
+ print "
\n";
+
+ print "\n";
+ print "\n";
+ print "".((count($receiptStatus) > 10) ? ' \n";
+ print "".getMLText("last_update")." \n";
+ print "".getMLText("comment")." ";
+ print "".getMLText("status")." \n";
+ print " \n";
+ print " \n";
+ print "\n";
+
+ $stat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
+ foreach ($receiptStatus as $r) {
+ $required = null;
+ $is_recipient = false;
+ $stat[''.$r['status']]++;
+ $accesserr = '';
+ switch ($r["type"]) {
+ case 0: // Recipient is an individual.
+ $required = $dms->getUser($r["required"]);
+ if (!is_object($required)) {
+ $reqName = getMLText("unknown_user")." '".$r["required"]."'";
+ } else {
+ $reqName = "\n";
+ print "".$reqName." \n";
+ print "".getLongReadableDate($r["date"])." ";
+ print "".htmlspecialchars($r["comment"])." \n";
+ print "";
+ if($class)
+ echo " \n";
+ print "";
+ if($accesserr)
+ echo "".$accesserr." ', ' '));
+ } elseif ($accessobject->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
+ print $this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('', ' '));
+ }
+ }
+ }
+
+ print " \n";
+ }
+ }
+?>
+
+
+contentContainerEnd();
+ if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
+ /* Do not count entries '-2' as they are removed userѕ */
+ $totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
+?>
+
+
+
+printProtocol($latestContent, 'receipt');
+?>
+
+
+
+
+getStatus();
+ if(in_array($status['status'], [S_RELEASED, S_EXPIRED])) {
+ if($latestContent->getRevisionDate()) {
+ $this->warningMsg(getMLText('revise_document_on', array('date' => getReadableDate($latestContent->getRevisionDate()))));
+ } else {
+ $this->errorMsg(getMLText('no_revision_date'));
+ }
+ } elseif($status['status'] != S_IN_REVISION) {
+ $this->infoMsg(getMLText('no_revision_planed'));
+ }
+// $this->contentContainerStart();
+ print "
\n";
+
+ print "\n";
+ print "".getMLText("name")." ".getMLText("last_update")." ".getMLText("comment")." ".getMLText("status")." \n";
+
+ foreach ($revisionStatus as $r) {
+ $class = '';
+ switch($r['status']) {
+ case '-1':
+ $class = 'error';
+ break;
+ case '1':
+ $class = 'success';
+ break;
+ }
+ $required = null;
+ $is_recipient = false;
+ $accesserr = '';
+ switch ($r["type"]) {
+ case 0: // Reviewer is an individual.
+ $required = $dms->getUser($r["required"]);
+ if (!is_object($required)) {
+ $reqName = getMLText("unknown_user")." '".$r["required"]."'";
+ } else {
+ $reqName = "\n";
+ print "".$reqName." \n";
+ print "".getLongReadableDate($r["date"])." ";
+ /* $updateUser is the user who has done the revision */
+ $updateUser = null;
+ if($r['status'] != 0) {
+ $updateUser = $dms->getUser($r["userID"]);
+ print "".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")." ";
+ }
+ print "".htmlspecialchars($r["comment"])." \n";
+ print "";
+ if($class)
+ echo " \n";
+ print "";
+ if($accesserr)
+ echo "".$accesserr." ', ' '));
+ } elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+ print $this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('', ' '));
+ }
+ }
+
+ print " \n";
+ }
+ }
+?>
+
+contentContainerEnd();
+ if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
+?>
+
+
+printProtocol($latestContent, 'revision');
+?>
+
+
+
+
check_view_access($this, array('action'=>'attachments'))) {
?>
getAccessMode($user) >= M_READWRITE){
if($enableDropUpload){
?>
-
html_link('AddFile', array('documentid'=>$documentid), array('class'=>'alert alert-warning'), getMLText('drop_files_here_or_click'), false, true); ?>
+
html_link('AddFile', array('documentid'=>$documentid), array(), getMLText('drop_files_here_or_click'), false, true); ?>
html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn btn-primary'), getMLText("add"), false, true)."\n";
@@ -1563,7 +1925,11 @@ $(document).ready( function() {
$this->columnEnd();
$this->rowEnd();
?>
-
+
0) {
@@ -1671,6 +2037,7 @@ $(document).ready( function() {
?>
$tab) {
echo '';
diff --git a/views/bootstrap/class.ViewEvent.php b/views/bootstrap/class.ViewEvent.php
index 85eb4ac29..0b0eeb448 100644
--- a/views/bootstrap/class.ViewEvent.php
+++ b/views/bootstrap/class.ViewEvent.php
@@ -16,7 +16,7 @@
/**
* Include parent class
*/
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for ViewEvent view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
-class SeedDMS_View_ViewEvent extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ViewEvent extends SeedDMS_Theme_Style {
function show() { /* {{{ */
$dms = $this->params['dms'];
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index ba6ca4306..3ce5ba6de 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
/**
* Class which outputs the html page for ViewFolder view
*
@@ -137,6 +132,9 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Theme_Style {
header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
?>
+$(document).ready(function() {
+ $('#searchfield').focus();
+});
seeddms_folder = getID() ?>;
function folderSelectedmaintree(id, name) {
@@ -235,7 +233,7 @@ $('body').on('click', '.order-btn', function(ev) {
if($showtree == 1)
$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, 'maintree', ($expandFolderTree == 1) ? -1 : 3, $orderby);
- if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
+ if ($enableDropUpload /*&& $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "SeedDMSUpload.setUrl('".$this->params['settings']->_httpRoot."op/op.Ajax.php');";
echo "SeedDMSUpload.setAbortBtnLabel('".getMLText("cancel")."');";
echo "SeedDMSUpload.setEditBtnLabel('".getMLText("edit_document_props")."');";
@@ -250,6 +248,7 @@ $('body').on('click', '.order-btn', function(ev) {
function folderInfos() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
+ $settings = $this->params['settings'];
$folder = $this->params['folder'];
$txt = $this->callHook('folderInfos', $folder);
@@ -277,13 +276,19 @@ $('body').on('click', '.order-btn', function(ev) {
echo "
".getLongReadableDate($folder->getDate())." ";
echo " ";
if($folder->getComment()) {
+ if($settings->_markdownComments) {
+ $Parsedown = new Parsedown();
+ $comment = $Parsedown->text($folder->getComment());
+ } else {
+ $comment = htmlspecialchars($folder->getComment());
+ }
echo "";
echo "".getMLText("comment").": \n";
- echo "".htmlspecialchars($folder->getComment())." \n";
+ echo " ";
}
- if($user->isAdmin() || $folder->getAccessMode($user) > M_READ) {
+ if($folder->getAccessMode($user) == M_ALL) {
echo "";
echo "".getMLText('default_access').": ";
echo "".$this->getAccessModeText($folder->getDefaultAccess())." ";
@@ -457,7 +462,7 @@ $('body').on('click', '.order-btn', function(ev) {
if(is_string($txt))
echo $txt;
else {
- $this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder);
+ $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
}
echo $this->callHook('preContent');
diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index ba579020e..4aaef34d7 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -41,7 +41,16 @@ class SeedDMS_View_WorkflowGraph extends SeedDMS_Theme_Style {
$this->curtransitions = $this->params['transitions'];
header('Content-Type: application/javascript; charset=UTF-8');
- $renderdata = '';
+ $renderdata = $this->workflow->getLayoutData();
+ $positions = array();
+ if($renderdata) {
+ $data = json_decode($renderdata);
+ foreach($data->nodes as $node) {
+ if($node->group == 'nodes') {
+ $positions[$node->data->id] = $node->position;
+ }
+ }
+ }
?>
var cy = cytoscape({
container: document.getElementById('canvas'),
@@ -120,6 +129,8 @@ var cy = cytoscape({
{
selector: 'edge',
style: {
+ 'content': 'data(name)',
+ 'text-wrap': 'wrap',
'width': 4,
'curve-style': 'bezier',
'target-arrow-shape': 'triangle',
@@ -145,6 +156,30 @@ cy.gridGuide({
}
});
+function save_handler(evt) {
+// console.log(JSON.stringify(cy.json().elements));
+ $.ajax('../op/op.WorkflowMgr.php', {
+ type:"POST",
+ async:true,
+ dataType:"json",
+ data: {
+ action: 'setrenderdata',
+ workflowid: workflow->getID(); ?>,
+ data: JSON.stringify(cy.json().elements)
+ },
+ success: function(data, textStatus) {
+ noty({
+ text: data.message,
+ type: data.success ? 'success' : 'error',
+ dismissQueue: true,
+ layout: 'topRight',
+ theme: 'defaultTheme',
+ timeout: 1500,
+ });
+ }
+ });
+};
+
cy.on('free', 'node', function(evt) {
$('#png').attr('src', cy.png({'full': true}));
});
@@ -170,14 +205,18 @@ cy.on('zoom', function(evt) {
});
printGraph();
+ $this->printGraph($positions);
?>
- cy.layout({ name: 'cose', ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
+ cy.layout({ name: '', ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
cy.maxZoom(2.5);
cy.minZoom(0.4);
$('#zoom button').text(Math.round(cy.zoom()*100)+'%');
$(document).ready(function() {
+ $('body').on('click', '#savelayout', function(ev){
+ ev.preventDefault();
+ save_handler();
+ });
$('body').on('click', '#setlayout', function(ev){
ev.preventDefault();
var element = $(this);
@@ -191,7 +230,7 @@ $(document).ready(function() {
workflow->getTransitions();
if($transitions) {
@@ -224,16 +263,18 @@ $(document).ready(function() {
foreach($transgroups as $transgroup) {
$gnames[] = htmlspecialchars($transgroup->getGroup()->getName());
}
+ $nodeid = "A".$transition->getID()."-".$action->getID();
echo "cy.add({
- data: {
- id: 'A".$transition->getID()."-".$action->getID()."',
- name: \"".str_replace('"', "\\\"", $action->getName())/*.($unames ? "\\n(".str_replace('"', "\\\"", implode(", ", $unames)).")" : '').($gnames ? "\\n(".str_replace('"', "\\\"", implode(", ", $gnames)).")" : '')*/."\"
- },
- classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."'".(!$this->curtransitions || $iscurtransition && $this->curtransitions ? ",
- scratch: {
- app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"}
- }" : "")."
- });\n";
+ data: {
+ id: '".$nodeid."',
+ name: \"".str_replace('"', "\\\"", $action->getName())/*.($unames ? "\\n(".str_replace('"', "\\\"", implode(", ", $unames)).")" : '').($gnames ? "\\n(".str_replace('"', "\\\"", implode(", ", $gnames)).")" : '')*/."\"
+ },".(isset($positions[$nodeid]) ? "
+ position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
+ classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."'".(!$this->curtransitions || $iscurtransition && $this->curtransitions ? ",
+ scratch: {
+ app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"}
+ }" : "")."
+});\n";
}
/* Collect all states and remember those which are part of a
@@ -253,13 +294,15 @@ $(document).ready(function() {
foreach($this->states as $state) {
$docstatus = $state->getDocumentStatus();
+ $nodeid = 'S'.$state->getID();
echo "cy.add({
- data: {
- id: 'S".$state->getID()."',
- name: \"".str_replace('"', "\\\"", $state->getName())."\"
- },
- classes: 'state".($state == $this->workflow->getInitState() ? ' init' : ($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ''))).($highlightstates && !in_array($state->getID(), $highlightstates) ? ' light' : '')."'
- });\n";
+ data: {
+ id: '".$nodeid."',
+ name: \"".str_replace('"', "\\\"", $state->getName())."\"
+ },".(isset($positions[$nodeid]) ? "
+ position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
+ classes: 'state".($state == $this->workflow->getInitState() ? ' init' : ($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ''))).($highlightstates && !in_array($state->getID(), $highlightstates) ? ' light' : '')."'
+});\n";
}
foreach($transitions as $transition) {
@@ -278,6 +321,7 @@ $(document).ready(function() {
echo "cy.add({
data: {
id: 'E1-".$transition->getID()."',
+ name: '',
source: 'S".$state->getID()."',
target: 'A".$transition->getID()."-".$action->getID()."'
},
@@ -286,6 +330,7 @@ $(document).ready(function() {
echo "cy.add({
data: {
id: 'E2-".$transition->getID()."',
+ name: '',
source: 'A".$transition->getID()."-".$action->getID()."',
target: 'S".$nextstate->getID()."'
},
@@ -343,6 +388,7 @@ div.buttons #zoom {margin: 3px; _float: right;}
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index e4bf58631..a7fbda91d 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -18,11 +18,6 @@
*/
//require_once("class.Bootstrap.php");
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
/**
* Class which outputs the html page for WorkflowSummary view
*
@@ -49,6 +44,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Theme_Style {
$user = $this->params['user'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -63,6 +59,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Theme_Style {
$workflowStatus = $user->getWorkflowStatus();
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+ $previewer->setConverters($previewconverters);
$printheader=true;
$iRev = array();
diff --git a/views/bootstrap/styles/application.css b/views/bootstrap/styles/application.css
index 10d2c690c..68898a15b 100644
--- a/views/bootstrap/styles/application.css
+++ b/views/bootstrap/styles/application.css
@@ -265,6 +265,15 @@ span.datepicker {
span.datepicker input {
max-width: 100px;
}
+
+div.typeahead span.path {
+ font-size: 85%;
+ color: #888;
+}
+
+div.fulltextinfo > span:hover {
+ background-color: lightblue;
+}
/* Sidenav for Docs
* -------------------------------------------------- */
diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 096c057d4..cb261a983 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -12,6 +12,8 @@ chzn_template_func = function (state) {
if($(state.element).data('warning'))
warning = $(state.element).data('warning')+''; /* make sure it is a string */
var html = '';
+ if($(state.element).data('before-title'))
+ html += $(state.element).data('before-title')+'';
if($(state.element).data('icon-before'))
html += '' + item.path + ' ';
else if(item.type.charAt(0) == 'F')
- return '' + item.path + ' ';
else
- return '' + item.column + ' ' : '');
},
/* This only works with a modified version of bootstrap typeahead located
* in boostrap-typeahead.js Search for 'render'
@@ -507,6 +505,7 @@ $(document).ready( function() {
var action = element.data('action');
var query = element.data('query');
var afterload = $(this).data('afterload');
+ var updatemsg = element.data('update-msg');
if(view && action) {
url = seeddms_webroot+base+"out/out."+view+".php?action="+action;
if(query) {
@@ -529,7 +528,9 @@ $(document).ready( function() {
} else {
url += "&"+param1;
}
- console.log(url);
+ //console.log(url);
+ if(typeof updatemsg != 'undefined')
+ element.html(updatemsg);
if(!element.data('no-spinner'))
element.prepend('');
$.get(url, function(data) {
@@ -1408,14 +1409,14 @@ $(document).ready(function() { /* {{{ */
);
SeedDMSTask.add = function(task) {
- tasks.push(task);
+ return tasks.push(task);
}
SeedDMSTask.run = function() {
for(let task of tasks) {
if(counter % task.interval == 0) {
// console.log("Running task '" + task.name + "'");
- task.func();
+ task.func(task);
}
}
//console.log(counter);
diff --git a/views/bootstrap/trait.TransmittalDeleteButton.php b/views/bootstrap/trait.TransmittalDeleteButton.php
new file mode 100644
index 000000000..ea08ca647
--- /dev/null
+++ b/views/bootstrap/trait.TransmittalDeleteButton.php
@@ -0,0 +1,81 @@
+getID();
+ $content = '';
+ $content .= '
';
+ if($return)
+ return $content;
+ else
+ echo $content;
+ return '';
+ } /* }}} */
+
+ protected function printDeleteItemButtonJs(){ /* {{{ */
+ echo "
+ $(document).ready(function () {
+ $('body').on('click', 'a.delete-transmittalitem-btn', function(ev){
+ id = $(ev.currentTarget).attr('rel');
+ confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+ msg = $(ev.currentTarget).attr('msg');
+ formtoken = '".createFormKey('removetransmittalitem')."';
+ bootbox.dialog(confirmmsg, [{
+ \"label\" : \"
".getMLText("rm_transmittalitem")."\",
+ \"class\" : \"btn-danger\",
+ \"callback\": function() {
+ $.ajax('../op/op.TransmittalMgr.php', {
+ type:'POST',
+ async:true,
+ dataType:'json',
+ data: {
+ action: 'removetransmittalitem',
+ id: id,
+ formtoken: formtoken
+ },
+ success: function(data) {
+ if(data.success) {
+ $('#table-row-transmittalitem-'+id).hide('slow');
+ noty({
+ text: msg,
+ type: 'success',
+ dismissQueue: true,
+ layout: 'topRight',
+ theme: 'defaultTheme',
+ timeout: 1500,
+ });
+ } else {
+ noty({
+ text: data.message,
+ type: 'error',
+ dismissQueue: true,
+ layout: 'topRight',
+ theme: 'defaultTheme',
+ timeout: 3500,
+ });
+ }
+ },
+ });
+ }
+ }, {
+ \"label\" : \"".getMLText("cancel")."\",
+ \"class\" : \"btn-cancel\",
+ \"callback\": function() {
+ }
+ }]);
+ });
+ });
+ ";
+ } /* }}} */
+
+}
diff --git a/views/bootstrap/trait.TransmittalUpdateButton.php b/views/bootstrap/trait.TransmittalUpdateButton.php
new file mode 100644
index 000000000..85937b5cb
--- /dev/null
+++ b/views/bootstrap/trait.TransmittalUpdateButton.php
@@ -0,0 +1,79 @@
+getID();
+ $content = '';
+ $content .= '
';
+ if($return)
+ return $content;
+ else
+ echo $content;
+ return '';
+ } /* }}} */
+
+ protected function printUpdateItemButtonJs(){ /* {{{ */
+ echo "
+ $(document).ready(function () {
+ $('body').on('click', 'a.update-transmittalitem-btn', function(ev){
+ ev.stopPropagation();
+ id = $(ev.currentTarget).attr('rel');
+ transmittalid = $(ev.currentTarget).attr('transmittal');
+ confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+ msg = $(ev.currentTarget).attr('msg');
+ formtoken = '".createFormKey('updatetransmittalitem')."';
+ bootbox.dialog(confirmmsg, [{
+ \"label\" : \"
".getMLText("update_transmittalitem")."\",
+ \"class\" : \"btn-danger\",
+ \"callback\": function() {
+ $.ajax('../op/op.TransmittalMgr.php', {
+ type:'POST',
+ async:true,
+ dataType:'json',
+ data: {
+ action: 'updatetransmittalitem',
+ id: id,
+ formtoken: formtoken
+ },
+ success: function(data) {
+ if(data.success) {
+ noty({
+ text: msg,
+ type: 'success',
+ dismissQueue: true,
+ layout: 'topRight',
+ theme: 'defaultTheme',
+ timeout: 1500,
+ });
+ $('div.ajax').trigger('update', {transmittalid: transmittalid});
+ } else {
+ noty({
+ text: data.message,
+ type: 'error',
+ dismissQueue: true,
+ layout: 'topRight',
+ theme: 'defaultTheme',
+ timeout: 3500,
+ });
+ }
+ }
+ });
+ }
+ }, {
+ \"label\" : \"".getMLText("cancel")."\",
+ \"class\" : \"btn-cancel\",
+ \"callback\": function() {
+ }
+ }]);
+ });
+ });
+ ";
+ } /* }}} */
+
+}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 0568bd0f6..8a51bca5c 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -57,9 +57,11 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
* X-Content-Security-Policy is deprecated, Firefox understands
* Content-Security-Policy since version 23+
* 'worker-src blob:' is needed for cytoscape
+ * 'unsafe-inline' is needed for jquery 3.6.1 when loading the remote
+ * content of a modal box
*/
$csp_rules = [];
- $csp_rule = "script-src 'self' 'unsafe-eval'";
+ $csp_rule = "script-src 'self' 'unsafe-eval' 'unsafe-inline'";
if($this->nonces) {
$csp_rule .= " 'nonce-".implode("' 'nonce-", $this->nonces)."'";
}
@@ -85,7 +87,13 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
if($this->hasHook('startPage'))
$this->callHook('startPage');
echo "\n";
- echo "\n\n";
+ echo "params['session'] && ($slang = $this->params['session']->getLanguage())) {
+ echo str_replace('_', '-', $slang);
+ } else {
+ echo str_replace('_', '-', $this->params['settings']->_language);
+ }
+ echo "\">\n\n";
echo "
\n";
echo '
'."\n";
if($base)
@@ -94,7 +102,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
echo '
'."\n";
$sitename = trim(strip_tags($this->params['sitename']));
if($this->params['session'])
- echo '
'."\n";
+ echo '
'."\n";
$parenttheme = 'bootstrap';
echo '
'."\n";
echo '
'."\n";
@@ -306,7 +314,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function globalBanner() { /* {{{ */
echo "
\n";
- echo " extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")." \n";
+ echo " extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "")." \n";
echo " \n";
} /* }}} */
@@ -314,7 +322,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$dms = $this->params['dms'];
$accessobject = $this->params['accessobject'];
echo "
\n";
- echo " extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")." \n";
+ echo " extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "")." \n";
if(isset($this->params['user']) && $this->params['user']) {
/* search form {{{ */
@@ -338,7 +346,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems = array();
/* calendar {{{ */
if ($this->params['enablecalendar'] && $accessobject->check_view_access('Calendar')) $menuitems['calendar'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.Calendar.php?mode='.$this->params['calendardefaultview'], 'label'=>getMLText("calendar"));
- if ($this->params['user']->isAdmin()) $menuitems['admintools'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.AdminTools.php', 'label'=>getMLText("admin_tools"));
+ if ($accessobject->check_view_access('AdminTools')) $menuitems['admintools'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.AdminTools.php', 'label'=>getMLText("admin_tools"));
if($this->params['enablehelp']) {
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$menuitems['help'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.Help.php?context='.$tmp[1], 'label'=>getMLText("help"));
@@ -395,7 +403,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
/* clipboard {{{ */
if($this->params['enableclipboard']) {
echo " ";
}
/* }}} End of clipboard */
@@ -407,10 +415,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " \n";
@@ -952,7 +1012,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$accessobject = $this->params['accessobject'];
$menuitems = array();
- if (!$this->params['user']->isGuest())
+ if($accessobject->check_view_access(array('AddEvent')))
$menuitems['addevent'] = array('link'=>$this->params['settings']->_httpRoot."out/out.AddEvent.php", 'label'=>getMLText('add_event'));
/* Do not use $this->callHook() because $menuitems must be returned by the the
@@ -1108,17 +1168,21 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
} elseif(is_array($value)) {
switch($value['element']) {
case 'select':
+ $allowempty = empty($value['allow_empty']) ? false : $value['allow_empty'];
echo '";
if(isset($value['options']) && is_array($value['options'])) {
+ if($allowempty)
+ echo "';
@@ -1210,6 +1274,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
case 'danger':
$class = 'btn-danger';
break;
+ case 'secondary':
+ $class = 'btn-secondary';
+ break;
+ case 'neutral':
+ $class = '';
+ break;
case 'primary':
default:
$class = 'btn-primary';
@@ -1342,6 +1412,15 @@ function getOverallStatusIcon($status) { /* {{{ */
case S_EXPIRED:
$icon = 'fa-circle expired';
break;
+ case S_IN_REVISION:
+ $icon = 'fa-refresh';
+ break;
+ case S_DRAFT:
+ $icon = 'fa-circle-o';
+ break;
+ case S_NEEDS_CORRECTION:
+ $icon = 'fa-circle in-workflow';
+ break;
default:
$icon = 'fa fa-question';
break;
@@ -1361,8 +1440,10 @@ function getOverallStatusIcon($status) { /* {{{ */
function getModalBoxLinkAttributes($config) { /* {{{ */
$attrs = array();
$attrs[] = array('data-target', '#'.$config['target']);
- if(isset($config['remote']))
+ if(isset($config['remote'])) {
$attrs[] = array('href', $config['remote']);
+ $attrs[] = array('data-remote', $config['remote']);
+ }
$attrs[] = array('data-toggle', 'modal');
$attrs[] = array('role', 'button');
if(isset($config['class'])) {
@@ -1513,17 +1594,19 @@ $(document).ready(function() {
echo self::getDateChooser($defDate, $varName, $lang, $dateformat, $startdate, $enddate, $weekstart);
} /* }}} */
- function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null) { /* {{{ */
+ function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $placeholder='', $nogroup=false) { /* {{{ */
if(!$dateformat)
$dateformat = getConvertDateFormat();
- $content = '
-
-';
+ $content = '';
+ if(!$nogroup)
+ $content .= '';
+ }
return $content;
} /* }}} */
@@ -1597,12 +1680,15 @@ $(document).ready(function() {
$content .= "";
return $content;
} /* }}} */
-
- function getDocumentChooserHtml($form, $default=false, $formname='', $skiptree=false) { /* {{{ */
+
+ function getDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0, $skiptree=false) { /* {{{ */
if(!$formname)
$formname = "docid";
$formid = md5($formname.$form);
-
+ if(!$folder)
+ $folderid = $this->params['dms']->getRootFolder()->getId();
+ else
+ $folderid = $folder->getID();
$content = '';
$content .= "\n";
@@ -1613,7 +1699,7 @@ $(document).ready(function() {
$content .= $this->getModalBoxLink(
array(
'target' => 'docChooser'.$formid,
- 'remote' => $this->params['settings']->_httpRoot."out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['dms']->getRootFolder()->getId(),
+ 'remote' => $this->params['settings']->_httpRoot."out/out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
'class' => 'btn btn-secondary',
'title' => getMLText('document').'…'
));
@@ -1631,8 +1717,8 @@ $(document).ready(function() {
return $content;
} /* }}} */
- function printDocumentChooserHtml($formName) { /* {{{ */
- echo self::getDocumentChooserHtml($formName);
+ function printDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+ echo self::getDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
} /* }}} */
/**
@@ -1655,8 +1741,8 @@ function folderSelected(id, name) {
printDocumentChooserHtml($form);
+ function printDocumentChooser($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+ $this->printDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
?>
